Commit Graph

2469 Commits

Author SHA1 Message Date
shijing 6a7975e6ce fix:大屏更改 2024-11-21 13:28:28 +08:00
shijing 0752000f24 fix:coding交接变动 2024-11-21 13:27:54 +08:00
shijing 4d8bf81be3 fix:成品检验车间库存放开检验 2024-11-21 13:27:18 +08:00
shijing 6a50019343 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-21 13:24:42 +08:00
shijing 431fcf4bd8 fix:尺寸外观(成品)检验添加检验设备和备注 2024-11-21 13:24:38 +08:00
caoqianming 78053dac34 fix: 标记位置加载js报错的问题 2024-11-20 17:39:05 +08:00
caoqianming fed5c23a28 fix: user处element升级导致的switch颜色处理 2024-11-20 15:52:10 +08:00
caoqianming 014da8f587 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-20 15:49:31 +08:00
caoqianming 5cefd84ded feat: 设备管理is_deleted可查 2024-11-20 15:49:16 +08:00
shijing 05649491ab Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-19 16:31:22 +08:00
shijing 38c84fa1e9 fix:高echarts改动 2024-11-19 16:31:18 +08:00
caoqianming e94d3194ef feat: 成品检验依据子项确定抽检数等 2024-11-19 15:23:04 +08:00
caoqianming 1849fe6eef feat: 修改xtSelect 的高度 2024-11-19 15:16:02 +08:00
caoqianming 7fe603dbc2 fix: scTable refresh问题 2024-11-15 18:51:51 +08:00
caoqianming 3376d9c5af Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-15 18:31:56 +08:00
caoqianming 234e5ca216 feat: mtask查看可用批次 2024-11-15 18:31:35 +08:00
shijing 231b306829 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-15 14:46:27 +08:00
shijing 4d21ef3a65 fix:大屏优化 2024-11-15 14:46:24 +08:00
caoqianming cbd7ec9e8d Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-15 14:39:51 +08:00
caoqianming 04d4129f98 feat: 图标展示优化 2024-11-15 14:39:30 +08:00
zty 3b71931f3a Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-15 14:07:54 +08:00
zty cc5df7b2b3 feat:修改 tkx 计算系数 和 backup --delete 2024-11-15 14:07:50 +08:00
caoqianming 890a344082 feat: base 系统路由中dashboard函数获取 2024-11-15 09:27:56 +08:00
zty b0d0df97be Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-14 17:45:08 +08:00
zty b7a420c576 fix tkx bug 2024-11-14 17:44:54 +08:00
shijing feeeaf423e fix:光芯大屏更新视频公告 2024-11-14 11:23:08 +08:00
shijing bfd3f5e7f9 fix:coding#502-2 2024-11-14 11:21:46 +08:00
shijing 6fd716d4ba Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-13 17:01:26 +08:00
shijing 07958e9a57 fix:车间库存添加状态筛选 2024-11-13 17:00:43 +08:00
shijing 95a81dbf8d fix:光芯大屏更新 2024-11-13 16:59:41 +08:00
zty e611c4597b fix : 修改 tkx bug 2024-11-12 16:23:22 +08:00
shijing 58a3e9fe2d Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-08 10:28:07 +08:00
shijing 9f9ce29ee0 fix:gx大屏初步模板 2024-11-08 10:28:02 +08:00
zty 72d29e6758 fix: 修改能源流向图地址 2024-11-07 11:16:45 +08:00
shijing fb79ad7943 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-07 11:09:47 +08:00
shijing 1b297de7bb fix:物料选择查询条件添加mtaskx 2024-11-07 11:09:44 +08:00
shijing ce3e4becc6 fix:能源流向放开 2024-11-07 11:08:00 +08:00
zty 48ce15857b feat: 修改图标 x 轴 顺序问题 2024-11-07 10:27:52 +08:00
zty 1b5bd4255c Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-07 09:55:40 +08:00
zty b2c8254976 feat: 修改大屏内容 2024-11-07 09:55:34 +08:00
caoqianming be9da52571 fix: testx中xtSelect修改 2024-11-07 08:32:45 +08:00
caoqianming 32547f26f1 fix: 解决overlay runtime error 2024-11-07 08:25:47 +08:00
zty d190c47c3b Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-01 17:11:14 +08:00
zty 7d7eee19af feat : index_enm 修改大屏内容 2024-11-01 17:11:11 +08:00
shijing bab6467c25 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-01 14:35:58 +08:00
shijing ddb83f7eb4 fix:流程图改动(抽出组件) 2024-11-01 14:35:53 +08:00
caoqianming 7b59a8ae3a Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-01 09:27:18 +08:00
caoqianming f0aab1b9af feat: 修改xtSelect名称 2024-11-01 09:26:50 +08:00
shijing d7965ef170 fix:coding507 2024-11-01 09:26:17 +08:00
shijing 7cb112bde8 fix:出入库后页面库存刷新 2024-11-01 09:24:04 +08:00