 caoqianming
|
a2feea0b54
|
fix: base 退出时用location.reload重置路由
|
2024-03-13 14:17:00 +08:00 |
|
caoqianming
|
8311cb7d1b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-03-13 11:19:36 +08:00 |
|
caoqianming
|
4c401c805a
|
fix: 无组织页面调整
|
2024-03-13 11:19:35 +08:00 |
 shijing
|
2aae784b2b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-03-13 10:59:38 +08:00 |
|
shijing
|
3ffe89512e
|
feat:大屏设备图标显及点击查看示（简易版）
|
2024-03-13 10:59:19 +08:00 |
|
caoqianming
|
6b9c0064c9
|
fix: 调整有组织排放界面
|
2024-03-13 09:52:03 +08:00 |
|
caoqianming
|
6fa74980ca
|
feat: 增加enum.js
|
2024-03-13 09:51:37 +08:00 |
|
caoqianming
|
9479de2460
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-03-13 09:51:22 +08:00 |
|
caoqianming
|
6228ba367a
|
feat: 添加设备分类页面及相应修改
|
2024-03-13 09:50:39 +08:00 |
|
caoqianming
|
50148b4e3a
|
fix: base 菜单删除进行刷新
|
2024-03-12 08:54:29 +08:00 |
|
shijing
|
994c625b0d
|
设备分类
|
2024-03-12 08:50:48 +08:00 |
|
shijing
|
47b34cf175
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-03-11 16:32:10 +08:00 |
|
shijing
|
e19b401ae5
|
mars3d
|
2024-03-11 16:32:01 +08:00 |
|
caoqianming
|
affb89e964
|
fix: worktask 获取退火炉列表修改完成
|
2024-03-11 15:57:00 +08:00 |
|
caoqianming
|
1a1aa3ebcb
|
feat: 从localstorage中获取token
|
2024-03-11 13:34:32 +08:00 |
|
caoqianming
|
767e2d8048
|
feat: base 退出后可重定向
|
2024-03-11 13:34:09 +08:00 |
|
caoqianming
|
efe3bb7777
|
feat: base 退出后登录可重定向rediect
|
2024-03-11 13:33:00 +08:00 |
|
caoqianming
|
052821526e
|
feat: base 完善无感刷新
|
2024-03-11 13:32:12 +08:00 |
|
caoqianming
|
ebf6e48d65
|
fix: worktask 获取退火炉列表修改2
|
2024-03-11 09:35:18 +08:00 |
|
caoqianming
|
ec0b455d30
|
fix: worktask 获取退火炉列表修改
|
2024-03-11 09:19:44 +08:00 |
|
caoqianming
|
d6430b17a6
|
feat: worktask 获取退火炉列表修改
|
2024-03-11 08:46:59 +08:00 |
|
shijing
|
4ad85cab13
|
环境质量
|
2024-03-08 13:19:00 +08:00 |
|
shijing
|
7b5c19ee83
|
cems中echarts的tooltip位置自适应
|
2024-03-08 09:37:59 +08:00 |
|
shijing
|
fbc2766534
|
图标tooltip的位置自适应
|
2024-03-08 09:35:28 +08:00 |
|
shijing
|
be92fd5ce1
|
mars3d文件
|
2024-03-08 09:24:08 +08:00 |
|
shijing
|
e13a52beea
|
cesium暂存更改
|
2024-03-08 09:22:37 +08:00 |
|
shijing
|
f783cd189d
|
取消过多的console
|
2024-03-07 15:01:37 +08:00 |
|
caoqianming
|
e9d2daa3af
|
feat: 默认开启纵向边框
|
2024-03-07 09:45:41 +08:00 |
|
caoqianming
|
5def66cf5c
|
fix: 混料添加车间库存及相应bug修复
|
2024-03-06 22:30:38 +08:00 |
|
caoqianming
|
cc29f2b2aa
|
fix: 退火交接记录bug2
|
2024-03-06 14:38:32 +08:00 |
|
caoqianming
|
1ec5626412
|
fix: 退火交接记录bug
|
2024-03-06 14:32:43 +08:00 |
|
shijing
|
42d6a8addc
|
设备巡检状态文案更改
|
2024-03-05 14:20:52 +08:00 |
|
shijing
|
855e6c3198
|
箱中破(count_n_xzp)与碎料(count_break)分开
|
2024-03-05 10:15:32 +08:00 |
|
shijing
|
b230202990
|
bufenxiugai
|
2024-03-05 09:18:06 +08:00 |
|
shijing
|
c9f78b5d6a
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-03-04 17:13:05 +08:00 |
|
shijing
|
9c6c796f0d
|
#129驾驶舱标题缺失
|
2024-03-04 17:13:02 +08:00 |
|
caoqianming
|
6e6186d143
|
feat: 退火页面按钮控制
|
2024-03-04 16:54:00 +08:00 |
|
caoqianming
|
f1c6c409b0
|
fix: 10车间mlog列表显示产出物
|
2024-03-04 16:53:36 +08:00 |
|
caoqianming
|
8a2d2d39ff
|
feat: 物料页面添加搜索框
|
2024-03-04 16:52:56 +08:00 |
|
caoqianming
|
0f298ce1da
|
fix: mlogb计算导致的count_ok错误
|
2024-03-04 15:46:40 +08:00 |
|
caoqianming
|
5d5ebf7ae1
|
feat: 事件列表增加处理描述列
|
2024-03-04 15:42:18 +08:00 |
|
caoqianming
|
59522261b7
|
feat: 10车间可直接出产物(无兄弟件)
|
2024-03-04 15:16:20 +08:00 |
|
caoqianming
|
2a316c2c56
|
fix: 混料需要传回count_real和count_use
|
2024-03-04 13:55:23 +08:00 |
|
shijing
|
0b60e40971
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-03-04 13:18:03 +08:00 |
|
shijing
|
456ef47eb1
|
worktask_form
|
2024-03-04 13:18:01 +08:00 |
|
caoqianming
|
28a4e77ab3
|
fix: mlog不显示产品名称
|
2024-03-04 13:04:03 +08:00 |
|
caoqianming
|
962dae3fde
|
feat: 物料导入功能
|
2024-03-04 10:47:36 +08:00 |
|
shijing
|
03168c01d5
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-03-04 09:48:16 +08:00 |
|
shijing
|
b45d946d4e
|
批量巡检&巡检记录
|
2024-03-04 09:48:13 +08:00 |
|
caoqianming
|
7de24e53c7
|
feat: 库存增加撤销功能
|
2024-03-04 08:34:46 +08:00 |
|
shijing
|
0ef2c8ba18
|
入场检验列表
|
2024-03-01 16:49:07 +08:00 |
|
shijing
|
2d86e13808
|
过程检验
|
2024-03-01 16:13:38 +08:00 |
|
shijing
|
bb9bae23fd
|
enp大屏
|
2024-03-01 15:52:12 +08:00 |
|
shijing
|
b2ef0ed3e5
|
检验管理
|
2024-03-01 15:49:23 +08:00 |
|
shijing
|
4247366f7a
|
周四会议部分更改
|
2024-03-01 14:57:07 +08:00 |
|
shijing
|
4da1c33c33
|
小微站设备数据
|
2024-02-28 17:37:03 +08:00 |
|
shijing
|
69570c44f3
|
大屏改动
|
2024-02-28 16:42:18 +08:00 |
|
shijing
|
6ca6565791
|
智能管理表头
|
2024-02-28 16:02:08 +08:00 |
|
shijing
|
beac9f3733
|
3dtiles依赖换线上地址
|
2024-02-28 13:40:12 +08:00 |
|
shijing
|
281db61506
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-02-28 13:16:19 +08:00 |
|
shijing
|
a1f1f8af63
|
3dtiles
|
2024-02-28 13:16:09 +08:00 |
|
caoqianming
|
908dab5634
|
fix: 不同项目切换的打包适配
|
2024-02-28 11:51:14 +08:00 |
|
shijing
|
3f1f78f625
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-02-28 10:43:34 +08:00 |
|
shijing
|
f5f7ec2e54
|
性能检验添加编辑
|
2024-02-28 10:43:32 +08:00 |
|
caoqianming
|
b5c5507564
|
fix: 多页面样式调整
|
2024-02-27 18:21:54 +08:00 |
|
caoqianming
|
7eff5872f6
|
fix: 智能治理结构优化
|
2024-02-27 16:04:11 +08:00 |
|
caoqianming
|
ce5562a20f
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-02-27 15:20:17 +08:00 |
|
caoqianming
|
f0b16b601c
|
fix: rpj_show选择证书不显示的bug
|
2024-02-27 15:20:15 +08:00 |
|
shijing
|
3e7cacb061
|
style
|
2024-02-27 14:32:20 +08:00 |
|
shijing
|
3c0b221c13
|
页面标题
|
2024-02-27 14:28:47 +08:00 |
|
shijing
|
33eb880002
|
pollutant2
|
2024-02-27 14:24:50 +08:00 |
|
shijing
|
dc74f69cc3
|
页面标题样式统一
|
2024-02-27 14:22:45 +08:00 |
|
shijing
|
762f648d23
|
页面标题样式统一
|
2024-02-27 14:20:08 +08:00 |
|
caoqianming
|
6e7b2a9f57
|
fix: 污染源界面样式调整
|
2024-02-27 14:04:37 +08:00 |
|
caoqianming
|
9715aace46
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-02-27 13:55:09 +08:00 |
|
caoqianming
|
051319c883
|
fix: 排口清单样式调整
|
2024-02-27 13:55:08 +08:00 |
|
shijing
|
dc7d7f1ec0
|
dapingshujutiaoshi
|
2024-02-27 13:49:19 +08:00 |
|
shijing
|
bc4b944272
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-02-27 13:48:39 +08:00 |
|
shijing
|
488e74ccf0
|
enp新增接口
|
2024-02-27 13:48:36 +08:00 |
|
caoqianming
|
2ae64eef2a
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-02-27 13:44:19 +08:00 |
|
caoqianming
|
dbdc20b42b
|
fix: 有组织排放内容调整
|
2024-02-27 13:44:17 +08:00 |
|
shijing
|
a914d61e8a
|
视频显示
|
2024-02-27 09:01:07 +08:00 |
|
caoqianming
|
8629e1bf61
|
fix: 根据项目code个性化定制的bug
|
2024-02-26 18:46:18 +08:00 |
|
caoqianming
|
4918d99218
|
fix: 登录后顶栏名称错误
|
2024-02-26 17:23:53 +08:00 |
|
shijing
|
b0452cfb96
|
菜单更改
|
2024-02-26 14:45:10 +08:00 |
|
shijing
|
a1f2c86055
|
页面更新
|
2024-02-23 17:01:02 +08:00 |
|
shijing
|
a7616c4d60
|
接口添加
|
2024-02-23 11:20:29 +08:00 |
|
shijing
|
f26cd3f2f6
|
洗车记录
|
2024-02-23 11:20:10 +08:00 |
|
shijing
|
1a3f77a6a9
|
小问题修改
|
2024-02-22 14:29:53 +08:00 |
|
shijing
|
a57fa2f750
|
工序合格数统计
|
2024-02-22 11:03:45 +08:00 |
|
shijing
|
fa87c5fdce
|
生产检验统计表加名称规格型号列
|
2024-02-22 10:05:21 +08:00 |
|
shijing
|
6c795c0127
|
任务进度添加规格和开工完工时间
|
2024-02-22 09:56:37 +08:00 |
|
shijing
|
78f9b40a1b
|
生产线表格中炉号变动
|
2024-02-22 09:49:19 +08:00 |
|
shijing
|
2a4fdf1573
|
滚动table中新增设备状态
|
2024-02-22 09:46:39 +08:00 |
|
shijing
|
6beafdc9f2
|
成品检验表格宽度修改
|
2024-02-22 09:40:06 +08:00 |
|
shijing
|
136eff089f
|
10车间车间看板全年生产统计柱状图标注更改颜色和位置
|
2024-02-22 09:11:10 +08:00 |
|
shijing
|
688b3b82fe
|
首页库存、生产进度更改
|
2024-02-22 09:10:00 +08:00 |
|
shijing
|
5401d07003
|
shouye
|
2024-02-21 09:46:54 +08:00 |
|
shijing
|
bbb096e67c
|
光子首件检验人员筛选
|
2024-02-21 09:13:44 +08:00 |
|
shijing
|
06f87adc45
|
添加事件批量删除按钮与前方的间隔
|
2024-02-20 10:02:55 +08:00 |
|
shijing
|
65a4795721
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-02-20 10:01:51 +08:00 |
|
shijing
|
bd0f46d7e9
|
事件相关接口的变动
|
2024-02-20 10:01:48 +08:00 |
|
caoqianming
|
2597e63aeb
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-02-20 10:01:29 +08:00 |
|
caoqianming
|
0f33197bb0
|
feat: 添加治理设备和监控设备界面
|
2024-02-20 10:01:27 +08:00 |
|
shijing
|
594a217af2
|
事件批量删除
|
2024-02-19 17:08:05 +08:00 |
|
shijing
|
a2e91fa968
|
报警事件批量删除
|
2024-02-19 16:57:42 +08:00 |
|
shijing
|
6244d0d49f
|
菜单变动
|
2024-02-19 10:58:47 +08:00 |
|
shijing
|
68416ae7a9
|
菜单变动
|
2024-02-19 10:55:51 +08:00 |
|
caoqianming
|
3240f66f8a
|
fix: 处理合并冲突
|
2024-02-19 10:52:17 +08:00 |
|
caoqianming
|
da3136ecc6
|
feat: 智能治理页面
|
2024-02-19 10:48:00 +08:00 |
|
shijing
|
e60973b274
|
运输页面
|
2024-02-05 17:02:41 +08:00 |
|
shijing
|
3cf1e45762
|
样式更改
|
2024-02-04 17:36:43 +08:00 |
|
caoqianming
|
e1817e611f
|
feat: cems2,cemsExport导出
|
2024-02-04 14:28:05 +08:00 |
|
caoqianming
|
26b055ab6f
|
feat: 调整cmes界面
|
2024-02-04 14:16:59 +08:00 |
|
caoqianming
|
4dc0136368
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-02-04 10:07:40 +08:00 |
|
caoqianming
|
08290605e2
|
feat: 新增pollutant页面
|
2024-02-04 10:07:38 +08:00 |
|
shijing
|
64bad78780
|
背景图片丢失修改
|
2024-02-04 09:03:57 +08:00 |
|
shijing
|
cf3cfeba90
|
pfkecharts
|
2024-02-01 18:13:50 +08:00 |
|
shijing
|
d51041cd20
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-02-01 17:59:29 +08:00 |
|
shijing
|
41137027c0
|
pfkecharts
|
2024-02-01 17:59:24 +08:00 |
|
caoqianming
|
b895165e99
|
merge: 合并更改
|
2024-02-01 17:57:52 +08:00 |
|
caoqianming
|
6e3e7c4e8e
|
feat: 新增污染源清单
|
2024-02-01 17:56:47 +08:00 |
|
caoqianming
|
72f7bc4a38
|
feat: 界面调整
|
2024-02-01 17:56:29 +08:00 |
|
shijing
|
5c87111b7c
|
zhutisexiala
|
2024-02-01 15:17:57 +08:00 |
|
shijing
|
d9e61258a3
|
zhutisexiala
|
2024-02-01 15:17:15 +08:00 |
|
shijing
|
807294d364
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-02-01 15:09:28 +08:00 |
|
shijing
|
17b9e166f0
|
pfk
|
2024-02-01 15:09:22 +08:00 |
|
caoqianming
|
eeeadd9b98
|
feat: cems导出接口完善
|
2024-02-01 14:15:59 +08:00 |
|
caoqianming
|
868a7e7f51
|
fix: cems.vue筛选条件
|
2024-02-01 14:02:29 +08:00 |
|
caoqianming
|
1873f17e4c
|
feat: 添加cems导出界面
|
2024-02-01 09:32:28 +08:00 |
|
shijing
|
1923d9ca2e
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-01-31 16:22:38 +08:00 |
|
shijing
|
755d02fa85
|
wry
|
2024-01-31 16:22:34 +08:00 |
|
caoqianming
|
24876dcf38
|
feat: cems2监测预警页面
|
2024-01-31 16:19:50 +08:00 |
|
shijing
|
187005d361
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-01-31 14:00:40 +08:00 |
|
shijing
|
55c36acaec
|
wry
|
2024-01-31 14:00:36 +08:00 |
|
caoqianming
|
99325eb5cf
|
fix: cems样式调整
|
2024-01-31 13:57:08 +08:00 |
|
caoqianming
|
721030420a
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-01-31 13:20:19 +08:00 |
|
caoqianming
|
60e6e154f7
|
feat: 添加cems监测清单页及相应的接口
|
2024-01-31 13:20:18 +08:00 |
|
shijing
|
58e7ea29ad
|
退火时车间库存的筛选
|
2024-01-31 13:19:14 +08:00 |
|
shijing
|
57daa1bc19
|
退火日志撤回
|
2024-01-31 10:07:25 +08:00 |
|
shijing
|
29b64b9a2a
|
退火提交
|
2024-01-31 09:29:55 +08:00 |
|
caoqianming
|
e2015236e7
|
feat: 调整scTable默认配置
|
2024-01-30 16:14:37 +08:00 |
|
shijing
|
d2f39536af
|
enpTable中hover状态背景色
|
2024-01-30 15:29:34 +08:00 |
|
shijing
|
dd4529bd3b
|
enpTable中hover状态背景色
|
2024-01-30 15:29:05 +08:00 |
|
shijing
|
27ed58bf5c
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-01-30 14:44:08 +08:00 |
|
shijing
|
6c20c1180a
|
超低排放
|
2024-01-30 14:43:54 +08:00 |
|
caoqianming
|
9afbeaa891
|
feat: 增加物料复制功能
|
2024-01-29 18:41:46 +08:00 |
|
caoqianming
|
5c7a61089b
|
feat: 简化mlogb逻辑
|
2024-01-28 00:21:32 +08:00 |
|
caoqianming
|
4855ab4028
|
fix: 10车间mlog编辑
|
2024-01-27 22:50:15 +08:00 |
|
caoqianming
|
6cb3e526aa
|
fix: 退火先去除不必要的表单项目
|
2024-01-25 13:23:24 +08:00 |