zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,463 Commits 4 Branches 2 Tags 363 MiB
Commit Graph

2356 Commits

Author SHA1 Message Date
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
shijing 28d4826043 feat:光子统计分析-任务统计 2024-08-26 09:59:02 +08:00
shijing 1793a41dfb feat:黑化车间数据看板 2024-08-26 09:02:11 +08:00
zty 7f135ed7e1 fix: 水泥磨 2024-08-23 17:20:22 +08:00
zty 11491e1394 feat:增加水泥包装 2024-08-21 17:54:28 +08:00
shijing 2a7502d023 fix:审批流程添加审批图片(必填) 2024-08-21 15:31:24 +08:00
shijing 5ac6bd553b fix:for循环添加key 2024-08-20 14:57:00 +08:00
shijing fef724888b fix:成品检验coding#465 2024-08-20 14:47:48 +08:00
shijing ab9375ddc2 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-08-20 14:46:49 +08:00
shijing 3cda314ad4 fix:成品检验coding#465 2024-08-20 14:46:46 +08:00
zty 27c736d080 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 
fix bar dar
 2024-08-20 14:40:25 +08:00
zty e44e904abe fix: 修改各个工段柱状图 2024-08-20 14:40:09 +08:00
shijing ca9b281834 fix:检验管理的检验人查询条件全部用posts__code__contains: "check" 2024-08-20 13:48:25 +08:00
shijing 20890b5532 fix:成品检验传入type(prod成品)和type2(10抽检) 2024-08-20 11:15:06 +08:00
shijing f2546ecb91 fix:工作开始添加开始图片 2024-08-20 10:14:16 +08:00
shijing 559f3e2a10 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-08-20 09:16:58 +08:00
shijing 8f3ef47bb1 fix:碳排放图表数据展示 2024-08-20 09:16:54 +08:00
Li xia 6417f2ef49 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-08-19 17:01:27 +08:00
Li xia 1ed17fcedc feat：”超低0816需求修改“ 2024-08-19 17:01:11 +08:00
shijing 8a8c8322a5 fix:审批图片复现 2024-08-19 16:33:56 +08:00
shijing 5dcbe0c8e4 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-08-19 15:18:31 +08:00
shijing 9c76501511 fix:pc端作业审批添加图片 2024-08-19 15:18:27 +08:00
Li xia 2fdcd3db1b Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-08-19 14:16:38 +08:00
Li xia b05ce66c38 feat:"bug修改" 2024-08-19 14:16:12 +08:00
Li xia be467d3f93 feat: ”大屏修改“ 2024-08-19 14:14:34 +08:00
caoqianming fe704c09a7 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-08-19 14:06:32 +08:00
caoqianming 2044684c26 feat: 去除登录重定向 2024-08-19 14:06:29 +08:00
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