diff --git a/LargeSquareOne/Config/Configure.ini b/LargeSquareOne/Config/Configure.ini index a8874ec..48e5e1b 100644 --- a/LargeSquareOne/Config/Configure.ini +++ b/LargeSquareOne/Config/Configure.ini @@ -7,7 +7,7 @@ 切换监控界面间隔时间=1 曲线显示数量=1 开启刷卡模式=False -MES/非MES模式切换=False +MES/非MES模式切换=True 获取MES参数=True 线程耗时日志保存=False 是否获取服务器数据=1 @@ -17,8 +17,8 @@ MES/ [MES配置] 工厂代码=60J -产线编号=MW-601 -设备编号=601UPW01 +产线编号=MW-602 +设备编号=602VIM01 智能电表编号=1,2 白夜班交替时间=20:30:00 MES日志保存路径=D:\APILog @@ -34,7 +34,7 @@ MES 设备状态=http://10.22.160.141/core/api/public/eve/pm/eqm/run/status/operation 能耗=http://10.22.160.141/core/api/public/eve/pm/energy/consumption/collection/submit 风速仪=https://iot.eveportal.com:9470/eve_api/ems/iot/upload_device_collect_data -guid=55e9ca41-814c-43a4-9e7e-34324548ade7 +guid=a270c7d2-9cbd-4739-9a0b-0709b5813332 DeviceState=1 run_AlarmMark=0 run_IdleMark=0 diff --git a/LargeSquareOne/Config/Device.ini b/LargeSquareOne/Config/Device.ini new file mode 100644 index 0000000..6668344 --- /dev/null +++ b/LargeSquareOne/Config/Device.ini @@ -0,0 +1,4 @@ +[设备参数] +IP地址=127.0.0.1 +端口号=9600 +PLC类型=OmronFinsTcp_HSL diff --git a/LargeSquareOne/Config/Group.xlsx b/LargeSquareOne/Config/Group.xlsx new file mode 100644 index 0000000..a70b064 Binary files /dev/null and b/LargeSquareOne/Config/Group.xlsx differ diff --git a/LargeSquareOne/Config/Variable.xlsx b/LargeSquareOne/Config/Variable.xlsx new file mode 100644 index 0000000..e2697d0 Binary files /dev/null and b/LargeSquareOne/Config/Variable.xlsx differ diff --git a/LargeSquareOne/Config/琛ㄦ牸/Variable - 2.xlsx b/LargeSquareOne/Config/琛ㄦ牸/Variable - 2.xlsx new file mode 100644 index 0000000..b0b64ce Binary files /dev/null and b/LargeSquareOne/Config/琛ㄦ牸/Variable - 2.xlsx differ diff --git a/LargeSquareOne/Config/琛ㄦ牸/Variable - 3-1.xlsx b/LargeSquareOne/Config/琛ㄦ牸/Variable - 3-1.xlsx new file mode 100644 index 0000000..b4a9b06 Binary files /dev/null and b/LargeSquareOne/Config/琛ㄦ牸/Variable - 3-1.xlsx differ diff --git a/LargeSquareOne/Config/琛ㄦ牸/Variable - 3-2.xlsx b/LargeSquareOne/Config/琛ㄦ牸/Variable - 3-2.xlsx new file mode 100644 index 0000000..49d9604 Binary files /dev/null and b/LargeSquareOne/Config/琛ㄦ牸/Variable - 3-2.xlsx differ diff --git a/LargeSquareOne/Config/琛ㄦ牸/Variable - 3-3.xlsx b/LargeSquareOne/Config/琛ㄦ牸/Variable - 3-3.xlsx new file mode 100644 index 0000000..cb9c922 Binary files /dev/null and b/LargeSquareOne/Config/琛ㄦ牸/Variable - 3-3.xlsx differ diff --git a/LargeSquareOne/Config/琛ㄦ牸/Variable - 7.xlsx b/LargeSquareOne/Config/琛ㄦ牸/Variable - 7.xlsx new file mode 100644 index 0000000..ee54a62 Binary files /dev/null and b/LargeSquareOne/Config/琛ㄦ牸/Variable - 7.xlsx differ diff --git a/LargeSquareOne/Config/琛ㄦ牸/Variable - 8.xlsx b/LargeSquareOne/Config/琛ㄦ牸/Variable - 8.xlsx new file mode 100644 index 0000000..f426ae3 Binary files /dev/null and b/LargeSquareOne/Config/琛ㄦ牸/Variable - 8.xlsx differ diff --git a/LargeSquareOne/Config/琛ㄦ牸/Variable.xlsx b/LargeSquareOne/Config/琛ㄦ牸/Variable.xlsx new file mode 100644 index 0000000..8856c5e Binary files /dev/null and b/LargeSquareOne/Config/琛ㄦ牸/Variable.xlsx differ diff --git a/LargeSquareOne/LargeSquareOne.csproj b/LargeSquareOne/LargeSquareOne.csproj index 9c394a9..1c6f773 100644 --- a/LargeSquareOne/LargeSquareOne.csproj +++ b/LargeSquareOne/LargeSquareOne.csproj @@ -414,6 +414,9 @@ PreserveNewest + + + SettingsSingleFileGenerator