Commit Graph

2448 Commits

Author SHA1 Message Date
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