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

2095 Commits

Author SHA1 Message Date
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
shijing 26bffd4f49 fix:工艺路线新增route批次校验 2024-08-02 11:22:04 +08:00
shijing 4466350cde fix:半成品生产入库显示隐藏物料 2024-08-02 10:35:33 +08:00
shijing 0bd5345cd1 fix:异常录入问题改正 2024-08-02 10:06:21 +08:00
shijing 8ac1ad41b1 fix:关闭详情后刷新mlog 2024-08-01 18:12:35 +08:00
shijing 263a914fa9 fix:不合格校验 2024-08-01 17:38:43 +08:00
shijing 061ebbb09f Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-08-01 17:02:42 +08:00
shijing df7ae9e7cd fix:交接记录按钮权限 2024-08-01 17:02:39 +08:00
caoqianming 00a030e29c Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-08-01 16:07:31 +08:00
caoqianming f8b974cacb fix: base wf获取下拉选项 2024-08-01 16:07:28 +08:00
shijing fa0cfddc3c fix:日志添加撤回 2024-08-01 15:28:49 +08:00
shijing 896cba6bc9 fix:返工物料名称标注 2024-08-01 15:25:58 +08:00
shijing ed4cc66303 fix:交接编辑人员显示bug修改 2024-08-01 15:25:14 +08:00
caoqianming 51ef980600 feat: 添加一个测试页 2024-08-01 13:46:02 +08:00
caoqianming 8566b8a6be Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-08-01 13:44:36 +08:00
caoqianming d101916362 feat: 添加ehsselect组件 2024-08-01 13:44:32 +08:00
shijing ff03923c1e fix:详情显示物料fullName 2024-08-01 11:18:05 +08:00
shijing cc0c0bc6d4 fix:日志开始/结束时间选择时不能超过当前时间 2024-08-01 11:04:26 +08:00
shijing e6b945b152 fix:交接单删除接口修正，以及状态判断 2024-08-01 10:41:21 +08:00
shijing dbec6f5396 fix:光芯生产日志中产出物详情展开 2024-08-01 10:27:09 +08:00
caoqianming 80b90d7d03 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-08-01 09:03:49 +08:00
caoqianming bd04abe46e fix: base systemdict提交时不刷新 2024-08-01 09:03:45 +08:00
shijing 0d6dc1a0e2 fix:coding#432兼容处理 2024-08-01 08:54:19 +08:00
shijing c8c675f44a Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-08-01 08:53:56 +08:00
shijing 116c066a81 fix:coding#432兼容处理 2024-08-01 08:53:52 +08:00
caoqianming 1de0d342d5 feat: 添加工段获取错误提示 2024-08-01 08:37:31 +08:00
caoqianming 947832ce0a Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-08-01 08:36:34 +08:00
caoqianming 457dc4c23b fix: 修改批次绑定为批次校验 2024-08-01 08:36:31 +08:00
shijing 1861f6406b fix：采购订单雨采购计划添加单价和总价汇总 2024-07-31 19:38:53 +08:00
shijing 28bea49629 fix：批号追加设备 2024-07-31 19:00:08 +08:00
shijing f7e875b43e fix:coding#425 2024-07-31 16:44:27 +08:00
shijing 17b81345a6 fix:采购详情列表文案修改 2024-07-31 14:11:12 +08:00
shijing 3637f548fd fix:coding#431 2024-07-31 10:24:43 +08:00
shijing 023b2ee618 fix:原料库列表显示修改 2024-07-31 08:44:48 +08:00
shijing 1f383eefac fix:大屏文案修改 2024-07-31 08:43:28 +08:00
shijing f1e1f0f78e fix:测点所属工段清空 2024-07-30 16:48:26 +08:00
shijing e4dfebee09 fix:交接记录中options展示样式 2024-07-30 15:30:14 +08:00
shijing 94e0ed014a feat:添加打印机名称保存 2024-07-30 15:22:25 +08:00
shijing f40ef04e36 fix:单位产品电耗日期查询清空时错误改正 2024-07-30 15:00:55 +08:00
shijing 09991ac6c9 fix:统计分析-综合查询 2024-07-30 14:55:46 +08:00
shijing 04a40a6d1f fix:完善电量报表 2024-07-30 14:47:40 +08:00
shijing 8917c2cb1b Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-07-30 14:46:56 +08:00
shijing be2ba954ff fix:日期查询的时候清空报错改正 2024-07-30 14:46:52 +08:00
zty 8e59bdccce fix: route/utask 更新筛选条件 2024-07-30 14:31:29 +08:00
zty 8896a3927c feat: wpm_gx mlog_form user添加筛选条件 2024-07-30 14:15:11 +08:00
zty 733b43786b feat: mio 增加工段 2024-07-30 14:10:05 +08:00
shijing a0225cdc72 fix:光纤页面权限控制 2024-07-30 09:28:08 +08:00
shijing e24b10019f fix:输入输出物料显示条件修改 2024-07-29 17:01:54 +08:00
shijing e15f03142a fix：光芯物料显示单价和总价，并且半成品不显示单价 2024-07-29 17:01:03 +08:00
shijing c9bf9177e0 fix:添加接口声明 2024-07-29 10:58:17 +08:00
shijing a1b436d38f fix:综合查询添加检验合格数 2024-07-29 10:57:03 +08:00
shijing 75c2ebcadf fix:光子物料 2024-07-29 10:55:43 +08:00
shijing 110bc149d8 fix:成品检验 2024-07-29 10:55:16 +08:00
shijing 0f00f121f4 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-07-29 10:54:43 +08:00
shijing 65e56d1dcf fix:添加检测项目页面 2024-07-29 10:54:40 +08:00
caoqianming 60f8b0fb6d feat: base menu更新时变更options 2024-07-29 10:25:19 +08:00
caoqianming 497e5fd410 feat: base menu菜单添加搜索 2024-07-29 10:00:03 +08:00
shijing 88852831d9 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-07-29 09:32:46 +08:00
shijing ffe246e5e3 fix:大屏页面退出处理 2024-07-29 09:32:43 +08:00
caoqianming 4f62f5e8b4 feat: base 菜单管理 父级使用value-on-clear 2024-07-26 13:18:13 +08:00
shijing 083248cba2 fix：光芯工艺路线产品展示和主要输入输出展示的变动 2024-07-25 17:28:40 +08:00
shijing 8d45bc1ced fix:主要输入展示原料和半成品，主要输出展示半成品和成品 2024-07-25 17:00:17 +08:00
shijing 14ec636422 fix:活化改为扫边 2024-07-25 16:39:36 +08:00
shijing 8d6b620123 fix:主要设备单位电耗和生产报告筛选条件修正 2024-07-25 16:09:27 +08:00
shijing e67532d958 fix:交接记录展示不合格标记 2024-07-25 15:41:57 +08:00
shijing 1b6cf9a66b fix:交接记录 2024-07-25 14:58:01 +08:00
shijing 2c5bd1d103 fix：工序添加字段 2024-07-25 11:09:22 +08:00
shijing 29c6989d50 fix:打印接口声明 2024-07-25 10:07:51 +08:00
shijing 996759e60c fix: 2024-07-25 09:34:54 +08:00
shijing 42676ab855 fix:charts测试更改 2024-07-25 09:34:33 +08:00
shijing 7d7c5f2dcc fix:光芯-添加日志增加外协单位 2024-07-24 16:41:48 +08:00
shijing ed385acf4d Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-07-24 15:13:24 +08:00
shijing f53252f6c2 fix:光芯首页 2024-07-24 15:13:20 +08:00
caoqianming 2cca7d8c14 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-07-24 15:02:11 +08:00
shijing 75a0dc33ce fix:小问题修改 2024-07-24 15:01:59 +08:00
caoqianming 4610d7e676 feat: 添加hazard页面 2024-07-24 15:01:39 +08:00
shijing 029d881774 fix:供应商添加时增加是否外协字段 2024-07-24 14:42:39 +08:00
shijing 86e383d041 fix:出入库记录-销售发货部分更改 2024-07-24 14:41:47 +08:00
shijing 4158313155 fix:托克逊大屏更改 2024-07-24 14:39:33 +08:00
shijing 7567ca54ad fix:统计分析综合查询更改文案 2024-07-24 14:38:50 +08:00
shijing 61a86d766a fix:测试文件改动 2024-07-24 13:48:58 +08:00
shijing 7a9e193dc6 fix:去除多余的大屏页面 2024-07-24 13:45:08 +08:00
shijing 88aee21df9 fix:qm接口声明添加，route改动 2024-07-24 13:44:36 +08:00
shijing 55fb2b925c fix:销售订单中添加产品搜索 2024-07-24 13:42:52 +08:00
shijing 8a1c7cb11e fix:echarts动态壮壮图折线图测试demo 2024-07-23 09:18:36 +08:00
shijing ee809aa571 fix:工序页面完善 2024-07-22 16:55:59 +08:00
shijing d401e4b4dd feat:光芯 2024-07-22 13:35:39 +08:00
shijing 58c24851c6 fix:table页码 2024-07-19 08:59:09 +08:00
shijing d524063ea1 fix:光子库存检验导出 2024-07-18 16:40:08 +08:00
shijing ca7a62fbbc fix:enm单位产品电耗更改引用接口 2024-07-16 14:54:38 +08:00
shijing 32252eb850 fix:环保模块-排放口-详情修正 2024-07-16 14:05:22 +08:00
shijing 7e2a6f2f0b fix:停机异常删除以及stlog表格table高度自适应 2024-07-16 13:48:44 +08:00
shijing 67f664638f fix:stlog删除接口声明更正 2024-07-16 10:44:58 +08:00
shijing f6e8b82101 添加光芯生产执行页面 2024-07-15 13:45:01 +08:00
shijing 5293d8150a fix:环保模块排放口点击显示关联信息 2024-07-09 16:51:28 +08:00
shijing cd7f0a0f89 fix:工艺审批和车间任务 2024-07-04 16:50:35 +08:00
shijing baf2102944 fix:审批添加routepack的相关流程 2024-07-04 09:48:11 +08:00
shijing f2d4b447f3 fix:加工工艺 2024-07-03 17:45:51 +08:00
shijing 4f5098bcdc Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-07-03 16:49:49 +08:00
shijing e03f767284 fix:routepack接口添加 2024-07-03 09:03:26 +08:00
caoqianming c20dc4dbda feat: base 优化wf配置页展示效果 2024-07-02 18:07:48 +08:00
caoqianming 66142799fd Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-07-02 13:47:19 +08:00
caoqianming 455c80050c feat: 添加routepack空白页面 2024-07-02 13:47:16 +08:00
shijing 1da3fc9261 fix:大屏数据修改 2024-07-02 11:02:35 +08:00
shijing f91f0dbb49 fix:凌源大屏模拟数据 2024-07-02 09:57:31 +08:00
shijing 9140c41a15 fix:404返回首页 2024-07-02 09:16:26 +08:00
shijing 5fe388aaf6 fix:光子退火混料bug修改 2024-07-01 14:17:17 +08:00
shijing 4968f43c06 fix:更改凌源大屏路由名称 2024-07-01 09:58:11 +08:00
shijing 4852f6f84b fix:车间库存添加查询条件 2024-06-28 17:12:44 +08:00
shijing 1bc60ddc8e fix:凌源更改 2024-06-28 13:34:07 +08:00
shijing 9b84b4f991 fix:更改模型放大倍数限制 2024-06-27 17:06:49 +08:00
shijing 0bf861cac2 fix:凌源大屏更新 2024-06-27 10:51:41 +08:00
shijing ae67a9a0a0 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-06-26 17:28:09 +08:00
shijing 7e647dd67a fix:凌源大屏初版 2024-06-26 17:28:04 +08:00
caoqianming 7a21bc53e0 refector: 增加utask 恢复功能2 2024-06-25 10:31:00 +08:00
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
shijing 1a457fe49d feat:余热发电生产报告添加参数&生产报告完成率小数点保留两位 2024-05-11 10:34:56 +08:00
shijing 610c4ae52c fix:mpoint更改查询条件 2024-05-11 10:33:01 +08:00
shijing 3a5185ed58 fix:物料价格和工段成本添加权限 2024-05-10 15:06:23 +08:00
shijing c16743f9a5 fix:coding#410 2024-05-10 13:36:52 +08:00
shijing 5302c5a5fd fix:coding#411 2024-05-10 13:15:16 +08:00
shijing 1e20725bb7 fix:目标设置 2024-05-10 13:13:10 +08:00
shijing 3e334416a7 fix:全场能源电量消耗报表 2024-05-10 11:35:52 +08:00
shijing 5f727aea27 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-05-10 09:10:50 +08:00
shijing 9da3a27fdb fix:coding#408 2024-05-10 09:10:48 +08:00
caoqianming 36000a2b1f fix: 熟料料耗系数 2024-05-09 17:37:22 +08:00
shijing 1ba5401b05 fix:光子大屏中引入congfig 2024-05-09 16:26:40 +08:00
shijing fb67075e19 fix:mopint筛选问题 2024-05-09 16:26:05 +08:00
shijing ce9fdf52b4 fix:日志详情添加停机时间，修正新增编辑的bug 2024-05-09 16:25:14 +08:00
shijing 979ad5870d fix:计算系数 2024-05-09 16:02:22 +08:00
shijing 77aa24c19e feat:mpoint新增测点原始记录 2024-05-09 13:46:23 +08:00
shijing 330a87bf7e fix:enm添加测点采集数据 2024-05-09 13:44:30 +08:00
shijing 0457605c07 fix:首页控制台 2024-05-09 09:41:51 +08:00
shijing fba62dc2c0 fix:更改计算系数 2024-05-08 16:11:45 +08:00
shijing b32511f35e fix:layout 2024-05-08 15:34:39 +08:00
shijing 054829996e fix:全厂能源电量消耗报表 2024-05-08 14:08:18 +08:00
caoqianming 4b52570a4d feat: mpoint_form表格结构调整 2024-05-08 13:04:28 +08:00
caoqianming 8911a27b6d feat: 移除mgroups_allocate字段2 2024-05-08 13:00:17 +08:00
caoqianming 218f35dd60 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-05-08 12:55:09 +08:00
caoqianming 02b8364a51 feat: 移除mgroups_allocate字段 2024-05-08 12:55:07 +08:00
shijing a788587df4 feat:凌源的能管大屏基础版 2024-05-07 15:59:05 +08:00
shijing 248b15440e fix:去掉重复的路由 2024-05-07 15:58:17 +08:00
shijing e166bd7950 fix:路由处理（父级严格大于子级） 2024-05-07 11:25:58 +08:00
shijing cc5bff2c27 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-05-07 11:24:18 +08:00
shijing d67ed6ce74 fix:路由变动，将日志详情提到enm_base中 2024-05-07 11:19:08 +08:00
shijing 09e83c9fc0 fix:回转窑交接班日志 2024-05-07 10:01:38 +08:00
shijing 267cfe4733 fix:增加计算公式页面 2024-05-06 17:10:48 +08:00
shijing 44f3e3fc68 fix:设备分类增删改 2024-05-06 16:27:52 +08:00
shijing 56b2d8de89 fix:日志报错修改 2024-05-06 14:48:03 +08:00
shijing bf8812452f fix:大屏标题更改 2024-05-06 14:46:47 +08:00
shijing 72cab70f23 fix:em中计量物料取消类型筛选 2024-05-06 11:20:42 +08:00
shijing 9e4ac65994 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-05-06 10:02:40 +08:00
shijing b4a6e3d811 fix:生产报告report中图标颜色及数据对应 2024-05-06 10:02:37 +08:00
caoqianming baa46135fb feat: mpoint form添加关联环保字段2 2024-05-06 09:46:42 +08:00
caoqianming 97dd1431ea feat: mpoint form添加关联环保字段 2024-05-06 09:46:33 +08:00
caoqianming 52762117cc feat: mpoint form增加影响测点编号 2024-05-06 09:19:39 +08:00
shijing b881449d11 fix:生产报告中小时数据的获取更正 2024-04-30 16:52:47 +08:00
shijing 0135367fea fix:石灰石破碎中生产报告不要小时;余热发电中生产报告的产量单位更正 2024-04-30 16:16:25 +08:00
shijing 8b8ff3b48b fix:数据统计图数据日期对应修正 2024-04-30 13:52:00 +08:00
shijing bd3ae583fc fix:原料磨生产报告修改 2024-04-30 11:04:43 +08:00
shijing aee0427138 fix:水泥包装mgroup根据名称获取 2024-04-29 16:30:32 +08:00
shijing 74e65ba199 fix:石灰石破碎mgroup根据名称获取 2024-04-29 16:18:45 +08:00
shijing 4e8a3d486a fix:水泥磨mgroup根据名称获取 2024-04-29 16:11:57 +08:00
shijing 63737587e1 fix:物料添加时增加排序 2024-04-29 15:32:02 +08:00
shijing 25e2a1e9d6 fix:enm_kiln回转窑mgroup根据名称获取id 2024-04-29 15:10:39 +08:00
shijing d392d7f012 fix:enm_rm原料磨mgroup 根据名称获取id 2024-04-29 14:29:25 +08:00
shijing 4188ad2a8b fix:余热发电mgroup根据name获取 2024-04-29 13:49:37 +08:00
shijing 93f058997a fix:电石渣mgroup根据名称通过接口获取id 2024-04-29 11:12:25 +08:00
shijing 6e7e535cfc Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-28 17:05:27 +08:00
shijing 5b73a45e20 fix:日志异常改动，全场电量统计折线图 2024-04-28 17:05:25 +08:00
caoqianming e8bb37d87f feat: mpoint_form增加字段 2024-04-28 17:02:42 +08:00
caoqianming 12cb9a6bfb Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-28 14:14:14 +08:00
caoqianming efdbc4fd94 feat: mpoint界面修改 2024-04-28 14:14:13 +08:00
shijing de77f4eaee Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-26 17:03:35 +08:00
shijing 0bff96af1c fix:异常添加 2024-04-26 17:03:00 +08:00
caoqianming 0460e2636f fix: enm mgroup 不预先筛选 2024-04-26 12:20:50 +08:00