Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hemei
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
潘栩锋
hemei
Commits
60f737c7
Commit
60f737c7
authored
Jun 18, 2019
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
初步检测完,应该完成
parent
59dd3f6d
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
138 additions
and
4 deletions
+138
-4
FLY.Thick.BlowingScan.UI.Client.csproj
...wingScan.UI.Client/FLY.Thick.BlowingScan.UI.Client.csproj
+10
-3
packages.config
...owingScan/FLY.Thick.BlowingScan.UI.Client/packages.config
+3
-0
0.clear_module.ps1
脚本/0.clear_module.ps1
+13
-0
1.update_dll.ps1
脚本/1.update_dll.ps1
+56
-1
2.update_graphcustom_AirRing.ps1
脚本/2.update_graphcustom_AirRing.ps1
+5
-0
2.update_graphcustom_AirRingWeight3.ps1
脚本/2.update_graphcustom_AirRingWeight3.ps1
+5
-0
2.update_graphcustom_AirRingWeight5.ps1
脚本/2.update_graphcustom_AirRingWeight5.ps1
+5
-0
2.update_graphcustom_AllWeight3.ps1
脚本/2.update_graphcustom_AllWeight3.ps1
+5
-0
get_exe_all.ps1
脚本/get_exe_all.ps1
+17
-0
install.xml
脚本/install/install.xml
+19
-0
No files found.
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/FLY.Thick.BlowingScan.UI.Client.csproj
View file @
60f737c7
...
...
@@ -68,9 +68,14 @@
<Reference
Include=
"Costura, Version=3.3.3.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL"
>
<HintPath>
..\..\packages\Costura.Fody.3.3.3\lib\net40\Costura.dll
</HintPath>
</Reference>
<Reference
Include=
"MathNet.Numerics, Version=3.11.0.0, Culture=neutral, processorArchitecture=MSIL"
>
<SpecificVersion>
False
</SpecificVersion>
<HintPath>
..\dll\MathNet.Numerics.dll
</HintPath>
<Reference
Include=
"LiveCharts, Version=0.9.7.0, Culture=neutral, PublicKeyToken=0bc1f845d1ebb8df, processorArchitecture=MSIL"
>
<HintPath>
..\..\packages\LiveCharts.0.9.7\lib\net45\LiveCharts.dll
</HintPath>
</Reference>
<Reference
Include=
"LiveCharts.Wpf, Version=0.9.7.0, Culture=neutral, PublicKeyToken=0bc1f845d1ebb8df, processorArchitecture=MSIL"
>
<HintPath>
..\..\packages\LiveCharts.Wpf.0.9.7\lib\net45\LiveCharts.Wpf.dll
</HintPath>
</Reference>
<Reference
Include=
"MathNet.Numerics, Version=4.8.1.0, Culture=neutral, processorArchitecture=MSIL"
>
<HintPath>
..\..\packages\MathNet.Numerics.4.8.1\lib\net461\MathNet.Numerics.dll
</HintPath>
</Reference>
<Reference
Include=
"Microsoft.Expression.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
/>
<Reference
Include=
"Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
/>
...
...
@@ -84,6 +89,8 @@
<Reference
Include=
"System"
/>
<Reference
Include=
"System.Data"
/>
<Reference
Include=
"System.Drawing"
/>
<Reference
Include=
"System.Numerics"
/>
<Reference
Include=
"System.Runtime.Serialization"
/>
<Reference
Include=
"System.Windows.Forms"
/>
<Reference
Include=
"System.Windows.Forms.DataVisualization"
/>
<Reference
Include=
"System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
/>
...
...
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/packages.config
View file @
60f737c7
...
...
@@ -2,6 +2,9 @@
<
packages
>
<
package
id
=
"Costura.Fody"
version
=
"3.3.3"
targetFramework
=
"net461"
/>
<
package
id
=
"Fody"
version
=
"4.2.1"
targetFramework
=
"net461"
developmentDependency
=
"true"
/>
<
package
id
=
"LiveCharts"
version
=
"0.9.7"
targetFramework
=
"net461"
/>
<
package
id
=
"LiveCharts.Wpf"
version
=
"0.9.7"
targetFramework
=
"net461"
/>
<
package
id
=
"MathNet.Numerics"
version
=
"4.8.1"
targetFramework
=
"net461"
/>
<
package
id
=
"Newtonsoft.Json"
version
=
"12.0.2"
targetFramework
=
"net461"
/>
<
package
id
=
"PropertyChanged.Fody"
version
=
"2.6.1"
targetFramework
=
"net461"
/>
</
packages
>
\ No newline at end of file
脚本/0.clear_module.ps1
View file @
60f737c7
...
...
@@ -22,6 +22,18 @@ foreach ($n in $modules)
}
}
$src_path
=
$root_path
+
"\..\Project.FLY.Thick.BlowingScan\FLY.Thick.BlowingScan.UI.Client\bin\Debug"
foreach
(
$n
in
$modules
)
{
$path
=
$src_path
+
"\"
+
$n
#echo $path
if
(
Test-Path
(
$path
))
{
echo
$path
+
"存在,把它删除"
rm
-R
$path
}
}
#-----------------------------------------------------------------
echo
复制成功
pause
\ No newline at end of file
脚本/1.update_dll.ps1
View file @
60f737c7
...
...
@@ -2,15 +2,19 @@
#AirRing
$root_path
=
$PSScriptRoot
+
"\.."
$src_path
=
$root_path
+
"\Project.FLY.FeedbackRenZiJia\FLY.FeedbackRenZiJia.UI.Client\bin\Debug"
$dest_path
=
$root_path
+
"\Project.FLY.Thick.Blowing\FLY.Thick.Blowing.UI.Fix.Client\bin\Debug"
$src_path
=
$root_path
+
"\Project.FLY.FeedbackRenZiJia\FLY.FeedbackRenZiJia.UI.Client\bin\Debug"
echo
复制 FLY.FeedbackRenZiJia.dll
cp
(
$src_path
+
"\FLY.FeedbackRenZiJia.dll"
)
$dest_path
echo
复制 FLY.FeedbackRenZiJia.UI.Client.dll
cp
(
$src_path
+
"\FLY.FeedbackRenZiJia.UI.Client.dll"
)
$dest_path
#-----------------------------------------------------------------
#IBC
...
...
@@ -22,6 +26,7 @@ cp ($src_path + "\FLY.IBC.dll") $dest_path
echo
复制 FLY.IBC.UI.Client.dll
cp
(
$src_path
+
"\FLY.IBC.UI.Client.dll"
)
$dest_path
#-----------------------------------------------------------------
#Winder
...
...
@@ -44,6 +49,55 @@ cp ($src_path + "\FLY.Weight.dll") $dest_path
echo
复制 FLY.Weight.UI.Client.dll
cp
(
$src_path
+
"\FLY.Weight.UI.Client.dll"
)
$dest_path
#扫描测厚仪-----------------------------------------------------------
echo
------------------------------------扫描测厚仪-------------------------------------------
$dest_path
=
$root_path
+
"\Project.FLY.Thick.BlowingScan\FLY.Thick.BlowingScan.UI.Client\bin\Debug"
$src_path
=
$root_path
+
"\Project.FLY.FeedbackRenZiJia\FLY.FeedbackRenZiJia.UI.Client\bin\Debug"
echo
复制 FLY.FeedbackRenZiJia.dll
cp
(
$src_path
+
"\FLY.FeedbackRenZiJia.dll"
)
$dest_path
echo
复制 FLY.FeedbackRenZiJia.UI.Client.dll
cp
(
$src_path
+
"\FLY.FeedbackRenZiJia.UI.Client.dll"
)
$dest_path
#-----------------------------------------------------------------
#IBC
$src_path
=
$root_path
+
"\Project.FLY.IBC\FLY.IBC.UI.Client\bin\Debug"
echo
复制 FLY.IBC.dll
cp
(
$src_path
+
"\FLY.IBC.dll"
)
$dest_path
echo
复制 FLY.IBC.UI.Client.dll
cp
(
$src_path
+
"\FLY.IBC.UI.Client.dll"
)
$dest_path
#-----------------------------------------------------------------
#Winder
$src_path
=
$root_path
+
"\Project.FLY.Winder_20190413\FLY.Winder.UI.Client\bin\Debug"
echo
复制 FLY.Winder.dll
cp
(
$src_path
+
"\FLY.Winder.dll"
)
$dest_path
echo
复制 FLY.Winder.UI.Client.dll
cp
(
$src_path
+
"\FLY.Winder.UI.Client.dll"
)
$dest_path
#-----------------------------------------------------------------
#Weight
$src_path
=
$root_path
+
"\Project.FLY.Weight\FLY.Weight.UI.Client\bin\Debug"
echo
复制 FLY.Weight.dll
cp
(
$src_path
+
"\FLY.Weight.dll"
)
$dest_path
echo
复制 FLY.Weight.UI.Client.dll
cp
(
$src_path
+
"\FLY.Weight.UI.Client.dll"
)
$dest_path
#-----------------------------------------------------------------
echo
复制成功
pause
\ No newline at end of file
脚本/2.update_graphcustom_AirRing.ps1
View file @
60f737c7
...
...
@@ -4,6 +4,10 @@ $dest_path = $root_path + "\Project.FLY.Thick.Blowing\FLY.Thick.Blowing.UI.Fix.C
cp
$src_path
$dest_path
$dest_path
=
$root_path
+
"\Project.FLY.Thick.BlowingScan\FLY.Thick.BlowingScan.UI.Client\bin\Debug\layout\graphcustom.xml"
cp
$src_path
$dest_path
#-----------------------------------------------------------------
echo
Ƴɹ
pause
\ No newline at end of file
脚本/2.update_graphcustom_AirRingWeight3.ps1
View file @
60f737c7
...
...
@@ -4,6 +4,10 @@ $dest_path = $root_path + "\Project.FLY.Thick.Blowing\FLY.Thick.Blowing.UI.Fix.C
cp
$src_path
$dest_path
$dest_path
=
$root_path
+
"\Project.FLY.Thick.BlowingScan\FLY.Thick.BlowingScan.UI.Client\bin\Debug\layout\graphcustom.xml"
cp
$src_path
$dest_path
#-----------------------------------------------------------------
echo
Ƴɹ
pause
\ No newline at end of file
脚本/2.update_graphcustom_AirRingWeight5.ps1
View file @
60f737c7
...
...
@@ -4,6 +4,10 @@ $dest_path = $root_path + "\Project.FLY.Thick.Blowing\FLY.Thick.Blowing.UI.Fix.C
cp
$src_path
$dest_path
$dest_path
=
$root_path
+
"\Project.FLY.Thick.BlowingScan\FLY.Thick.BlowingScan.UI.Client\bin\Debug\layout\graphcustom.xml"
cp
$src_path
$dest_path
#-----------------------------------------------------------------
echo
Ƴɹ
pause
\ No newline at end of file
脚本/2.update_graphcustom_AllWeight3.ps1
View file @
60f737c7
...
...
@@ -4,6 +4,10 @@ $dest_path = $root_path + "\Project.FLY.Thick.Blowing\FLY.Thick.Blowing.UI.Fix.C
cp
$src_path
$dest_path
$dest_path
=
$root_path
+
"\Project.FLY.Thick.BlowingScan\FLY.Thick.BlowingScan.UI.Client\bin\Debug\layout\graphcustom.xml"
cp
$src_path
$dest_path
#-----------------------------------------------------------------
echo
Ƴɹ
pause
\ No newline at end of file
脚本/get_exe_all.ps1
View file @
60f737c7
...
...
@@ -86,6 +86,17 @@ copy_to2 `
"FLY.Winder.UI.Server"
`
(
"Gage1"
)
copy_to2
`
"Project.FLY.Thick.BlowingScan"
`
"FLY.Thick.BlowingScan.UI.Client"
`
(
"csysparam.xml"
,
"layout"
,
"main_module"
,
"music"
,
"版本说明.txt"
,
"测厚仪说明书.pdf"
)
copy_to2
`
"Project.FLY.Thick.BlowingScan"
`
"FLY.Thick.BlowingScan.UI.Server"
`
(
"Gage1"
)
#删除 历史数据文件
$remove_files
=
(
"backup"
,
"profile"
,
"warning_history"
,
"history"
,
"bulk.csv"
)
foreach
(
$f
in
$remove_files
)
...
...
@@ -93,6 +104,12 @@ foreach($f in $remove_files)
rm
-Recurse -Force
(
$install_dir
+
"\FLY.Thick.Blowing.UI.Fix.Server\Gage1\"
+
$f
)
}
$remove_files
=
(
"backup"
,
"profile"
,
"warning_history"
,
"history"
,
"bulk.csv"
)
foreach
(
$f
in
$remove_files
)
{
rm
-Recurse -Force
(
$install_dir
+
"\FLY.Thick.BlowingScan.UI.Server\Gage1\"
+
$f
)
}
$remove_files
=
(
"flowlist.csv"
,
"warning_newest.csv"
)
foreach
(
$f
in
$remove_files
)
{
...
...
脚本/install/install.xml
View file @
60f737c7
...
...
@@ -20,6 +20,25 @@
<string>
测厚仪说明书.pdf
</string>
</Others>
</SoftwareItem>
<SoftwareItem>
<IsAutoRun>
true
</IsAutoRun>
<Name>
扫描测厚仪服务器
</Name>
<Path>
佛山市枫莱尔自动化技术有限公司\windows\FLY.Thick.BlowingScan.UI.Server
</Path>
<Exe>
FLY.Thick.BlowingScan.UI.Server.exe
</Exe>
</SoftwareItem>
<SoftwareItem>
<IsAutoRun>
true
</IsAutoRun>
<Name>
扫描测厚仪客户端
</Name>
<Path>
佛山市枫莱尔自动化技术有限公司\windows\FLY.Thick.BlowingScan.UI.Client
</Path>
<Exe>
FLY.Thick.BlowingScan.UI.Client.exe
</Exe>
<Others>
<string>
main_module
</string>
<string>
music
</string>
<string>
版本说明.txt
</string>
<string>
测厚仪说明书.pdf
</string>
</Others>
</SoftwareItem>
<SoftwareItem>
<IsAutoRun>
true
</IsAutoRun>
<Name>
自动风环
</Name>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment