Commit Graph

1140 Commits

Author SHA1 Message Date
shijing a81eea91ca gantt图问题修复 2023-11-24 11:38:23 +08:00
shijing 0f6ffb356b el-tag 2023-11-24 10:39:36 +08:00
shijing db3e181254 el-tag标签属性type没有primary修正 2023-11-24 10:33:13 +08:00
shijing a79651d7b7 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-11-23 17:27:34 +08:00
shijing e548bd52af 到岗单加人 2023-11-23 17:27:18 +08:00
caoqianming 7659d641ab fix: 解决ResizeObserver loop 的问题 2023-11-23 16:24:11 +08:00
caoqianming 0a4b380668 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-11-23 16:07:54 +08:00
caoqianming 5d8621cac0 feat: mgroup增加排班规则字段 2023-11-23 16:07:48 +08:00
shijing c073c25436 大屏看板头部字体 2023-11-23 16:05:53 +08:00
shijing dd2fc9a455 更改菜单栏 2023-11-23 11:29:51 +08:00
shijing 924ed50ce8 dataset.delete 2023-11-23 11:29:11 +08:00
shijing 9682eadf4f 数据大屏 2023-11-23 11:25:33 +08:00
shijing 1e18828985 到岗记录 2023-11-23 11:24:58 +08:00
shijing 74c37d903d 性能检验tabs改动及记录查看 2023-11-23 11:23:45 +08:00
shijing d137beb872 设备相关改动及设备巡检 2023-11-23 11:22:38 +08:00
shijing ed835482a0 统计分析的四个统计模块 2023-11-23 11:20:23 +08:00
shijing 07bb1011da 抽取组件(table中的行自动循环) 2023-11-23 11:19:11 +08:00
shijing 5d125d0875 daogangjilu 2023-11-21 09:25:43 +08:00
shijing 36321f144d tkx部分更改 2023-11-20 18:13:38 +08:00
shijing 0229338a5f team 2023-11-20 16:50:23 +08:00
shijing df9bdab0a6 新增查询规范 2023-11-20 13:46:29 +08:00
shijing 22cf49a6b3 到岗 2023-11-17 19:20:29 +08:00
shijing 21764716dd 大屏看板 2023-11-15 19:05:22 +08:00
shijing bb40ee35e3 vue-json-edit 2023-11-14 11:18:57 +08:00
caoqianming 6eee28c91d Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-11-14 10:28:17 +08:00
caoqianming 5d5ea3e1c3 feat: bidataset修改数据 2023-11-14 10:26:36 +08:00
shijing ae78d57720 ganttanddialog 2023-11-13 18:44:15 +08:00
shijing 821bf22e8c 1110笔记部分修改 2023-11-13 11:04:39 +08:00
caoqianming 283321f238 fix: 大屏及部分bug修复 2023-11-13 08:51:08 +08:00
shijing 155a4c7b7e feat: 光子大屏页面调整 2023-11-10 08:29:49 +08:00
shijing b85c654591 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-11-08 09:23:15 +08:00
shijing ca3c430e75 shujukanbancolorsChange 2023-11-08 09:23:12 +08:00
caoqianming bbb3d40b11 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-11-08 09:04:37 +08:00
caoqianming 707dbf6a19 feat: index_10dept界面修改 2023-11-08 09:04:35 +08:00
shijing 2249f5fc3e shujukanbancolorsChange 2023-11-08 09:03:05 +08:00
shijing dfc84e220b shujukanban 2023-11-07 14:21:02 +08:00
caoqianming d261ae7b7e feat: 10dept界面优化 2023-11-07 13:03:15 +08:00
caoqianming d3c47a12c3 feat: 安装了datavue3 2023-11-07 09:08:35 +08:00
caoqianming 024301c294 fix: 解决冲突 2023-11-06 19:19:07 +08:00
caoqianming 6c4b1f75d1 feat: 车间看板调整 2023-11-06 19:16:25 +08:00
shijing d7c0fa0843 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-11-06 17:43:23 +08:00
shijing f91ae2f5d2 jianyan 2023-11-06 17:43:19 +08:00
caoqianming f3ece1dd0e feat: 增加了车间看板 2023-11-06 15:53:22 +08:00
shijing c5b6eb4f58 部分检验 2023-11-03 19:24:34 +08:00
shijing 329d30eecb gantt图修改,生产执行修改 2023-11-01 10:28:16 +08:00
shijing 9fb27aa062 10.26日要修改内容以及检验页面 2023-10-27 17:15:36 +08:00
shijing e246e6f33b 1026修改 2023-10-26 14:49:50 +08:00
shijing 0c8fd90feb utask分车间创建工段控制显示 2023-10-26 08:52:42 +08:00
shijing 3249a6c29d utask分车间创建 2023-10-25 18:51:52 +08:00
caoqianming 5a7b647692 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-10-25 18:32:24 +08:00
caoqianming 4b5c43ae36 feat: 页面修改 2023-10-25 18:32:22 +08:00
shijing d6e15c1917 7车间 2023-10-25 18:29:36 +08:00
shijing 1bdd206573 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-10-25 17:44:55 +08:00
caoqianming 9557074627 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-10-25 17:44:46 +08:00
shijing e7c4832ac0 1025 2023-10-25 17:44:12 +08:00
caoqianming c456086901 feat: 出入库页面基本完成 2023-10-25 17:33:39 +08:00
shijing 8837579a5d mtask日志提交 2023-10-25 14:02:08 +08:00
shijing 33343150bf 按钮图标更改 2023-10-25 13:17:04 +08:00
shijing b902e59588 6车间utask详情 2023-10-25 13:09:25 +08:00
shijing fbc7806a73 6车间日志编辑 2023-10-25 12:35:32 +08:00
shijing d15cc32e7d 6车间日志提交 2023-10-25 10:27:10 +08:00
shijing 59d8c6f3df 设备检验记录新增 2023-10-24 14:58:57 +08:00
shijing e5f3d24205 worktask 2023-10-24 14:55:11 +08:00
shijing ce1e98df96 worktask 2023-10-20 18:03:04 +08:00
shijing 740c73ec1f Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-10-20 09:32:18 +08:00
shijing 7429dd3dce 更改样式 2023-10-20 09:30:52 +08:00
caoqianming c4d06c06d0 fix: 展示可排产的订单明细 2023-10-20 09:07:57 +08:00
caoqianming f41e7a8a67 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-10-19 14:16:45 +08:00
shijing 51570f408b task2 2023-10-19 14:15:32 +08:00
caoqianming 84adac4680 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-10-19 14:12:53 +08:00
caoqianming b65b83dc20 fix: 订单/采购订单相关页面修改 2023-10-19 14:08:31 +08:00
shijing 584b22fbbd 页面调整 2023-10-18 17:12:23 +08:00
caoqianming 848182e6a4 feat: 物料/工段/工艺路线页面及排产部分逻辑 2023-10-18 16:31:52 +08:00
shijing 355dfc5250 生产执行页面 2023-10-17 09:04:17 +08:00
shijing 6bae3795da Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-10-13 08:55:21 +08:00
shijing 19d1a3a847 1013 2023-10-13 08:55:15 +08:00
caoqianming 17a030bdbf fix: visit purpose options 2023-10-10 12:25:27 +08:00
caoqianming 2f30d9c2ee feat: 门禁权限完成 2023-10-10 12:12:39 +08:00
caoqianming a090b463ee fix: 取消多标签页展示 2023-10-09 17:31:15 +08:00
caoqianming 7fa43de6c7 feat: 门禁权限查看与删除 2023-10-09 15:51:25 +08:00
shijing c40364a1f7 光子基础模块 2023-10-09 12:46:15 +08:00
shijing d216b6df98 fix:打卡记录添加标注,全场电量统计添加趋势图 2023-09-18 13:57:04 +08:00
shijing 2d2e9c9f74 fix:0915会议123456 2023-09-15 17:07:16 +08:00
shijing ed9698aeea fix:大屏数据更新 2023-09-14 14:51:20 +08:00
shijing b61ff39468 fix:tracking依赖文件 2023-09-14 09:25:28 +08:00
shijing 3db54ec1f3 fix:工段定位 2023-09-13 17:23:55 +08:00
shijing 7a8f2c0813 fix:工段标识及建筑高亮 2023-09-12 08:37:08 +08:00
shijing b149cb59e7 fix:交接班日志报告报表填充数据并导出 2023-09-11 15:12:48 +08:00
shijing 7a7ad8c9ce fix:能量报警放到首页,回转窑报表调整 2023-09-08 17:09:09 +08:00
shijing 984dc6d7b7 fix:曲阳更改文案 2023-09-07 09:45:53 +08:00
shijing b871efc464 fix:计量设备 2023-09-06 15:48:15 +08:00
shijing db8e04276e 计量器具台账 2023-09-05 17:05:54 +08:00
shijing a932162058 echarts表格数据填充 2023-09-04 14:31:05 +08:00
shijing f14a2c2682 账号信息中个人打卡记录的处理 2023-09-04 10:58:58 +08:00
caoqianming ae7cf80c64 feat: 添加天空和地面 2023-08-30 10:29:57 +08:00
shijing 2b98daca58 设备单位产品电耗趋势图 2023-08-28 13:35:41 +08:00
shijing 9dd33d43b1 曲阳修改 2023-08-28 08:47:21 +08:00
shijing 5ba3ab8656 生产报告趋势图数据导入 2023-08-25 14:23:48 +08:00
shijing 00e3fde1d4 添加电量小时、日、月统计报表 2023-08-24 16:31:35 +08:00
shijing 67aa47adb8 添加手机登录方式密码重置添加提醒 2023-08-24 10:27:17 +08:00
shijing e1cadf9a74 密码强度设置 2023-08-24 08:58:27 +08:00
shijing fda89dde11 fixed:部分修改 2023-08-22 09:25:32 +08:00
shijing 62631a2490 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-08-18 17:15:58 +08:00
shijing 285703dbad fixed:首页调整 2023-08-18 17:15:53 +08:00
caoqianming e1c29c282a Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-08-18 16:33:50 +08:00
caoqianming a2784a473e feat: 大屏效果2 2023-08-18 16:33:47 +08:00
shijing 8beb8b143e fixed:统一页面筛选框样式 2023-08-18 14:37:42 +08:00
shijing f4bd009948 fixed:工段报表导出以及宽度变小时的表单拖动问题 2023-08-18 10:18:11 +08:00
shijing 9caf5a3690 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-08-17 09:36:54 +08:00
shijing 3cdee248c9 fixd:8.17 2023-08-17 09:36:51 +08:00
caoqianming 55beb660cb fix: 修改route perm先 2023-08-17 09:33:30 +08:00
caoqianming be7bd541fd feat: 大屏优化 2023-08-17 09:16:26 +08:00
caoqianming 10656c643a fix: enm screen css调整 2023-08-16 16:05:24 +08:00
caoqianming 4f4a0c85a9 feat: 大屏效果初步完成 2023-08-16 13:56:12 +08:00
shijing 2d6ad430a4 fixd:系统图标中单位更正 2023-08-16 10:57:55 +08:00
shijing fafe94dc91 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-08-15 14:13:03 +08:00
shijing 9c6fa00272 fixd:提交8.10问题修改(还差最后一条) 2023-08-15 14:12:59 +08:00
caoqianming 5ae4238b20 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-08-15 12:39:23 +08:00
caoqianming 5eeecdef14 feat: 添加大屏数据 2023-08-15 12:39:16 +08:00
shijing ce43a1165f fixd:工段图标 2023-08-11 17:15:19 +08:00
shijing 4119c93408 表格样式变动 2023-07-24 16:26:36 +08:00
shijing 6078fb329f 工段菜单 2023-07-24 11:30:08 +08:00
shijing c3a656fc5d 登陆后首页 2023-07-19 16:13:55 +08:00
shijing f95918bda3 feat:统计 2023-07-14 17:03:27 +08:00
shijing d195b260fa feat:能源统计 2023-07-10 15:00:46 +08:00
shijing f14ee6bb95 报表 2023-07-07 17:05:48 +08:00
shijing 89323113d6 fim 2023-07-05 15:23:01 +08:00
shijing d9181d1905 设备添加、产品添加 2023-06-30 17:25:14 +08:00
shijing 8bc055bf06 提醒配置文案更改,访客选项更改、添加拉送货车辆图片 2023-06-30 16:10:01 +08:00
shijing c8c14c8f1c Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-06-30 08:56:58 +08:00
shijing 12e533fac9 设备、测点、测点集、班组页面 2023-06-30 08:56:51 +08:00
caoqianming 87a107144b fix: filter recipient options 错误 2023-06-29 11:13:26 +08:00
caoqianming 3cab3db8cd fix: opl detail时二次打开不刷新 2023-06-29 11:12:59 +08:00
caoqianming 3e85e50a19 fix: dutywork下都可处理 2023-06-22 08:35:39 +08:00
caoqianming ec21622c42 fix: 工单处理相关bug解决 2023-06-22 01:50:19 +08:00
shijing 268c512273 feat:工单回退后编辑PC端 2023-06-21 17:52:50 +08:00
shijing 2e1411ce04 feat: 能管接口等 2023-06-21 17:52:07 +08:00
shijing c2435fed9e 作业统计更改及添加大屏中作业所在区域的监控设备 2023-06-20 15:21:07 +08:00
shijing 1d55dc3c19 权限控制及原料磨页面 2023-06-20 10:04:21 +08:00
shijing 94904bcff8 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-06-16 16:55:50 +08:00
shijing aea01b7df0 config&配置&原料磨 2023-06-16 16:55:41 +08:00
caoqianming f8e1524e8b fix: 批量布设时算法options不加入筛选条件 2023-06-16 08:56:32 +08:00
shijing 748fa2479a 许可证流程进度字体大小改动 2023-06-09 14:28:21 +08:00
shijing b6fd672062 许可证添加流程进度 2023-06-09 13:13:49 +08:00
shijing 49e8368eaf Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-06-09 10:13:11 +08:00
shijing fe48ad17dd 视频自动播放以及部门下监控设备的查看 2023-06-09 10:12:59 +08:00
caoqianming b23783f942 feat: operation delete_hard2 2023-06-07 10:08:06 +08:00
caoqianming 2f2ea5dbd4 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-06-07 09:26:07 +08:00
caoqianming 6cd695a5b3 feat: operation delete_hard 2023-06-07 09:26:02 +08:00
shijing f96cde3f00 打卡统计 2023-06-05 09:01:08 +08:00