 shijing
|
ed9698aeea
|
fix:大屏数据更新
|
2023-09-14 14:51:20 +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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
ffdb17596f
|
导出添加tips
|
2023-03-23 10:15:49 +08:00 |
|
shijing
|
dcb843a554
|
jjj
|
2023-03-21 11:26:45 +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
|
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 |
|
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 |
|
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 |
|
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 |
|
shijing
|
723e2db9c5
|
shouyedaibanyangshitioazheng
|
2023-02-06 12:22:39 +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 |
|
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
|
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 |