 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 |
|
shijing
|
a85dca660f
|
生产检验统计
|
2024-01-19 17:40:06 +08:00 |
|
shijing
|
3162c5948a
|
统计分析-合格数统计
|
2024-01-19 16:52:54 +08:00 |
|
shijing
|
4b533d4e94
|
6车间看板昨日改为本周工序进度
|
2024-01-19 16:06:40 +08:00 |
|
shijing
|
8ba7a12c88
|
AVG日志记录
|
2024-01-19 15:12:28 +08:00 |
|
shijing
|
b2343d5438
|
gantt悬浮时间显示
|
2024-01-19 11:17:50 +08:00 |
|
shijing
|
3a3d89d127
|
成品检验&0119的问题
|
2024-01-19 11:11:07 +08:00 |
|
shijing
|
b3edf33de9
|
混料小数点u
|
2024-01-18 14:58:57 +08:00 |
|
shijing
|
1212162a7e
|
批次号自动生成10车间
|
2024-01-18 14:26:22 +08:00 |
|
shijing
|
f9d146240a
|
批次号自动生成
|
2024-01-18 14:22:05 +08:00 |
|
shijing
|
4e468abfd5
|
成品检验未完成
|
2024-01-18 14:13:07 +08:00 |
|
shijing
|
82c300d25c
|
首件检验
|
2024-01-17 17:48:46 +08:00 |
|
shijing
|
4fe31bb4c8
|
#116
|
2024-01-17 15:49:26 +08:00 |
|
shijing
|
6c73fda22e
|
#113&6车间合格率小数位问题
|
2024-01-17 15:04:37 +08:00 |
|
shijing
|
10376bbbdf
|
获取检验项查询条件
|
2024-01-16 18:15:16 +08:00 |
|
shijing
|
7ef9042a0d
|
#115
|
2024-01-16 17:47:43 +08:00 |
|
shijing
|
88fcbe4518
|
enp
|
2024-01-16 15:41:08 +08:00 |
|
shijing
|
5e1990c1a0
|
picture
|
2024-01-15 16:10:49 +08:00 |
|
shijing
|
2b148dbd91
|
mtask提交
|
2024-01-10 16:06:26 +08:00 |
|
shijing
|
6172ca5a80
|
交付参数更改
|
2024-01-10 14:25:12 +08:00 |
|
shijing
|
355159e49a
|
系统基本信息获取
|
2024-01-10 13:42:55 +08:00 |
|
shijing
|
ac79990bbf
|
生产入库、采购入库记录检验
|
2024-01-10 09:44:54 +08:00 |
|
shijing
|
5109a85764
|
物料统计
|
2024-01-09 17:02:38 +08:00 |
|
shijing
|
ef2612f2b7
|
销售统计查询条件更改
|
2024-01-09 09:35:10 +08:00 |
|
shijing
|
890d41dfa4
|
rukujianyan
|
2024-01-09 09:13:55 +08:00 |
|
shijing
|
b9e1fe491c
|
销售统计
|
2024-01-05 17:54:27 +08:00 |
|
shijing
|
6472e9adcb
|
性能检验
|
2024-01-05 17:50:20 +08:00 |
|
shijing
|
d741746c7f
|
生产统计数据调试
|
2024-01-04 19:09:24 +08:00 |
|
shijing
|
8e5fca3daf
|
utask终止
|
2024-01-04 13:27:19 +08:00 |
|
shijing
|
4b3e3bf1a4
|
mlog中shift问题
|
2024-01-03 16:42:35 +08:00 |
|
shijing
|
060c15c314
|
混料去除四舍五入
|
2024-01-02 16:37:25 +08:00 |
|
shijing
|
4d122d9ad7
|
报错更改error Handler.js#109
|
2024-01-02 10:28:39 +08:00 |
|
shijing
|
d4fb4ca081
|
rowclick冒泡
|
2023-12-28 17:55:24 +08:00 |
|
shijing
|
484618d842
|
BABYLON引用依赖本地化
|
2023-12-28 15:14:40 +08:00 |
|
shijing
|
6674e0e123
|
首页柱状图tip文案显示，进度条文案，以及GATT改动
|
2023-12-28 10:25:54 +08:00 |
|
shijing
|
cabb27a41d
|
首页柱状图tip文案显示，进度条文案，以及GATT改动
|
2023-12-28 10:23:37 +08:00 |
|
caoqianming
|
0e06b13501
|
fix: 大屏getDeptDetail错误
|
2023-12-27 18:32:16 +08:00 |
|
shijing
|
417a583c7a
|
#设备查询
|
2023-12-27 13:25:30 +08:00 |
|
shijing
|
4bd9b311cf
|
#986车间日志填写的不合格原因错误
|
2023-12-27 09:35:26 +08:00 |
|
shijing
|
598e461d0d
|
#
|
2023-12-26 18:01:45 +08:00 |
|
shijing
|
de3e9e6532
|
#10410车间车间看板累计合格
|
2023-12-26 17:46:44 +08:00 |
|
shijing
|
3904743f49
|
#106车间今日任务显示utask
|
2023-12-26 16:21:56 +08:00 |
|
shijing
|
9ddc0f2555
|
车间名称改成门牌名称&不合格统计自动切换
|
2023-12-26 16:06:45 +08:00 |
|
shijing
|
5e056b56a7
|
#105车间看板合格率小数位保留整数
|
2023-12-26 14:26:14 +08:00 |
|
shijing
|
6e99ddf001
|
#108混料每桶kg可以有两位小数
|
2023-12-26 14:07:57 +08:00 |
|
shijing
|
12b25518c3
|
出入库记录mioitem新增时选项限制
|
2023-12-26 14:03:33 +08:00 |
|
shijing
|
95d2b1ca42
|
#9210车间配粉料数编辑隐去
|
2023-12-26 09:42:11 +08:00 |
|
shijing
|
80c2676551
|
#90到岗记录第二次新建回携带数据有显示问题
|
2023-12-26 09:31:43 +08:00 |
|
shijing
|
e2b980a6d0
|
登录页logo大小调整
|
2023-12-26 09:20:53 +08:00 |
|
shijing
|
8c835fe715
|
数据大屏数据同步
|
2023-12-25 17:30:11 +08:00 |
|
shijing
|
b11e2aaeb4
|
数据大屏数据同步
|
2023-12-25 16:57:55 +08:00 |
|
shijing
|
d7d215fbd7
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-25 13:51:10 +08:00 |
|
shijing
|
64b6b7b3dc
|
6车间看板
|
2023-12-25 13:51:06 +08:00 |
|
caoqianming
|
02162eb83e
|
fix: 车间库存显示count__gte
|
2023-12-25 13:09:19 +08:00 |
|
caoqianming
|
eee2fb8372
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-25 12:48:10 +08:00 |
|
caoqianming
|
e355fcedc7
|
fix: 6车间任务执行筛选及相关调整
|
2023-12-25 12:48:09 +08:00 |
|
shijing
|
495955c495
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-25 11:03:21 +08:00 |
|
shijing
|
5e26baf75f
|
6车间看板
|
2023-12-25 11:03:15 +08:00 |
|
caoqianming
|
29bd6ac6a2
|
fix: 进入某些出入库记录时不用做限制以及部分优化
|
2023-12-25 10:46:48 +08:00 |
|
caoqianming
|
611255a2d0
|
fix: 仓库查看按钮先去除
|
2023-12-25 10:08:35 +08:00 |
|
caoqianming
|
6a212139d2
|
fix: 10车间日志展示调宽
|
2023-12-25 09:18:53 +08:00 |
|
caoqianming
|
b379532a9e
|
修改10车间显示物料全名及不合格数
|
2023-12-24 19:00:11 +08:00 |
|
caoqianming
|
99413a3fef
|
fix: 切换账号时菜单不变化
|
2023-12-24 18:49:12 +08:00 |
|
caoqianming
|
7591e3c34c
|
fix: 移动端logo和name从config获取
|
2023-12-24 18:35:27 +08:00 |
|
caoqianming
|
a24eece353
|
feat: 去除不必要的超管判断
|
2023-12-23 17:31:25 +08:00 |
|
caoqianming
|
e4658ea882
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-23 17:30:46 +08:00 |
|
caoqianming
|
795044c841
|
fix: worktask_form放出班次
|
2023-12-23 17:30:43 +08:00 |
|
shijing
|
0ecd78bf40
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-22 17:46:14 +08:00 |
|
shijing
|
e8ae54f706
|
车间看板
|
2023-12-22 17:46:09 +08:00 |
|
caoqianming
|
8f79680b21
|
fix: selectMaterialChange bug
|
2023-12-22 14:04:33 +08:00 |
|
caoqianming
|
222d766c11
|
fix: 出入库记录物料批次选择
|
2023-12-22 13:46:54 +08:00 |
|
caoqianming
|
517d10b572
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-22 13:46:22 +08:00 |
|
caoqianming
|
9182c99ba1
|
fix: 部分按钮添加v-auth
|
2023-12-22 13:46:19 +08:00 |
|
shijing
|
17dd67d1b4
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-22 11:11:39 +08:00 |
|
shijing
|
9669badae8
|
index_10dept
|
2023-12-22 11:11:36 +08:00 |
|
caoqianming
|
a9d0660617
|
fix: 型号规格用|隔开
|
2023-12-22 10:58:50 +08:00 |
|
caoqianming
|
a1b74f4639
|
fix: 班次选择，先这样处理
|
2023-12-22 10:38:09 +08:00 |
|
caoqianming
|
b207edccf5
|
fix: 任务分解按钮code错误
|
2023-12-22 09:40:58 +08:00 |
|
caoqianming
|
a8cd681e33
|
fix: 班组管理新增后刷新
|
2023-12-22 09:40:18 +08:00 |
|
caoqianming
|
ddfc2cb5b5
|
feat: 设备所属车间筛选条件
|
2023-12-22 09:39:50 +08:00 |
|
caoqianming
|
9ee05321e8
|
fix: 长白班和两倒
|
2023-12-21 21:25:10 +08:00 |
|
caoqianming
|
c691474254
|
fix: employee光子页面 update控权
|
2023-12-21 21:24:50 +08:00 |
|
caoqianming
|
8fdd0268ee
|
feat: mioitem 物料看full_name
|
2023-12-21 15:21:22 +08:00 |
|
caoqianming
|
b1eef89d87
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-21 15:11:32 +08:00 |
|
caoqianming
|
e0ba3ca6fb
|
fix: 7车间 10车间批次号手填
|
2023-12-21 15:10:48 +08:00 |
|
shijing
|
976c92cdec
|
加工路线中step居中
|
2023-12-21 14:44:24 +08:00 |
|
shijing
|
c95c7134d7
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-21 14:33:22 +08:00 |
|
shijing
|
f789550dfe
|
home
|
2023-12-21 14:33:19 +08:00 |
|
caoqianming
|
a3670056ae
|
fix: 到岗记录获取部门错误
|
2023-12-21 14:08:53 +08:00 |
|
caoqianming
|
d4094d3607
|
fix: team_photon去除硬编码2
|
2023-12-21 13:32:57 +08:00 |
|
caoqianming
|
a57b49316b
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-21 13:25:30 +08:00 |
|
caoqianming
|
01276e0a00
|
fix: team_photon去除硬编码
|
2023-12-21 13:25:28 +08:00 |
|
shijing
|
278e3c3648
|
role
|
2023-12-21 13:16:46 +08:00 |
|
shijing
|
a629a3cf2c
|
role
|
2023-12-21 13:13:09 +08:00 |
|
caoqianming
|
21c6b5177b
|
fix: 人员编辑bug
|
2023-12-21 13:05:56 +08:00 |
|
caoqianming
|
cbcde10f80
|
fix: role create update 没有刷新
|
2023-12-21 12:58:29 +08:00 |
|
caoqianming
|
e5edaf1b3c
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-21 10:40:50 +08:00 |
|
caoqianming
|
cffbecf330
|
feat: route增加筛选
|
2023-12-21 10:40:21 +08:00 |
|
caoqianming
|
f2afea91ed
|
feat: material添加是否隐藏选项
|
2023-12-21 10:39:43 +08:00 |
|
shijing
|
5b0ed75718
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-21 10:22:16 +08:00 |
|
shijing
|
115045b520
|
首页控制台数据
|
2023-12-21 10:22:10 +08:00 |
|
caoqianming
|
d8f49bb9c5
|
fix: 任务执行界面查询过滤
|
2023-12-21 01:26:59 +08:00 |
|
caoqianming
|
4b822b7b52
|
fix: worktask_form批次号限制及其他一些问题
|
2023-12-21 00:58:25 +08:00 |
|
caoqianming
|
4a8bae6c00
|
fix: 按钮样式错误
|
2023-12-20 23:51:42 +08:00 |
|
caoqianming
|
b1bd32cca0
|
fix: sysconfig修改
|
2023-12-20 21:56:44 +08:00 |
|
caoqianming
|
27282570e9
|
feat: 路线选择可筛选
|
2023-12-20 21:05:59 +08:00 |
|
caoqianming
|
82f11fe205
|
feat: 输入/输出物料添加筛选条件
|
2023-12-20 20:53:11 +08:00 |
|
caoqianming
|
5f2ab70e8c
|
feat: 车间库存处添加已到工序
|
2023-12-20 15:27:29 +08:00 |
|
caoqianming
|
56e180b46f
|
feat: 加工路线新建表单时返回物料full_name
|
2023-12-20 15:22:12 +08:00 |
|
caoqianming
|
5ff50b579c
|
feat: 路线编辑返回物料full_name2
|
2023-12-20 15:20:22 +08:00 |
|
caoqianming
|
606aef07c2
|
feat: 路线编辑返回物料full_name
|
2023-12-20 15:18:47 +08:00 |
|
shijing
|
cb2418fcf1
|
material&route中material展示加规格型号
|
2023-12-20 14:05:21 +08:00 |
|
shijing
|
90403e3577
|
#86物料创建或编辑时物料类型必选
|
2023-12-20 13:53:52 +08:00 |
|
shijing
|
ff2cb928c6
|
#73有甘特图的地方加时间范围搜索
|
2023-12-20 13:25:02 +08:00 |
|
shijing
|
76e50e36e2
|
页面权限设置
|
2023-12-20 10:05:09 +08:00 |
|
shijing
|
39f8a9fda6
|
部门提交更新
|
2023-12-19 17:18:51 +08:00 |
|
caoqianming
|
e1563f70bb
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-19 17:03:22 +08:00 |
|
caoqianming
|
94dbdc4d86
|
fix: 路由表完善
|
2023-12-19 17:03:20 +08:00 |
|
shijing
|
bd24a20f3b
|
菜单权限配置
|
2023-12-19 16:55:41 +08:00 |
|
shijing
|
1a45a24d7c
|
菜单更改
|
2023-12-19 15:23:24 +08:00 |
|
shijing
|
354343c882
|
#85
|
2023-12-19 09:04:16 +08:00 |
|
shijing
|
78e3647f46
|
#72
|
2023-12-19 08:59:27 +08:00 |
|
shijing
|
ce162d5f9a
|
#71生产管理-6车间mtask需要可编辑
|
2023-12-18 15:40:39 +08:00 |
|
shijing
|
f334f1c646
|
首页文案更改
|
2023-12-18 15:06:20 +08:00 |
|
shijing
|
7ce9f1d9f6
|
结石气线分开
|
2023-12-18 14:50:04 +08:00 |
|
caoqianming
|
4657a2591d
|
feat: 增加mtask合格数展示
|
2023-12-18 13:32:46 +08:00 |
|
caoqianming
|
5ef55f83a5
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-18 13:25:44 +08:00 |
|
caoqianming
|
2f2220c5c1
|
feat: 6车间mlog撤回
|
2023-12-18 13:25:42 +08:00 |
|
shijing
|
825364b137
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-18 13:14:34 +08:00 |
|
shijing
|
83ce1372ae
|
#82采购计划详情-没有新增
|
2023-12-18 13:14:31 +08:00 |
|
caoqianming
|
ae299a4194
|
feat: 10车间撤回
|
2023-12-18 13:03:02 +08:00 |
|
shijing
|
29330fe515
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-18 12:36:23 +08:00 |
|
shijing
|
1b191df783
|
绩效
|
2023-12-18 12:36:18 +08:00 |
|
caoqianming
|
965dfdb670
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-18 12:35:04 +08:00 |
|
caoqianming
|
6febb51cdb
|
feat: 日志撤回，目前只修改了7车间
|
2023-12-18 12:34:00 +08:00 |
|
shijing
|
1a1a838042
|
合格率格式更改
|
2023-12-18 10:19:16 +08:00 |
|
shijing
|
855d365394
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-18 09:49:59 +08:00 |
|
shijing
|
391e33bd0e
|
7车间完成率
|
2023-12-18 09:49:56 +08:00 |
|
caoqianming
|
b1e2871e03
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-17 20:35:18 +08:00 |
|
caoqianming
|
7a4e70626d
|
feat: mtask执行时添加配分料数
|
2023-12-17 20:35:15 +08:00 |
|
shijing
|
4424ce7030
|
绩效考核初始页面
|
2023-12-16 13:01:21 +08:00 |
|
shijing
|
d0b651745d
|
6、7、10mlog提交，退火新增交接记录
|
2023-12-16 12:32:48 +08:00 |
|
shijing
|
9f5aa25aca
|
成品组合件
|
2023-12-16 09:37:02 +08:00 |
|
shijing
|
3aa3bec7de
|
统计2
|
2023-12-15 15:15:32 +08:00 |
|
shijing
|
c07fd76ed5
|
统计2
|
2023-12-15 15:13:43 +08:00 |
|
shijing
|
b924fb5af6
|
统计
|
2023-12-13 11:27:33 +08:00 |
|
shijing
|
96bff20959
|
库存改动
|
2023-12-11 13:42:40 +08:00 |
|
shijing
|
ba2d621214
|
库存改动
|
2023-12-11 13:41:47 +08:00 |
|
shijing
|
700f04aa13
|
生产执行改动
|
2023-12-06 17:41:10 +08:00 |
|
shijing
|
c0ea8b80a9
|
混料新增修改
|
2023-12-05 10:23:46 +08:00 |
|
shijing
|
1f1d96528a
|
gantt修改
|
2023-12-05 08:49:20 +08:00 |
|
caoqianming
|
5ce7ce250f
|
feat: 添加很多新页面
|
2023-12-01 16:15:25 +08:00 |
|
caoqianming
|
ae4863529f
|
fix: 7车间大屏一些修改
|
2023-11-28 08:03:27 +08:00 |
|
caoqianming
|
2ddcb49616
|
fix: 一些修改
|
2023-11-28 08:03:13 +08:00 |
|
caoqianming
|
c62188eaa7
|
fix: mtask页面的bug修改
|
2023-11-28 00:40:28 +08:00 |
|
caoqianming
|
93a85eb192
|
fix: 一些bug调整
|
2023-11-27 18:14:35 +08:00 |
|
caoqianming
|
831d75bb4d
|
feat: 大屏样式的修改
|
2023-11-27 13:53:27 +08:00 |
|
caoqianming
|
98d2b3d20f
|
feat: wpm添加了其他日志用于录入avg
|
2023-11-27 13:52:27 +08:00 |
|
shijing
|
0316f42e11
|
异常修改（未完成）
|
2023-11-24 17:13:02 +08:00 |
|
shijing
|
a81eea91ca
|
gantt图问题修复
|
2023-11-24 11:38:23 +08:00 |
|
shijing
|
0f6ffb356b
|
el-tag
|
2023-11-24 10:39:36 +08:00 |
|
shijing
|
db3e181254
|
el-tag标签属性type没有primary修正
|
2023-11-24 10:33:13 +08:00 |
|
shijing
|
a79651d7b7
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-11-23 17:27:34 +08:00 |
|
shijing
|
e548bd52af
|
到岗单加人
|
2023-11-23 17:27:18 +08:00 |
|
caoqianming
|
7659d641ab
|
fix: 解决ResizeObserver loop 的问题
|
2023-11-23 16:24:11 +08:00 |
|
caoqianming
|
0a4b380668
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-11-23 16:07:54 +08:00 |
|
caoqianming
|
5d8621cac0
|
feat: mgroup增加排班规则字段
|
2023-11-23 16:07:48 +08:00 |
|
shijing
|
c073c25436
|
大屏看板头部字体
|
2023-11-23 16:05:53 +08:00 |
|
shijing
|
dd2fc9a455
|
更改菜单栏
|
2023-11-23 11:29:51 +08:00 |
|
shijing
|
924ed50ce8
|
dataset.delete
|
2023-11-23 11:29:11 +08:00 |
|
shijing
|
9682eadf4f
|
数据大屏
|
2023-11-23 11:25:33 +08:00 |
|
shijing
|
1e18828985
|
到岗记录
|
2023-11-23 11:24:58 +08:00 |
|
shijing
|
74c37d903d
|
性能检验tabs改动及记录查看
|
2023-11-23 11:23:45 +08:00 |
|
shijing
|
d137beb872
|
设备相关改动及设备巡检
|
2023-11-23 11:22:38 +08:00 |
|
shijing
|
ed835482a0
|
统计分析的四个统计模块
|
2023-11-23 11:20:23 +08:00 |
|
shijing
|
07bb1011da
|
抽取组件（table中的行自动循环）
|
2023-11-23 11:19:11 +08:00 |
|
shijing
|
5d125d0875
|
daogangjilu
|
2023-11-21 09:25:43 +08:00 |
|
shijing
|
36321f144d
|
tkx部分更改
|
2023-11-20 18:13:38 +08:00 |
|
shijing
|
0229338a5f
|
team
|
2023-11-20 16:50:23 +08:00 |
|
shijing
|
df9bdab0a6
|
新增查询规范
|
2023-11-20 13:46:29 +08:00 |
|
shijing
|
22cf49a6b3
|
到岗
|
2023-11-17 19:20:29 +08:00 |
|
shijing
|
21764716dd
|
大屏看板
|
2023-11-15 19:05:22 +08:00 |
|
shijing
|
bb40ee35e3
|
vue-json-edit
|
2023-11-14 11:18:57 +08:00 |
|
caoqianming
|
6eee28c91d
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-11-14 10:28:17 +08:00 |
|
caoqianming
|
5d5ea3e1c3
|
feat: bidataset修改数据
|
2023-11-14 10:26:36 +08:00 |
|
shijing
|
ae78d57720
|
ganttanddialog
|
2023-11-13 18:44:15 +08:00 |
|
shijing
|
821bf22e8c
|
1110笔记部分修改
|
2023-11-13 11:04:39 +08:00 |
|
caoqianming
|
283321f238
|
fix: 大屏及部分bug修复
|
2023-11-13 08:51:08 +08:00 |
|
shijing
|
155a4c7b7e
|
feat: 光子大屏页面调整
|
2023-11-10 08:29:49 +08:00 |
|
shijing
|
b85c654591
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-11-08 09:23:15 +08:00 |
|
shijing
|
ca3c430e75
|
shujukanbancolorsChange
|
2023-11-08 09:23:12 +08:00 |
|
caoqianming
|
bbb3d40b11
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-11-08 09:04:37 +08:00 |
|
caoqianming
|
707dbf6a19
|
feat: index_10dept界面修改
|
2023-11-08 09:04:35 +08:00 |
|
shijing
|
2249f5fc3e
|
shujukanbancolorsChange
|
2023-11-08 09:03:05 +08:00 |
|
shijing
|
dfc84e220b
|
shujukanban
|
2023-11-07 14:21:02 +08:00 |
|
caoqianming
|
d261ae7b7e
|
feat: 10dept界面优化
|
2023-11-07 13:03:15 +08:00 |
|
caoqianming
|
d3c47a12c3
|
feat: 安装了datavue3
|
2023-11-07 09:08:35 +08:00 |
|
caoqianming
|
024301c294
|
fix: 解决冲突
|
2023-11-06 19:19:07 +08:00 |
|
caoqianming
|
6c4b1f75d1
|
feat: 车间看板调整
|
2023-11-06 19:16:25 +08:00 |
|
shijing
|
d7c0fa0843
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-11-06 17:43:23 +08:00 |
|
shijing
|
f91ae2f5d2
|
jianyan
|
2023-11-06 17:43:19 +08:00 |
|
caoqianming
|
f3ece1dd0e
|
feat: 增加了车间看板
|
2023-11-06 15:53:22 +08:00 |
|
shijing
|
c5b6eb4f58
|
部分检验
|
2023-11-03 19:24:34 +08:00 |
|
shijing
|
329d30eecb
|
gantt图修改，生产执行修改
|
2023-11-01 10:28:16 +08:00 |
|
shijing
|
9fb27aa062
|
10.26日要修改内容以及检验页面
|
2023-10-27 17:15:36 +08:00 |
|
shijing
|
e246e6f33b
|
1026修改
|
2023-10-26 14:49:50 +08:00 |
|
shijing
|
0c8fd90feb
|
utask分车间创建工段控制显示
|
2023-10-26 08:52:42 +08:00 |
|
shijing
|
3249a6c29d
|
utask分车间创建
|
2023-10-25 18:51:52 +08:00 |
|
caoqianming
|
5a7b647692
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-10-25 18:32:24 +08:00 |
|
caoqianming
|
4b5c43ae36
|
feat: 页面修改
|
2023-10-25 18:32:22 +08:00 |
|
shijing
|
d6e15c1917
|
7车间
|
2023-10-25 18:29:36 +08:00 |
|
shijing
|
1bdd206573
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-10-25 17:44:55 +08:00 |
|
caoqianming
|
9557074627
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-10-25 17:44:46 +08:00 |
|
shijing
|
e7c4832ac0
|
1025
|
2023-10-25 17:44:12 +08:00 |
|
caoqianming
|
c456086901
|
feat: 出入库页面基本完成
|
2023-10-25 17:33:39 +08:00 |
|
shijing
|
8837579a5d
|
mtask日志提交
|
2023-10-25 14:02:08 +08:00 |
|
shijing
|
33343150bf
|
按钮图标更改
|
2023-10-25 13:17:04 +08:00 |
|
shijing
|
b902e59588
|
6车间utask详情
|
2023-10-25 13:09:25 +08:00 |
|
shijing
|
fbc7806a73
|
6车间日志编辑
|
2023-10-25 12:35:32 +08:00 |
|
shijing
|
d15cc32e7d
|
6车间日志提交
|
2023-10-25 10:27:10 +08:00 |
|
shijing
|
59d8c6f3df
|
设备检验记录新增
|
2023-10-24 14:58:57 +08:00 |
|
shijing
|
e5f3d24205
|
worktask
|
2023-10-24 14:55:11 +08:00 |
|
shijing
|
ce1e98df96
|
worktask
|
2023-10-20 18:03:04 +08:00 |
|
shijing
|
740c73ec1f
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-10-20 09:32:18 +08:00 |
|
shijing
|
7429dd3dce
|
更改样式
|
2023-10-20 09:30:52 +08:00 |
|
caoqianming
|
c4d06c06d0
|
fix: 展示可排产的订单明细
|
2023-10-20 09:07:57 +08:00 |
|
caoqianming
|
f41e7a8a67
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-10-19 14:16:45 +08:00 |
|
shijing
|
51570f408b
|
task2
|
2023-10-19 14:15:32 +08:00 |
|
caoqianming
|
84adac4680
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-10-19 14:12:53 +08:00 |
|
caoqianming
|
b65b83dc20
|
fix: 订单/采购订单相关页面修改
|
2023-10-19 14:08:31 +08:00 |
|
shijing
|
584b22fbbd
|
页面调整
|
2023-10-18 17:12:23 +08:00 |
|
caoqianming
|
848182e6a4
|
feat: 物料/工段/工艺路线页面及排产部分逻辑
|
2023-10-18 16:31:52 +08:00 |
|
shijing
|
355dfc5250
|
生产执行页面
|
2023-10-17 09:04:17 +08:00 |
|
shijing
|
6bae3795da
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-10-13 08:55:21 +08:00 |
|
shijing
|
19d1a3a847
|
1013
|
2023-10-13 08:55:15 +08:00 |
|
caoqianming
|
17a030bdbf
|
fix: visit purpose options
|
2023-10-10 12:25:27 +08:00 |
|
caoqianming
|
2f30d9c2ee
|
feat: 门禁权限完成
|
2023-10-10 12:12:39 +08:00 |
|
caoqianming
|
a090b463ee
|
fix: 取消多标签页展示
|
2023-10-09 17:31:15 +08:00 |
|
caoqianming
|
7fa43de6c7
|
feat: 门禁权限查看与删除
|
2023-10-09 15:51:25 +08:00 |
|
shijing
|
c40364a1f7
|
光子基础模块
|
2023-10-09 12:46:15 +08:00 |
|
shijing
|
d216b6df98
|
fix:打卡记录添加标注，全场电量统计添加趋势图
|
2023-09-18 13:57:04 +08:00 |
|
shijing
|
2d2e9c9f74
|
fix:0915会议123456
|
2023-09-15 17:07:16 +08:00 |
|
shijing
|
ed9698aeea
|
fix:大屏数据更新
|
2023-09-14 14:51:20 +08:00 |
|
shijing
|
b61ff39468
|
fix:tracking依赖文件
|
2023-09-14 09:25:28 +08:00 |
|
shijing
|
3db54ec1f3
|
fix:工段定位
|
2023-09-13 17:23:55 +08:00 |
|
shijing
|
7a8f2c0813
|
fix:工段标识及建筑高亮
|
2023-09-12 08:37:08 +08:00 |
|
shijing
|
b149cb59e7
|
fix:交接班日志报告报表填充数据并导出
|
2023-09-11 15:12:48 +08:00 |
|
shijing
|
7a7ad8c9ce
|
fix:能量报警放到首页，回转窑报表调整
|
2023-09-08 17:09:09 +08:00 |
|
shijing
|
984dc6d7b7
|
fix:曲阳更改文案
|
2023-09-07 09:45:53 +08:00 |
|
shijing
|
b871efc464
|
fix:计量设备
|
2023-09-06 15:48:15 +08:00 |
|
shijing
|
db8e04276e
|
计量器具台账
|
2023-09-05 17:05:54 +08:00 |
|
shijing
|
a932162058
|
echarts表格数据填充
|
2023-09-04 14:31:05 +08:00 |
|
shijing
|
f14a2c2682
|
账号信息中个人打卡记录的处理
|
2023-09-04 10:58:58 +08:00 |
|
caoqianming
|
ae7cf80c64
|
feat: 添加天空和地面
|
2023-08-30 10:29:57 +08:00 |
|
shijing
|
2b98daca58
|
设备单位产品电耗趋势图
|
2023-08-28 13:35:41 +08:00 |
|
shijing
|
9dd33d43b1
|
曲阳修改
|
2023-08-28 08:47:21 +08:00 |
|
shijing
|
5ba3ab8656
|
生产报告趋势图数据导入
|
2023-08-25 14:23:48 +08:00 |
|
shijing
|
00e3fde1d4
|
添加电量小时、日、月统计报表
|
2023-08-24 16:31:35 +08:00 |
|
shijing
|
67aa47adb8
|
添加手机登录方式密码重置添加提醒
|
2023-08-24 10:27:17 +08:00 |
|
shijing
|
e1cadf9a74
|
密码强度设置
|
2023-08-24 08:58:27 +08:00 |
|
shijing
|
fda89dde11
|
fixed:部分修改
|
2023-08-22 09:25:32 +08:00 |
|
shijing
|
62631a2490
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-08-18 17:15:58 +08:00 |
|
shijing
|
285703dbad
|
fixed:首页调整
|
2023-08-18 17:15:53 +08:00 |
|
caoqianming
|
e1c29c282a
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-08-18 16:33:50 +08:00 |
|
caoqianming
|
a2784a473e
|
feat: 大屏效果2
|
2023-08-18 16:33:47 +08:00 |
|
shijing
|
8beb8b143e
|
fixed:统一页面筛选框样式
|
2023-08-18 14:37:42 +08:00 |
|
shijing
|
f4bd009948
|
fixed:工段报表导出以及宽度变小时的表单拖动问题
|
2023-08-18 10:18:11 +08:00 |
|
shijing
|
9caf5a3690
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-08-17 09:36:54 +08:00 |
|
shijing
|
3cdee248c9
|
fixd:8.17
|
2023-08-17 09:36:51 +08:00 |
|
caoqianming
|
55beb660cb
|
fix: 修改route perm先
|
2023-08-17 09:33:30 +08:00 |
|
caoqianming
|
be7bd541fd
|
feat: 大屏优化
|
2023-08-17 09:16:26 +08:00 |
|
caoqianming
|
10656c643a
|
fix: enm screen css调整
|
2023-08-16 16:05:24 +08:00 |
|
caoqianming
|
4f4a0c85a9
|
feat: 大屏效果初步完成
|
2023-08-16 13:56:12 +08:00 |
|
shijing
|
2d6ad430a4
|
fixd:系统图标中单位更正
|
2023-08-16 10:57:55 +08:00 |
|
shijing
|
fafe94dc91
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-08-15 14:13:03 +08:00 |
|
shijing
|
9c6fa00272
|
fixd:提交8.10问题修改（还差最后一条）
|
2023-08-15 14:12:59 +08:00 |
|
caoqianming
|
5ae4238b20
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-08-15 12:39:23 +08:00 |
|
caoqianming
|
5eeecdef14
|
feat: 添加大屏数据
|
2023-08-15 12:39:16 +08:00 |
|
shijing
|
ce43a1165f
|
fixd:工段图标
|
2023-08-11 17:15:19 +08:00 |
|
shijing
|
4119c93408
|
表格样式变动
|
2023-07-24 16:26:36 +08:00 |
|
shijing
|
6078fb329f
|
工段菜单
|
2023-07-24 11:30:08 +08:00 |
|
shijing
|
c3a656fc5d
|
登陆后首页
|
2023-07-19 16:13:55 +08:00 |
|
shijing
|
f95918bda3
|
feat:统计
|
2023-07-14 17:03:27 +08:00 |
|
shijing
|
d195b260fa
|
feat:能源统计
|
2023-07-10 15:00:46 +08:00 |
|
shijing
|
f14ee6bb95
|
报表
|
2023-07-07 17:05:48 +08:00 |
|
shijing
|
89323113d6
|
fim
|
2023-07-05 15:23:01 +08:00 |
|
shijing
|
d9181d1905
|
设备添加、产品添加
|
2023-06-30 17:25:14 +08:00 |
|
shijing
|
8bc055bf06
|
提醒配置文案更改，访客选项更改、添加拉送货车辆图片
|
2023-06-30 16:10:01 +08:00 |
|
shijing
|
c8c14c8f1c
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-06-30 08:56:58 +08:00 |
|
shijing
|
12e533fac9
|
设备、测点、测点集、班组页面
|
2023-06-30 08:56:51 +08:00 |
|
caoqianming
|
87a107144b
|
fix: filter recipient options 错误
|
2023-06-29 11:13:26 +08:00 |
|
caoqianming
|
3cab3db8cd
|
fix: opl detail时二次打开不刷新
|
2023-06-29 11:12:59 +08:00 |
|
caoqianming
|
3e85e50a19
|
fix: dutywork下都可处理
|
2023-06-22 08:35:39 +08:00 |
|
caoqianming
|
ec21622c42
|
fix: 工单处理相关bug解决
|
2023-06-22 01:50:19 +08:00 |
|
shijing
|
268c512273
|
feat:工单回退后编辑PC端
|
2023-06-21 17:52:50 +08:00 |
|
shijing
|
2e1411ce04
|
feat: 能管接口等
|
2023-06-21 17:52:07 +08:00 |
|
shijing
|
c2435fed9e
|
作业统计更改及添加大屏中作业所在区域的监控设备
|
2023-06-20 15:21:07 +08:00 |
|
shijing
|
1d55dc3c19
|
权限控制及原料磨页面
|
2023-06-20 10:04:21 +08:00 |
|
shijing
|
94904bcff8
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-06-16 16:55:50 +08:00 |
|
shijing
|
aea01b7df0
|
config&配置&原料磨
|
2023-06-16 16:55:41 +08:00 |
|
caoqianming
|
f8e1524e8b
|
fix: 批量布设时算法options不加入筛选条件
|
2023-06-16 08:56:32 +08:00 |
|
shijing
|
748fa2479a
|
许可证流程进度字体大小改动
|
2023-06-09 14:28:21 +08:00 |
|
shijing
|
b6fd672062
|
许可证添加流程进度
|
2023-06-09 13:13:49 +08:00 |
|
shijing
|
49e8368eaf
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-06-09 10:13:11 +08:00 |
|
shijing
|
fe48ad17dd
|
视频自动播放以及部门下监控设备的查看
|
2023-06-09 10:12:59 +08:00 |
|
caoqianming
|
b23783f942
|
feat: operation delete_hard2
|
2023-06-07 10:08:06 +08:00 |
|
caoqianming
|
2f2ea5dbd4
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-06-07 09:26:07 +08:00 |
|
caoqianming
|
6cd695a5b3
|
feat: operation delete_hard
|
2023-06-07 09:26:02 +08:00 |
|
shijing
|
f96cde3f00
|
打卡统计
|
2023-06-05 09:01:08 +08:00 |
|
shijing
|
3c718311db
|
打卡统计添加统计
|
2023-06-02 17:07:09 +08:00 |
|
caoqianming
|
f2e1f450ef
|
feat: 测试报表功能
|
2023-05-31 15:36:18 +08:00 |
|
caoqianming
|
a7c2c7478c
|
feat: 部门页面筛选
|
2023-05-29 15:21:33 +08:00 |
|
caoqianming
|
a1196c3b2b
|
fix: 拒绝颜色的属性
|
2023-05-29 15:20:48 +08:00 |
|
caoqianming
|
4380167d05
|
refector: 调整显示效果
|
2023-05-26 08:48:32 +08:00 |
|
caoqianming
|
7647378c0d
|
Merge commit '41d1df3bc6b6d895fdf544ee1a15a299d0ddf350' into v2
|
2023-05-26 08:40:02 +08:00 |
|
caoqianming
|
6b6d5b1266
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-05-26 08:36:04 +08:00 |
|
caoqianming
|
de68080dcd
|
refactor: 修改菜单显示效果
|
2023-05-26 08:35:58 +08:00 |
|
shijing
|
dc4764c6ff
|
1
|
2023-05-25 14:23:43 +08:00 |
|
shijing
|
61e4a0a42e
|
feat:事件列表添加删除以及触发关联部门和作业票详情
|
2023-05-25 14:00:45 +08:00 |
|
shijing
|
4a9694c429
|
作业票模板改动，以及管理员权限变动
|
2023-05-25 13:57:22 +08:00 |
|
shijing
|
5a910c67d1
|
feat:添加触发人部门，添加事件删除添和关联的作业票详情
|
2023-05-25 13:53:40 +08:00 |
|
caoqianming
|
12f60e490b
|
refector: 请求不携带时间戳，需要的时候自行携带
|
2023-05-25 10:02:29 +08:00 |
|
caoqianming
|
c4b4e95ce5
|
fix: 权限auth 优化superuser
|
2023-05-22 16:40:21 +08:00 |
|
caoqianming
|
a80a1ab83e
|
Merge branch 'ehs' into v2
|
2023-05-11 14:40:39 +08:00 |
|
shijing
|
41d1df3bc6
|
首页在厂人员列表
|
2023-05-11 14:36:03 +08:00 |
|
shijing
|
b028869736
|
许可证图片必填，首页添加在场人员列表
|
2023-05-09 10:59:47 +08:00 |
|
shijing
|
fc908b1803
|
首页添加在厂人员
|
2023-05-08 09:53:55 +08:00 |
|
shijing
|
ff4f5bcce4
|
pc端许可证添加图片、更改相关方地图头像、修改相关方项目人员
|
2023-04-27 16:03:04 +08:00 |
|
caoqianming
|
73d3724e8e
|
fix: 导出excel时未导入config
|
2023-04-23 08:57:05 +08:00 |
|
caoqianming
|
b8d49dd356
|
feat: 人员列表导出
|
2023-04-20 10:22:52 +08:00 |
|
caoqianming
|
2a109634e7
|
refector: 相关方人员证书可编辑
|
2023-04-14 00:33:12 +08:00 |
|
caoqianming
|
53ec05a036
|
fix: 大屏点击区域只显示正在进行的作业
|
2023-04-14 00:04:11 +08:00 |
|
caoqianming
|
376f40c124
|
fix: opl detail logsData显示bug
|
2023-04-13 23:46:52 +08:00 |
|
caoqianming
|
1460a6466a
|
refector: opl和visit显示照片
|
2023-04-13 17:01:58 +08:00 |
|
caoqianming
|
e63926cffb
|
fix: 证书只能上传一张;opl detail显示
|
2023-04-13 16:26:44 +08:00 |
|
caoqianming
|
bb1b867238
|
refector: ep.vue增加筛选条件
|
2023-04-12 16:40:40 +08:00 |
|
caoqianming
|
de5746330a
|
fix: 绑定解绑定位卡后刷新列表
|
2023-04-12 15:29:42 +08:00 |
|
caoqianming
|
dc78d09542
|
fix: 许可证关于level的options修改
|
2023-04-12 15:26:49 +08:00 |
|
caoqianming
|
4a48e69248
|
feat: 增加相关方黑名单功能
|
2023-04-07 15:07:06 +08:00 |
|
caoqianming
|
bdad640645
|
refector: rpj 证书显示的修改
|
2023-04-05 18:37:19 +08:00 |
|
caoqianming
|
3bc21a1adc
|
fix: opl未提交前可编辑
|
2023-04-05 18:36:43 +08:00 |
|
shijing
|
a6a0fcdc5a
|
添加人员筛选以及被退回的相应处理
|
2023-03-31 14:22:22 +08:00 |
|
caoqianming
|
ec38844851
|
refector: 导出作业pdf样式优化
|
2023-03-27 14:21:08 +08:00 |
|
caoqianming
|
3e85c7771c
|
refector: 文字调整
|
2023-03-27 12:39:52 +08:00 |
|
caoqianming
|
1177af5088
|
refector: 界面字段优化
|
2023-03-24 17:54:54 +08:00 |
|
shijing
|
1cfd216468
|
项目人员变动
|
2023-03-24 17:11:36 +08:00 |
|
shijing
|
f3bffa50ca
|
普通作业作业前照片测试
|
2023-03-23 17:14:35 +08:00 |
|
shijing
|
fda36d30aa
|
tinyChange
|
2023-03-23 11:13:25 +08:00 |
|
shijing
|
ffdb17596f
|
导出添加tips
|
2023-03-23 10:15:49 +08:00 |
|
shijing
|
dcb843a554
|
jjj
|
2023-03-21 11:26:45 +08:00 |
|
shijing
|
9b6f1d0995
|
作业证导出调整
|
2023-03-20 10:45:17 +08:00 |
|
shijing
|
1bf3a44513
|
自定义防抖指令
|
2023-03-17 17:13:18 +08:00 |
|
shijing
|
0d2250d417
|
账号信息添加打卡记录
|
2023-03-16 16:16:54 +08:00 |
|
shijing
|
0b4a4cdd92
|
系统多岗部门人员查询
|
2023-03-16 10:08:12 +08:00 |
|
shijing
|
60d6e00f2b
|
账户管理添加重置密码
|
2023-03-16 09:43:04 +08:00 |
|
caoqianming
|
c6c6a8d321
|
fix: 上下班打卡颜色
|
2023-03-15 18:38:29 +08:00 |
|
shijing
|
ab88bc38ee
|
打卡记录导出excel带颜色
|
2023-03-15 16:58:26 +08:00 |
|
shijing
|
717bff01c8
|
作业编辑可更改业务部门及属地部门
|
2023-03-15 09:31:33 +08:00 |
|
shijing
|
3fb7918c2e
|
时间添加默认时间放开作业编辑
|
2023-03-15 09:12:21 +08:00 |
|
caoqianming
|
22b3a8cf02
|
增加考勤推测列
|
2023-03-12 21:17:10 +08:00 |
|
caoqianming
|
52476e76c1
|
从ticketdetail中打开查看作业详情
|
2023-03-12 10:27:29 +08:00 |
|
caoqianming
|
578f4a5e7c
|
作业创建时属地部门和业务部门需要选择为本部
|
2023-03-12 08:38:08 +08:00 |
|
caoqianming
|
7d58c27074
|
employee 优化
|
2023-03-10 18:10:31 +08:00 |
|
caoqianming
|
aa36560521
|
opm 显示优化
|
2023-03-10 17:55:10 +08:00 |
|
caoqianming
|
21c35bae31
|
Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs
|
2023-03-10 17:44:25 +08:00 |
|
caoqianming
|
0e67678458
|
算法配置页面修改
|
2023-03-10 17:44:17 +08:00 |
|
shijing
|
a1076de9af
|
print打印许可证
|
2023-03-10 17:26:53 +08:00 |
|
shijing
|
d2e76f4220
|
print打印许可证
|
2023-03-10 17:24:17 +08:00 |
|
shijing
|
d07962189d
|
Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs
|
2023-03-10 08:50:10 +08:00 |
|
shijing
|
d4730d0b3d
|
简单导出
|
2023-03-10 08:50:01 +08:00 |
|
caoqianming
|
73a5a8483f
|
Merge branch 'ehs' into v2
|
2023-03-09 15:45:49 +08:00 |
|
caoqianming
|
4561c9a577
|
打卡统计记录导出增加时间
|
2023-03-09 15:45:12 +08:00 |
|
shijing
|
3b2482e492
|
Merge branch 'master' of https://gitee.com/lolicode/scui into v2
|
2023-03-09 12:27:05 +08:00 |
|
shijing
|
82795ee36e
|
首页图标链接
|
2023-03-08 12:43:52 +08:00 |
|
shijing
|
4f48e9c03a
|
导出页部门筛选更改
|
2023-03-08 12:19:49 +08:00 |
|
shijing
|
f674e8e3e8
|
导出页部门筛选更改
|
2023-03-08 12:17:48 +08:00 |
|
shijing
|
cb4854d0f5
|
Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs
|
2023-03-03 14:31:08 +08:00 |
|
shijing
|
f9b779a237
|
更改导出打卡时间取值
|
2023-03-03 14:31:01 +08:00 |
|
caoqianming
|
1255c38d1b
|
优化显示
|
2023-03-02 23:53:14 +08:00 |
|
caoqianming
|
dc1ac15649
|
hrm employee 门禁权限显示优化
|
2023-03-02 22:34:30 +08:00 |
|
shijing
|
c68b834b98
|
0302导出周几问题
|
2023-03-02 09:36:20 +08:00 |
sc
|
348a007851
|
UP 更新部分依赖，更新版本号1.6.9
|
2023-02-28 14:12:15 +08:00 |
|
sc
|
d358dfa7a2
|
DEL 删除多余属性
|
2023-02-28 14:11:47 +08:00 |
|
sc
|
9ee2d62243
|
UP scSelect 1.1 支持值类型为对象
|
2023-02-24 09:45:09 +08:00 |
|
shijing
|
6adc906c06
|
zuoyeshipin
|
2023-02-20 09:27:16 +08:00 |
|
shijing
|
f8ea630f61
|
zuoyeshipin
|
2023-02-20 09:24:29 +08:00 |
|
sc
|
c31958d0b7
|
UP scFormTable 1.3 增加外部新增删除方法
|
2023-02-17 10:43:41 +08:00 |
|
sc
|
1c8869c476
|
UP scFormTable 1.2 增加隐藏新增，隐藏删除
|
2023-02-17 10:13:44 +08:00 |
|
shijing
|
de9dfdf3a9
|
Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs
|
2023-02-13 13:29:16 +08:00 |
|
shijing
|
7e54d59bd1
|
0213bigScreenShowopl
|
2023-02-13 13:29:07 +08:00 |
|
caoqianming
|
dd614cd68a
|
opl detail增加监控状态
|
2023-02-11 10:32:08 +08:00 |
|
sc
|
3dca03187c
|
更新版本号 1.6.8
|
2023-02-09 13:11:49 +08:00 |
|
sc
|
5275981469
|
UP 样式调整 全局禁用el-tag动画
|
2023-02-09 13:06:24 +08:00 |
|
sc
|
74581d8d33
|
UP scFormTable 1.1
|
2023-02-09 12:42:54 +08:00 |
|
caoqianming
|
b14b57a3b8
|
事件记录导出
|
2023-02-08 23:19:57 +08:00 |
|
sc
|
a28750dc52
|
UP scFilterBar 2.6
1：修复下拉选项丢失
2：增加自定义日期过滤类型
3：增加是否重复过滤
|
2023-02-07 14:11:35 +08:00 |
sakuya
|
30469c0504
|
!51 [fix] 过滤器未显示声明emits导致输出警告
Merge pull request !51 from Kyour/N/A
|
2023-02-07 01:54:32 +00:00 |
Kyour
|
e5936f0bb9
|
[fix] 过滤器未显示声明emits导致输出警告
Signed-off-by: Kyour <kyour@vip.qq.com>
|
2023-02-06 14:17:43 +00:00 |
|
Kyour
|
b6255cb72f
|
[fix] 过滤器select固定选项选择后被清空
Signed-off-by: Kyour <kyour@vip.qq.com>
|
2023-02-06 13:40:39 +00:00 |
|
shijing
|
723e2db9c5
|
shouyedaibanyangshitioazheng
|
2023-02-06 12:22:39 +08:00 |
|
shijing
|
61f533ef9b
|
0206
|
2023-02-06 09:16:01 +08:00 |
|
shijing
|
26e5672543
|
0203
|
2023-02-03 16:07:13 +08:00 |
|
shijing
|
7d7b8aa76f
|
0203
|
2023-02-03 15:33:35 +08:00 |
|
shijing
|
0d533ea8fb
|
0203
|
2023-02-03 14:51:54 +08:00 |
|
shijing
|
e28f557d45
|
0203
|
2023-02-03 14:20:44 +08:00 |
|
shijing
|
facd1c081c
|
0203
|
2023-02-03 11:36:28 +08:00 |
|
shijing
|
8fc3563a45
|
0203
|
2023-02-03 11:14:15 +08:00 |
|
shijing
|
6b28a6c2c5
|
0203
|
2023-02-03 10:52:04 +08:00 |
|
shijing
|
1c616d3b3d
|
xinbiaoqian
|
2023-02-03 10:25:07 +08:00 |
|
shijing
|
c3954c8f8a
|
xinbiaoqian
|
2023-02-03 09:56:26 +08:00 |
|
shijing
|
00e7b1464f
|
xinbiaoqian
|
2023-02-03 09:19:36 +08:00 |
|
shijing
|
317b75fd79
|
Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs
|
2023-02-03 09:01:43 +08:00 |
|
shijing
|
e287df2393
|
xinbiaoqian
|
2023-02-03 09:01:23 +08:00 |
|
caoqianming
|
fadcc97f3e
|
考勤记录导出需选部门和月份
|
2023-02-02 19:03:14 +08:00 |
|
caoqianming
|
1c625e08d5
|
作业详情时可看到监控设备
|
2023-02-02 18:56:50 +08:00 |
|
sakuya
|
f651c80faf
|
!47 [style] request.js 优化请求参数注解，增强ide提示
Merge pull request !47 from Kyour/N/A
|
2023-01-30 06:14:48 +00:00 |
|
Kyour
|
550c620e63
|
[style] request.js 优化请求参数注解，增强ide提示
Signed-off-by: Kyour <kyour@vip.qq.com>
|
2023-01-20 08:20:19 +00:00 |
|
Kyour
|
31dbe2c280
|
update src/main.js.
import顺序调整，vue应在el-plus之前，否则在新版wl-plus中可能报错
Signed-off-by: Kyour <kyour@vip.qq.com>
|
2023-01-20 04:54:06 +00:00 |
|
shijing
|
c2c9f32908
|
jiankongfangda
|
2023-01-11 13:08:22 +08:00 |
|
shijing
|
34e968f849
|
0109
|
2023-01-09 13:51:35 +08:00 |
|
shijing
|
fbfc4e7522
|
0109出勤导出
|
2023-01-09 11:06:05 +08:00 |
|
shijing
|
9c3ceb1ca9
|
Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs
|
2022-12-27 22:09:09 +08:00 |
|
shijing
|
31e875dce3
|
1227访客信息去除防疫信息
|
2022-12-27 22:09:03 +08:00 |
|
caoqianming
|
51ea19a0f1
|
rfile pagination
|
2022-12-22 17:02:07 +08:00 |
|
sc
|
600e9cc7c3
|
FIX 菜单管理字典管理左侧树按钮样式
|
2022-12-02 13:52:22 +08:00 |
|
sc
|
70f7310dea
|
FIX 菜单管理字典管理左侧树按钮样式
|
2022-12-02 13:48:50 +08:00 |
|
sakuya
|
5b751801b8
|
!44 update src/components/scTable/index.vue.
Merge pull request !44 from YaChengMu/N/A
|
2022-12-02 05:00:38 +00:00 |
|
sakuya
|
16fdc73a92
|
!45 v-auth权限补充
Merge pull request !45 from yoyo/yoyo/add-auths
|
2022-12-02 04:59:37 +00:00 |
yoyo0926
|
880d386257
|
feat: add auth/auths/authsAll
|
2022-11-25 10:09:00 +08:00 |
|
sc
|
711e8cb570
|
FIX Contextmenu 多级菜单disabled后继续执行
|
2022-11-23 10:11:11 +08:00 |
|
shijing
|
e44c04a2b5
|
eventhandleSubmit
|
2022-11-18 09:08:29 +08:00 |
|
sc
|
c8ac9d5f93
|
UP 更新版本号
|
2022-11-17 09:07:47 +08:00 |
|
shijing
|
5b1588f55c
|
Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs
|
2022-11-15 09:42:52 +08:00 |
|
shijing
|
87f7652443
|
comeplace
|
2022-11-15 09:42:44 +08:00 |
|
caoqianming
|
db68c140ca
|
ops增加数据库列表
|
2022-11-14 13:34:01 +08:00 |
|
caoqianming
|
6f22533bd2
|
bigscreen voice 播放地址bug
|
2022-11-10 17:45:59 +08:00 |
|
caoqianming
|
011790c6fc
|
加载地图修改
|
2022-11-10 17:24:56 +08:00 |
|
sc
|
d7cf9c59c7
|
UP 更新上游依赖
|
2022-11-10 15:37:05 +08:00 |
|
shijing
|
2def4938a1
|
Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs
|
2022-11-10 14:07:56 +08:00 |
|
shijing
|
db4087ec65
|
loading&ticketName
|
2022-11-10 14:06:42 +08:00 |
|
caoqianming
|
85f0e3b469
|
调整visit界面
|
2022-11-10 10:31:32 +08:00 |