 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 |
|
shijing
|
b062b9f568
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-11-01 09:11:21 +08:00 |
|
shijing
|
6f717b03ec
|
fix:fmlog日志中编辑mlog时取消领料数量不能大于当前工段库存数的限制，且合格不合格禁用
|
2024-11-01 09:11:17 +08:00 |
|
zty
|
30e24fd8f5
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-31 11:28:27 +08:00 |
|
zty
|
0dd7648593
|
feat: 修改图表
|
2024-10-31 11:28:23 +08:00 |
|
shijing
|
9734d461cf
|
fix:交接页面按钮修正
|
2024-10-30 10:03:34 +08:00 |
|
shijing
|
f4fcc315bb
|
fix:小问题修正（过程抽检打印）
|
2024-10-30 09:05:57 +08:00 |
|
shijing
|
dabedbd432
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-30 09:04:04 +08:00 |
|
shijing
|
371316faea
|
fix:添加扫描按钮，并更换
|
2024-10-30 09:04:00 +08:00 |
|
zty
|
e8d28126ad
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-29 16:28:30 +08:00 |
|
zty
|
2ed4e5dc7a
|
feat:fac_cal 增加 计算中心折线图
|
2024-10-29 16:28:25 +08:00 |
|
shijing
|
6f476c2740
|
fix:日志中物料标签的打印
|
2024-10-29 15:29:03 +08:00 |
|
shijing
|
7ed39bb24a
|
fix:标签模板优化
|
2024-10-29 14:24:57 +08:00 |
|
shijing
|
d91db25ed6
|
fix:fmlogs打印传参更改
|
2024-10-29 13:54:28 +08:00 |
|
shijing
|
af24f1f4cf
|
feat：导航栏添加扫描按钮，扫描二维码查看打印详情
|
2024-10-29 10:15:46 +08:00 |
|
shijing
|
8e5f258d1a
|
fix:区别详情查看和扫码添加
|
2024-10-29 10:14:58 +08:00 |
|
shijing
|
c5e83d9581
|
fix:更正错别字，表头深色，修正错误数据引用
|
2024-10-29 10:14:17 +08:00 |
|
shijing
|
be8ee7b14b
|
fix:更改日志打印标记
|
2024-10-29 10:12:22 +08:00 |
|
caoqianming
|
27fd49a690
|
feat: xselect edit参数更改
|
2024-10-26 13:13:03 +08:00 |
|
caoqianming
|
177446d8c2
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-26 13:09:04 +08:00 |
|
caoqianming
|
fdd3604fc3
|
feat: 完善xselect封装
|
2024-10-26 13:08:45 +08:00 |
|
shijing
|
0a48dbecdd
|
fix:添加一个全局参数
|
2024-10-25 17:21:23 +08:00 |
|
shijing
|
642b94923f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-25 17:20:12 +08:00 |
|
shijing
|
3349982650
|
fix:工段库存物料标签打印
|
2024-10-25 17:17:54 +08:00 |
|
shijing
|
f3f59c7888
|
feat:抽取物料标签打印并改动库存里的物料标签打印
|
2024-10-25 17:16:37 +08:00 |
|
caoqianming
|
7cd8ad4b0d
|
feat: 解除vue警告
|
2024-10-25 16:34:46 +08:00 |
|
caoqianming
|
b866d133e0
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-25 16:04:12 +08:00 |
|
caoqianming
|
875b47f111
|
feat: 添加scTableSelect
|
2024-10-25 16:03:52 +08:00 |