 zty
|
ba5c1b2129
|
fix bug
|
2024-09-12 15:58:20 +08:00 |
 shijing
|
58bf615de3
|
fix:交接物料/按钮显示问题
|
2024-09-12 15:28:29 +08:00 |
|
shijing
|
a0013e00cc
|
fix:coding#481：合格数统计
|
2024-09-12 11:25:58 +08:00 |
|
shijing
|
ff9f751fef
|
fix:coding#481：合格数统计
|
2024-09-12 11:23:14 +08:00 |
|
shijing
|
7316da4504
|
fix:coding#4811.2任务进度
|
2024-09-12 10:44:54 +08:00 |
|
shijing
|
714e18e168
|
fix:检验部交接物料查询
|
2024-09-12 10:43:46 +08:00 |
|
shijing
|
4382057684
|
fix:统计分析—任务进度
|
2024-09-12 10:03:05 +08:00 |
|
shijing
|
1cb2c30d3e
|
fix:合格数统计每个模块添加工段名称
|
2024-09-11 16:56:19 +08:00 |
|
shijing
|
8a1cf4a25b
|
fix:成品检验中交接记录的筛选
|
2024-09-11 16:47:01 +08:00 |
|
shijing
|
2d5bbca578
|
fix:成品检验添加班次
|
2024-09-11 15:46:40 +08:00 |
|
shijing
|
744f78b621
|
fix:工段交接记录和库存修正
|
2024-09-11 15:28:35 +08:00 |
|
shijing
|
98b54e50d5
|
fix:黑化车间展示数据修正
|
2024-09-11 15:27:06 +08:00 |
|
shijing
|
6764381bad
|
fix:接收部门placeholder提示文案修正
|
2024-09-10 17:30:55 +08:00 |
|
shijing
|
654a7a3e86
|
fix:黑化车间看板调整
|
2024-09-10 17:30:00 +08:00 |
|
shijing
|
9a41a29f49
|
fix:coding#493保温时间和冷却时间可编辑
|
2024-09-10 16:59:39 +08:00 |
|
shijing
|
7f3c2f00f6
|
fix:其他出入库加编辑
|
2024-09-10 15:50:44 +08:00 |
|
shijing
|
d6c27697c4
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-10 15:06:37 +08:00 |
|
shijing
|
54678f9ffc
|
fix:添加wpm接口声明（车间看板用到）
|
2024-09-10 15:06:33 +08:00 |
|
zty
|
70b7427044
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-09 10:51:46 +08:00 |
|
zty
|
9eb6ffeff5
|
fix tkx
|
2024-09-09 10:51:19 +08:00 |
|
shijing
|
709bd6d11b
|
fix:水泥院动态图标改动
|
2024-09-09 08:47:07 +08:00 |
|
shijing
|
1510aee343
|
fix：交接页面添加打印机名称修改
|
2024-09-06 12:46:24 +08:00 |
|
shijing
|
408f83436c
|
fix:车间库存报废，在库存管理里查看
|
2024-09-06 11:00:53 +08:00 |
|
shijing
|
2eca64bf93
|
fix:日志添加时，设备显示设别编号
|
2024-09-05 19:27:50 +08:00 |
|
shijing
|
d17f336a89
|
fix:批量交接，并可查询
|
2024-09-05 19:26:26 +08:00 |
|
shijing
|
9d7dca9096
|
fix:mlog二级可编辑，并且展示batch
|
2024-09-05 19:25:48 +08:00 |
|
shijing
|
4ae990fbdb
|
fix:各类设备表单字段补全
|
2024-09-05 19:24:43 +08:00 |
|
shijing
|
8eaf952916
|
fix:fmlog工艺路线显示routepack_name
|
2024-09-05 17:17:13 +08:00 |
|
shijing
|
997a1e71ef
|
fix:退火审批问题修改
|
2024-09-05 17:02:28 +08:00 |
|
shijing
|
5cd34dd627
|
fix:mlog提交状态
|
2024-09-05 14:53:08 +08:00 |
|
shijing
|
a57b58c29c
|
fix:外协添加单位编号
|
2024-09-05 14:51:25 +08:00 |
|
shijing
|
eac434c0ea
|
fix:
|
2024-09-05 14:40:49 +08:00 |
|
shijing
|
04fd2c4899
|
fix:生产设备以mgroup筛选，添加设备工作进度条
|
2024-09-05 14:04:58 +08:00 |
|
shijing
|
baaa9f9e2e
|
fix:分配
|
2024-09-05 13:45:22 +08:00 |
|
shijing
|
f93cfa8000
|
fix:黑化日志添加检验附件excel
|
2024-09-05 12:12:58 +08:00 |
|
shijing
|
c45d39ff16
|
fix:除了切片、白片抛、黑化、退火、一次抛其他工序都成新的日志填写
|
2024-09-05 11:03:16 +08:00 |
|
shijing
|
93b3a053f2
|
feat:添加fmlog和第二大类的日志填写
|
2024-09-05 10:55:09 +08:00 |
|
shijing
|
23c9d67b7a
|
fix:产出物料里的不合格显示小崩边
|
2024-09-05 10:53:25 +08:00 |
|
shijing
|
8ee097af9a
|
fix:工改加工前不良对应字段
|
2024-09-05 10:15:47 +08:00 |
|
shijing
|
b0777bdb12
|
fix:fmlog接口声明
|
2024-09-05 09:10:58 +08:00 |
|
shijing
|
25ca2a9e03
|
fix:mtaskbAdd接口声明
|
2024-09-05 09:10:31 +08:00 |
|
shijing
|
69333a2dcc
|
fix：添加mtaskb相关接口声明
|
2024-09-04 14:59:29 +08:00 |
|
shijing
|
a3b2c0a2b5
|
fix:退货放行单日志提交时上传excel文件，并存在日志里
|
2024-09-04 13:37:02 +08:00 |
|
shijing
|
67b5d82545
|
fix:原料检验时备注为保存修正
|
2024-09-04 11:38:14 +08:00 |
|
shijing
|
85e2bf1078
|
fix:车间库存添加检验记录页面，退火日志审批时控制页面按钮
|
2024-09-04 09:50:46 +08:00 |
|
shijing
|
ee973ca0da
|
fix:添加黑化工段库存检验
|
2024-09-03 17:31:48 +08:00 |
|
shijing
|
9675c51e49
|
fix:文案修改，冷却时间
|
2024-09-03 16:33:12 +08:00 |
|
shijing
|
8b2c575a2d
|
fix:日志输入物料添加该批次所在层数的备注
|
2024-09-03 15:31:59 +08:00 |
|
shijing
|
ed0d2a8cad
|
fix:mlogb检验的form表单(全检/抽检)
|
2024-09-03 15:30:22 +08:00 |
|
shijing
|
1a291c6a2e
|
fix:添加车间出入库记录中间页
|
2024-09-03 15:28:53 +08:00 |
|
shijing
|
b69038d369
|
fix:工段库存检验可抽检，可全检
|
2024-09-03 15:27:18 +08:00 |
|
shijing
|
c009cf68ec
|
fix:退火工序日志交接时出发审批，破碎数改为加工前不良
|
2024-09-03 15:25:25 +08:00 |
|
shijing
|
54d00c660a
|
fix:退货放行单审批
|
2024-09-03 15:21:16 +08:00 |
|
shijing
|
abb4ea8d24
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-03 15:20:00 +08:00 |
|
shijing
|
ded2507d02
|
fix:mlog只有黑化和退火时添加保温时间和退火时间
|
2024-09-03 15:19:57 +08:00 |
 caoqianming
