 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 |