 caoqianming
|
0a081a0101
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-06-25 09:13:37 +08:00 |
|
caoqianming
|
c384335ebe
|
feat: 增加utask 恢复功能
|
2024-06-25 09:13:33 +08:00 |
 shijing
|
c5bb7b2570
|
fix:tkx工段页面中去除底部滚动条
|
2024-06-24 16:32:08 +08:00 |
|
shijing
|
74ba7e6f97
|
fix:工段页面中去除底部滚动条
|
2024-06-24 11:27:28 +08:00 |
|
shijing
|
fc119e3f2a
|
fix：tkx生产报告、单位产品电耗echarts选择显示
|
2024-06-24 11:14:42 +08:00 |
|
shijing
|
160dd3cfdc
|
fix:调整表格宽度
|
2024-06-24 10:06:53 +08:00 |
|
shijing
|
0f06924303
|
fix:凌源大屏
|
2024-06-21 17:38:24 +08:00 |
|
shijing
|
de43f31e01
|
fix:0621添加拉加筛选功能
|
2024-06-21 17:18:21 +08:00 |
|
shijing
|
ff92a53fc7
|
fix
|
2024-06-19 13:38:39 +08:00 |
|
shijing
|
c5bd0352ec
|
fix:searchHeader样式修改
|
2024-06-19 13:38:18 +08:00 |
|
shijing
|
21c1575ebb
|
fix:车间执行6批次号选择
|
2024-06-19 11:23:27 +08:00 |
|
caoqianming
|
487ad11b07
|
feat: 大屏3dpanel优化样式2
|
2024-06-18 16:25:33 +08:00 |
|
caoqianming
|
b6c8cd2259
|
feat: 大屏3dpanel优化样式
|
2024-06-18 10:54:50 +08:00 |
|
caoqianming
|
1bf7d47aba
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-06-17 14:39:19 +08:00 |
|
caoqianming
|
fbc5573703
|
fix: 修改get_host_url
|
2024-06-17 14:35:32 +08:00 |
 zty
