 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 |