 shijing
|
b79a1ef671
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-06 09:15:03 +08:00 |
|
shijing
|
6598a4f845
|
fix:coding#673电石渣工序
|
2024-12-06 09:14:59 +08:00 |
 caoqianming
|
a019b681ee
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-05 18:18:04 +08:00 |
|
caoqianming
|
5cb13722a4
|
feat: 排班规则页面
|
2024-12-05 18:17:59 +08:00 |
|
shijing
|
520004edb9
|
fix:coding#658能源监察报表填数
|
2024-12-05 17:48:31 +08:00 |
|
shijing
|
4909cadf77
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-05 17:19:17 +08:00 |
|
shijing
|
619e1ea535
|
fix:coding#658能源监察报表
|
2024-12-05 17:19:13 +08:00 |
|
caoqianming
|
345c73cf09
|
feat: 计算结果页面优化
|
2024-12-05 15:26:20 +08:00 |
|
caoqianming
|
5ec953ff2e
|
feat: base xtselect emit change
|
2024-12-05 15:21:56 +08:00 |
|
shijing
|
bc583ecb8d
|
fix:托克逊事件跳转
|
2024-12-05 11:23:43 +08:00 |
|
shijing
|
3105ac993d
|
fix:能源流向图辊压机计算
|
2024-12-05 10:24:57 +08:00 |
|
shijing
|
64fc587726
|
fix:能源图
|
2024-12-05 10:07:36 +08:00 |
|
shijing
|
4bcc78f789
|
fix:tkx大屏
|
2024-12-05 09:58:40 +08:00 |
|
shijing
|
16f1541e42
|
fix:能源流向图
|
2024-12-05 09:52:48 +08:00 |
|
shijing
|
91b8d3fc4a
|
fix:tkx大屏改动
|
2024-12-04 15:45:23 +08:00 |
|
shijing
|
578c69b599
|
fix:棒管统计字段/条件查询 修正
|
2024-12-04 13:48:34 +08:00 |
|
shijing
|
0d2a4a25ff
|
fix:棒管统计字段修正
|
2024-12-04 11:06:13 +08:00 |
|
shijing
|
84a8b8d1df
|
fix:统计分析棒管页面查询条件改动
|
2024-12-04 10:36:21 +08:00 |
|
shijing
|
54a46fe18c
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-03 17:53:24 +08:00 |
|
shijing
|
085b4aa1c7
|
fix:统计分析棒管
|
2024-12-03 17:53:21 +08:00 |
 zty
