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

1698 Commits

Author SHA1 Message Date
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
shijing dbd019d0ef fix:煤磨mgroup接口获取 2024-04-26 10:41:11 +08:00
shijing ffc08a38de fix:煤磨mgroup通过名称获取 2024-04-26 10:28:08 +08:00
shijing 939129b5df fix:删除多余文件 2024-04-26 10:03:28 +08:00
caoqianming 0b3531131c fix: enum下拉不显示的bug需parseInt 2024-04-25 00:23:04 +08:00
caoqianming 4b8347185a fix: indicate_mgroup_running清空时设为null 2024-04-25 00:22:34 +08:00
caoqianming 3f331eec9f fix: 展示组合件信息的bug 2024-04-25 00:11:33 +08:00
shijing 838e71ad98 fix:更换凌源模型并适当调整 2024-04-24 16:52:20 +08:00
shijing f6c3cf410e Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-24 16:04:41 +08:00
shijing 2312537af2 fix:设备历史检测图y隐藏axisLabel 2024-04-24 16:04:36 +08:00
caoqianming 6be5494f1a Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-24 15:50:31 +08:00
caoqianming d051748cf0 feat: mgroup_form 排班规则可clear 2024-04-24 15:50:30 +08:00
shijing 241f14c324 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-24 15:42:46 +08:00
shijing 6fb1ff7b17 fix:采购入库检验放开撤回 2024-04-24 15:42:43 +08:00
caoqianming 6c0703eac1 feat: 完善productTypeEnum 2024-04-24 15:19:54 +08:00
caoqianming 12eff830f3 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-24 15:08:15 +08:00
caoqianming 9ffdca6f68 feat: mpoint form添加can_manual 2024-04-24 15:08:14 +08:00
shijing 2cd956e123 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-24 14:31:16 +08:00
shijing ab4b0c030d fix:入库检验数据回显问题 2024-04-24 14:31:12 +08:00
caoqianming c827b50d62 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-24 09:53:25 +08:00
caoqianming 5300b425d7 feat: 设备管理页面优化 2024-04-24 09:53:24 +08:00
shijing 51c79f1d6f fix:table滚动条和设备分类选择框颜色 2024-04-23 16:05:25 +08:00
caoqianming 4cc204c594 feat: 设备管理添加一些字段及部分调整 2024-04-23 13:43:16 +08:00
caoqianming 841f2a27f8 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-23 13:27:12 +08:00
caoqianming ebe61dfde4 feat: 相关方证书删除后刷新 2024-04-23 13:27:11 +08:00
shijing e02c11634d fix:光子添加库存检验撤回 2024-04-22 15:36:06 +08:00
caoqianming 02b03770c3 fix: 工段表单及相关文件表述修改 2024-04-18 14:46:18 +08:00
caoqianming 9286ad0d73 fix: 设备分类显示调整 2024-04-18 14:45:39 +08:00
caoqianming 36ebdd00f6 feat: enp调整viewer环境亮度 2024-04-17 15:34:21 +08:00
caoqianming dfe4f1d1c3 fix: 打包时使用服务器host获取厂区模型 2024-04-17 15:04:14 +08:00
caoqianming e1d846cd2d fix: 无用文件 2024-04-17 14:38:13 +08:00
caoqianming d2b82c290a fix: babylonjs加载material的引入包错误 2024-04-17 14:37:53 +08:00
caoqianming aa2a4c136c fix: enp 设备状态查询的优化 2024-04-17 11:02:41 +08:00
caoqianming 2ce50e7bac Revert "fix:排放系统登陆页面更改样式" 
This reverts commit 89f05ee8e8.
 2024-04-16 16:54:37 +08:00
