 zhaohongyu
|
e4aaa14a6a
|
2024/12/13 曹煤炭清单管理增加隐患级别搜索条件
|
2024-12-13 15:10:34 +08:00 |
 dearLin
|
e4c1452d25
|
补充 机设部 业务部 综合办公室 隐患统计增加统计的内容 导出
|
2024-07-17 15:16:39 +08:00 |
|
dearLin
|
b3ec07ece1
|
补充 机设部 业务部 综合办公室 隐患统计增加统计的内容
|
2024-07-16 17:56:48 +08:00 |
|
dearLin
|
a450bcda16
|
修复煤炭隐患台账 隐患统计增加统计部门 并且在计算处罚金额时 因为汉字报错
|
2024-07-16 14:40:24 +08:00 |
 songwenxuan
|
dcf42699c3
|
安全承诺和责任状 详情菜单更改
|
2024-06-25 20:42:53 +08:00 |
|
songwenxuan
|
dbf6227c77
|
解决了 Bug 看不到与自己有关的重点工程项目无法发起安全环保检查。 16445
解决了 Bug 未显示在线状态。 16444
解决了 Bug 摄像头数量未显示 16443
解决了 Bug 集团单位没有数据。 16441
解决了 Bug 身份证号未做校验 16439
解决了 Bug 选择摄像头的时候点击取消按钮，直接回到主页面了。 应保存在当前页面 16442
|
2024-06-25 17:27:46 +08:00 |
|
songwenxuan
|
cc6b208e08
|
解决了 Bug 身份证号。手机号未做数据验证 16264
解决了 Bug 特种作业人员新增，未清除老数据。 16263
解决了 Bug 选择到子菜单的时候导航栏信息隐藏，刷新页面才能出来。 16262
解决了 Bug 作业类别数据带出过慢，要等个几秒钟 才出来。 16265
解决了 Bug 数据未做验证。 16266
解决了 Bug 作业类别要等几秒钟才出来。 16267
解决了 Bug 作业类别要等几秒钟才出来。 16268
解决了 Bug 进入记录页面，系统报错。 16270
解决了 Bug 排查页面进去一直转圈不动。 16271
解决了 Bug 相关方单位无法新增，点击保存没反应。 16272
解决了 Bug 选择部门页面速度加载过慢。 16273
动火新增审批流程
|
2024-06-20 16:40:39 +08:00 |
|
songwenxuan
|
523290ad6a
|
修复风险管控台账管控责任人搜索无效的问题
|
2024-06-13 19:17:36 +08:00 |
|
songwenxuan
|
8b88ae3f62
|
修复特种作业bug
|
2024-06-12 10:06:23 +08:00 |
|
songwenxuan
|
627d6282bd
|
改为3级页面
一级列表改成作业单位
二级列表改成作业单位，作业类别，作业人数
三级列表展示 单位 类别 操作项目，姓名，特种作业编号，证书有效期，复审时间，状态（是否有效）
新增或修改人员增加是否复审的确认框。
|
2024-06-11 18:04:01 +08:00 |
|
songwenxuan
|
f62622a42b
|
安全承诺和责任状 增加按年份筛选，跟签署的起始日期年份比较
|
2024-06-06 17:33:07 +08:00 |
zhaoyu
|
ebfdb42b8f
|
保存不上企业经营地址问题
|
2024-06-06 09:44:02 +08:00 |
|
songwenxuan
|
8cdb06f8db
|
首页统计每日工作接口和bug修复
|
2024-05-15 16:33:37 +08:00 |
|
songwenxuan
|
c10d2740c5
|
安全承诺和责任状导出相关接口
|
2024-05-09 15:11:59 +08:00 |
|
zhaoyu
|
5e21a66e95
|
隐患统计导出
|
2024-04-10 16:51:57 +08:00 |
|
zhaoyu
|
795a50361c
|
新的责任状模板
|
2024-03-18 16:18:15 +08:00 |
|
zhaoyu
|
1329dc662b
|
删除多余文件
|
2024-02-06 15:22:08 +08:00 |
|
zhaoyu
|
5deb7d2b03
|
Merge branch '0206czks' into 0205cmt
# Conflicts:
# pom.xml
# src/main/java/com/zcloud/aspect/DockingAspect.java
# src/main/java/com/zcloud/config/ShiroConfiguration.java
# src/main/java/com/zcloud/config/StartWebsocketServer.java
# src/main/java/com/zcloud/controller/app/AppPromiseController.java
# src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalInspectorController.java
# src/main/java/com/zcloud/controller/bus/CorpPromiseController.java
# src/main/java/com/zcloud/controller/bus/HiddenExamineController.java
# src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java
# src/main/java/com/zcloud/controller/bus/RiskPointController.java
# src/main/java/com/zcloud/controller/bus/RiskUnitController.java
# src/main/java/com/zcloud/controller/filemanager/MfolderController.java
# src/main/java/com/zcloud/controller/firemanager/FireResourcesController.java
# src/main/java/com/zcloud/controller/gatemachine/GateMachineController.java
# src/main/java/com/zcloud/controller/gatemachine/GateVideoController.java
# src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalInspectorController.java
# src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java
# src/main/java/com/zcloud/controller/map/MapController.java
# src/main/java/com/zcloud/controller/map/MapEightController.java
# src/main/java/com/zcloud/controller/map/MapKeyProjectController.java
# src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java
# src/main/java/com/zcloud/controller/system/HeadController.java
# src/main/java/com/zcloud/mapper/datasource/czksbimap/CzksMapEightMapper.java
# src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java
# src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
# src/main/java/com/zcloud/service/bus/impl/RiskUnitServiceImpl.java
# src/main/java/com/zcloud/service/czksbimap/CzksMapEightService.java
# src/main/java/com/zcloud/service/czksbimap/impl/CzksBiMapServiceImpl.java
# src/main/java/com/zcloud/service/czksbimap/impl/CzksMapEightServiceImpl.java
# src/main/java/com/zcloud/service/gatemachine/impl/GateAreaServiceImpl.java
# src/main/java/com/zcloud/service/gatemachine/impl/GateMachineServiceImpl.java
# src/main/java/com/zcloud/service/gatemachine/impl/GateVideoServiceImpl.java
# src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalInspectorServiceImpl.java
# src/main/java/com/zcloud/service/keyProjects/impl/PlatformvideomanagementServiceImpl.java
# src/main/java/com/zcloud/service/map/AbsFireSourcesHandel.java
# src/main/java/com/zcloud/service/map/impl/BiMapServiceImpl.java
# src/main/java/com/zcloud/service/map/impl/BiTongjiServiceImpl.java
# src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java
# src/main/java/com/zcloud/service/map/impl/MapKeyProjectServiceImpl.java
# src/main/java/com/zcloud/service/system/UsersService.java
# src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java
# src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
# src/main/java/com/zcloud/util/Const.java
# src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java
# src/main/java/com/zcloud/util/HiddenExcelImgView.java
# src/main/java/com/zcloud/util/HttpClientService.java
# src/main/java/com/zcloud/util/HttpRequestUtil.java
# src/main/java/com/zcloud/util/MD5.java
# src/main/java/com/zcloud/util/ReturnMap.java
# src/main/java/com/zcloud/util/Smb.java
# src/main/java/com/zcloud/util/czksBiMapFactory/AbsCzksFireSourcesHandel.java
# src/main/java/com/zcloud/util/hk/HKUtil.java
# src/main/resources/application-dev.properties
# src/main/resources/application.properties
# src/main/resources/config/sysSet.ini
# src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml
# src/main/resources/mybatis/datasource/bus/CorpPromiseDetailsMapper.xml
# src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml
# src/main/resources/mybatis/datasource/bus/CorpPromisePeopleMapper.xml
# src/main/resources/mybatis/datasource/bus/HiddenMapper.xml
# src/main/resources/mybatis/datasource/bus/ImgFilesMapper.xml
# src/main/resources/mybatis/datasource/bus/PromiseDetailsMapper.xml
# src/main/resources/mybatis/datasource/bus/PromiseMapper.xml
# src/main/resources/mybatis/datasource/bus/RiskPointMapper.xml
# src/main/resources/mybatis/datasource/corpsystem/CorpUsersMapper.xml
# src/main/resources/mybatis/datasource/czksbimap/CzksBiMapMapper.xml
# src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml
# src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml
# src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml
# src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml
# src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml
# src/main/resources/mybatis/datasource/highriskwork/HighWorkMapper.xml
# src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml
# src/main/resources/mybatis/datasource/keyProjects/KeyprojectCheckMapper.xml
# src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml
# src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml
# src/main/resources/mybatis/datasource/keyProjects/PlatformvideomanagementMapper.xml
# src/main/resources/mybatis/datasource/mq/MqProductionErrorLogMapper.xml
# src/main/resources/mybatis/datasource/mq/MqProductionLogMapper.xml
# src/main/resources/mybatis/datasource/mysql1.sql
# src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml
# src/main/resources/mybatis/datasource/system/CorpPathMapper.xml
# src/main/resources/mybatis/datasource/system/DepartmentMapper.xml
# src/main/resources/mybatis/datasource/system/PoliceMapper.xml
# src/main/resources/mybatis/datasource/system/UsersMapper.xml
# src/main/resources/mybatis/datasource/xgf/TrainUsersMapper.xml
# src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml
# src/main/resources/mybatis/dsno2/bus/NoticeRegulatoryMapper.xml
# src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml
# src/main/resources/mybatis/dsno2/keyProjects/AIWarningMapper.xml
# src/main/resources/mybatis/dsno2/keyProjects/DeviceMapper.xml
# src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml
# src/main/resources/mybatis/dsno2/keyProjects/PersonnelManagementMapper.xml
# src/main/resources/mybatis/dsno2/keyProjects/UnitsMapper.xml
# src/main/resources/mybatis/dsno2/keyProjects/VideoManagerMapper.xml
# src/main/resources/mybatis/dsno2/keyProjects/VideoResourcesMapper.xml
# src/main/resources/mybatis/dsno2/map/FireResourcesMapper.xml
# src/main/resources/mybatis/dsno2/map/MeteorologicalMapper.xml
# src/main/resources/mybatis/dsno2/map/MeteorologicalinfoMapper.xml
# src/main/resources/mybatis/dsno2/map/PlatformelectronicMapper.xml
|
2024-02-06 13:55:09 +08:00 |
|
zhaoyu
|
e6889bacd9
|
初始化沧州矿石
|
2024-02-06 11:05:20 +08:00 |
|
zhaoyu
|
f21c91c821
|
初始化曹煤炭
|
2024-02-06 11:02:25 +08:00 |
|
zhaoyu
|
4f468e21b2
|
测试
|
2024-02-06 10:03:02 +08:00 |
|
dearlin
|
7ca4ab9570
|
Merge branch '1212-八项作业迁移' into czks1.0
# Conflicts:
# pom.xml
# src/main/resources/application-dev.properties
# src/main/resources/application-master.properties
|
2023-12-19 17:18:35 +08:00 |
|
dearlin
|
7073565e0b
|
add: 沧州矿石代码同步加地图版本
|
2023-12-17 15:29:45 +08:00 |
|
zhaoyu
|
8446811b6f
|
搜索bug处理
|
2023-12-14 17:23:42 +08:00 |
limingyu
|
335d1e04fd
|
曹妃甸动火作业搬到港务局3
|
2023-12-05 13:45:52 +08:00 |
|
dearlin
|
8fc5375db9
|
一般隐患台账导出，监管端的创建人和发现人 没有显示数据 注意按列导出
|
2023-11-08 14:37:24 +08:00 |
guoyuepeng
|
71846cb62a
|
初始化
|
2023-11-08 08:53:50 +08:00 |
|
guoyuepeng
|
9e993610b0
|
初始化
|
2023-11-07 09:32:12 +08:00 |