 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 |
|
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 |