caoqianming 373b461549 feat: mioitem成品库展示组合件信息 2024-04-13 11:29:48 +08:00
caoqianming fdd58501f2 fix: 7车间和10车间大屏修改 2024-04-13 10:46:04 +08:00
caoqianming e2eb647351 fix: 仓库执行人从库管中获取 2024-04-12 16:45:30 +08:00
shijing 20881c4e4e fix:格式化某一月 2024-04-12 15:21:13 +08:00
shijing 89f05ee8e8 fix:排放系统登陆页面更改样式 2024-04-12 14:37:16 +08:00
shijing 16bf29cd4f feat:凌源电量消耗报表 2024-04-12 13:30:45 +08:00
shijing ad3f90c293 fix:日志提交时班组默认 2024-04-11 17:31:56 +08:00
shijing 50ec90045a fix:mioitem_check 2024-04-11 17:03:04 +08:00
shijing d07bdb77d8 fix:更改监控设备端口号 2024-04-11 14:49:43 +08:00
shijing 1c4eb04604 fifix:更新jquery版本 2024-04-11 14:49:10 +08:00
shijing bbff16431d fix:添加material中的cate选项 2024-04-11 14:48:38 +08:00
shijing 43ecf55818 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-10 17:20:52 +08:00
shijing e31a3b527a feat:凌源新增原料磨、回转窑、煤磨模块 2024-04-10 17:20:47 +08:00
caoqianming cafe762fd4 feat: 添加mpoint相应功能页面 2024-04-10 10:40:32 +08:00
caoqianming c16c5fcd17 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-10 10:22:38 +08:00
caoqianming fcc4ac5aa4 feat: base 添加了valTypeEnum/boolEnum 2024-04-10 10:22:36 +08:00
shijing 95b7c45b18 fix:退火检验不合格数修正 2024-04-09 17:37:20 +08:00
shijing 3d53992bfb Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-09 16:39:15 +08:00
shijing 4cbf1c4c9f fix:成品检验详情列表 2024-04-09 16:39:12 +08:00
caoqianming b0ada60169 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-09 15:46:30 +08:00
caoqianming 0928b39e40 fix: 修改设备路由显示perm 2024-04-09 15:45:22 +08:00
caoqianming 43e1dd40c3 feat: base scTable增加选择数量显示 2024-04-09 15:44:16 +08:00
shijing eba2759470 feat:新曾凌源原料磨模块 2024-04-09 15:43:49 +08:00
shijing 6fe3ab6eb9 feat:页面header添加主题切换 2024-04-09 10:25:55 +08:00
shijing 6d1f8fcbcb fix:成品、半成品库存统计更改 2024-04-09 09:34:53 +08:00
shijing 5518f090d6 fix:半成品和成品检验提交之前不合格计算 2024-04-08 15:29:04 +08:00
shijing d0fef8aa15 fix:辅料出入库记录添加生产领料 2024-04-08 14:22:47 +08:00
shijing e2682042c9 fix:增加半成品不合格原因‘扁’ 2024-04-08 13:26:50 +08:00
shijing 9034457ffa caozuoshiwu 2024-04-08 11:24:23 +08:00
shijing 6e932ef1e9 fix:排放图标点击事件 2024-04-08 11:20:45 +08:00
caoqianming d1e9fd5a2d feat: 工艺设计产品列显示full_name 2024-04-07 19:26:31 +08:00
caoqianming d452eea5b6 feat: 关闭时间对模型明暗的影响 2024-04-04 01:29:51 +08:00
caoqianming 891a5b5ec7 fix: 界面模拟数据展示优化 2024-04-04 01:09:29 +08:00
caoqianming 3d034a859b feat: 排放大屏标题加粗 2024-04-03 21:51:35 +08:00
shijing d120b827ae fix:更改俯视角 2024-04-03 17:27:01 +08:00
shijing 145b971fdd fix:首页数据 2024-04-03 17:07:45 +08:00
shijing b9a2d069e2 fix:不合格原因默认值为0 2024-04-03 16:35:15 +08:00
caoqianming f9bf8060bd feat: 修改了托克逊工厂的坐标 2024-04-03 15:33:51 +08:00
shijing b01d1164c3 fix:去掉库存检验的不合格必填 2024-04-03 14:47:47 +08:00
shijing 9387cca8a0 fix:cesiumtest 2024-04-03 14:10:44 +08:00
shijing 52ecdb332b fix:其他入库放开检验（半成品检验） 2024-04-03 11:25:04 +08:00
shijing 75ea25baa2 feat:新增石灰石破碎和余热发电 2024-04-03 10:56:34 +08:00
shijing 46742f99b4 fix:改变模型方向 2024-04-03 10:48:59 +08:00
caoqianming 824f0cd6bc feat: cesium抗锯齿效果 2024-04-03 10:33:28 +08:00
shijing 7e9abf6ed3 fix:库存检验中备注test_note 2024-04-03 09:08:38 +08:00
shijing 732b892c36 fix:成品检验 2024-04-02 16:50:00 +08:00
shijing 1b81d0ac5f fix:退火不合格原因变更 2024-04-02 16:38:03 +08:00
shijing 66e34be254 fix:半成品库存检验不合格原因添加划伤 2024-04-02 16:19:05 +08:00
shijing c882cedb10 fix:原料库出入库数量小数点后3位 2024-04-02 10:04:41 +08:00
shijing d2b03eb2f3 fix:4成品库的销售发货添加客户信息&销售管理的客户信息的联系人和联系方式选填 2024-04-02 09:37:24 +08:00
shijing a4c279e3db fix:检验加备注 2024-04-01 15:46:58 +08:00
shijing 8ae196b9e3 fix:检验加备注 2024-04-01 15:45:17 +08:00
shijing 142233e6c0 fix:性能检验加一个编号搜索 2024-04-01 15:09:09 +08:00
shijing 29de95414a fix:半成品添加两个不合格体原因（颜色青和杂志）添加备注 2024-04-01 11:28:40 +08:00
shijing bb7b2817e0 fix:成品库配棒管显示半成品的规格型号，不要显示物料编号 2024-03-29 14:16:24 +08:00
shijing 2d500e396d fix:6、10车间看板图标数据调整 2024-03-29 09:42:38 +08:00
shijing e6488c51a5 fix:7车间看板图标数据调整，以及7车间不合格统计去掉合格数 2024-03-29 09:41:16 +08:00
shijing 4d2328540f fix:供应商，名称必填，其他选填 2024-03-29 09:34:42 +08:00
shijing 4c935cb4a2 fix:6、7、10车间可以显示已终止的任务 2024-03-28 17:02:10 +08:00
shijing d4809de933 fix:任务创建和下达状态可以删除 2024-03-28 16:40:02 +08:00
shijing f0b4dc4634 fix:任务创建和下达状态可以删除 2024-03-28 16:37:55 +08:00
shijing d1e997fcb5 fix:任务创建和下达状态可以删除 2024-03-28 16:21:10 +08:00
shijing 8d10e15d12 fix:出入库记录可编辑 2024-03-27 16:53:47 +08:00
shijing f88932b304 原料出入库记录加撤销 2024-03-27 16:04:50 +08:00
shijing ad80db57fa fix:管料退火数据展示 2024-03-26 17:00:18 +08:00
shijing c8be074677 fix:生产检验统计合格率取整 2024-03-26 16:27:54 +08:00
shijing 00c57134d3 fix: 库存统计更新 2024-03-26 16:22:39 +08:00
shijing a97006c2d3 feat:10车间看板添加本月的生产合格数 2024-03-26 15:30:45 +08:00
shijing 0964b47bfc fix:生产管理6、7、10车间任务编号和任务名称宽度放大 2024-03-26 14:34:44 +08:00
shijing b5472e8c52 fix:销售统计格式类比采购统计 2024-03-26 14:27:02 +08:00
shijing ff19bedf76 fix: 采购统计日期修正 2024-03-26 13:51:53 +08:00
shijing 2346b053b5 fix:绩效统计合格率取整 2024-03-26 13:35:48 +08:00
shijing dcecde3c11 fix:生产统计百分比保留整数加% 2024-03-26 13:31:48 +08:00
shijing 4b66cea211 fix:采购统计默认不请求柱状图数据 2024-03-26 11:11:43 +08:00
shijing 98ac2b691b fix:6车间看板柱状图标注文字改为白色 2024-03-26 10:05:17 +08:00
shijing 149f985707 fix:生产管理6、7、10车间gantt随着上面的表格数据变动 2024-03-26 09:31:58 +08:00
shijing 70df6c3837 fix:gantt去掉累加，随上表数据变化变化 2024-03-25 15:50:48 +08:00
shijing 89d70548b9 fix:原料库->出入库记录->采购入库添加供应商 2024-03-25 15:31:32 +08:00
shijing 9e475887b5 fix:首页控制台，6、7、10车间昨日核心指标和本月累计交付数；显示库存预警 2024-03-25 15:24:40 +08:00
shijing d80a8336aa fix:大屏本周合格率为0时，置空；本周不合格占比：10车间数据；库存情况改为半成品库存 2024-03-25 15:20:32 +08:00
shijing d6bf155a30 fix:生产检验统计计数累加 2024-03-25 10:25:01 +08:00
shijing 419c2ae885 fix:库存检验添加检验结果 2024-03-22 15:14:29 +08:00
shijing e9d4569619 fix:绩效统计人员后面添加工段 2024-03-22 15:06:47 +08:00
shijing 3e63263ec9 feat:添加库存检验记录 2024-03-22 15:01:43 +08:00
shijing 43ec5f099a fix:检验管理-过程检验 添加生产数合格数不合格数，添加工段筛选 2024-03-22 14:37:39 +08:00
shijing 466c8270b4 隐藏库存检验统计 2024-03-22 14:14:51 +08:00
shijing ed22e6a374 fix:粗加工生产检验日期更正&添加环形图label 2024-03-22 13:58:16 +08:00
shijing cf0cc53df9 fix:生产检验统计右侧表格无数据以及左边环形图加lebel 2024-03-22 13:50:01 +08:00
shijing 6be565c499 fix:统计分析：任务进度，6车间以及环形图添加label and legend 2024-03-22 11:26:01 +08:00
shijing 07c34e78ff fix:统计分析时间宽度缩小，型号规格调整顺序，合格率四舍五入取整 2024-03-22 10:37:42 +08:00
shijing 294c349d46 fix:coding#144 
日志的批次号改为可选择也可搜索
 2024-03-21 17:06:49 +08:00
