zhaoyu
|
bfb899e560
|
BUG修复 特级动火数据丢失问题
|
2024-01-09 16:12:50 +08:00 |
 liujun
|
4be8922c59
|
相关方端bug
|
2024-01-02 14:12:40 +08:00 |
|
zhaoyu
|
e2dc13b349
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-28 16:45:36 +08:00 |
|
zhaoyu
|
18b1a824b4
|
对接到沧州矿石
|
2023-12-28 16:45:28 +08:00 |
 dearlin
|
3a66270a6f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-28 14:07:10 +08:00 |
|
dearlin
|
cb3db28e83
|
add：数据同步配置文件
|
2023-12-28 14:06:55 +08:00 |
|
liujun
|
a2caf30b90
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/resources/application-dev.properties
# src/main/resources/application-local.properties
# src/main/resources/application-master.properties
|
2023-12-28 13:53:41 +08:00 |
|
dearlin
|
fa82dc7272
|
add：港务局数据同步注解与配置
|
2023-12-28 13:49:21 +08:00 |
|
zhaoyu
|
7b9d086d55
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-27 11:12:59 +08:00 |
|
zhaoyu
|
4574316eee
|
处理海康空指针问题
|
2023-12-27 11:12:51 +08:00 |
|
dearlin
|
19181555b8
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
# Conflicts:
# src/main/resources/application-dev.properties
|
2023-12-27 10:22:30 +08:00 |
|
dearlin
|
6a7ec92c75
|
fix: app用户登录时候后台地址问题
|
2023-12-27 10:21:55 +08:00 |
guoyuepeng
|
86765ce3c7
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-26 17:26:51 +08:00 |
|
zhaoyu
|
c346cd9d4e
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-26 16:57:09 +08:00 |
|
zhaoyu
|
91c3ebdcfc
|
图片地址
|
2023-12-26 16:56:49 +08:00 |
limingyu
|
5bf53a82a6
|
修改pc端动火作业动火区域管辖单位显示bug
|
2023-12-26 16:42:56 +08:00 |
|
guoyuepeng
|
0a7cacc666
|
测试环境和正式环境的配置信息,
|
2023-12-26 16:21:52 +08:00 |
|
zhaoyu
|
d05156eee2
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-26 16:11:36 +08:00 |
|
zhaoyu
|
42ea8d5208
|
高处作业迁移补充
|
2023-12-26 16:11:26 +08:00 |
|
guoyuepeng
|
ee37e8e021
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-26 14:02:28 +08:00 |
|
liujun
|
a8378f01f0
|
Merge remote-tracking branch 'origin/liujun-2023-12-18-相关方需求更新' into 1212-八项作业迁移
|
2023-12-26 13:45:38 +08:00 |
|
liujun
|
e1cd46b493
|
bug修复
|
2023-12-26 12:35:28 +08:00 |
|
guoyuepeng
|
021a6551a3
|
动态地址的默认信息
|
2023-12-26 11:48:51 +08:00 |
 guoyuepeng