|
54524ce17e
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-06-12 15:49:32 +08:00 |
|
zty
|
cc20b723fa
|
fix: edu.js train.vue 新增线下培训
|
2024-06-12 15:49:29 +08:00 |
|
shijing
|
6cb063e08b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-06-12 10:14:06 +08:00 |
|
shijing
|
99ac0298c7
|
index_enm_ly改动
|
2024-06-12 10:14:01 +08:00 |
|
zty
|
d1844a2104
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
fix: edu/train
|
2024-06-12 10:09:00 +08:00 |
|
zty
|
553b2c9980
|
fix: edu/train
|
2024-06-12 10:08:38 +08:00 |
|
caoqianming
|
34835be268
|
feat: 风险管理页面完成
|
2024-06-11 16:42:08 +08:00 |
|
caoqianming
|
90036784db
|
fix: exam 进行中列表展示
|
2024-06-11 16:41:48 +08:00 |
|
caoqianming
|
8c5b926045
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-06-11 11:16:45 +08:00 |
|
caoqianming
|
69b7d92105
|
fix: base 字典页面刷新的bug
|
2024-06-11 11:16:42 +08:00 |
|
shijing
|
11ab06f162
|
fix:检验人查询条件修改
|
2024-06-11 10:15:17 +08:00 |
|
shijing
|
1b26a5d014
|
fix:检验人查询条件修改
|
2024-06-11 10:15:02 +08:00 |
|
caoqianming
|
d2aba7d384
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-06-07 17:37:48 +08:00 |
|
caoqianming
|
4b71866a81
|
feat: 风险管控页面2
|
2024-06-07 17:37:45 +08:00 |
|
zty
|
1635262a18
|
fix: scTable getData err处理
|
2024-06-07 16:28:44 +08:00 |
|
caoqianming
|
6f0a3bf09b
|
feat: base 升级了element-plus版本
|
2024-06-07 13:58:56 +08:00 |
|
caoqianming
|
f2ce1e31da
|
feat: 初步添加双控页面
|
2024-06-07 13:20:35 +08:00 |
|
caoqianming
|
f392d49292
|
fix: question cate级联选择错误
|
2024-06-05 15:02:42 +08:00 |
|
caoqianming
|
b4ffe30ca2
|
feat: edu页面基本完成
|
2024-06-05 08:37:48 +08:00 |
|
caoqianming
|
1e77723d6f
|
feat: 添加Enum
|
2024-06-03 19:15:11 +08:00 |
|
caoqianming
|
239d8202ea
|
feat: 回退至genTree
|
2024-06-03 18:03:03 +08:00 |
|
shijing
|
9538339d29
|
fix:table树数据处理
|
2024-06-03 17:28:21 +08:00 |
|
shijing
|
e986d75419
|
fix:table树数据处理
|
2024-06-03 17:24:49 +08:00 |
|
caoqianming
|
c69d47a98d
|
feat: scTable 使用genTree
|
2024-06-03 14:35:01 +08:00 |
|
caoqianming
|
51e4d527d4
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-06-03 14:08:29 +08:00 |
|
caoqianming
|
2a4a6e4924
|
feat: questioncat 页面
|
2024-06-03 14:08:26 +08:00 |
|
shijing
|
caf5ddf0d1
|
fix:综合查询布局调整
|
2024-06-03 11:14:05 +08:00 |
|
shijing
|
4b55e431b5
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-06-03 10:14:28 +08:00 |
|
shijing
|
a2b031ebf9
|
fix:综合查询模拟数据
|
2024-06-03 10:14:24 +08:00 |
|
caoqianming
|
210eef9e9d
|
feat: 添加综合对比菜单及标识
|
2024-06-03 09:10:39 +08:00 |
|
shijing
|
14aac09779
|
fix:注释mock数据
|
2024-06-03 08:57:52 +08:00 |
|
shijing
|
7f257e1316
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-05-31 18:43:26 +08:00 |
|
shijing
|
ae19b4ac21
|
feat:光子添加综合查询
|
2024-05-31 18:43:22 +08:00 |
|
caoqianming
|
0958c62f06
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-05-31 17:09:35 +08:00 |
|
caoqianming
|
1c65ea0308
|
feat: 添加培训考试页面路由
|
2024-05-31 17:08:30 +08:00 |
|
caoqianming
|
2e04419846
|
fix: 修改权限标识
|
2024-05-31 17:07:56 +08:00 |
|
shijing
|
26a85861f8
|
fix：el-drawer缓存显示问题-其他出入库记录
|
2024-05-30 11:32:10 +08:00 |
|
shijing
|
c7887fc5f2
|
fix：el-drawer缓存显示问题-订单管理
|
2024-05-30 10:35:33 +08:00 |
|
shijing
|
4843e7a6d1
|
fix：el-drawer缓存显示问题-采购计划
|
2024-05-30 09:53:17 +08:00 |
|
shijing
|
c2034fc737
|
fix：el-drawer缓存显示问题-成品检验
|
2024-05-30 09:40:11 +08:00 |
|
shijing
|
b768946738
|
fix：el-drawer缓存显示问题-库存
|
2024-05-30 09:23:00 +08:00 |
|
shijing
|
1e930db135
|
fix：el-drawer缓存显示问题
|
2024-05-29 10:27:41 +08:00 |
|
shijing
|
13eb12434f
|
fix:库存统计查询更改
|
2024-05-28 14:56:44 +08:00 |
|
shijing
|
4dc039bef6
|
feat:添加综合查询
|
2024-05-24 17:45:21 +08:00 |
|
shijing
|
4643728a9f
|
fix:查询字段更正
|
2024-05-24 17:44:47 +08:00 |
|
shijing
|
02475672d7
|
fix:库存统计只算仓库库存
|
2024-05-24 15:27:00 +08:00 |
|
shijing
|
e01877ebd2
|
fix:coding#413采购和销售部分
|
2024-05-23 11:33:53 +08:00 |
|
shijing
|
86be993ba0
|
fix:coding#413生产执行模块
|
2024-05-23 09:56:52 +08:00 |
|
shijing
|
f5d4fc1ced
|
fix:router添加权限
|
2024-05-23 09:26:51 +08:00 |
|
shijing
|
4ab4bc7214
|
fix：coding#413库存模块
|
2024-05-22 17:36:06 +08:00 |
|
shijing
|
516319c53d
|
fix:coding414不合格原因并集
|
2024-05-22 16:58:11 +08:00 |
|
shijing
|
b28eb27d77
|
fix:#413---成品检验
|
2024-05-22 16:23:57 +08:00 |
|
shijing
|
a777e06d4b
|
fix:coding#412,弹窗标题和检验人员列表筛选
|
2024-05-22 14:58:07 +08:00 |
|
shijing
|
ca0282595b
|
fix:计算系数和交接班日志操作添加权限
|
2024-05-22 09:09:54 +08:00 |
|
shijing
|
c4ff77c876
|
fix:计算系数和交接班日志操作添加权限
|
2024-05-22 09:09:37 +08:00 |
|
shijing
|
aeb7259350
|
fix:添加两个电量报表里的table样式
|
2024-05-21 17:03:42 +08:00 |
|
shijing
|
6a18cae3bb
|
fix:主要设备单位电耗变更（显示电耗报表里的所有设备）
|
2024-05-21 17:02:32 +08:00 |
|
shijing
|
7e50f935e3
|
fix:电耗报表动态合并
|
2024-05-21 13:41:35 +08:00 |
|
shijing
|
b7fc2b8ded
|
fix:菜单名称更改
|
2024-05-20 10:52:38 +08:00 |
|
shijing
|
d866335c78
|
fix:电耗报表问题修改
|
2024-05-20 10:10:11 +08:00 |
|
shijing
|
348fac78f3
|
fix:电耗报表串行问题
|
2024-05-20 09:37:21 +08:00 |
|
shijing
|
aa19ef2788
|
fix:回转窑更改计算测点值
|
2024-05-17 14:57:11 +08:00 |
|
shijing
|
0015e2c96d
|
fix:回转窑更改计算测点值
|
2024-05-17 14:48:51 +08:00 |
|
shijing
|
08130abf6a
|
fix:生产小时报告去掉常为0的项
|
2024-05-17 10:47:39 +08:00 |
|
caoqianming
|
bbb24409a5
|
feat: 路由中煤磨调换位置
|
2024-05-16 18:30:19 +08:00 |
|
shijing
|
1d4023493c
|
feat:添加排放口和孰料产量
|
2024-05-16 11:51:15 +08:00 |
|
shijing
|
771bcc2add
|
fix:时间与数据错位
|
2024-05-15 15:48:18 +08:00 |
|
shijing
|
6999a172cd
|
fix:主要设备单位产品电耗图标时间搜索
|
2024-05-15 14:33:49 +08:00 |
|
shijing
|
bad6efb816
|
fix:tku中的power更改
|
2024-05-15 11:29:36 +08:00 |
|
shijing
|
245c2b6155
|
fix:power添加筛选条件
|
2024-05-15 11:17:24 +08:00 |
|
shijing
|
b73f62b4d2
|
fix:报表合计行
|
2024-05-15 09:51:11 +08:00 |
|
shijing
|
224d4e37a8
|
fix:生产报告和主要设备单位电耗添加radios并居中
|
2024-05-14 15:54:09 +08:00 |
|
shijing
|
ff62c9e636
|
fix:更改路由名称
|
2024-05-14 15:02:58 +08:00 |
|
shijing
|
be3d63e526
|
fix:凌源生产报告统计图显示改动（添加radio）
|
2024-05-14 13:43:07 +08:00 |
|
shijing
|
1667f02408
|
fix:电量报表查询条件改动
|
2024-05-14 13:41:55 +08:00 |
|
shijing
|
2f0401534d
|
fix:日志信息测点录入
|
2024-05-14 09:42:40 +08:00 |
|
shijing
|
85eb08dfb1
|
fix:单位产品电耗数据更新
|
2024-05-13 17:21:15 +08:00 |
|
shijing
|
c55f516019
|
fix:生产报告小时数据查询条件
|
2024-05-13 11:01:45 +08:00 |
|
shijing
|
2e257bdcb1
|
feat:测点原始记录添加信号状态
|
2024-05-13 10:35:52 +08:00 |
|
shijing
|
0c1fb4b563
|
fix:电量消耗统计表
|
2024-05-13 09:36:51 +08:00 |
|
caoqianming
|
9e263abd38
|
feat: 增加enpfieldEnum
|
2024-05-11 15:51:17 +08:00 |
|
caoqianming
|
d332a78ee2
|
feat: mpoint_form设备选择等
|
2024-05-11 15:49:22 +08:00 |
|
shijing
|
c25c237cd6
|
fix:日志测点录入
|
2024-05-11 12:47:35 +08:00 |
|
shijing
|
3827d3ce86
|
fix:测点原始记录改动查询条件-半个小时
|
2024-05-11 10:54:00 +08:00 |
|
shijing
|
5ca9fb5332
|
fix:引入mpointstat删除接口
|
2024-05-11 10:35:53 +08:00 |