shijing 6e6c818af4 fix:coding146 
7车间看板任务的最近产量改为合格数量
 2024-03-21 17:02:13 +08:00
caoqianming fe2ab50fdb fix: 工序合格数统计bug 2024-03-21 16:40:44 +08:00
shijing c409aed5f6 #142 2024-03-21 15:43:45 +08:00
shijing 365439d05b gannt修改#138 2024-03-21 11:04:44 +08:00
shijing 7e90d78de3 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-03-21 09:41:27 +08:00
shijing 1bce64dbbd 库存统计、采购统计、库存检验统计 2024-03-21 09:41:23 +08:00
caoqianming 7fe92f1065 fix: 大屏接口报错因时间计算在后的bug 2024-03-21 09:06:36 +08:00
caoqianming 25d3aaa0e2 fix: 大屏页面页面调整 2024-03-20 17:23:15 +08:00
caoqianming 9d8384c365 fix: 6车间看板按型号和工段聚合 2024-03-20 17:04:39 +08:00
caoqianming 193d2e32a8 fix: 混料数据is_count_utask为-1 2024-03-20 15:33:20 +08:00
caoqianming 5f211068a3 fix: 进度显示bug 2024-03-20 15:22:17 +08:00
caoqianming 6d600c309d fix: 6车间车间看板 2024-03-20 14:49:00 +08:00
caoqianming 60bad2227b fix: 完成度统计 2024-03-20 14:48:43 +08:00
caoqianming c5185965b5 fix: 添加状态展示 2024-03-20 14:37:25 +08:00
caoqianming bccdaa16ca Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-03-20 13:10:17 +08:00
caoqianming 7cd9da49be feat: dataset名称列加长 2024-03-20 13:10:15 +08:00
shijing 69ed9b9d83 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-03-20 10:12:40 +08:00
shijing be9af90e12 甘特图数量显示问题 2024-03-20 10:12:33 +08:00
caoqianming af0f718565 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-03-19 17:35:32 +08:00
caoqianming 8dc5827c15 fix: dataset删除功能 2024-03-19 17:35:31 +08:00
shijing c0def9482e 混料统计导出 2024-03-19 17:32:52 +08:00
shijing b7cb025304 统计分析导出 2024-03-19 17:15:07 +08:00
shijing 5ea16bde8a 统计分析导出 2024-03-19 17:13:03 +08:00
caoqianming 51a6b6c10a feat: pass_num 添加任务数 2024-03-19 16:56:00 +08:00
caoqianming a828acbed5 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-03-19 15:10:36 +08:00
caoqianming e329cf86f0 feat: 混料统计页面 2024-03-19 15:10:34 +08:00
shijing b74e71b659 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-03-19 14:10:08 +08:00
shijing a4d490ec5b #79过程检验 2024-03-19 14:10:02 +08:00
caoqianming 7d69285bf0 feat: 绩效统计增加字段 2024-03-19 14:08:31 +08:00
caoqianming 07adf80056 feat: 绩效统计返回更多字段 2024-03-19 14:07:07 +08:00
caoqianming 2f122360c1 feat: 车间生产合格数返回更多字段 2024-03-19 14:06:24 +08:00
caoqianming 789f8da088 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-03-19 11:32:50 +08:00
caoqianming f397b53c0a feat: dataset 增加字段 2024-03-19 11:32:48 +08:00
shijing 8f20e298ca coding#140 2024-03-19 10:14:45 +08:00
shijing 9fa1e63438 地图位置调整 2024-03-18 11:43:23 +08:00
shijing 2b4ccc1e5e Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-03-15 17:47:08 +08:00
shijing 9eb4058212 fix:会议 2024-03-15 17:47:03 +08:00
caoqianming c3898769e5 feat: base 添加celery和redis的状态信息 2024-03-15 17:00:56 +08:00
shijing b0a0529abd Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-03-14 08:43:06 +08:00
shijing dc1130a5ee feat:大屏设备小类选择展示隐藏 2024-03-14 08:42:56 +08:00
caoqianming ca925eb0a6 fix: 环境和台账相关页面调整 2024-03-13 15:30:10 +08:00
caoqianming a2feea0b54 fix: base 退出时用location.reload重置路由 2024-03-13 14:17:00 +08:00
caoqianming 8311cb7d1b Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-03-13 11:19:36 +08:00
caoqianming 4c401c805a fix: 无组织页面调整 2024-03-13 11:19:35 +08:00
shijing 2aae784b2b Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-03-13 10:59:38 +08:00
shijing 3ffe89512e feat:大屏设备图标显及点击查看示（简易版） 2024-03-13 10:59:19 +08:00
caoqianming 6b9c0064c9 fix: 调整有组织排放界面 2024-03-13 09:52:03 +08:00
caoqianming 6fa74980ca feat: 增加enum.js 2024-03-13 09:51:37 +08:00
caoqianming 9479de2460 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-03-13 09:51:22 +08:00
caoqianming 6228ba367a feat: 添加设备分类页面及相应修改 2024-03-13 09:50:39 +08:00
caoqianming 50148b4e3a fix: base 菜单删除进行刷新 2024-03-12 08:54:29 +08:00
shijing 994c625b0d 设备分类 2024-03-12 08:50:48 +08:00
shijing 47b34cf175 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-03-11 16:32:10 +08:00
shijing e19b401ae5 mars3d 2024-03-11 16:32:01 +08:00
caoqianming affb89e964 fix: worktask 获取退火炉列表修改完成 2024-03-11 15:57:00 +08:00
caoqianming 1a1aa3ebcb feat: 从localstorage中获取token 2024-03-11 13:34:32 +08:00
caoqianming 767e2d8048 feat: base 退出后可重定向 2024-03-11 13:34:09 +08:00
caoqianming efe3bb7777 feat: base 退出后登录可重定向rediect 2024-03-11 13:33:00 +08:00
caoqianming 052821526e feat: base 完善无感刷新 2024-03-11 13:32:12 +08:00
caoqianming ebf6e48d65 fix: worktask 获取退火炉列表修改2 2024-03-11 09:35:18 +08:00
caoqianming ec0b455d30 fix: worktask 获取退火炉列表修改 2024-03-11 09:19:44 +08:00
caoqianming d6430b17a6 feat: worktask 获取退火炉列表修改 2024-03-11 08:46:59 +08:00
shijing 4ad85cab13 环境质量 2024-03-08 13:19:00 +08:00
shijing 7b5c19ee83 cems中echarts的tooltip位置自适应 2024-03-08 09:37:59 +08:00
shijing fbc2766534 图标tooltip的位置自适应 2024-03-08 09:35:28 +08:00
shijing be92fd5ce1 mars3d文件 2024-03-08 09:24:08 +08:00
shijing e13a52beea cesium暂存更改 2024-03-08 09:22:37 +08:00
shijing f783cd189d 取消过多的console 2024-03-07 15:01:37 +08:00
caoqianming e9d2daa3af feat: 默认开启纵向边框 2024-03-07 09:45:41 +08:00
caoqianming 5def66cf5c fix: 混料添加车间库存及相应bug修复 2024-03-06 22:30:38 +08:00
caoqianming cc29f2b2aa fix: 退火交接记录bug2 2024-03-06 14:38:32 +08:00
caoqianming 1ec5626412 fix: 退火交接记录bug 2024-03-06 14:32:43 +08:00
shijing 42d6a8addc 设备巡检状态文案更改 2024-03-05 14:20:52 +08:00