|
7a85418098
|
Merge pull request '分公司可以创建角色等信息' (#7) from corpSystem into 1212-八项作业迁移
Reviewed-on: #7
|
2023-12-26 09:54:14 +08:00 |
|
liujun
|
797a8c0586
|
bug修复
|
2023-12-25 18:17:09 +08:00 |
|
liujun
|
4f60d4f571
|
解决无法多选bug
|
2023-12-25 14:45:17 +08:00 |
|
limingyu
|
c8e4eb4972
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-25 14:13:48 +08:00 |
|
limingyu
|
72793b2a76
|
Merge branch 'lmy20231215-动火bug修改' into 1212-八项作业迁移
# Conflicts:
# src/main/java/com/zcloud/controller/system/LoginController.java
|
2023-12-25 13:58:14 +08:00 |
|
zhaoyu
|
c82b1a7a01
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-25 13:55:33 +08:00 |
|
zhaoyu
|
ce4aafb5af
|
Merge branch 'zy-1218-重点工程播放视频' into 1212-八项作业迁移
|
2023-12-25 13:55:16 +08:00 |
|
dearlin
|
46b4239571
|
add: app用户登录时候后台地址问题
|
2023-12-23 11:36:32 +08:00 |
|
liujun
|
40cbbe7dcc
|
查看bug修复
|
2023-12-23 10:27:04 +08:00 |
|
liujun
|
8be39e14d3
|
查看bug修复
|
2023-12-22 17:41:36 +08:00 |
|
zhaoyu
|
0e22d45975
|
增加坐标
|
2023-12-22 17:09:54 +08:00 |
|
liujun
|
93679092de
|
查看bug修复
|
2023-12-22 17:07:44 +08:00 |
|
liujun
|
5d46fa3c4d
|
查看bug修复
|
2023-12-22 15:49:12 +08:00 |
|
liujun
|
cd048126c0
|
查看bug修复
|
2023-12-22 13:39:11 +08:00 |
|
zhaoyu
|
195b9d4de0
|
处理数据丢失问题
|
2023-12-22 09:22:58 +08:00 |
|
liujun
|
644ee59398
|
查看bug修复
|
2023-12-21 19:55:08 +08:00 |
|
zhaoyu
|
519c0be3e7
|
注释代码
|
2023-12-21 17:46:03 +08:00 |
|
liujun
|
f59d2b0500
|
查看bug修复
|
2023-12-21 16:59:50 +08:00 |
|
liujun
|
e552502458
|
查看bug修复
|
2023-12-21 15:15:45 +08:00 |
|
liujun
|
a28d97cea7
|
相关方查看详情统一格式
|
2023-12-21 13:58:57 +08:00 |
|
liujun
|
9e7a5334bd
|
bug修复
|
2023-12-20 19:51:15 +08:00 |
|
liujun
|
8c68daee79
|
bug修复
|
2023-12-20 15:57:29 +08:00 |
|
liujun
|
add025a274
|
bug修复
|
2023-12-20 15:01:47 +08:00 |
|
liujun
|
d8f38ffdcd
|
bug修复
|
2023-12-20 14:49:01 +08:00 |
|
liujun
|
7360ba8cca
|
bug修复
|
2023-12-19 20:03:25 +08:00 |
|
limingyu
|
990ea8814d
|
修改动火作业数据延时监火审核人显示
|
2023-12-19 18:00:49 +08:00 |
|
liujun
|
d50f6f2d28
|
八项作业前端更新
|
2023-12-19 17:12:17 +08:00 |
|
liujun
|
a87827104e
|
Merge branch 'dev' into 1212-八项作业迁移
# Conflicts:
# pom.xml
# src/main/resources/application-dev.properties
|
2023-12-19 16:45:15 +08:00 |
|
liujun
|
d5f729cdbe
|
bug修复
|
2023-12-19 15:01:44 +08:00 |
|
limingyu
|
e29300756e
|
Merge branch 'dev' into lmy20231215-动火bug修改
|
2023-12-19 14:15:35 +08:00 |
|
zhaoyu
|
07b7e772aa
|
列表拆分 并且app播放视频
|
2023-12-19 11:33:21 +08:00 |
|
liujun
|
6d49773242
|
相关方需求变革
|
2023-12-18 20:24:02 +08:00 |
|
liujun
|
cfb4c2dd8e
|
相关方需求变革
|
2023-12-18 19:58:52 +08:00 |
|
liujun
|
a0dcdb61d3
|
相关方需求变革
|
2023-12-18 18:54:50 +08:00 |
|
zhaoyu
|
63d831eba9
|
增加角标
|
2023-12-18 14:23:18 +08:00 |
|
zhaoyu
|
d59a9f1dfe
|
重点工程列表排序
|
2023-12-18 10:25:17 +08:00 |
|
zhaoyu
|
6cb9900bbf
|
增加31的mq配置
|
2023-12-18 09:36:47 +08:00 |
|
zhaoyu
|
0d9228dda4
|
八项作业优化 正向流程bug修复
|
2023-12-17 15:53:55 +08:00 |
|
zhaoyu
|
343b66b914
|
正向逻辑走通
|
2023-12-17 14:18:12 +08:00 |
|
zhaoyu
|
fcd6a6860f
|
高处作业迁移补充
|
2023-12-17 09:31:34 +08:00 |
|
limingyu
|
6997c26a5f
|
一公司企业端驾驶舱危险作业统计显示2
|
2023-12-15 15:09:16 +08:00 |
|
limingyu
|
83c43d21f2
|
Merge branch 'lmy20231207-登录返回图片和后端地址' into lmy20231215-动火bug修改
|
2023-12-15 14:11:14 +08:00 |
|
limingyu
|
4a347f328a
|
Merge branch 'lmy20231211' into lmy20231215-动火bug修改
|
2023-12-15 14:05:10 +08:00 |
|
limingyu
|
6937054d44
|
一公司企业端驾驶舱危险作业统计显示
|
2023-12-15 13:59:11 +08:00 |
|
zhaoyu
|
1cb56a5c82
|
正式配置修改
|
2023-12-14 19:42:21 +08:00 |
|
zhaoyu
|
a63fd74460
|
Merge remote-tracking branch 'origin/lmy20231113' into 相关方关联分公司功能
|
2023-12-14 19:33:34 +08:00 |
|
guoyuepeng
|
88be88ad31
|
正式地址配置信息
|
2023-12-14 19:32:32 +08:00 |
|
zhaoyu
|
c972e6c9c7
|
Merge remote-tracking branch 'origin/lmy20231211' into 相关方关联分公司功能
|
2023-12-14 18:48:24 +08:00 |
|
limingyu
|
f53539025c
|
延时监火改为多人同时监火，在同一个部门中都可以查看和发布监火信息2
|
2023-12-14 18:40:07 +08:00 |
|
zhaoyu
|
190f0dc838
|
Merge remote-tracking branch 'origin/相关方关联分公司功能' into 相关方关联分公司功能
|
2023-12-14 17:23:51 +08:00 |
|
zhaoyu
|
8446811b6f
|
搜索bug处理
|
2023-12-14 17:23:42 +08:00 |
|
liujun
|
71e3449f48
|
12618 编辑页面 判空提示语不正确
|
2023-12-14 16:50:11 +08:00 |
|
liujun
|
09b8516881
|
八项作业前端更新
|
2023-12-14 14:47:02 +08:00 |
|
zhaoyu
|
253f559ba5
|
是否发送短信字段
|
2023-12-14 09:52:05 +08:00 |
|
zhaoyu
|
9469e9c1db
|
Merge remote-tracking branch 'origin/相关方关联分公司功能' into 相关方关联分公司功能
|
2023-12-13 14:45:23 +08:00 |
|
zhaoyu
|
cfc13f4ae0
|
企业端缺失功能补全
|
2023-12-13 14:45:11 +08:00 |
|
liujun
|
d55fd86916
|
八项作业前端更新
|
2023-12-13 14:35:16 +08:00 |
|
liujun
|
e3b7a14601
|
吊装作业
|
2023-12-13 13:49:37 +08:00 |
|
liujun
|
e21a116d8d
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-13 13:02:45 +08:00 |
|
liujun
|
8e983a58a8
|
短路功能迁移
|
2023-12-13 13:02:20 +08:00 |
|
zhaoyu
|
dfa04334c3
|
临时用电迁移
|
2023-12-13 10:58:39 +08:00 |
|
liujun
|
515476f56a
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-13 10:14:20 +08:00 |
|
liujun
|
520d5a03c6
|
短路功能迁移
|
2023-12-13 10:14:00 +08:00 |
|
zhaoyu
|
7f3883c401
|
临时用电 暂时提交 报错未解决
|
2023-12-13 09:18:54 +08:00 |
|
liujun
|
c998e2ebb0
|
bug修复
|
2023-12-12 19:16:04 +08:00 |
|
liujun
|
cce02a4d42
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-12 18:02:47 +08:00 |
|
liujun
|
1daf485e92
|
八项作业mq功能
|
2023-12-12 18:02:22 +08:00 |
|
zhaoyu
|
e9fccd58fc
|
有限空间迁移 还缺少mq 等内容
|
2023-12-12 17:47:59 +08:00 |
|
zhaoyu
|
f338b750da
|
动土作业迁移
|
2023-12-12 15:25:59 +08:00 |
|
zhaoyu
|
486a95acdb
|
盲板作业迁移
|
2023-12-12 13:46:12 +08:00 |
|
zhaoyu
|
2521ccf737
|
部署31专用配置文件
|
2023-12-12 10:24:05 +08:00 |
|
zhaoyu
|
e0d63a1bcb
|
部署31配置文件修改
|
2023-12-12 10:23:44 +08:00 |
|
zhaoyu
|
25bcb42ad0
|
Merge branch '1122-动火台账' into 相关方关联分公司功能
|
2023-12-11 17:59:10 +08:00 |
|
zhaoyu
|
07cdd9faa4
|
Merge branch '安全环保检查状态改8-1122' into 相关方关联分公司功能
|
2023-12-11 17:59:07 +08:00 |
|
zhaoyu
|
dfcc0cb817
|
Merge remote-tracking branch 'origin/liujun-2023-12-05-相关方需求变更' into 相关方关联分公司功能
|
2023-12-11 17:59:02 +08:00 |
|
zhaoyu
|
bbc8ea9a54
|
Merge remote-tracking branch 'origin/lmy20231211' into 相关方关联分公司功能
|
2023-12-11 17:58:17 +08:00 |
|
limingyu
|
98dc83e051
|
延时监火改为多人同时监火，在同一个部门中都可以查看和发布监火信息
|
2023-12-11 10:00:16 +08:00 |
|
liujun
|
32f2a32e67
|
历史bug修复
|
2023-12-07 15:02:01 +08:00 |
|
limingyu
|
cd71673e7c
|
登录时返回图片和后端接口地址2
|
2023-12-07 13:50:02 +08:00 |
|
limingyu
|
2856aa0626
|
登录时返回图片和后端接口地址
|
2023-12-07 10:30:43 +08:00 |
|
liujun
|
de3503d0e8
|
相关方培训新增需求
|
2023-12-06 15:02:41 +08:00 |
|
zhaoyu
|
2817e16fe5
|
关联八项作业修改
|
2023-12-06 13:43:53 +08:00 |
|
zhaoyu
|
81450f048a
|
相关方关联分公司功能
|
2023-12-05 14:27:11 +08:00 |
|
limingyu
|
761630df77
|
曹妃甸动火作业搬到港务局5
|
2023-12-05 14:19:09 +08:00 |
|
limingyu
|
72cb39f096
|
曹妃甸动火作业搬到港务局4
|
2023-12-05 14:13:49 +08:00 |
|
limingyu
|
4111ee1565
|
Merge branch 'dev' into lmy20231113
|
2023-12-05 14:08:10 +08:00 |
|
limingyu
|
335d1e04fd
|
曹妃甸动火作业搬到港务局3
|
2023-12-05 13:45:52 +08:00 |
|
liujun
|
38bdba0109
|
相关方企业审核移动到企业端
|
2023-12-05 10:43:41 +08:00 |
|
dearlin
|
c2b835ebfa
|
add: 定位卡号维护信息
|
2023-11-28 16:57:13 +08:00 |
|
dearlin
|
e8653b1870
|
add: 分公司系统管理（菜单角色权限）
|
2023-11-28 15:26:20 +08:00 |
|
dearlin
|
3928e7f4d6
|
add: 分公司系统管理（菜单角色权限）
|
2023-11-27 09:39:23 +08:00 |
|
zhaoyu
|
bbaad2b6d7
|
安全环保检查状态改8
|
2023-11-22 17:52:09 +08:00 |
|
dearlin
|
6d238d6cc1
|
fix: 重点工程处罚管理 里面的隐患没有区分重点工程项目 每个重点工程点进去都一样
|
2023-11-22 16:56:33 +08:00 |
|
zhaoyu
|
86e10c7966
|
Merge branch 'dev' into 1122-动火台账
|
2023-11-22 16:33:18 +08:00 |
|
zhaoyu
|
e3be1f21d7
|
Merge branch 'zdgc-duanxin' into dev
|
2023-11-22 16:31:40 +08:00 |
|
zhaoyu
|
a4e65f049f
|
动火台账增加展示以及搜索条件
|
2023-11-22 14:37:03 +08:00 |
|
limingyu
|
ff9dc890bf
|
Merge remote-tracking branch 'origin/dev' into lmy20231113
|
2023-11-17 14:19:56 +08:00 |
|
zhaoyu
|
8e5325bd17
|
调整处罚短信接口逻辑
|
2023-11-16 17:20:16 +08:00 |
|
dearlin
|
4678fb2bc3
|
fix:测试环境配置文件修正
|
2023-11-15 16:25:34 +08:00 |
|
dearlin
|
d1600cd7ce
|
fix:ai报警手机端不显示隐患验收的信息
|
2023-11-14 14:07:41 +08:00 |
|
dearlin
|
86b4493820
|
fix:ai报警不存隐患发现人公司的问题
|
2023-11-14 11:31:00 +08:00 |
|
dearlin
|
2cc9c41b49
|
fix:重点工程检查企业端来源不正确的问题
|
2023-11-14 10:57:54 +08:00 |
|
limingyu
|
5b22778601
|
曹妃甸动火作业搬到港务局
|
2023-11-14 10:16:26 +08:00 |
|
dearlin
|
1197111074
|
fix:smb空指针问题修复
|
2023-11-08 17:15:45 +08:00 |
|
dearlin
|
8fc5375db9
|
一般隐患台账导出，监管端的创建人和发现人 没有显示数据 注意按列导出
|
2023-11-08 14:37:24 +08:00 |
|
wangxuan
|
b5b5aba4dc
|
Merge pull request 'BUILD: x1108改造配置文件方便部署' (#1) from x1108 into dev
Reviewed-on: #1
|
2023-11-08 11:09:48 +08:00 |
|
dearlin
|
15d9942227
|
删除无用的文件
|
2023-11-08 11:06:39 +08:00 |
|
dearlin
|
8f1868e6cd
|
改造配置文件
|
2023-11-08 10:24:18 +08:00 |
|
guoyuepeng
|
71846cb62a
|
初始化
|
2023-11-08 08:53:50 +08:00 |
|
guoyuepeng
|
9e993610b0
|
初始化
|
2023-11-07 09:32:12 +08:00 |