wangsr
|
3cda278e1d
|
change - 界面美化
|
1 year ago |
nodyang
|
cd50514e00
|
修复按钮
|
1 year ago |
wangsr
|
f926545355
|
change - 修改nodedevice 完善设备监控图 发版前准备
|
1 year ago |
wangsr
|
63eab8ca08
|
add - 设备监控界面添加报警
|
1 year ago |
wangsr
|
37e66a188d
|
add - 报表plchelper数据读取废案
|
1 year ago |
nodyang
|
94101f3a1d
|
后台运行
|
1 year ago |
wangsr
|
acebd40093
|
Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
|
1 year ago |
wangsr
|
12927af05a
|
change - 展示界面报表添加
|
1 year ago |
nodyang
|
751b3f53ab
|
Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
|
1 year ago |
nodyang
|
55a9a78539
|
0913 整理代码
|
1 year ago |
wangsr
|
ab7419f990
|
Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
# Conflicts:
# Main/MCEdit/Data/MCProject/nodeDevice.xml
|
1 year ago |
wangsr
|
4c5f60e7fb
|
change - 展示界面添加高低料位等
|
1 year ago |
nodyang
|
e9f1825eaf
|
Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
# Conflicts:
# Main/MCEdit/Data/MCProject/nodeDevice.xml
|
1 year ago |
nodyang
|
7e71fd990b
|
2107 add 新增数据库2107
|
1 year ago |
wangsr
|
96afbeffa4
|
Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
# Conflicts:
# Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DownloadAction.cs
|
1 year ago |
wangsr
|
e74338a03d
|
change - 界面设置
|
1 year ago |
nodyang
|
a5e0b1e767
|
0912 测试计划的版本呢
|
1 year ago |
wangsr
|
8942b48b85
|
Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
|
1 year ago |
wangsr
|
918040618a
|
change - 中横线改下划线
|
1 year ago |
nodyang
|
d14fa8de9d
|
demo
|
1 year ago |
nodyang
|
397e90d767
|
Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
|
1 year ago |
nodyang
|
aeab567cc7
|
修补缺失的点位
|
1 year ago |
wangsr
|
de62462783
|
Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
|
1 year ago |
wangsr
|
f0eec65097
|
change - 点位测试
|
1 year ago |
nodyang
|
cc63ca6d63
|
0911 修改146=>2106
|
1 year ago |
wangsr
|
320f5331ee
|
change - 小改动
|
1 year ago |
wangsr
|
42c9b0b73d
|
add - 展示界面添加新点位
|
1 year ago |
wangsr
|
87dfe65f7e
|
change - db 2102 2103 2017 维护完毕
|
1 year ago |
wangsr
|
4d53b1d2eb
|
change - nodedevice 新版本维护
|
1 year ago |
nodyang
|
098f833ec0
|
merge
|
1 year ago |
nodyang
|
9fbf00b15f
|
mege
|
1 year ago |
nodyang
|
1f0c2da3d3
|
Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
|
1 year ago |
nodyang
|
7848b05546
|
merge
|
1 year ago |
wangsr
|
28de46fb64
|
change - 界面美化
|
1 year ago |
nodyang
|
9f13b74e6d
|
0907 晚上临时提交
|
1 year ago |
wangsr
|
62bbcfaf91
|
解决合并冲突 最终正常期望版本
|
1 year ago |
nodyang
|
e6ce524df2
|
0907
|
1 year ago |
wangsr
|
26358bdfbd
|
add - DB2105nodeDevice添加 问题待解决
|
1 year ago |
wangsr
|
d8b0eb696d
|
add - 输送监视图完成 点位开始维护 换电脑
|
1 year ago |
nodyang
|
1761df780f
|
Merge branch 'dep0901' into dep
|
1 year ago |
nodyang
|
4e0213df1b
|
榄菊新的管理
|
1 year ago |
nodyang
|
c72bd4553b
|
add 重新编辑配方
|
1 year ago |
wangsr
|
142709f84f
|
change - 小料监控图重画完毕
|
1 year ago |
wangsr
|
b27477df99
|
change - 按钮逻辑修改
|
1 year ago |
nodyang
|
d48a870f9f
|
页面整合处理
|
1 year ago |
wangsr
|
53c2b54934
|
Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
|
1 year ago |
wangsr
|
dc45f101bb
|
change - 化工來訪前
|
1 year ago |
nodyang
|
a1c9ba3aac
|
生产计划
|
1 year ago |
nodyang
|
4ad8952ab1
|
Merge remote-tracking branch 'haiwei/dep' into dep
|
1 year ago |
nodyang
|
57880f5e4e
|
0830 提交
|
1 year ago |