 caoqianming
|
442fc20ad6
|
feat: base 调整样式
|
2024-08-08 09:48:18 +08:00 |
 shijing
|
4aa1463b83
|
fix:materials列表中体现物料系列
|
2024-08-07 18:09:05 +08:00 |
|
shijing
|
f52915325d
|
fix:将检测项目移动到制造管理
|
2024-08-07 17:55:45 +08:00 |
|
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 |
|
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 |
|
shijing
|
855e6c3198
|
箱中破(count_n_xzp)与碎料(count_break)分开
|
2024-03-05 10:15:32 +08:00 |
|
shijing
|
b230202990
|
bufenxiugai
|
2024-03-05 09:18:06 +08:00 |
|
shijing
|
c9f78b5d6a
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-03-04 17:13:05 +08:00 |
|
shijing
|
9c6c796f0d
|
#129驾驶舱标题缺失
|
2024-03-04 17:13:02 +08:00 |
|
caoqianming
|
6e6186d143
|
feat: 退火页面按钮控制
|
2024-03-04 16:54:00 +08:00 |
|
caoqianming
|
f1c6c409b0
|
fix: 10车间mlog列表显示产出物
|
2024-03-04 16:53:36 +08:00 |
|
caoqianming
|
8a2d2d39ff
|
feat: 物料页面添加搜索框
|
2024-03-04 16:52:56 +08:00 |
|
caoqianming
|
0f298ce1da
|
fix: mlogb计算导致的count_ok错误
|
2024-03-04 15:46:40 +08:00 |
|
caoqianming
|
5d5ebf7ae1
|
feat: 事件列表增加处理描述列
|
2024-03-04 15:42:18 +08:00 |
|
caoqianming
|
59522261b7
|
feat: 10车间可直接出产物(无兄弟件)
|
2024-03-04 15:16:20 +08:00 |
|
caoqianming
|
2a316c2c56
|
fix: 混料需要传回count_real和count_use
|
2024-03-04 13:55:23 +08:00 |
|
shijing
|
0b60e40971
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-03-04 13:18:03 +08:00 |
|
shijing
|
456ef47eb1
|
worktask_form
|
2024-03-04 13:18:01 +08:00 |
|
caoqianming
|
28a4e77ab3
|
fix: mlog不显示产品名称
|
2024-03-04 13:04:03 +08:00 |
|
caoqianming
|
962dae3fde
|
feat: 物料导入功能
|
2024-03-04 10:47:36 +08:00 |
|
shijing
|
03168c01d5
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-03-04 09:48:16 +08:00 |
|
shijing
|
b45d946d4e
|
批量巡检&巡检记录
|
2024-03-04 09:48:13 +08:00 |
|
caoqianming
|
7de24e53c7
|
feat: 库存增加撤销功能
|
2024-03-04 08:34:46 +08:00 |
|
shijing
|
0ef2c8ba18
|
入场检验列表
|
2024-03-01 16:49:07 +08:00 |
|
shijing
|
2d86e13808
|
过程检验
|
2024-03-01 16:13:38 +08:00 |
|
shijing
|
bb9bae23fd
|
enp大屏
|
2024-03-01 15:52:12 +08:00 |
|
shijing
|
b2ef0ed3e5
|
检验管理
|
2024-03-01 15:49:23 +08:00 |
|
shijing
|
4247366f7a
|
周四会议部分更改
|
2024-03-01 14:57:07 +08:00 |
|
shijing
|
4da1c33c33
|
小微站设备数据
|
2024-02-28 17:37:03 +08:00 |
|
shijing
|
69570c44f3
|
大屏改动
|
2024-02-28 16:42:18 +08:00 |
|
shijing
|
6ca6565791
|
智能管理表头
|
2024-02-28 16:02:08 +08:00 |
|
shijing
|
beac9f3733
|
3dtiles依赖换线上地址
|
2024-02-28 13:40:12 +08:00 |
|
shijing
|
281db61506
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-02-28 13:16:19 +08:00 |
|
shijing
|
a1f1f8af63
|
3dtiles
|
2024-02-28 13:16:09 +08:00 |
|
caoqianming
|
908dab5634
|
fix: 不同项目切换的打包适配
|
2024-02-28 11:51:14 +08:00 |
|
shijing
|
3f1f78f625
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-02-28 10:43:34 +08:00 |
|
shijing
|
f5f7ec2e54
|
性能检验添加编辑
|
2024-02-28 10:43:32 +08:00 |
|
caoqianming
|
b5c5507564
|
fix: 多页面样式调整
|
2024-02-27 18:21:54 +08:00 |
|
caoqianming
|
7eff5872f6
|
fix: 智能治理结构优化
|
2024-02-27 16:04:11 +08:00 |
|
caoqianming
|
ce5562a20f
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-02-27 15:20:17 +08:00 |
|
caoqianming
|
f0b16b601c
|
fix: rpj_show选择证书不显示的bug
|
2024-02-27 15:20:15 +08:00 |
|
shijing
|
3e7cacb061
|
style
|
2024-02-27 14:32:20 +08:00 |
|
shijing
|
3c0b221c13
|
页面标题
|
2024-02-27 14:28:47 +08:00 |
|
shijing
|
33eb880002
|
pollutant2
|
2024-02-27 14:24:50 +08:00 |
|
shijing
|
dc74f69cc3
|
页面标题样式统一
|
2024-02-27 14:22:45 +08:00 |
|
shijing
|
762f648d23
|
页面标题样式统一
|
2024-02-27 14:20:08 +08:00 |
|
caoqianming
|
6e7b2a9f57
|
fix: 污染源界面样式调整
|
2024-02-27 14:04:37 +08:00 |
|
caoqianming
|
9715aace46
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-02-27 13:55:09 +08:00 |
|
caoqianming
|
051319c883
|
fix: 排口清单样式调整
|
2024-02-27 13:55:08 +08:00 |
|
shijing
|
dc7d7f1ec0
|
dapingshujutiaoshi
|
2024-02-27 13:49:19 +08:00 |
|
shijing
|
bc4b944272
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-02-27 13:48:39 +08:00 |
|
shijing
|
488e74ccf0
|
enp新增接口
|
2024-02-27 13:48:36 +08:00 |
|
caoqianming
|
2ae64eef2a
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-02-27 13:44:19 +08:00 |
|
caoqianming
|
dbdc20b42b
|
fix: 有组织排放内容调整
|
2024-02-27 13:44:17 +08:00 |
|
shijing
|
a914d61e8a
|
视频显示
|
2024-02-27 09:01:07 +08:00 |
|
caoqianming
|
8629e1bf61
|
fix: 根据项目code个性化定制的bug
|
2024-02-26 18:46:18 +08:00 |
|
caoqianming
|
4918d99218
|
fix: 登录后顶栏名称错误
|
2024-02-26 17:23:53 +08:00 |
|
shijing
|
b0452cfb96
|
菜单更改
|
2024-02-26 14:45:10 +08:00 |
|
shijing
|
a1f2c86055
|
页面更新
|
2024-02-23 17:01:02 +08:00 |
|
shijing
|
a7616c4d60
|
接口添加
|
2024-02-23 11:20:29 +08:00 |
|
shijing
|
f26cd3f2f6
|
洗车记录
|
2024-02-23 11:20:10 +08:00 |
|
shijing
|
1a3f77a6a9
|
小问题修改
|
2024-02-22 14:29:53 +08:00 |
|
shijing
|
a57fa2f750
|
工序合格数统计
|
2024-02-22 11:03:45 +08:00 |
|
shijing
|
fa87c5fdce
|
生产检验统计表加名称规格型号列
|
2024-02-22 10:05:21 +08:00 |
|
shijing
|
6c795c0127
|
任务进度添加规格和开工完工时间
|
2024-02-22 09:56:37 +08:00 |
|
shijing
|
78f9b40a1b
|
生产线表格中炉号变动
|
2024-02-22 09:49:19 +08:00 |
|
shijing
|
2a4fdf1573
|
滚动table中新增设备状态
|
2024-02-22 09:46:39 +08:00 |
|
shijing
|
6beafdc9f2
|
成品检验表格宽度修改
|
2024-02-22 09:40:06 +08:00 |
|
shijing
|
136eff089f
|
10车间车间看板全年生产统计柱状图标注更改颜色和位置
|
2024-02-22 09:11:10 +08:00 |
|
shijing
|
688b3b82fe
|
首页库存、生产进度更改
|
2024-02-22 09:10:00 +08:00 |
|
shijing
|
5401d07003
|
shouye
|
2024-02-21 09:46:54 +08:00 |
|
shijing
|
bbb096e67c
|
光子首件检验人员筛选
|
2024-02-21 09:13:44 +08:00 |
|
shijing
|
06f87adc45
|
添加事件批量删除按钮与前方的间隔
|
2024-02-20 10:02:55 +08:00 |
|
shijing
|
65a4795721
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-02-20 10:01:51 +08:00 |
|
shijing
|
bd0f46d7e9
|
事件相关接口的变动
|
2024-02-20 10:01:48 +08:00 |
|
caoqianming
|
2597e63aeb
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-02-20 10:01:29 +08:00 |
|
caoqianming
|
0f33197bb0
|
feat: 添加治理设备和监控设备界面
|
2024-02-20 10:01:27 +08:00 |
|
shijing
|
594a217af2
|
事件批量删除
|
2024-02-19 17:08:05 +08:00 |
|
shijing
|
a2e91fa968
|
报警事件批量删除
|
2024-02-19 16:57:42 +08:00 |
|
shijing
|
6244d0d49f
|
菜单变动
|
2024-02-19 10:58:47 +08:00 |
|
shijing
|
68416ae7a9
|
菜单变动
|
2024-02-19 10:55:51 +08:00 |
|
caoqianming
|
3240f66f8a
|
fix: 处理合并冲突
|
2024-02-19 10:52:17 +08:00 |
|
caoqianming
|
da3136ecc6
|
feat: 智能治理页面
|
2024-02-19 10:48:00 +08:00 |
|
shijing
|
e60973b274
|
运输页面
|
2024-02-05 17:02:41 +08:00 |
|
shijing
|
3cf1e45762
|
样式更改
|
2024-02-04 17:36:43 +08:00 |
|
caoqianming
|
e1817e611f
|
feat: cems2,cemsExport导出
|
2024-02-04 14:28:05 +08:00 |
|
caoqianming
|
26b055ab6f
|
feat: 调整cmes界面
|
2024-02-04 14:16:59 +08:00 |
|
caoqianming
|
4dc0136368
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-02-04 10:07:40 +08:00 |
|
caoqianming
|
08290605e2
|
feat: 新增pollutant页面
|
2024-02-04 10:07:38 +08:00 |
|
shijing
|
64bad78780
|
背景图片丢失修改
|
2024-02-04 09:03:57 +08:00 |
|
shijing
|
cf3cfeba90
|
pfkecharts
|
2024-02-01 18:13:50 +08:00 |
|
shijing
|
d51041cd20
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-02-01 17:59:29 +08:00 |
|
shijing
|
41137027c0
|
pfkecharts
|
2024-02-01 17:59:24 +08:00 |
|
caoqianming
|
b895165e99
|
merge: 合并更改
|
2024-02-01 17:57:52 +08:00 |
|
caoqianming
|
6e3e7c4e8e
|
feat: 新增污染源清单
|
2024-02-01 17:56:47 +08:00 |
|
caoqianming
|
72f7bc4a38
|
feat: 界面调整
|
2024-02-01 17:56:29 +08:00 |
|
shijing
|
5c87111b7c
|
zhutisexiala
|
2024-02-01 15:17:57 +08:00 |
|
shijing
|
d9e61258a3
|
zhutisexiala
|
2024-02-01 15:17:15 +08:00 |
|
shijing
|
807294d364
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-02-01 15:09:28 +08:00 |
|
shijing
|
17b9e166f0
|
pfk
|
2024-02-01 15:09:22 +08:00 |
|
caoqianming
|
eeeadd9b98
|
feat: cems导出接口完善
|
2024-02-01 14:15:59 +08:00 |
|
caoqianming
|
868a7e7f51
|
fix: cems.vue筛选条件
|
2024-02-01 14:02:29 +08:00 |
|
caoqianming
|
1873f17e4c
|
feat: 添加cems导出界面
|
2024-02-01 09:32:28 +08:00 |
|
shijing
|
1923d9ca2e
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-01-31 16:22:38 +08:00 |
|
shijing
|
755d02fa85
|
wry
|
2024-01-31 16:22:34 +08:00 |
|
caoqianming
|
24876dcf38
|
feat: cems2监测预警页面
|
2024-01-31 16:19:50 +08:00 |
|
shijing
|
187005d361
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-01-31 14:00:40 +08:00 |
|
shijing
|
55c36acaec
|
wry
|
2024-01-31 14:00:36 +08:00 |
|
caoqianming
|
99325eb5cf
|
fix: cems样式调整
|
2024-01-31 13:57:08 +08:00 |
|
caoqianming
|
721030420a
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-01-31 13:20:19 +08:00 |
|
caoqianming
|
60e6e154f7
|
feat: 添加cems监测清单页及相应的接口
|
2024-01-31 13:20:18 +08:00 |
|
shijing
|
58e7ea29ad
|
退火时车间库存的筛选
|
2024-01-31 13:19:14 +08:00 |
|
shijing
|
57daa1bc19
|
退火日志撤回
|
2024-01-31 10:07:25 +08:00 |
|
shijing
|
29b64b9a2a
|
退火提交
|
2024-01-31 09:29:55 +08:00 |
|
caoqianming
|
e2015236e7
|
feat: 调整scTable默认配置
|
2024-01-30 16:14:37 +08:00 |
|
shijing
|
d2f39536af
|
enpTable中hover状态背景色
|
2024-01-30 15:29:34 +08:00 |
|
shijing
|
dd4529bd3b
|
enpTable中hover状态背景色
|
2024-01-30 15:29:05 +08:00 |
|
shijing
|
27ed58bf5c
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-01-30 14:44:08 +08:00 |
|
shijing
|
6c20c1180a
|
超低排放
|
2024-01-30 14:43:54 +08:00 |
|
caoqianming
|
9afbeaa891
|
feat: 增加物料复制功能
|
2024-01-29 18:41:46 +08:00 |
|
caoqianming
|
5c7a61089b
|
feat: 简化mlogb逻辑
|
2024-01-28 00:21:32 +08:00 |
|
caoqianming
|
4855ab4028
|
fix: 10车间mlog编辑
|
2024-01-27 22:50:15 +08:00 |
|
caoqianming
|
6cb3e526aa
|
fix: 退火先去除不必要的表单项目
|
2024-01-25 13:23:24 +08:00 |
|
caoqianming
|
729dd9b38d
|
feat: 出入库记录增加执行车间
|
2024-01-25 10:17:27 +08:00 |
|
caoqianming
|
f855f65d25
|
fix: mioitem batch选择时可显示数量
|
2024-01-25 10:13:18 +08:00 |
|
caoqianming
|
0a12e323f9
|
fix: 性能检验列表展示用户名
|
2024-01-25 10:05:25 +08:00 |
|
caoqianming
|
5c5a0bafc0
|
fix: 出入库记录按物料类型筛选
|
2024-01-24 11:56:48 +08:00 |
|
caoqianming
|
9a9ddcfe5d
|
feat: 出入库记录按物料类型筛选
|
2024-01-24 11:26:37 +08:00 |
|
caoqianming
|
8458dc765e
|
feat: 隐去加工工具和辅助工装
|
2024-01-24 11:26:10 +08:00 |
|
caoqianming
|
72875e5b0b
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-01-24 09:32:00 +08:00 |
|
caoqianming
|
98581e7d51
|
fix: mioitem_form车间批次号获取
|
2024-01-24 09:31:57 +08:00 |
|
shijing
|
5ed9cd6d72
|
batch跟随mtask日期
|
2024-01-24 09:02:29 +08:00 |
|
shijing
|
0a273bbfca
|
获取项目code
|
2024-01-23 17:07:33 +08:00 |
|
shijing
|
ee580fdb27
|
托克逊大屏文案更改
|
2024-01-23 16:59:47 +08:00 |
|
shijing
|
376a0900e1
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-01-23 11:19:14 +08:00 |
|
shijing
|
fa600610d9
|
materialList展示
|
2024-01-23 11:19:09 +08:00 |
|
caoqianming
|
9ea6c53725
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-01-23 10:54:49 +08:00 |
|
caoqianming
|
47d11d82db
|
能管模拟数据
|
2024-01-23 10:54:47 +08:00 |
|
shijing
|
e0dcddfec6
|
数据看板今日任务改动
|
2024-01-23 09:08:08 +08:00 |
|
shijing
|
c2d09a0fe1
|
7车间数据
|
2024-01-22 17:54:35 +08:00 |
|
shijing
|
410a55b411
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-01-22 17:07:13 +08:00 |
|
caoqianming
|
29b073759d
|
fix: 7车间设备查询使用升降式退火炉
|
2024-01-22 17:07:11 +08:00 |
|
shijing
|
0f15a76945
|
6车间看板数据调整
|
2024-01-22 17:07:04 +08:00 |
|
caoqianming
|
7e5d95a0a3
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-01-22 17:05:26 +08:00 |
|
caoqianming
|
98f10a3182
|
fix: 交接单时保留2位数的bug
|
2024-01-22 17:05:24 +08:00 |
|
shijing
|
5538f8354c
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-01-22 13:45:17 +08:00 |
|
shijing
|
f916b09ec6
|
数据大屏多次请求问题
|
2024-01-22 13:45:09 +08:00 |
|
caoqianming
|
96921a938e
|
fix: material_form选择时使用full_name
|
2024-01-22 09:12:35 +08:00 |
|
shijing
|
940c1b6337
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2024-01-22 08:50:53 +08:00 |
|
shijing
|
348bd899d5
|
数据大屏为昨日周所在数据
|
2024-01-22 08:50:49 +08:00 |
|
caoqianming
|
1d896185a2
|
fix: 6车间炸纹未纳入count_ok统计
|
2024-01-20 22:50:02 +08:00 |
|
caoqianming
|
03698ba109
|
fix: count_n_w改为count_n_wq
|
2024-01-20 22:39:54 +08:00 |
|
caoqianming
|
d9cf2d8b72
|
fix: 路线选择返回item需要使用value-key
|
2024-01-20 22:31:36 +08:00 |
|
caoqianming
|
0a47b93517
|
feat: 退火显示完整物料名称
|
2024-01-20 22:30:48 +08:00 |
|
caoqianming
|
f1a65e94d0
|
feat: 混料显示完整物料名称
|
2024-01-20 22:29:52 +08:00 |