 zty
|
1d9645fa45
|
feat:修改循环风机无数据
|
2024-12-24 09:30:47 +08:00 |
 caoqianming
|
ec90ec5ecd
|
feat: 按托克逊要求修改页面
|
2024-12-23 14:40:36 +08:00 |
 shijing
|
f3015f58bf
|
fix:一些小改动
|
2024-12-23 09:25:19 +08:00 |
|
shijing
|
93d207b7d4
|
fix:testitem添加字段
|
2024-12-20 16:51:10 +08:00 |
|
shijing
|
a9117da584
|
fix:testitem_form中去掉cate获取
|
2024-12-20 11:24:22 +08:00 |
|
shijing
|
f51f7affaf
|
fix:enum.js新增数据
|
2024-12-20 11:08:53 +08:00 |
|
shijing
|
6dac98b2a3
|
fix:scformtable添加序号隐藏
|
2024-12-20 10:47:15 +08:00 |
|
shijing
|
e825947de7
|
fix:检验表功能完善
|
2024-12-20 10:45:59 +08:00 |
|
shijing
|
94bd41c4f1
|
fix:qm检测表相关接口声明
|
2024-12-19 16:08:41 +08:00 |
|
shijing
|
0deb3a653c
|
fix:检测项列表展示修正
|
2024-12-19 16:07:44 +08:00 |
|
shijing
|
8664db52b7
|
fix:检验项修正
|
2024-12-19 15:55:13 +08:00 |
|
shijing
|
9018800f4f
|
fix:玻纤生产执行页面变更
|
2024-12-18 17:42:18 +08:00 |
|
shijing
|
d2821d5e98
|
fix:玻纤物料添加追踪方式
|
2024-12-18 15:09:43 +08:00 |
|
shijing
|
9bee6af2b1
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-18 13:44:51 +08:00 |
|
shijing
|
4afa8e8361
|
fix:工艺路线添加切分数量
|
2024-12-18 13:43:59 +08:00 |
|
zty
|
0a20102060
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-18 13:29:41 +08:00 |
|
zty
|
f3d84d165e
|
feat: 修改生成日报的运转率和运转时间
|
2024-12-18 13:29:37 +08:00 |
|
shijing
|
8b25da6bad
|
fix:能源流向图片地址纠正
|
2024-12-18 11:32:48 +08:00 |
|
shijing
|
c3eaa07d73
|
feat:添加不合格项#coding720
|
2024-12-18 11:25:23 +08:00 |
|
caoqianming
|
f231b2dc25
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-17 17:33:10 +08:00 |
|
caoqianming
|
299258925c
|
feat: process添加字段
|
2024-12-17 17:32:53 +08:00 |
|
zty
|
376b65364f
|
feat: 增加压缩空气报表
|
2024-12-17 17:21:07 +08:00 |
|
shijing
|
af45254d43
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-17 17:07:45 +08:00 |
|
shijing
|
368d106143
|
fix:能源流向图添加工业水，去掉图标
|
2024-12-17 17:07:42 +08:00 |
|
zty
|
1246966c58
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-17 16:22:33 +08:00 |
|
zty
|
fbda02f549
|
feat: 修改大屏内容和报表
|
2024-12-17 16:22:29 +08:00 |
|
shijing
|
e0a02ba014
|
fix:客户端可修改大屏标题
|
2024-12-17 15:43:37 +08:00 |
|
shijing
|
bb95b5228e
|
feat:白片抛检验审批
|
2024-12-17 14:30:38 +08:00 |
|
shijing
|
5c139f0b7c
|
fix:光芯生产执行恢复
|
2024-12-17 10:39:01 +08:00 |
|
shijing
|
ce57e0c5e1
|
fix:光芯生产执行恢复
|
2024-12-17 10:28:41 +08:00 |
|
shijing
|
b435f9ed10
|
fix:玻纤生产执行分离
|
2024-12-17 10:27:19 +08:00 |
|
shijing
|
25a2427138
|
fix:动态路由
|
2024-12-16 17:38:43 +08:00 |
|
shijing
|
82ee266d51
|
fix:menu
|
2024-12-16 15:57:26 +08:00 |
|
zty
|
421ae76ac6
|
feat:修改设备编号
|
2024-12-16 14:54:35 +08:00 |
|
shijing
|
da53ce0411
|
fix:10车间日志提交更新
|
2024-12-16 13:37:30 +08:00 |
|
shijing
|
139c24c9bc
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-16 11:31:46 +08:00 |
|
shijing
|
ba3ce6e30e
|
fix:system添加接口声明
|
2024-12-16 11:31:42 +08:00 |
|
caoqianming
|
1a6d53a685
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-13 18:14:57 +08:00 |
|
caoqianming
|
b3ca98680d
|
feat: 电石渣工序车间单耗异常填写
|
2024-12-13 18:14:37 +08:00 |
 Li xia