|
18fa08f3f2
|
feat: 改变主界面logo配置
|
2024-08-30 14:01:24 +08:00 |
|
shijing
|
25e4b9f5c9
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-30 09:10:57 +08:00 |
|
shijing
|
3274b9361e
|
fix:工艺路线添加时route的高度调整
|
2024-08-30 09:07:15 +08:00 |
|
caoqianming
|
f8c6e51a39
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-29 13:55:03 +08:00 |
|
caoqianming
|
4963645672
|
feat: 基础配置修改图标
|
2024-08-29 13:55:00 +08:00 |
|
shijing
|
ddb17c9df3
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-29 13:33:39 +08:00 |
|
shijing
|
eb56c827ef
|
fix:合格数统计工段展开
|
2024-08-29 13:33:35 +08:00 |
|
caoqianming
|
06bbc7c776
|
fix: 计算中心页面调整
|
2024-08-29 12:52:06 +08:00 |
|
caoqianming
|
dbc65739ce
|
feat: 计算公式字段加大
|
2024-08-29 12:51:20 +08:00 |
|
caoqianming
|
86dc38f847
|
fix: routeForm is_autotask默认为true
|
2024-08-29 11:47:32 +08:00 |
|
caoqianming
|
f636d549c0
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-28 17:18:23 +08:00 |
|
caoqianming
|
bb1a63437a
|
feat: 添加计算中心及相应的js
|
2024-08-28 17:18:14 +08:00 |
|
caoqianming
|
b6857c3ab8
|
feat: 添加空白控制台
|
2024-08-28 17:17:50 +08:00 |
|
caoqianming
|
1674f56a58
|
feat: 添加时间策略页面
|
2024-08-28 17:17:36 +08:00 |
|
shijing
|
3e146f7d26
|
fix:过程与成品检验添加不合格列
|
2024-08-28 16:02:53 +08:00 |
|
shijing
|
14e2fe211d
|
fix:光芯合格数统计
|
2024-08-28 14:02:07 +08:00 |
|
shijing
|
2a0bcc4692
|
fix:更改宽度
|
2024-08-28 14:01:28 +08:00 |
|
shijing
|
146a2e086c
|
fix:外观检验添加棕圈
|
2024-08-28 14:00:54 +08:00 |
|
shijing
|
d6cef78446
|
fix:物料清单下载模板时添加时间戳
|
2024-08-27 16:36:35 +08:00 |
|
shijing
|
880c655e63
|
fix:coding#4511
|
2024-08-27 16:09:04 +08:00 |
|
shijing
|
ce51133d4c
|
fix:黑化车间车间看板权限控制
|
2024-08-27 15:03:21 +08:00 |
|
shijing
|
5017710f33
|
fix:coding#445
|
2024-08-27 14:45:20 +08:00 |
|
shijing
|
826d7db102
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-27 14:18:32 +08:00 |
|
shijing
|
d56d6d22e1
|
fix:coding#446
|
2024-08-27 14:18:28 +08:00 |
 Li xia