|
1d0bb09f10
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-03 17:45:14 +08:00 |
|
zty
|
93979953f6
|
feat: 修改tkx 检定设备
|
2024-12-03 17:45:09 +08:00 |
|
shijing
|
f2cfde2355
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-03 15:22:38 +08:00 |
|
shijing
|
96b6e63d03
|
fix:检验表单中设备列表获取修正
|
2024-12-03 15:22:34 +08:00 |
|
zty
|
f677082480
|
feat: tkx 检验设备临期提醒
|
2024-12-03 15:21:21 +08:00 |
|
zty
|
c667ac0994
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-03 11:44:53 +08:00 |
|
zty
|
4db4a87d99
|
feat: tkx 增加柱状图
|
2024-12-03 11:44:50 +08:00 |
|
shijing
|
148584b8aa
|
fix:日志中工段问题修改
|
2024-12-03 09:45:01 +08:00 |
|
shijing
|
048a8976db
|
fix:批次统计数据接口声明
|
2024-12-02 15:31:12 +08:00 |
|
shijing
|
2d52ae26c5
|
fix:棒管统计页面
|
2024-11-29 17:45:25 +08:00 |
|
shijing
|
3e3c34e49f
|
fix:coding#656form表单
|
2024-11-29 17:43:00 +08:00 |
|
shijing
|
5b676f7c4b
|
fix:coding#656
|
2024-11-29 17:42:37 +08:00 |
|
shijing
|
13d0d7d5f7
|
fix:coding#604
|
2024-11-29 14:16:50 +08:00 |
|
shijing
|
721ddd7b17
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-11-28 16:43:33 +08:00 |
|
shijing
|
0d9afd42e0
|
fix:fmlog改动，以及大屏改动
|
2024-11-28 16:43:30 +08:00 |
|
zty
|
6cb44c71ec
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-11-28 16:13:59 +08:00 |
|
zty
|
8c5e3498ab
|
feat：home/event 修改tkx 能源报警事件
|
2024-11-28 16:13:56 +08:00 |
|
shijing
|
ffc95890fa
|
fix:coding#594
|
2024-11-28 09:59:57 +08:00 |
|
shijing
|
96820cbb4f
|
fix:检验合格B类
|
2024-11-28 08:55:59 +08:00 |
|
shijing
|
fe312b455c
|
fix:coding#628
|
2024-11-27 17:14:08 +08:00 |
|
shijing
|
f079ad9144
|
fix:coding#608
|
2024-11-27 14:29:26 +08:00 |
|
shijing
|
208c0aee5c
|
fix:coding#560二、1性能检验改动
|
2024-11-27 14:28:27 +08:00 |
|
zty
|
52aa3b167b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-11-27 09:51:58 +08:00 |
|
zty
|
cdf271877d
|
feat:tkx 页面修改
|
2024-11-27 09:51:34 +08:00 |
|
shijing
|
29597f1348
|
#502coding：13、添加批次序号 预备用
|
2024-11-27 09:28:24 +08:00 |
|
shijing
|
cc1bc5c129
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-11-27 09:22:38 +08:00 |
|
shijing
|
cea727a691
|
fix:大屏动态获取公告
|
2024-11-27 09:22:35 +08:00 |
|
caoqianming
|
3b7458d683
|
feat: 外协和磨抛一次抛2
|
2024-11-26 22:31:27 +08:00 |
|
caoqianming
|
ae365ee383
|
feat: 外协和磨抛一次抛
|
2024-11-26 22:23:04 +08:00 |
|
caoqianming
|
03780360ac
|
feat: 设备取消是否删除的筛选
|
2024-11-26 17:51:03 +08:00 |
|
caoqianming
|
17dc188e25
|
fix: 车间入库时depts查询报错
|
2024-11-26 16:58:52 +08:00 |
|
zty
|
a9cb7c918b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-11-25 18:33:11 +08:00 |
|
zty
|
893f7a6cd7
|
fix : 修改 tkx 工序内容
|
2024-11-25 18:32:52 +08:00 |
|
shijing
|
63c7929ea3
|
feat:新增返工统计页面，车间库存检验统计
|
2024-11-25 17:24:10 +08:00 |
|
shijing
|
a4eeb13b2f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-11-25 10:25:08 +08:00 |
|
shijing
|
78d82b6f3f
|
fix:字段更正
|
2024-11-25 10:25:05 +08:00 |
|
caoqianming
|
eabdabcf3a
|
feat: mlog不再进行审计
|
2024-11-24 17:42:32 +08:00 |
|
caoqianming
|
4c003251c1
|
feat: base 修改xtui名称
|
2024-11-24 17:41:22 +08:00 |
|
shijing
|
61c03414c0
|
fix:article中form清空与复现
|
2024-11-22 17:24:32 +08:00 |
|
shijing
|
34d3099ed6
|
feat:添加公告视频列表页面
|
2024-11-22 15:46:41 +08:00 |
|
shijing
|
5c0f9acf2f
|
fix:gx获取工段用name查询
|
2024-11-22 11:32:47 +08:00 |
|
shijing
|
37eacdadfe
|
fix:光芯大屏更新
|
2024-11-22 11:21:17 +08:00 |
|
shijing
|
4e1a6901fd
|
fix:tool中修改格式化日期方法
|
2024-11-22 10:00:29 +08:00 |
|
shijing
|
b92937fb9b
|
fix:交接记录手动添加时多选物料
|
2024-11-22 09:59:32 +08:00 |
|
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 |
|
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 |
|
zty
|
19cc389066
|
feat:修改tkx大屏内容
|
2024-10-25 15:48:52 +08:00 |
|
zty
|
ab3b815832
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-25 15:34:35 +08:00 |
|
zty
|
6502325099
|
feat: 修改tkx大屏内容
|
2024-10-25 15:34:29 +08:00 |
|
caoqianming
|
9c12eea0f3
|
feat: 更新xselect以支持多选
|
2024-10-25 14:52:59 +08:00 |
|
caoqianming
|
f844379525
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-25 12:55:32 +08:00 |
|
caoqianming
|
31c6cc6a1f
|
feat: base 消除element警告
|
2024-10-25 12:55:18 +08:00 |
|
shijing
|
13ce3ccc83
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-25 11:15:18 +08:00 |
|
shijing
|
f53ab995fd
|
feat:日志添加车间库存并打印物料标签
|
2024-10-25 11:14:19 +08:00 |
|
shijing
|
f5860c42d5
|
feat:日志添加车间库存并打印物料标签
|
2024-10-25 11:13:28 +08:00 |
|
caoqianming
|
49f6158bf0
|
feat: 调整目录结构等
|
2024-10-25 10:37:50 +08:00 |
|
caoqianming
|
5f738446fb
|
feat: 添加xselect
|
2024-10-25 10:37:00 +08:00 |
|
caoqianming
|
0449684caf
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-25 09:34:27 +08:00 |
|
caoqianming
|
ebd9bfb7fa
|
feat: base sctable去除最后一列
|
2024-10-25 09:34:13 +08:00 |
|
shijing
|
9e4ceeec3f
|
fix:光芯过程自检过程抽检和外观检验权限变动
|
2024-10-24 17:25:59 +08:00 |
|
shijing
|
a9ca429667
|
feat:新增过程光芯自检，与光子抽离
|
2024-10-24 17:23:13 +08:00 |
|
shijing
|
472a871b90
|
feat:过程抽检添加打印
|
2024-10-24 17:22:41 +08:00 |
|
shijing
|
88fc695454
|
feat:工段交接记录新增时扫码添加物料
|
2024-10-24 17:21:37 +08:00 |
|
shijing
|
4acdc9f4cd
|
feat:工段交接记录打印
|
2024-10-24 17:20:42 +08:00 |
|
shijing
|
f02467a881
|
feat:车间入库记录打印
|
2024-10-24 17:19:53 +08:00 |
|
shijing
|
bd873b3b32
|
feat:车间库存物料标签打印
|
2024-10-24 17:18:48 +08:00 |
|
shijing
|
d07ff31f76
|
feat:日志打印
|
2024-10-24 17:18:15 +08:00 |
|
shijing
|
7956d72987
|
feat:任务分解打印
|
2024-10-24 17:17:31 +08:00 |
|
shijing
|
b56a06d5e6
|
feat:扫描组件
|
2024-10-24 17:16:44 +08:00 |
|
shijing
|
42760326b8
|
fix:日志打印
|
2024-10-24 17:15:53 +08:00 |
|
shijing
|
01500ad0b1
|
fix:库存出入库记录打印
|
2024-10-24 17:15:05 +08:00 |
|
shijing
|
06e52b6c5f
|
fix:A4打印
|
2024-10-24 17:14:09 +08:00 |
|
shijing
|
6d87291c90
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-24 17:12:36 +08:00 |
|
shijing
|
403560ce9f
|
fix:库存物料标签打印
|
2024-10-24 17:12:32 +08:00 |
|
zty
|
81b75aaaca
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-24 16:53:10 +08:00 |
|
zty
|
1be10389c9
|
feat: 修改代码 index_enm bug
|
2024-10-24 16:52:57 +08:00 |
|
shijing
|
ad7b0acfd6
|
fix:html2pdf.js更改导出dom宽度
|
2024-10-24 16:51:40 +08:00 |
|
zty
|
d519cd882a
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-24 16:05:15 +08:00 |
|
zty
|
550bc6443b
|
feat: index_enm 修改大屏内容
|
2024-10-24 16:05:12 +08:00 |
|
caoqianming
|
733e3ba9bf
|
feat: 添加xselect组件并注册到全局
|
2024-10-24 16:03:21 +08:00 |
|
caoqianming
|
15db849fd6
|
feat: 添加vue-echarts并注册到全局
|
2024-10-24 11:25:04 +08:00 |
|
caoqianming
|
d10f4a790a
|
feat: 测试页更改
|
2024-10-24 11:06:10 +08:00 |
|
zty
|
345bdc3b96
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-22 16:34:24 +08:00 |
|
zty
|
886c6c8184
|
feat：修改大屏内容
|
2024-10-22 16:34:09 +08:00 |
|
shijing
|
67a4814326
|
feat:检验表导出
|
2024-10-18 17:10:13 +08:00 |
|
shijing
|
a6a4ef7186
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-17 15:41:48 +08:00 |
|
shijing
|
ee12735ea1
|
feat:添加cm接口声明
|
2024-10-17 15:41:45 +08:00 |
|
caoqianming
|
6584b867d3
|
feat: remployee 添加权限标识2
|
2024-10-17 11:27:27 +08:00 |
|
caoqianming
|
a368dcab24
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-17 10:59:31 +08:00 |
|
caoqianming
|
0b72e2dcc1
|
feat: remployee 添加权限标识
|
2024-10-17 10:59:28 +08:00 |
|
shijing
|
b4bb7b0f9f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-17 10:37:36 +08:00 |
|
shijing
|
84524a8b71
|
feat:添加cm接口声明
|
2024-10-17 10:37:32 +08:00 |
|
caoqianming
|
007d5828b6
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-17 09:55:18 +08:00 |
|
caoqianming
|
4389195791
|
fix: base 岗位角色权限标识错误
|
2024-10-17 09:55:15 +08:00 |
|
zty
|
c0f7782aa7
|
feat: enm_kil 修改日月统计表
|
2024-10-16 16:50:57 +08:00 |
|
zty
|
38a9d7b4fb
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-15 14:36:51 +08:00 |
|
zty
|
6e4a817324
|
feat:tkx fix bug
|
2024-10-15 14:36:31 +08:00 |
|
shijing
|
77224cdbd4
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-15 10:49:36 +08:00 |
|
shijing
|
b9a7cd6b66
|
fix:入库信息，生产领料、销售发发货打印导出初版测试
|
2024-10-15 10:49:28 +08:00 |
|
zty
|
cb0a492bbc
|
feat: 修改tkx 日报表
|
2024-10-14 17:41:33 +08:00 |
|
shijing
|
4196873dd7
|
fix:打印模板更新
|
2024-10-14 09:58:56 +08:00 |
|
shijing
|
246bba5f78
|
fix:打印模板更新
|
2024-10-14 09:58:34 +08:00 |
|
shijing
|
1282d7a1c8
|
fix:光芯打印初始模板
|
2024-10-11 14:48:36 +08:00 |
|
shijing
|
0735f5dbf7
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-11 10:47:03 +08:00 |
|
shijing
|
eb0076444f
|
fix：coding#501
|
2024-10-11 10:46:59 +08:00 |
|
zty
|
5911d1f13b
|
feat:修改 能源统计表
|
2024-10-09 17:08:45 +08:00 |
|
zty
|
a831c17838
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
feat:修改水平涡流选粉机
|
2024-10-09 09:27:32 +08:00 |
|
zty
|
ab6e9ac889
|
feat:修改水泥磨中水平涡流选粉机
|
2024-10-09 09:27:18 +08:00 |
|
shijing
|
3fbd419ffd
|
fix:coding500
|
2024-10-08 14:30:59 +08:00 |
|
shijing
|
5ad7678d04
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-08 13:52:54 +08:00 |
|
shijing
|
12133a3b37
|
fix:coding497、499
|
2024-10-08 13:52:50 +08:00 |
|
zty
|
918d45503e
|
feat : 修改 报警界面
|
2024-09-30 17:19:45 +08:00 |
|
caoqianming
|
1ef6ad95a0
|
feat: 计算中心界面
|
2024-09-30 12:47:00 +08:00 |
|
zty
|
1dc5710f84
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-26 18:13:21 +08:00 |
|
zty
|
9c1c1fd39b
|
fix: tkx bug
|
2024-09-26 18:12:56 +08:00 |
|
shijing
|
e5b163dc59
|
fix:合格数统计柱状图修正，光芯mtask提交后刷新列表
|
2024-09-26 15:59:49 +08:00 |
|
shijing
|
753063ba47
|
fix:coding#492
|
2024-09-25 16:52:03 +08:00 |
|
shijing
|
4b7664296f
|
fix:coding#495
|
2024-09-25 16:51:08 +08:00 |
|
shijing
|
fd8e646c10
|
fix:日期显示更改
|
2024-09-25 16:04:13 +08:00 |
|
shijing
|
ba0bfc0ff3
|
fix:光芯合格数统计查询参数时间规范化
|
2024-09-25 14:22:20 +08:00 |
|
shijing
|
14a079ae0b
|
fix:日志中实际生产数和领料数以及加工前不良的计算
|
2024-09-25 14:11:44 +08:00 |
|
shijing
|
84581bc32c
|
fix:外观检验项崩边没有实时计算
|
2024-09-25 14:10:32 +08:00 |
|
shijing
|
25ef072e04
|
feat:utask大任务手动提交
|
2024-09-25 14:09:34 +08:00 |
|
shijing
|
8118bec402
|
fix:工段页面添加出入库记录
|
2024-09-24 16:46:14 +08:00 |
|
shijing
|
64016cf2dc
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-24 16:40:27 +08:00 |
|
shijing
|
4337fb7d1f
|
fix:光芯车间出入库改正
|
2024-09-24 16:40:22 +08:00 |
|
zty
|
f0aa7a2d2f
|
fix:enm 修改班组数据
|
2024-09-24 14:15:33 +08:00 |
|
zty
|
83426cb8cd
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-23 17:37:33 +08:00 |
|
zty
|
f53b3ca29f
|
fix : 测点录入和班组对不上
|
2024-09-23 17:37:28 +08:00 |
|
shijing
|
414fad1602
|
fix:工段库存领料入库操作抽屉展示
|
2024-09-23 11:15:55 +08:00 |
|
shijing
|
0fc3670bce
|
fix:任务进度legend颜色异常问题
|
2024-09-19 17:27:36 +08:00 |
|
shijing
|
c92cbbdcec
|
fix:成品检验切换类型时，清空原有数据
|
2024-09-19 16:48:20 +08:00 |
|
shijing
|
ab9b9bc18f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-19 15:46:48 +08:00 |
|
shijing
|
ffcbe833cf
|
fix:交接记录显示问题&检验时物料批次的排序
|
2024-09-19 15:46:44 +08:00 |
|
zty
|
b5190de25b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-19 15:44:04 +08:00 |
|
zty
|
9c3992b448
|
feat: 新增得分功能
|
2024-09-19 15:43:46 +08:00 |
|
shijing
|
45497e82a1
|
fix:gx成品检验编辑时不合格原因复显问题
|
2024-09-19 15:07:54 +08:00 |
|
shijing
|
86b3e4e2f3
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-19 14:55:13 +08:00 |
|
shijing
|
97e59c2c40
|
fix:库存统计的查询条件
|
2024-09-19 14:55:09 +08:00 |
 Li xia