|
bbc0603bdf
|
route生产二部权限替换
|
2024-12-13 17:41:16 +08:00 |
|
shijing
|
c43e670eb1
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-13 17:01:57 +08:00 |
|
shijing
|
9b4bdd2f96
|
fix：全场报表生产日报表、生产月报表表格改动
|
2024-12-13 17:01:53 +08:00 |
|
caoqianming
|
d14faabc46
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-13 16:13:48 +08:00 |
|
caoqianming
|
733d1bebb1
|
feat: base 优化menu展示
|
2024-12-13 16:13:23 +08:00 |
|
shijing
|
55f99058cf
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-13 15:42:30 +08:00 |
|
shijing
|
ece48faede
|
fix:厂级单耗
|
2024-12-13 15:42:26 +08:00 |
|
zty
|
5606d90eca
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-13 15:29:56 +08:00 |
|
zty
|
c336a6ef1e
|
feat:修改电量报表 按时间段查询
|
2024-12-13 15:29:53 +08:00 |
|
shijing
|
064860ed92
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-13 14:55:16 +08:00 |
|
shijing
|
8055fe7968
|
fix:pad端样式调整
|
2024-12-13 14:55:13 +08:00 |
|
caoqianming
|
fa475e8568
|
feat: base 功能管理页面调整以支持后端路由2
|
2024-12-13 13:43:46 +08:00 |
|
caoqianming
|
b0ad4e1a06
|
feat: base 功能管理页面调整以支持后端路由
|
2024-12-13 13:39:45 +08:00 |
|
shijing
|
42baf79b76
|
fix:工序type
|
2024-12-13 09:35:56 +08:00 |
|
shijing
|
1750e89138
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-12 17:36:30 +08:00 |
|
shijing
|
516085fa30
|
base:bx主题颜色变更
|
2024-12-12 17:36:26 +08:00 |
|
zty
|
a56d5cbf82
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-12 17:16:27 +08:00 |
|
zty
|
1f33764782
|
feat:能源流向图增加单位
|
2024-12-12 17:16:24 +08:00 |
|
shijing
|
fa9dea32ef
|
fix:清除移动端菜单边距
|
2024-12-12 17:15:00 +08:00 |
|
shijing
|
45f5166d95
|
fix:工序添加type
|
2024-12-12 16:40:39 +08:00 |
|
shijing
|
fd79baf73a
|
fix:检验项和检验表静态页面
|
2024-12-12 15:47:46 +08:00 |
|
shijing
|
24252a4995
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-12 15:47:14 +08:00 |
|
shijing
|
010298dd89
|
feat:废品库出库
|
2024-12-12 15:47:11 +08:00 |
|
zty
|
0c910a1783
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-12 14:56:12 +08:00 |
|
zty
|
1de408c64d
|
feat: 能源流向增加单位 和修改大屏
|
2024-12-12 14:56:09 +08:00 |
|
shijing
|
653f5b0282
|
fix:添加检验项、检验表页面路由
|
2024-12-12 14:05:36 +08:00 |
|
shijing
|
da221bbee4
|
fix:添加检验项、检验表页面路由
|
2024-12-12 13:46:17 +08:00 |
|
shijing
|
0cb85ee6dd
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-12 13:44:33 +08:00 |
|
shijing
|
256e2b5009
|
fix:bx放出排版规则
|
2024-12-12 13:44:30 +08:00 |
|
caoqianming
|
5d94b20320
|
feat: 优化测点表
|
2024-12-11 17:48:42 +08:00 |
|
caoqianming
|
a50794c2b7
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-11 17:47:04 +08:00 |
|
caoqianming
|
c8bde428a8
|
fix: team 编辑后未刷新
|
2024-12-11 17:46:37 +08:00 |
|
shijing
|
bb314a30a2
|
fix:物料清单成品添加图纸和图纸编号
|
2024-12-11 15:53:18 +08:00 |
|
shijing
|
69307c7590
|
fix:玻纤生产执行
|
2024-12-11 14:58:10 +08:00 |
|
shijing
|
e32d444e57
|
fix:玻纤工序变动
|
2024-12-11 14:56:50 +08:00 |
|
shijing
|
8bf82762bc
|
fix:玻纤工序变动
|
2024-12-11 14:56:28 +08:00 |
|
shijing
|
cce2c8e395
|
fix:玻纤工序变动
|
2024-12-11 10:12:25 +08:00 |
|
shijing
|
e03198aa43
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-11 10:09:38 +08:00 |
|
shijing
|
ba39e85698
|
fix:玻纤工段变动
|
2024-12-11 10:08:39 +08:00 |
|
zty
|
a4fa774ce2
|
feat: tkx 修改大屏增加电量报表和物料氨水消耗
|
2024-12-10 15:30:14 +08:00 |
|
shijing
|
d30376cd17
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-09 11:07:30 +08:00 |
|
shijing
|
5b3fa16bec
|
fix:光子综合查询库存修正
|
2024-12-09 11:05:13 +08:00 |
|
caoqianming
|
5b1f9db6d8
|
feat: mpoint添加筛选
|
2024-12-06 19:27:11 +08:00 |
|
caoqianming
|
8c5f6b6cec
|
feat: 停机日志页面调整
|
2024-12-06 19:23:48 +08:00 |
|
caoqianming
|
d0d41b6f59
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-06 19:22:22 +08:00 |
|
caoqianming
|
79debc4242
|
feat: 计算中心页面调整
|
2024-12-06 19:22:19 +08:00 |
|
shijing
|
8c070442c6
|
fix:流向图调整
|
2024-12-06 17:54:41 +08:00 |
|
shijing
|
9f2d1b9bf1
|
fix:流向图调整
|
2024-12-06 17:54:05 +08:00 |
|
shijing
|
d073270dbb
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-06 16:10:04 +08:00 |
|
shijing
|
02364cba7d
|
fix:流向图图片地址
|
2024-12-06 16:10:01 +08:00 |
|
caoqianming
|
9292cfe61d
|
feat: enstatvue 小调整
|
2024-12-06 15:37:08 +08:00 |
|
caoqianming
|
d7d1ab60de
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-06 15:36:37 +08:00 |
|
caoqianming
|
8443916320
|
feat: base query可替换order
|
2024-12-06 15:36:33 +08:00 |
|
shijing
|
856cd3dad1
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-06 15:34:06 +08:00 |
|
shijing
|
8f35a7f6b5
|
fix:coding#674页面数据
|
2024-12-06 15:34:03 +08:00 |
|
caoqianming
|
1c47d546b7
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-06 15:14:04 +08:00 |
|
caoqianming
|
497c57a186
|
feat: 增加计算聚合页面
|
2024-12-06 15:13:59 +08:00 |
|
zty
|
eca678139b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-06 15:06:41 +08:00 |
|
zty
|
bf581b872d
|
feat: 修改峰谷平的报表
|
2024-12-06 15:06:38 +08:00 |
|
shijing
|
3a59765b26
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-06 14:53:39 +08:00 |
|
shijing
|
09b5f89a0a
|
fix:coding#674页面数据
|
2024-12-06 14:53:36 +08:00 |
|
zty
|
2427752b2a
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-06 14:27:07 +08:00 |
|
zty
|
47b225d7ab
|
feat: 增加峰谷平和 水报表
|
2024-12-06 14:25:27 +08:00 |
|
caoqianming
|
9398cab8b6
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-06 13:50:57 +08:00 |
|
caoqianming
|
20b52d4c3b
|
feat: 计算中心添加工段计算页面
|
2024-12-06 13:50:54 +08:00 |
|
shijing
|
53b892317a
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-06 13:01:24 +08:00 |
|
shijing
|
cde58ee08f
|
fix:coding#674页面
|
2024-12-06 13:01:20 +08:00 |
|
caoqianming
|
2dd4661f44
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-12-06 11:53:59 +08:00 |
|
caoqianming
|
9b53a3428b
|
feat: 能管控制台设备提醒查询条件
|
2024-12-06 11:53:55 +08:00 |
|
shijing
|
3049f491a8
|
fix：报警事件页面以及处理改动
|
2024-12-06 11:16:15 +08:00 |
|
shijing
|
4e8f85f63a
|
fix:coding#673综合对比
|
2024-12-06 09:53:35 +08:00 |
|
shijing
|
b54b1733b9
|
fix:coding#673全厂报表
|
2024-12-06 09:48:42 +08:00 |
|
shijing
|
15292ee455
|
fix:coding#673能源报表
|
2024-12-06 09:39:09 +08:00 |
|
shijing
|
9c59ebbfc5
|
fix:coding#673水泥包装工序
|
2024-12-06 09:36:17 +08:00 |
|
shijing
|
5f58446d6d
|
fix:coding#673水泥粉磨工序
|
2024-12-06 09:34:56 +08:00 |
|
shijing
|
488ab287d4
|
fix:coding#673烧成工序
|
2024-12-06 09:22:23 +08:00 |
|
shijing
|
607546ba7d
|
fix:coding#673煤磨工序
|
2024-12-06 09:20:42 +08:00 |
|
shijing
|
d1ea1e49ac
|
fix:coding#673生料工序
|
2024-12-06 09:19:28 +08:00 |
|
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 |