|
33a55ffa65
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-27 14:03:27 +08:00 |
|
Li xia
|
02dfecfcad
|
fest:"大屏界面调整"
|
2024-08-27 14:03:14 +08:00 |
|
shijing
|
97eab5f9a4
|
fix:光芯自检添加不合格项”小崩边“
|
2024-08-27 11:05:57 +08:00 |
|
shijing
|
c86ab8411e
|
feat:光芯库存统计
|
2024-08-27 10:27:10 +08:00 |
|
shijing
|
7af7efad94
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-27 10:26:24 +08:00 |
|
shijing
|
c836b3f545
|
fix:文案修改配帮管---->配棒管
|
2024-08-27 10:26:20 +08:00 |
|
caoqianming
|
05ecdf7623
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-26 15:38:14 +08:00 |
|
caoqianming
|
0671b19823
|
feat: 添加计算中心页面
|
2024-08-26 15:38:10 +08:00 |
|
caoqianming
|
3994d63728
|
feat: base menu页面优化
|
2024-08-26 15:36:39 +08:00 |
|
shijing
|
f810b751dd
|
feat:光子合格数统计
|
2024-08-26 10:58:50 +08:00 |
|
shijing
|
fabfe94738
|
feat:光子成品检验
|
2024-08-26 10:57:47 +08:00 |
|
shijing
|
d21dc253e4
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-26 09:59:57 +08:00 |
|
shijing
|
8c3bafcc19
|
fix:光子统计分析添加新页面
|
2024-08-26 09:59:53 +08:00 |
|
shijing
|
28d4826043
|
feat:光子统计分析-任务统计
|
2024-08-26 09:59:02 +08:00 |
|
shijing
|
1793a41dfb
|
feat:黑化车间数据看板
|
2024-08-26 09:02:11 +08:00 |
|
zty
|
7f135ed7e1
|
fix: 水泥磨
|
2024-08-23 17:20:22 +08:00 |
|
zty
|
11491e1394
|
feat:增加水泥包装
|
2024-08-21 17:54:28 +08:00 |
|
shijing
|
2a7502d023
|
fix:审批流程添加审批图片(必填)
|
2024-08-21 15:31:24 +08:00 |
|
shijing
|
5ac6bd553b
|
fix:for循环添加key
|
2024-08-20 14:57:00 +08:00 |
|
shijing
|
fef724888b
|
fix:成品检验coding#465
|
2024-08-20 14:47:48 +08:00 |
|
shijing
|
ab9375ddc2
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-20 14:46:49 +08:00 |
|
shijing
|
3cda314ad4
|
fix:成品检验coding#465
|
2024-08-20 14:46:46 +08:00 |
|
zty
|
27c736d080
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
fix bar dar
|
2024-08-20 14:40:25 +08:00 |
|
zty
|
e44e904abe
|
fix: 修改各个工段柱状图
|
2024-08-20 14:40:09 +08:00 |
|
shijing
|
ca9b281834
|
fix:检验管理的检验人查询条件全部用posts__code__contains: "check"
|
2024-08-20 13:48:25 +08:00 |
|
shijing
|
20890b5532
|
fix:成品检验传入type(prod成品)和type2(10抽检)
|
2024-08-20 11:15:06 +08:00 |
|
shijing
|
f2546ecb91
|
fix:工作开始添加开始图片
|
2024-08-20 10:14:16 +08:00 |
|
shijing
|
559f3e2a10
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-20 09:16:58 +08:00 |
|
shijing
|
8f3ef47bb1
|
fix:碳排放图表数据展示
|
2024-08-20 09:16:54 +08:00 |
|
Li xia
|
6417f2ef49
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-19 17:01:27 +08:00 |
|
Li xia
|
1ed17fcedc
|
feat：”超低0816需求修改“
|
2024-08-19 17:01:11 +08:00 |
|
shijing
|
8a8c8322a5
|
fix:审批图片复现
|
2024-08-19 16:33:56 +08:00 |
|
shijing
|
5dcbe0c8e4
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-19 15:18:31 +08:00 |
|
shijing
|
9c76501511
|
fix:pc端作业审批添加图片
|
2024-08-19 15:18:27 +08:00 |
|
Li xia
|
2fdcd3db1b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-19 14:16:38 +08:00 |
|
Li xia
|
b05ce66c38
|
feat:"bug修改"
|
2024-08-19 14:16:12 +08:00 |
|
Li xia
|
be467d3f93
|
feat: ”大屏修改“
|
2024-08-19 14:14:34 +08:00 |
|
caoqianming
|
fe704c09a7
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-19 14:06:32 +08:00 |
|
caoqianming
|
2044684c26
|
feat: 去除登录重定向
|
2024-08-19 14:06:29 +08:00 |
|
zty
|
4aaad74a6a
|
fix: 能管页面更改
|
2024-08-16 18:42:42 +08:00 |
|
zty
|
048a2339d4
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-16 10:57:03 +08:00 |
|
zty
|
3324330799
|
fix: tkx/修改 环期值不显示问题
|
2024-08-16 10:56:58 +08:00 |
|
shijing
|
0dd28c95c5
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-16 10:23:27 +08:00 |
|
shijing
|
329bccb628
|
fix:任务分解后的修改问题
|
2024-08-16 10:21:45 +08:00 |
|
caoqianming
|
13e3c91ca2
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 18:14:52 +08:00 |
|
caoqianming
|
638c0e65b6
|
feat: 样式更改
|
2024-08-15 18:14:34 +08:00 |
|
Li xia
|
d8b7e344bd
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 18:12:45 +08:00 |
|
Li xia
|
e75402ec94
|
feat: "车辆清单"
|
2024-08-15 18:08:49 +08:00 |
|
shijing
|
c08dc1b2d3
|
fix:日志不合格项合计
|
2024-08-15 17:49:21 +08:00 |
|
shijing
|
93ae6ac3da
|
fix:日志检验中添加破损和其他
|
2024-08-15 17:23:44 +08:00 |
|
shijing
|
b353166dda
|
fix:日志中生产设备传dept
|
2024-08-15 17:08:03 +08:00 |
|
shijing
|
599a117a96
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 16:43:29 +08:00 |
|
shijing
|
ffbc69ebab
|
fix:设备巡检和检定记录的修订
|
2024-08-15 16:43:10 +08:00 |
|
Li xia
|
05727aebed
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 16:11:15 +08:00 |
|
Li xia
|
21d7f5d6f7
|
feat: 厂外运输
|
2024-08-15 16:10:53 +08:00 |
|
shijing
|
c60f1bc32f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 16:07:37 +08:00 |
|
shijing
|
3435ffa718
|
fix:创建工艺路线点击上一步时创建多条记录
|
2024-08-15 16:07:32 +08:00 |
|
caoqianming
|
acfc04653a
|
fix: 排放口infotitle
|
2024-08-15 15:59:31 +08:00 |
|
caoqianming
|
18c89f01bb
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 15:59:00 +08:00 |
|
caoqianming
|
e998dd2f8e
|
feat: 菜单icon调整
|
2024-08-15 15:58:26 +08:00 |
|
shijing
|
9fa6081434
|
fix:生产设备增删改后刷新列表，设备类型光子单独一个数组
|
2024-08-15 15:44:42 +08:00 |
|
shijing
|
06c3e107f0
|
fix:eq
|
2024-08-15 15:25:34 +08:00 |
|
shijing
|
791edcbf4f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 14:56:12 +08:00 |
|
shijing
|
9fba7a1330
|
fix:添加设备type
|
2024-08-15 14:56:03 +08:00 |
|
caoqianming
|
3a6249941e
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 14:07:56 +08:00 |
|
caoqianming
|
a085399727
|
fix: 超低修改
|
2024-08-15 14:07:53 +08:00 |
|
shijing
|
7ea7051a88
|
fix:更改密码时去掉 .
|
2024-08-15 13:58:52 +08:00 |
|
shijing
|
65f4502561
|
fix:白抛片-->改为 白片抛
|
2024-08-15 13:57:36 +08:00 |
|
shijing
|
be1f643eef
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 13:28:42 +08:00 |
|
shijing
|
29e4bb2432
|
fix:添加工序工段对应页面，更改工段名称
|
2024-08-15 13:28:38 +08:00 |
|
caoqianming
|
60b277b86b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 11:08:13 +08:00 |
|
caoqianming
|
705b15b833
|
feat: wmaterial增加state字段
|
2024-08-15 11:08:07 +08:00 |
|
shijing
|
d001a98168
|
fix:添加不合格项，抽检添加检验人
|
2024-08-14 21:23:44 +08:00 |
|
shijing
|
d92d010e4d
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-14 17:41:09 +08:00 |
|
shijing
|
57ab4f3914
|
fix：光芯物料导入模板下载地址改动
|
2024-08-14 17:41:05 +08:00 |
|
caoqianming
|
4371a5dff0
|
feat: 环保页面调整
|
2024-08-14 16:25:16 +08:00 |
|
caoqianming
|
e38d1d3eef
|
fix: 光子大屏light intensity调整
|
2024-08-14 14:27:38 +08:00 |
|
caoqianming
|
f2df4ddbb0
|
fix: wpm_gx handoverform getuserlist2 bug
|
2024-08-14 10:47:09 +08:00 |
|
shijing
|
c7bd84f8ab
|
fix:交接记录人员
|
2024-08-14 10:29:15 +08:00 |
|
shijing
|
6f0c9b57bd
|
fix:过程抽检
|
2024-08-14 09:54:46 +08:00 |
|
shijing
|
8ac6ee5db5
|
fix:打印接口设成本地，路由添加过程抽检，工艺路线table高度暂时设小
|
2024-08-14 09:54:11 +08:00 |
|
shijing
|
1666728e9e
|
fix:抽检
|
2024-08-13 15:42:24 +08:00 |
|
shijing
|
404b2b71cb
|
fix:chengpinjianyan
|
2024-08-13 13:51:17 +08:00 |
|
shijing
|
a5759b48b3
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-13 11:15:08 +08:00 |
|
shijing
|
7172a0e070
|
fix:二次、三次超洗
|
2024-08-13 11:15:05 +08:00 |
|
caoqianming
|
147c5273f1
|
feat: 左侧菜单宽度调整
|
2024-08-13 11:02:44 +08:00 |
|
caoqianming
|
a0dcbd8ec6
|
fix: route顺序调整
|
2024-08-13 10:58:10 +08:00 |
|
caoqianming
|
98cf9e8e66
|
feat: 首页调整
|
2024-08-13 10:57:57 +08:00 |
|
caoqianming
|
3e7473444f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-13 10:57:03 +08:00 |
|
caoqianming
|
c95c247cfd
|
feat: 审批管理调整位置
|
2024-08-13 10:56:59 +08:00 |
|
shijing
|
4ee3242fa9
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-13 10:49:35 +08:00 |
|
shijing
|
8e5a2f60ad
|
fix:检验提交
|
2024-08-13 10:49:31 +08:00 |
|
caoqianming
|
1a0b85b9a1
|
feat: 界面字段优化
|
2024-08-13 10:46:03 +08:00 |
|
caoqianming
|
28516c89dd
|
feat: wpm_gx mlog界面优化
|
2024-08-13 10:33:48 +08:00 |
|
caoqianming
|
009e2c05bb
|
fix: handover form wm做筛选
|
2024-08-13 09:56:19 +08:00 |
|
caoqianming
|
d6d1f9231d
|
feat: 修改设备图标
|
2024-08-13 09:42:44 +08:00 |
|
caoqianming
|
17218d6e60
|
fix: mioitem form 取消无反应
|
2024-08-13 09:35:46 +08:00 |
|
caoqianming
|
b28a7c0403
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-13 09:30:04 +08:00 |
|
caoqianming
|
a5f783b056
|
feat: base 登录选项配置/找回密码logo动态
|
2024-08-13 09:30:01 +08:00 |
|
shijing
|
8819696c1c
|
fix:图标更改
|
2024-08-13 09:29:21 +08:00 |
|
shijing
|
9bc030df31
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-12 17:21:35 +08:00 |
|
shijing
|
1ec89273e5
|
fix:光芯成品检验
|
2024-08-12 17:21:31 +08:00 |
|
caoqianming
|
6bf784df60
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-12 16:33:47 +08:00 |
|
caoqianming
|
97e69203ca
|
feat: mio form系统修改
|
2024-08-12 16:33:19 +08:00 |
|
shijing
|
cf3cb5139a
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-12 11:33:39 +08:00 |
|
shijing
|
45c223609c
|
fix:工序添加显示排序
|
2024-08-12 11:33:35 +08:00 |
|
caoqianming
|
857e806af8
|
feat: base 基础样式修改
|
2024-08-09 21:26:07 +08:00 |
|
zty
|
cf4974f824
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
fix：
|
2024-08-09 13:27:50 +08:00 |
|
zty
|
862782fe1f
|
fix type=hour_s 传参数 year month day
|
2024-08-09 13:27:17 +08:00 |
|
shijing
|
6efa08ea9f
|
fix:去掉二级菜单一下的图标，更改部分超低排放
|
2024-08-09 10:36:05 +08:00 |
|
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 |