From 91def538e9b1f6e28237bd94e3443d105b257577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Tue, 15 Aug 2023 17:48:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 2 - .../src/views/project/surProject/index.vue | 8 +-- .../views/project/surProjectSpecial/index.vue | 24 ++++--- .../surProjectSpecialDrawer.vue | 4 +- .../views/trouble/pshProblemmodify/index.vue | 1 + .../views/trouble/sspProblemmodify/index.vue | 20 ++++-- .../resources/mapper/ProjectInfoMapper.xml | 4 +- .../templates/pshManage/myChanges.html | 8 ++- .../templates/pshManage/sspChange.html | 2 +- .../templates/pshManage/sspStayCheck.html | 8 ++- .../templates/sspManage/myChanges.html | 8 ++- .../templates/sspManage/sspChange.html | 2 +- .../templates/sspManage/sspStayCheck.html | 8 ++- .../web/controller/BgWorkTrainController.java | 7 +- .../controller/ProjectSpecialController.java | 57 +++++++++++++++ .../project/domain/SurProjectWorkSpecial.java | 19 ++++- .../mapper/SurProjectWorkSpecialMapper.java | 10 +++ .../ISurProjectWorkSpecialService.java | 10 +++ .../SurProjectWorkSpecialServiceImpl.java | 16 +++++ .../controller/EmergencyDrillController.java | 14 ++++ .../work/controller/WorkTrainController.java | 14 ++++ .../yanzhu/jh/work/domain/WorkTrainDept.java | 18 +---- .../service/impl/WorkTrainServiceImpl.java | 28 +++++++- .../project/SurProjectUnitInfoMapper.xml | 1 + .../project/SurProjectWorkSpecialMapper.xml | 71 +++++++++++++++++-- .../trouble/SmzSspProblemmodifyMapper.xml | 5 +- .../resources/mapper/work/WorkTrainMapper.xml | 6 +- 27 files changed, 311 insertions(+), 64 deletions(-) create mode 100644 yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectSpecialController.java diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 09d37c2b..152c5e2d 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -10,8 +10,6 @@ ruoyi: demoEnabled: true # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath) profile: D:/data/uploadPath - # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath) - thumbnail: D:/data/uploadPath # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数字计算 char 字符验证 diff --git a/ruoyi-ui/src/views/project/surProject/index.vue b/ruoyi-ui/src/views/project/surProject/index.vue index ccc92ae6..1f4035fa 100644 --- a/ruoyi-ui/src/views/project/surProject/index.vue +++ b/ruoyi-ui/src/views/project/surProject/index.vue @@ -205,17 +205,17 @@ v-hasPermi="['system:assess:list']">季度考核管理 计划节点管理 - 安全隐患排查 - 质量隐患排查 项目专项培训 项目应急演练 - 项目特种人员 - 今日出勤 删除项目 diff --git a/ruoyi-ui/src/views/project/surProjectSpecial/index.vue b/ruoyi-ui/src/views/project/surProjectSpecial/index.vue index c4d59cd7..f4dbb403 100644 --- a/ruoyi-ui/src/views/project/surProjectSpecial/index.vue +++ b/ruoyi-ui/src/views/project/surProjectSpecial/index.vue @@ -125,13 +125,13 @@ - +