|
89018c5e59
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-19 09:34:56 +08:00 |
|
Li xia
|
f91ed595f2
|
fix:"摄像头"
|
2024-09-19 09:34:46 +08:00 |
|
shijing
|
17c50f7b27
|
fix:车间物料检验时数量显示为count_cando
|
2024-09-18 14:50:28 +08:00 |
|
shijing
|
747c22fc02
|
fix:调整库存管理目录
|
2024-09-18 13:40:33 +08:00 |
|
shijing
|
5487e1f74d
|
fix:任务统计页面的请求报错
|
2024-09-18 13:31:33 +08:00 |
|
shijing
|
12abe192ad
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-13 15:43:20 +08:00 |
|
shijing
|
4b9b768647
|
fix:coding#481统计中心优化
|
2024-09-13 15:43:16 +08:00 |
|
zty
|
659226e6ad
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-12 15:59:31 +08:00 |
|
zty
|
ba5c1b2129
|
fix bug
|
2024-09-12 15:58:20 +08:00 |
|
shijing
|
58bf615de3
|
fix:交接物料/按钮显示问题
|
2024-09-12 15:28:29 +08:00 |
|
shijing
|
a0013e00cc
|
fix:coding#481：合格数统计
|
2024-09-12 11:25:58 +08:00 |
|
shijing
|
ff9f751fef
|
fix:coding#481：合格数统计
|
2024-09-12 11:23:14 +08:00 |
|
shijing
|
7316da4504
|
fix:coding#4811.2任务进度
|
2024-09-12 10:44:54 +08:00 |
|
shijing
|
714e18e168
|
fix:检验部交接物料查询
|
2024-09-12 10:43:46 +08:00 |
|
shijing
|
4382057684
|
fix:统计分析—任务进度
|
2024-09-12 10:03:05 +08:00 |
|
shijing
|
1cb2c30d3e
|
fix:合格数统计每个模块添加工段名称
|
2024-09-11 16:56:19 +08:00 |
|
shijing
|
8a1cf4a25b
|
fix:成品检验中交接记录的筛选
|
2024-09-11 16:47:01 +08:00 |
|
shijing
|
2d5bbca578
|
fix:成品检验添加班次
|
2024-09-11 15:46:40 +08:00 |
|
shijing
|
744f78b621
|
fix:工段交接记录和库存修正
|
2024-09-11 15:28:35 +08:00 |
|
shijing
|
98b54e50d5
|
fix:黑化车间展示数据修正
|
2024-09-11 15:27:06 +08:00 |
|
shijing
|
6764381bad
|
fix:接收部门placeholder提示文案修正
|
2024-09-10 17:30:55 +08:00 |
|
shijing
|
654a7a3e86
|
fix:黑化车间看板调整
|
2024-09-10 17:30:00 +08:00 |
|
shijing
|
9a41a29f49
|
fix:coding#493保温时间和冷却时间可编辑
|
2024-09-10 16:59:39 +08:00 |
|
shijing
|
7f3c2f00f6
|
fix:其他出入库加编辑
|
2024-09-10 15:50:44 +08:00 |
|
shijing
|
d6c27697c4
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-10 15:06:37 +08:00 |
|
shijing
|
54678f9ffc
|
fix:添加wpm接口声明（车间看板用到）
|
2024-09-10 15:06:33 +08:00 |
|
zty
|
70b7427044
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-09 10:51:46 +08:00 |
|
zty
|
9eb6ffeff5
|
fix tkx
|
2024-09-09 10:51:19 +08:00 |
|
shijing
|
709bd6d11b
|
fix:水泥院动态图标改动
|
2024-09-09 08:47:07 +08:00 |
|
shijing
|
1510aee343
|
fix：交接页面添加打印机名称修改
|
2024-09-06 12:46:24 +08:00 |
|
shijing
|
408f83436c
|
fix:车间库存报废，在库存管理里查看
|
2024-09-06 11:00:53 +08:00 |
|
shijing
|
2eca64bf93
|
fix:日志添加时，设备显示设别编号
|
2024-09-05 19:27:50 +08:00 |
|
shijing
|
d17f336a89
|
fix:批量交接，并可查询
|
2024-09-05 19:26:26 +08:00 |
|
shijing
|
9d7dca9096
|
fix:mlog二级可编辑，并且展示batch
|
2024-09-05 19:25:48 +08:00 |
|
shijing
|
4ae990fbdb
|
fix:各类设备表单字段补全
|
2024-09-05 19:24:43 +08:00 |
|
shijing
|
8eaf952916
|
fix:fmlog工艺路线显示routepack_name
|
2024-09-05 17:17:13 +08:00 |
|
shijing
|
997a1e71ef
|
fix:退火审批问题修改
|
2024-09-05 17:02:28 +08:00 |
|
shijing
|
5cd34dd627
|
fix:mlog提交状态
|
2024-09-05 14:53:08 +08:00 |
|
shijing
|
a57b58c29c
|
fix:外协添加单位编号
|
2024-09-05 14:51:25 +08:00 |
|
shijing
|
eac434c0ea
|
fix:
|
2024-09-05 14:40:49 +08:00 |
|
shijing
|
04fd2c4899
|
fix:生产设备以mgroup筛选，添加设备工作进度条
|
2024-09-05 14:04:58 +08:00 |
|
shijing
|
baaa9f9e2e
|
fix:分配
|
2024-09-05 13:45:22 +08:00 |
|
shijing
|
f93cfa8000
|
fix:黑化日志添加检验附件excel
|
2024-09-05 12:12:58 +08:00 |
|
shijing
|
c45d39ff16
|
fix:除了切片、白片抛、黑化、退火、一次抛其他工序都成新的日志填写
|
2024-09-05 11:03:16 +08:00 |
|
shijing
|
93b3a053f2
|
feat:添加fmlog和第二大类的日志填写
|
2024-09-05 10:55:09 +08:00 |
|
shijing
|
23c9d67b7a
|
fix:产出物料里的不合格显示小崩边
|
2024-09-05 10:53:25 +08:00 |
|
shijing
|
8ee097af9a
|
fix:工改加工前不良对应字段
|
2024-09-05 10:15:47 +08:00 |
|
shijing
|
b0777bdb12
|
fix:fmlog接口声明
|
2024-09-05 09:10:58 +08:00 |
|
shijing
|
25ca2a9e03
|
fix:mtaskbAdd接口声明
|
2024-09-05 09:10:31 +08:00 |
|
shijing
|
69333a2dcc
|
fix：添加mtaskb相关接口声明
|
2024-09-04 14:59:29 +08:00 |
|
shijing
|
a3b2c0a2b5
|
fix:退货放行单日志提交时上传excel文件，并存在日志里
|
2024-09-04 13:37:02 +08:00 |
|
shijing
|
67b5d82545
|
fix:原料检验时备注为保存修正
|
2024-09-04 11:38:14 +08:00 |
|
shijing
|
85e2bf1078
|
fix:车间库存添加检验记录页面，退火日志审批时控制页面按钮
|
2024-09-04 09:50:46 +08:00 |
|
shijing
|
ee973ca0da
|
fix:添加黑化工段库存检验
|
2024-09-03 17:31:48 +08:00 |
|
shijing
|
9675c51e49
|
fix:文案修改，冷却时间
|
2024-09-03 16:33:12 +08:00 |
|
shijing
|
8b2c575a2d
|
fix:日志输入物料添加该批次所在层数的备注
|
2024-09-03 15:31:59 +08:00 |
|
shijing
|
ed0d2a8cad
|
fix:mlogb检验的form表单(全检/抽检)
|
2024-09-03 15:30:22 +08:00 |
|
shijing
|
1a291c6a2e
|
fix:添加车间出入库记录中间页
|
2024-09-03 15:28:53 +08:00 |
|
shijing
|
b69038d369
|
fix:工段库存检验可抽检，可全检
|
2024-09-03 15:27:18 +08:00 |
|
shijing
|
c009cf68ec
|
fix:退火工序日志交接时出发审批，破碎数改为加工前不良
|
2024-09-03 15:25:25 +08:00 |
|
shijing
|
54d00c660a
|
fix:退货放行单审批
|
2024-09-03 15:21:16 +08:00 |
|
shijing
|
abb4ea8d24
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-03 15:20:00 +08:00 |
|
shijing
|
ded2507d02
|
fix:mlog只有黑化和退火时添加保温时间和退火时间
|
2024-09-03 15:19:57 +08:00 |
|
caoqianming
|
18fa08f3f2
|
feat: 改变主界面logo配置
|
2024-08-30 14:01:24 +08:00 |
|
shijing
|
25e4b9f5c9
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-30 09:10:57 +08:00 |
|
shijing
|
3274b9361e
|
fix:工艺路线添加时route的高度调整
|
2024-08-30 09:07:15 +08:00 |
|
caoqianming
|
f8c6e51a39
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-29 13:55:03 +08:00 |
|
caoqianming
|
4963645672
|
feat: 基础配置修改图标
|
2024-08-29 13:55:00 +08:00 |
|
shijing
|
ddb17c9df3
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-29 13:33:39 +08:00 |
|
shijing
|
eb56c827ef
|
fix:合格数统计工段展开
|
2024-08-29 13:33:35 +08:00 |
|
caoqianming
|
06bbc7c776
|
fix: 计算中心页面调整
|
2024-08-29 12:52:06 +08:00 |
|
caoqianming
|
dbc65739ce
|
feat: 计算公式字段加大
|
2024-08-29 12:51:20 +08:00 |
|
caoqianming
|
86dc38f847
|
fix: routeForm is_autotask默认为true
|
2024-08-29 11:47:32 +08:00 |
|
caoqianming
|
f636d549c0
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-28 17:18:23 +08:00 |
|
caoqianming
|
bb1a63437a
|
feat: 添加计算中心及相应的js
|
2024-08-28 17:18:14 +08:00 |
|
caoqianming
|
b6857c3ab8
|
feat: 添加空白控制台
|
2024-08-28 17:17:50 +08:00 |
|
caoqianming
|
1674f56a58
|
feat: 添加时间策略页面
|
2024-08-28 17:17:36 +08:00 |
|
shijing
|
3e146f7d26
|
fix:过程与成品检验添加不合格列
|
2024-08-28 16:02:53 +08:00 |
|
shijing
|
14e2fe211d
|
fix:光芯合格数统计
|
2024-08-28 14:02:07 +08:00 |
|
shijing
|
2a0bcc4692
|
fix:更改宽度
|
2024-08-28 14:01:28 +08:00 |
|
shijing
|
146a2e086c
|
fix:外观检验添加棕圈
|
2024-08-28 14:00:54 +08:00 |
|
shijing
|
d6cef78446
|
fix:物料清单下载模板时添加时间戳
|
2024-08-27 16:36:35 +08:00 |
|
shijing
|
880c655e63
|
fix:coding#4511
|
2024-08-27 16:09:04 +08:00 |
|
shijing
|
ce51133d4c
|
fix:黑化车间车间看板权限控制
|
2024-08-27 15:03:21 +08:00 |
|
shijing
|
5017710f33
|
fix:coding#445
|
2024-08-27 14:45:20 +08:00 |
|
shijing
|
826d7db102
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-27 14:18:32 +08:00 |
|
shijing
|
d56d6d22e1
|
fix:coding#446
|
2024-08-27 14:18:28 +08:00 |
|
Li xia
|
33a55ffa65
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-27 14:03:27 +08:00 |
|
Li xia
|
02dfecfcad
|
fest:"大屏界面调整"
|
2024-08-27 14:03:14 +08:00 |
|
shijing
|
97eab5f9a4
|
fix:光芯自检添加不合格项”小崩边“
|
2024-08-27 11:05:57 +08:00 |
|
shijing
|
c86ab8411e
|
feat:光芯库存统计
|
2024-08-27 10:27:10 +08:00 |
|
shijing
|
7af7efad94
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-27 10:26:24 +08:00 |
|
shijing
|
c836b3f545
|
fix:文案修改配帮管---->配棒管
|
2024-08-27 10:26:20 +08:00 |
|
caoqianming
|
05ecdf7623
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-26 15:38:14 +08:00 |
|
caoqianming
|
0671b19823
|
feat: 添加计算中心页面
|
2024-08-26 15:38:10 +08:00 |
|
caoqianming
|
3994d63728
|
feat: base menu页面优化
|
2024-08-26 15:36:39 +08:00 |
|
shijing
|
f810b751dd
|
feat:光子合格数统计
|
2024-08-26 10:58:50 +08:00 |
|
shijing
|
fabfe94738
|
feat:光子成品检验
|
2024-08-26 10:57:47 +08:00 |
|
shijing
|
d21dc253e4
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-26 09:59:57 +08:00 |
|
shijing
|
8c3bafcc19
|
fix:光子统计分析添加新页面
|
2024-08-26 09:59:53 +08:00 |
|
shijing
|
28d4826043
|
feat:光子统计分析-任务统计
|
2024-08-26 09:59:02 +08:00 |
|
shijing
|
1793a41dfb
|
feat:黑化车间数据看板
|
2024-08-26 09:02:11 +08:00 |
|
zty
|
7f135ed7e1
|
fix: 水泥磨
|
2024-08-23 17:20:22 +08:00 |
|
zty
|
11491e1394
|
feat:增加水泥包装
|
2024-08-21 17:54:28 +08:00 |
|
shijing
|
2a7502d023
|
fix:审批流程添加审批图片(必填)
|
2024-08-21 15:31:24 +08:00 |
|
shijing
|
5ac6bd553b
|
fix:for循环添加key
|
2024-08-20 14:57:00 +08:00 |
|
shijing
|
fef724888b
|
fix:成品检验coding#465
|
2024-08-20 14:47:48 +08:00 |
|
shijing
|
ab9375ddc2
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-20 14:46:49 +08:00 |
|
shijing
|
3cda314ad4
|
fix:成品检验coding#465
|
2024-08-20 14:46:46 +08:00 |
|
zty
|
27c736d080
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
fix bar dar
|
2024-08-20 14:40:25 +08:00 |
|
zty
|
e44e904abe
|
fix: 修改各个工段柱状图
|
2024-08-20 14:40:09 +08:00 |
|
shijing
|
ca9b281834
|
fix:检验管理的检验人查询条件全部用posts__code__contains: "check"
|
2024-08-20 13:48:25 +08:00 |
|
shijing
|
20890b5532
|
fix:成品检验传入type(prod成品)和type2(10抽检)
|
2024-08-20 11:15:06 +08:00 |
|
shijing
|
f2546ecb91
|
fix:工作开始添加开始图片
|
2024-08-20 10:14:16 +08:00 |
|
shijing
|
559f3e2a10
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-20 09:16:58 +08:00 |
|
shijing
|
8f3ef47bb1
|
fix:碳排放图表数据展示
|
2024-08-20 09:16:54 +08:00 |
|
Li xia
|
6417f2ef49
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-19 17:01:27 +08:00 |
|
Li xia
|
1ed17fcedc
|
feat：”超低0816需求修改“
|
2024-08-19 17:01:11 +08:00 |
|
shijing
|
8a8c8322a5
|
fix:审批图片复现
|
2024-08-19 16:33:56 +08:00 |
|
shijing
|
5dcbe0c8e4
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-19 15:18:31 +08:00 |
|
shijing
|
9c76501511
|
fix:pc端作业审批添加图片
|
2024-08-19 15:18:27 +08:00 |
|
Li xia
|
2fdcd3db1b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-19 14:16:38 +08:00 |
|
Li xia
|
b05ce66c38
|
feat:"bug修改"
|
2024-08-19 14:16:12 +08:00 |
|
Li xia
|
be467d3f93
|
feat: ”大屏修改“
|
2024-08-19 14:14:34 +08:00 |
|
caoqianming
|
fe704c09a7
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-19 14:06:32 +08:00 |
|
caoqianming
|
2044684c26
|
feat: 去除登录重定向
|
2024-08-19 14:06:29 +08:00 |
|
zty
|
4aaad74a6a
|
fix: 能管页面更改
|
2024-08-16 18:42:42 +08:00 |
|
zty
|
048a2339d4
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-16 10:57:03 +08:00 |
|
zty
|
3324330799
|
fix: tkx/修改 环期值不显示问题
|
2024-08-16 10:56:58 +08:00 |
|
shijing
|
0dd28c95c5
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-16 10:23:27 +08:00 |
|
shijing
|
329bccb628
|
fix:任务分解后的修改问题
|
2024-08-16 10:21:45 +08:00 |
|
caoqianming
|
13e3c91ca2
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 18:14:52 +08:00 |
|
caoqianming
|
638c0e65b6
|
feat: 样式更改
|
2024-08-15 18:14:34 +08:00 |
|
Li xia
|
d8b7e344bd
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 18:12:45 +08:00 |
|
Li xia
|
e75402ec94
|
feat: "车辆清单"
|
2024-08-15 18:08:49 +08:00 |
|
shijing
|
c08dc1b2d3
|
fix:日志不合格项合计
|
2024-08-15 17:49:21 +08:00 |
|
shijing
|
93ae6ac3da
|
fix:日志检验中添加破损和其他
|
2024-08-15 17:23:44 +08:00 |
|
shijing
|
b353166dda
|
fix:日志中生产设备传dept
|
2024-08-15 17:08:03 +08:00 |
|
shijing
|
599a117a96
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 16:43:29 +08:00 |
|
shijing
|
ffbc69ebab
|
fix:设备巡检和检定记录的修订
|
2024-08-15 16:43:10 +08:00 |
|
Li xia
|
05727aebed
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 16:11:15 +08:00 |
|
Li xia
|
21d7f5d6f7
|
feat: 厂外运输
|
2024-08-15 16:10:53 +08:00 |
|
shijing
|
c60f1bc32f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 16:07:37 +08:00 |
|
shijing
|
3435ffa718
|
fix:创建工艺路线点击上一步时创建多条记录
|
2024-08-15 16:07:32 +08:00 |
|
caoqianming
|
acfc04653a
|
fix: 排放口infotitle
|
2024-08-15 15:59:31 +08:00 |
|
caoqianming
|
18c89f01bb
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 15:59:00 +08:00 |
|
caoqianming
|
e998dd2f8e
|
feat: 菜单icon调整
|
2024-08-15 15:58:26 +08:00 |
|
shijing
|
9fa6081434
|
fix:生产设备增删改后刷新列表，设备类型光子单独一个数组
|
2024-08-15 15:44:42 +08:00 |
|
shijing
|
06c3e107f0
|
fix:eq
|
2024-08-15 15:25:34 +08:00 |
|
shijing
|
791edcbf4f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 14:56:12 +08:00 |
|
shijing
|
9fba7a1330
|
fix:添加设备type
|
2024-08-15 14:56:03 +08:00 |
|
caoqianming
|
3a6249941e
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 14:07:56 +08:00 |
|
caoqianming
|
a085399727
|
fix: 超低修改
|
2024-08-15 14:07:53 +08:00 |
|
shijing
|
7ea7051a88
|
fix:更改密码时去掉 .
|
2024-08-15 13:58:52 +08:00 |
|
shijing
|
65f4502561
|
fix:白抛片-->改为 白片抛
|
2024-08-15 13:57:36 +08:00 |
|
shijing
|
be1f643eef
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 13:28:42 +08:00 |
|
shijing
|
29e4bb2432
|
fix:添加工序工段对应页面，更改工段名称
|
2024-08-15 13:28:38 +08:00 |
|
caoqianming
|
60b277b86b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 11:08:13 +08:00 |
|
caoqianming
|
705b15b833
|
feat: wmaterial增加state字段
|
2024-08-15 11:08:07 +08:00 |
|
shijing
|
d001a98168
|
fix:添加不合格项，抽检添加检验人
|
2024-08-14 21:23:44 +08:00 |
|
shijing
|
d92d010e4d
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-14 17:41:09 +08:00 |
|
shijing
|
57ab4f3914
|
fix：光芯物料导入模板下载地址改动
|
2024-08-14 17:41:05 +08:00 |
|
caoqianming
|
4371a5dff0
|
feat: 环保页面调整
|
2024-08-14 16:25:16 +08:00 |
|
caoqianming
|
e38d1d3eef
|
fix: 光子大屏light intensity调整
|
2024-08-14 14:27:38 +08:00 |
|
caoqianming
|
f2df4ddbb0
|
fix: wpm_gx handoverform getuserlist2 bug
|
2024-08-14 10:47:09 +08:00 |
|
shijing
|
c7bd84f8ab
|
fix:交接记录人员
|
2024-08-14 10:29:15 +08:00 |
|
shijing
|
6f0c9b57bd
|
fix:过程抽检
|
2024-08-14 09:54:46 +08:00 |
|
shijing
|
8ac6ee5db5
|
fix:打印接口设成本地，路由添加过程抽检，工艺路线table高度暂时设小
|
2024-08-14 09:54:11 +08:00 |
|
shijing
|
1666728e9e
|
fix:抽检
|
2024-08-13 15:42:24 +08:00 |
|
shijing
|
404b2b71cb
|
fix:chengpinjianyan
|
2024-08-13 13:51:17 +08:00 |
|
shijing
|
a5759b48b3
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-13 11:15:08 +08:00 |
|
shijing
|
7172a0e070
|
fix:二次、三次超洗
|
2024-08-13 11:15:05 +08:00 |
|
caoqianming
|
147c5273f1
|
feat: 左侧菜单宽度调整
|
2024-08-13 11:02:44 +08:00 |
|
caoqianming
|
a0dcbd8ec6
|
fix: route顺序调整
|
2024-08-13 10:58:10 +08:00 |
|
caoqianming
|
98cf9e8e66
|
feat: 首页调整
|
2024-08-13 10:57:57 +08:00 |
|
caoqianming
|
3e7473444f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-13 10:57:03 +08:00 |
|
caoqianming
|
c95c247cfd
|
feat: 审批管理调整位置
|
2024-08-13 10:56:59 +08:00 |
|
shijing
|
4ee3242fa9
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-13 10:49:35 +08:00 |
|
shijing
|
8e5a2f60ad
|
fix:检验提交
|
2024-08-13 10:49:31 +08:00 |
|
caoqianming
|
1a0b85b9a1
|
feat: 界面字段优化
|
2024-08-13 10:46:03 +08:00 |
|
caoqianming
|
28516c89dd
|
feat: wpm_gx mlog界面优化
|
2024-08-13 10:33:48 +08:00 |
|
caoqianming
|
009e2c05bb
|
fix: handover form wm做筛选
|
2024-08-13 09:56:19 +08:00 |
|
caoqianming
|
d6d1f9231d
|
feat: 修改设备图标
|
2024-08-13 09:42:44 +08:00 |
|
caoqianming
|
17218d6e60
|
fix: mioitem form 取消无反应
|
2024-08-13 09:35:46 +08:00 |
|
caoqianming
|
b28a7c0403
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-13 09:30:04 +08:00 |
|
caoqianming
|
a5f783b056
|
feat: base 登录选项配置/找回密码logo动态
|
2024-08-13 09:30:01 +08:00 |
|
shijing
|
8819696c1c
|
fix:图标更改
|
2024-08-13 09:29:21 +08:00 |
|
shijing
|
9bc030df31
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-12 17:21:35 +08:00 |
|
shijing
|
1ec89273e5
|
fix:光芯成品检验
|
2024-08-12 17:21:31 +08:00 |
|
caoqianming
|
6bf784df60
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-12 16:33:47 +08:00 |
|
caoqianming
|
97e69203ca
|
feat: mio form系统修改
|
2024-08-12 16:33:19 +08:00 |
|
shijing
|
cf3cb5139a
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-12 11:33:39 +08:00 |
|
shijing
|
45c223609c
|
fix:工序添加显示排序
|
2024-08-12 11:33:35 +08:00 |
|
caoqianming
|
857e806af8
|
feat: base 基础样式修改
|
2024-08-09 21:26:07 +08:00 |
|
zty
|
cf4974f824
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
fix：
|
2024-08-09 13:27:50 +08:00 |
|
zty
|
862782fe1f
|
fix type=hour_s 传参数 year month day
|
2024-08-09 13:27:17 +08:00 |
|
shijing
|
6efa08ea9f
|
fix:去掉二级菜单一下的图标，更改部分超低排放
|
2024-08-09 10:36:05 +08:00 |
|
caoqianming
|
442fc20ad6
|
feat: base 调整样式
|
2024-08-08 09:48:18 +08:00 |
|
shijing
|
4aa1463b83
|
fix:materials列表中体现物料系列
|
2024-08-07 18:09:05 +08:00 |
|
shijing
|
f52915325d
|
fix:将检测项目移动到制造管理
|
2024-08-07 17:55:45 +08:00 |
|
shijing
|
119bc195d3
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-07 17:51:09 +08:00 |
|
shijing
|
e68b15b12b
|
fix:成品检验变更(ps:需要改动的地方:物料的物料系列,检测项目testitem的字段类型,检验类型,物料系列标签)
|
2024-08-07 17:51:05 +08:00 |
|
caoqianming
|
afb4070f25
|
feat: base 登录页美化
|
2024-08-07 17:41:41 +08:00 |
|
caoqianming
|
e7a3ad5b19
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-07 16:36:17 +08:00 |
|
caoqianming
|
f8923e2a48
|
feat: 样式调整
|
2024-08-07 16:36:14 +08:00 |
|
shijing
|
34838c76b3
|
fix:testitem
|
2024-08-07 15:58:29 +08:00 |
|
shijing
|
7f6a675a29
|
fix:
|
2024-08-07 14:52:29 +08:00 |
|
shijing
|
1951eae679
|
fix:新增testitem选项在单选或多选时显示
|
2024-08-07 14:41:25 +08:00 |
|
shijing
|
a7d02670d9
|
fix:检测项目更新
|
2024-08-07 14:27:07 +08:00 |
|
shijing
|
766b3d0704
|
fix:首件检验中testitem的获取
|
2024-08-07 13:31:02 +08:00 |
|
shijing
|
0bb5da3c3d
|
fix:性能检验中testitems的获取
|
2024-08-07 13:30:27 +08:00 |
|
shijing
|
fd08cc9356
|
fix:无聊添加时无聊系列的获取
|
2024-08-07 13:29:46 +08:00 |
|
shijing
|
edc93d7110
|
fix:托克逊生产报告小时数据hour_s传参year，month，day，hour
|
2024-08-07 09:20:56 +08:00 |
|
shijing
|
c7285dc56f
|
fix:日志详情页去掉权控
|
2024-08-07 09:18:19 +08:00 |
|
shijing
|
f64e1a3b84
|
fix:托克逊日志详情的测点录入添加测点筛选条件，去除其他成本改为测点录入
|
2024-08-07 09:07:41 +08:00 |
|
shijing
|
9ab7e759dd
|
fix:小时数hour_s传参换成实际时间year、month、day、hour;表格数据通过测点的mpoint_name进行整合数据
|
2024-08-07 09:04:19 +08:00 |
|
shijing
|
909ba81ad4
|
fix:综合查询的检验合格数改正
|
2024-08-07 08:51:19 +08:00 |
|
shijing
|
d2ed2d84f6
|
fix:托克逊新增测点增加字段是否单位量
|
2024-08-06 10:48:15 +08:00 |
|
shijing
|
dd07b3ca11
|
fix:托克逊车间单耗分析箭头表格中当期与环期差值箭头问题
|
2024-08-06 10:00:59 +08:00 |
|
shijing
|
69786dddb7
|
fix:托克逊交接班日志报表完善
|
2024-08-06 09:58:08 +08:00 |
|
shijing
|
0a34b50fef
|
fix:coding#443生产报告小数点问题
|
2024-08-05 14:46:06 +08:00 |
|
shijing
|
32d659912e
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-05 13:55:38 +08:00 |
|
shijing
|
c1ec453081
|
fix:交接班日志报表内容修正
|
2024-08-05 13:55:35 +08:00 |
|
caoqianming
|
d033ac01a7
|
feat: opl添加详情展示信息
|
2024-08-04 20:32:21 +08:00 |
|
caoqianming
|
78205457ae
|
fix: 光子工艺路线不显示
|
2024-08-02 21:11:45 +08:00 |
|
shijing
|
d2f5432095
|
fix:coding#443中添加异常修正
|
2024-08-02 11:28:39 +08:00 |
|
shijing
|
26bffd4f49
|
fix:工艺路线新增route批次校验
|
2024-08-02 11:22:04 +08:00 |
|
shijing
|
4466350cde
|
fix:半成品生产入库显示隐藏物料
|
2024-08-02 10:35:33 +08:00 |
|
shijing
|
0bd5345cd1
|
fix:异常录入问题改正
|
2024-08-02 10:06:21 +08:00 |
|
shijing
|
8ac1ad41b1
|
fix:关闭详情后刷新mlog
|
2024-08-01 18:12:35 +08:00 |
|
shijing
|
263a914fa9
|
fix:不合格校验
|
2024-08-01 17:38:43 +08:00 |
|
shijing
|
061ebbb09f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-01 17:02:42 +08:00 |
|
shijing
|
df7ae9e7cd
|
fix:交接记录按钮权限
|
2024-08-01 17:02:39 +08:00 |
|
caoqianming
|
00a030e29c
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-01 16:07:31 +08:00 |
|
caoqianming
|
f8b974cacb
|
fix: base wf获取下拉选项
|
2024-08-01 16:07:28 +08:00 |
|
shijing
|
fa0cfddc3c
|
fix:日志添加撤回
|
2024-08-01 15:28:49 +08:00 |
|
shijing
|
896cba6bc9
|
fix:返工物料名称标注
|
2024-08-01 15:25:58 +08:00 |
|
shijing
|
ed4cc66303
|
fix:交接编辑人员显示bug修改
|
2024-08-01 15:25:14 +08:00 |
|
caoqianming
|
51ef980600
|
feat: 添加一个测试页
|
2024-08-01 13:46:02 +08:00 |
|
caoqianming
|
8566b8a6be
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-01 13:44:36 +08:00 |
|
caoqianming
|
d101916362
|
feat: 添加ehsselect组件
|
2024-08-01 13:44:32 +08:00 |
|
shijing
|
ff03923c1e
|
fix:详情显示物料fullName
|
2024-08-01 11:18:05 +08:00 |
|
shijing
|
cc0c0bc6d4
|
fix:日志开始/结束时间选择时不能超过当前时间
|
2024-08-01 11:04:26 +08:00 |
|
shijing
|
e6b945b152
|
fix:交接单删除接口修正，以及状态判断
|
2024-08-01 10:41:21 +08:00 |
|
shijing
|
dbec6f5396
|
fix:光芯生产日志中产出物详情展开
|
2024-08-01 10:27:09 +08:00 |
|
caoqianming
|
80b90d7d03
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-01 09:03:49 +08:00 |
|
caoqianming
|
bd04abe46e
|
fix: base systemdict提交时不刷新
|
2024-08-01 09:03:45 +08:00 |
|
shijing
|
0d6dc1a0e2
|
fix:coding#432兼容处理
|
2024-08-01 08:54:19 +08:00 |
|
shijing
|
c8c675f44a
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-01 08:53:56 +08:00 |
|
shijing
|
116c066a81
|
fix:coding#432兼容处理
|
2024-08-01 08:53:52 +08:00 |
|
caoqianming
|
1de0d342d5
|
feat: 添加工段获取错误提示
|
2024-08-01 08:37:31 +08:00 |
|
caoqianming
|
947832ce0a
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-01 08:36:34 +08:00 |
|
caoqianming
|
457dc4c23b
|
fix: 修改批次绑定为批次校验
|
2024-08-01 08:36:31 +08:00 |
|
shijing
|
1861f6406b
|
fix：采购订单雨采购计划添加单价和总价汇总
|
2024-07-31 19:38:53 +08:00 |
|
shijing
|
28bea49629
|
fix：批号追加设备
|
2024-07-31 19:00:08 +08:00 |
|
shijing
|
f7e875b43e
|
fix:coding#425
|
2024-07-31 16:44:27 +08:00 |
|
shijing
|
17b81345a6
|
fix:采购详情列表文案修改
|
2024-07-31 14:11:12 +08:00 |
|
shijing
|
3637f548fd
|
fix:coding#431
|
2024-07-31 10:24:43 +08:00 |
|
shijing
|
023b2ee618
|
fix:原料库列表显示修改
|
2024-07-31 08:44:48 +08:00 |
|
shijing
|
1f383eefac
|
fix:大屏文案修改
|
2024-07-31 08:43:28 +08:00 |
|
shijing
|
f1e1f0f78e
|
fix:测点所属工段清空
|
2024-07-30 16:48:26 +08:00 |
|
shijing
|
e4dfebee09
|
fix:交接记录中options展示样式
|
2024-07-30 15:30:14 +08:00 |
|
shijing
|
94e0ed014a
|
feat:添加打印机名称保存
|
2024-07-30 15:22:25 +08:00 |
|
shijing
|
f40ef04e36
|
fix:单位产品电耗日期查询清空时错误改正
|
2024-07-30 15:00:55 +08:00 |
|
shijing
|
09991ac6c9
|
fix:统计分析-综合查询
|
2024-07-30 14:55:46 +08:00 |
|
shijing
|
04a40a6d1f
|
fix:完善电量报表
|
2024-07-30 14:47:40 +08:00 |
|
shijing
|
8917c2cb1b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-07-30 14:46:56 +08:00 |