安全隐患整改审批流程处理

yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml

@@ -274,6 +274,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.smark_url,
         a.isDel,
         CONCAT(c.nick_name,'【',c.phonenumber,'】') as createUser,
+        a.createUser as updateUser,
         a.createTime,
         a.updateUser,
         a.updateTime,

yanzhu-ui-vue3/src/components/BaiduMap/Map.vue

@@ -1,15 +1,15 @@
 <template>
-   <el-dialog :title="title" v-model="show" width="800px" append-to-body class="baidu-map-dialog" 
+    <el-dialog :title="title" v-model="show" width="800px" append-to-body class="baidu-map-dialog"
-   :close-on-click-modal="false" :close-on-press-escape="false" >
+        :close-on-click-modal="false" :close-on-press-escape="false">
-    <div class="div-info">
+        <div class="div-info">
-        <div>经度纬度:{{point?(point.lng.toFixed(5)+","+point.lat.toFixed(5)):'' }}</div>
+            <div>经度纬度:{{ point ? (point.lng.toFixed(5) + "," + point.lat.toFixed(5)) : '' }}</div>
-        <div>详细地址:{{ getAddress() }}</div>
+            <div>详细地址:{{ getAddress() }}</div>
-        <div style="margin-top: 10px;text-align: center;" v-if="getAddress()">
+            <div style="margin-top: 10px;text-align: center;" v-if="getAddress()">
-            <el-button size="small" type="primary" @click="doOk">确定</el-button>
+                <el-button size="small" type="primary" @click="doOk">确定</el-button>
+            </div>
         </div>
-    </div>
+        <div id="index-map" style="width: 100%;height:600px;"></div>
-    <div id="index-map" style="width: 100%;height:600px;"></div>
+    </el-dialog>
-   </el-dialog>
 </template>
 
 <script setup>
@@ -21,44 +21,44 @@ const cityInfo = ref("");
 
 const emit = defineEmits(["docom"]);
 
-function getCity(data,cb){
+function getCity(data, cb) {
-    let myPoint = new BMapGL.Point(+data.longitude,+data.latitude);
+    let myPoint = new BMapGL.Point(+data.longitude, +data.latitude);
-    let myGeo = new BMapGL.Geocoder({extensions_town: true});      
+    let myGeo = new BMapGL.Geocoder({ extensions_town: true });
-    myGeo.getLocation(myPoint,r=>{
+    myGeo.getLocation(myPoint, r => {
-        let cityInfo={
+        let cityInfo = {
-                address:r.content?.address||'',
+            address: r.content?.address || '',
-                poi_desc:r.content?.poi_desc||'',
+            poi_desc: r.content?.poi_desc || '',
-                district:r.content?.address_detail?.district||'',
+            district: r.content?.address_detail?.district || '',
-                city:r.content?.address_detail?.city||'',
+            city: r.content?.address_detail?.city || '',
-                province:r.content?.address_detail?.province||''
+            province: r.content?.address_detail?.province || ''
-            }                
+        }
-        cb && cb(myPoint,cityInfo);
+        cb && cb(myPoint, cityInfo);
     });
 }
 
-function doOk(){
+function doOk() {
-    emit("docom",point.value,cityInfo.value);
+    emit("docom", point.value, cityInfo.value);
-    show.value=false;
+    show.value = false;
 }
 
-function getAddress(){
+function getAddress() {
-    let addr=cityInfo.value?.address||'';
+    let addr = cityInfo.value?.address || '';
     return addr;
 }
 
-function showDlg(opt){    
+function showDlg(opt) {
-    title.value=opt?.title||'选择地址';
+    title.value = opt?.title || '选择地址';
-    show.value=true;
+    show.value = true;
-    setTimeout(()=>{
+    setTimeout(() => {
-      initMap(opt);
+        initMap(opt);
-    },400);
+    }, 400);
 }
 
-function currentPoint(){
+function currentPoint() {
-    let  geolocation = new BMapGL.Geolocation();
+    let geolocation = new BMapGL.Geolocation();
     geolocation.enableSDKLocation();
-    geolocation.getCurrentPosition(e=>{
+    geolocation.getCurrentPosition(e => {
-        if(e.point){
+        if (e.point) {
             let point = e.point
             let initMarker = new BMapGL.Marker(point);
             map.value.centerAndZoom(point, 18);
@@ -67,20 +67,20 @@ function currentPoint(){
     })
 }
 
-function mapClick(e){
+function mapClick(e) {
-    point.value=e.latlng;
+    point.value = e.latlng;
-    let myGeo = new BMapGL.Geocoder({extensions_town: true});      
+    let myGeo = new BMapGL.Geocoder({ extensions_town: true });
-    myGeo.getLocation(e.latlng,r=>{
+    myGeo.getLocation(e.latlng, r => {
-        if(r){
+        if (r) {
-            cityInfo.value={
+            cityInfo.value = {
-                address:r.content?.address||'',
+                address: r.content?.address || '',
-                poi_desc:r.content?.poi_desc||'',
+                poi_desc: r.content?.poi_desc || '',
-                district:r.content?.address_detail?.district||'',
+                district: r.content?.address_detail?.district || '',
-                city:r.content?.address_detail?.city||'',
+                city: r.content?.address_detail?.city || '',
-                province:r.content?.address_detail?.province||''
+                province: r.content?.address_detail?.province || ''
             }
-        }else{
+        } else {
-            cityInfo.value={}
+            cityInfo.value = {}
         }
     });
 }
@@ -109,12 +109,11 @@ function initMap(opt) {
     //添加地图默认控件
     map.value.addControl(new BMapGL.NavigationControl());
     //开启鼠标滚轮缩放
-    map.value.addEventListener("click",mapClick);
+    map.value.addEventListener("click", mapClick);
     var myGeo = new BMapGL.Geocoder();
     // 将地址解析结果显示在地图上，并调整地图视野
     myGeo.getPoint('经河新城', function (point) {
         if (point) {
-            console.log("--->",point)
             map.value.centerAndZoom(point, 16);
             map.value.addOverlay(new BMapGL.Marker(point, { title: '经河新城' }))
             map.value.enableScrollWheelZoom(true);
@@ -127,41 +126,42 @@ function initMap(opt) {
     }, '陕西省')
     currentPoint();
 }
-function initMapData(data){
+function initMapData(data) {
-    if(data.latitude && data.longitude){
+    if (data.latitude && data.longitude) {
-        point.value={}
+        point.value = {}
-        point.value.lng=data.longitude*1.0;
+        point.value.lng = data.longitude * 1.0;
-        point.value.lat=data.latitude*1.0;   
+        point.value.lat = data.latitude * 1.0;
     }
-    cityInfo.value={}
+    cityInfo.value = {}
-    cityInfo.value.address=data.projectAddress||''
+    cityInfo.value.address = data.projectAddress || ''
-    cityInfo.value.district=data.district||''
+    cityInfo.value.district = data.district || ''
-    cityInfo.value.city=data.city||''
+    cityInfo.value.city = data.city || ''
-    cityInfo.value.province=data.province||''
+    cityInfo.value.province = data.province || ''
 }
 
 /** 暴露组件 */
 defineExpose({
-  showDlg,
+    showDlg,
-  initMapData
+    initMapData
 });
 </script>
-<style lang="scss" >
+<style lang="scss">
-.baidu-map-dialog{
+.baidu-map-dialog {
-    .el-dialog__body{
+    .el-dialog__body {
         position: relative;
         padding: 0px;
-        .div-info{
+
+        .div-info {
             position: absolute;
-            top:0px;
+            top: 0px;
             right: 10px;
-            width:300px;
+            width: 300px;
             font-size: 12px;
-            background: rgba(255,255,255,0.5);
+            background: rgba(255, 255, 255, 0.5);
-            box-shadow: 6px 6px 6px rgba(0,0,0,0.2);
+            box-shadow: 6px 6px 6px rgba(0, 0, 0, 0.2);
             z-index: 99999;
             padding: 8px;
-            border:solid 1px #ccc;
+            border: solid 1px #ccc;
             color: #51b5ff;
             line-height: 24px;
         }

yanzhu-ui-vue3/src/layout/components/Navbar.vue

@@ -1,13 +1,14 @@
 <template>
   <div class="navbar">
-    <hamburger id="hamburger-container" :is-active="appStore.sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+    <hamburger id="hamburger-container" :is-active="appStore.sidebar.opened" class="hamburger-container"
+      @toggleClick="toggleSideBar" />
     <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!settingsStore.topNav" />
     <top-nav id="topmenu-container" class="topmenu-container" v-if="settingsStore.topNav" />
 
     <div class="right-menu">
       <template v-if="appStore.device !== 'mobile'">
         <el-tag class="cur-comp" v-if="data.comName">当前租户:{{ data.comName }}</el-tag>
-        <current-project id="current-project" class="right-menu-item"/>
+        <current-project id="current-project" class="right-menu-item" />
 
         <header-search id="header-search" class="right-menu-item" />
 
@@ -58,8 +59,8 @@ import useSettingsStore from '@/store/modules/settings'
 const appStore = useAppStore()
 const userStore = useUserStore()
 const settingsStore = useSettingsStore()
-const data=reactive({
+const data = reactive({
-  comName:'',
+  comName: '',
 })
 function toggleSideBar() {
   appStore.toggleSideBar();
@@ -95,8 +96,7 @@ const emits = defineEmits(['setLayout'])
 function setLayout() {
   emits('setLayout');
 }
-data.comName=userStore.currentComName
+data.comName = userStore.currentComName
-console.log("---->",userStore)
 </script>
 
 <style lang='scss' scoped>
@@ -107,12 +107,13 @@ console.log("---->",userStore)
   background: #fff;
   box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
 
-  .cur-comp{
+  .cur-comp {
     position: relative;
     top: 11px;
     height: 32px;
     line-height: 32px;
   }
+
   .hamburger-container {
     line-height: 46px;
     height: 100%;

yanzhu-ui-vue3/src/store/modules/user.js

@@ -1,79 +1,90 @@
-import { login, logout, getInfo } from '@/api/login'
+import { login, logout, getInfo } from "@/api/login";
-import { findMyTasks } from '@/api/flowable/businessKey'
+import { findMyTasks } from "@/api/flowable/businessKey";
-import { getToken, setToken, removeToken } from '@/utils/auth'
+import { getToken, setToken, removeToken } from "@/utils/auth";
-import defAva from '@/assets/images/profile.jpg'
+import defAva from "@/assets/images/profile.jpg";
 
-const useUserStore = defineStore(
+const useUserStore = defineStore("user", {
-  'user',
+  state: () => ({
-  {
+    token: getToken(),
-    state: () => ({
+    uid: "",
-      token: getToken(),
+    name: "",
-      uid: '',
+    nickName: "",
-      name: '',
+    avatar: "",
-      nickName: '',
+    compInfo: {},
-      avatar: '',
+    roles: [],
-      compInfo:{},
+    permissions: [],
-      roles: [],
+    currentComId: null,
-      permissions: [],
+    currentComName: null,
-      currentComId: null,
+    currentPrjId: null,
-      currentComName: null,
+    currentProName: null,
-      currentPrjId: null,
+    isAdmin: false,
-      currentProName: null,
+  }),
-    }),
+  actions: {
-    actions: {
+    // 登录
-      // 登录
+    login(userInfo) {
-      login(userInfo) {
+      const username = userInfo.username.trim();
-        const username = userInfo.username.trim()
+      const password = userInfo.password;
-        const password = userInfo.password
+      const code = userInfo.code;
-        const code = userInfo.code
+      const uuid = userInfo.uuid;
-        const uuid = userInfo.uuid
+      return new Promise((resolve, reject) => {
-        return new Promise((resolve, reject) => {
+        login(username, password, code, uuid)
-          login(username, password, code, uuid).then(res => {
+          .then((res) => {
-            let data = res.data
+            let data = res.data;
-            setToken(data.access_token)
+            setToken(data.access_token);
-            this.token = data.access_token
+            this.token = data.access_token;
-            resolve()
+            resolve();
-          }).catch(error => {
-            reject(error)
           })
-        })
+          .catch((error) => {
-      },
+            reject(error);
-      // 获取用户信息
+          });
-      getInfo() {
+      });
-        return new Promise((resolve, reject) => {
+    },
-          getInfo().then(res => {
+    // 获取用户信息
-            const user = res.user
+    getInfo() {
-            const avatar = (user.avatar == "" || user.avatar == null) ? defAva : user.avatar;
+      return new Promise((resolve, reject) => {
+        getInfo()
+          .then((res) => {
+            const user = res.user;
+            const avatar =
+              user.avatar == "" || user.avatar == null ? defAva : user.avatar;
 
-            if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
+            if (res.roles && res.roles.length > 0) {
-              this.roles = res.roles
+              // 验证返回的roles是否是一个非空数组
-              this.permissions = res.permissions
+              this.roles = res.roles;
+              this.permissions = res.permissions;
             } else {
-              this.roles = ['ROLE_DEFAULT']
+              this.roles = ["ROLE_DEFAULT"];
             }
             this.uid = user.userId;
             this.name = user.userName;
             this.nickName = user.nickName;
-            this.compInfo=user.comp;
+            this.compInfo = user.comp;
             this.avatar = avatar;
             this.currentComId = user.activeComId;
             this.currentComName = user.activeComName;
             this.currentPrjId = user.activeProjectId;
             this.currentProName = user.activeProjectName;
-            resolve(res)
+            this.isAdmin = user.roles.some(
-          }).catch(error => {
+              (item) =>
-            reject(error)
+                item.roleKey.includes("admin") ||
+                item.roleKey.includes("gsAdmin")
+            );
+            resolve(res);
           })
-        })
+          .catch((error) => {
-      },
+            reject(error);
-      // 获取用户代办
+          });
-      getTasks(){
+      });
-        return new Promise((resolve, reject) => {
+    },
-          findMyTasks().then(response => {
+    // 获取用户代办
+    getTasks() {
+      return new Promise((resolve, reject) => {
+        findMyTasks()
+          .then((response) => {
             let todos = document.querySelectorAll(".tips_Todo");
             let tasks = document.querySelectorAll(".tips_Task");
             if (todos.length > 0) {
-              todos.forEach(el => {
+              todos.forEach((el) => {
                 el.innerHTML = response.data.todo;
                 if (response.data.todo > 0) {
                   el.style.display = "inline";
@@ -83,7 +94,7 @@ const useUserStore = defineStore(
               });
             }
             if (tasks.length > 0) {
-              tasks.forEach(el => {
+              tasks.forEach((el) => {
                 el.innerHTML = response.data.todo;
                 if (response.data.todo > 0) {
                   el.style.display = "inline";
@@ -92,27 +103,30 @@ const useUserStore = defineStore(
                 }
               });
             }
-            resolve(response)
+            resolve(response);
-          }).catch(error => {
-            reject(error)
           })
-        })
+          .catch((error) => {
-      },
+            reject(error);
-      // 退出系统
+          });
-      logOut() {
+      });
-        return new Promise((resolve, reject) => {
+    },
-          logout(this.token).then(() => {
+    // 退出系统
-            this.token = ''
+    logOut() {
-            this.roles = []
+      return new Promise((resolve, reject) => {
-            this.permissions = []
+        logout(this.token)
-            removeToken()
+          .then(() => {
-            resolve()
+            this.token = "";
-          }).catch(error => {
+            this.roles = [];
-            reject(error)
+            this.permissions = [];
+            removeToken();
+            resolve();
           })
-        })
+          .catch((error) => {
-      }
+            reject(error);
-    }
+          });
-  })
+      });
+    },
+  },
+});
 
-export default useUserStore
+export default useUserStore;

yanzhu-ui-vue3/src/views/trouble/problemmodify/detailDrawer.vue

@@ -6,80 +6,81 @@
                 <el-steps style="max-width: 600px" :active="data.stepActive" finish-status="success" simple>
                     <el-step title="待整改" />
                     <el-step title="待复检" />
-                    <el-step title="复检驳回" />
+                    <el-step title="复检驳回" v-if="!data.simple" />
                     <el-step title="复检通过" />
                 </el-steps>
+                <div class="step-list">
+                    <div v-for="(it, idx) in data.auditinfoList" :key="idx">
+                        <div class="step-header" :class="data.row.checkState >= 0 ? 'is-active' : ''">
+                            <el-icon>
+                                <SuccessFilled />
+                            </el-icon>
+                            {{ it.index }}.
+                            <span v-if="it.processState == 0">整改处理</span>
+                            <span v-if="it.processState == 1">复检通过</span>
+                            <span v-if="it.processState == 2">复检驳回</span>
+                        </div>
+                        <el-card>
+                            <table border class="step-table">
+                                <tr>
+                                    <td width="40%"><el-icon>
+                                            <User />
+                                        </el-icon>
+                                        <span v-if="it.processState == 0">整改说明</span>
+                                        <span v-if="it.processState == 1">复检意见</span>
+                                        <span v-if="it.processState == 2">驳回意见</span>
+
+                                    </td>
+                                    <td>{{ it.opinion }}</td>
+                                </tr>
+                                <tr v-if="it.processState == 0">
+                                    <td><el-icon>
+                                            <Picture />
+                                        </el-icon>整改图片</td>
+                                    <td>
+                                        <div class="step-img"><el-image :src="file.fileUrl"
+                                                v-for="(file, index) in it.files" :key="index"
+                                                :preview-teleported="true"
+                                                :preview-src-list="[file.fileUrl]"></el-image></div>
+                                    </td>
+                                </tr>
+                            </table>
+                        </el-card>
+                    </div>
 
-                <div v-for="(it, idx) in data.auditinfoList" :key="idx">
                     <div class="step-header" :class="data.row.checkState >= 0 ? 'is-active' : ''">
                         <el-icon>
                             <SuccessFilled />
                         </el-icon>
-                        {{ it.index }}.
+                        01.待整改
-                        <span v-if="it.processState == 0">整改处理</span>
-                        <span v-if="it.processState == 1">复检通过</span>
-                        <span v-if="it.processState == 2">复检驳回</span>
                     </div>
                     <el-card>
                         <table border class="step-table">
                             <tr>
                                 <td width="40%"><el-icon>
                                         <User />
-                                    </el-icon>
+                                    </el-icon>办理用户</td>
-                                    <span v-if="it.processState == 0">整改说明</span>
+                                <td>{{ data.row.createUser }}</td>
-                                    <span v-if="it.processState == 1">复检意见</span>
-                                    <span v-if="it.processState == 2">驳回意见</span>
-
-                                </td>
-                                <td>{{ it.opinion }}</td>
                             </tr>
-                            <tr v-if="it.processState == 0">
+                            <tr>
+                                <td><el-icon>
+                                        <Calendar />
+                                    </el-icon>办理时间</td>
+                                <td>{{ data.row.createTime }}</td>
+                            </tr>
+                            <tr>
                                 <td><el-icon>
                                         <Picture />
-                                    </el-icon>整改图片</td>
+                                    </el-icon>隐患图片</td>
                                 <td>
-                                    <div class="step-img"><el-image :src="file.fileUrl"
+                                    <el-image :src="data.row.smarkUrlPic" style="height:80px;"
-                                            v-for="(file, index) in it.files" :key="index" :preview-teleported="true"
+                                        :preview-teleported="true" :preview-src-list="data.row.smarkUrlPics"></el-image>
-                                            :preview-src-list="[file.fileUrl]"></el-image></div>
                                 </td>
                             </tr>
                         </table>
                     </el-card>
                 </div>
 
-                <div class="step-header" :class="data.row.checkState >= 0 ? 'is-active' : ''">
-                    <el-icon>
-                        <SuccessFilled />
-                    </el-icon>
-                    01.待整改
-                </div>
-                <el-card>
-                    <table border class="step-table">
-                        <tr>
-                            <td width="40%"><el-icon>
-                                    <User />
-                                </el-icon>办理用户</td>
-                            <td>{{ data.row.createUser }}</td>
-                        </tr>
-                        <tr>
-                            <td><el-icon>
-                                    <Calendar />
-                                </el-icon>办理时间</td>
-                            <td>{{ data.row.createTime }}</td>
-                        </tr>
-                        <tr>
-                            <td><el-icon>
-                                    <Picture />
-                                </el-icon>隐患图片</td>
-                            <td>
-                                <el-image :src="data.row.smarkUrlPic" style="height:80px;" :preview-teleported="true"
-                                    :preview-src-list="data.row.smarkUrlPics"></el-image>
-                            </td>
-                        </tr>
-                    </table>
-                </el-card>
-
-
             </el-col>
             <el-col :span="14" class="detail-right" :class="'is-' + data.mode">
                 <el-form style="margin: 0px 20px;" :model="data.baseForm" ref="baseInfo">
@@ -211,6 +212,7 @@
 <script setup name="Problemmodify">
 import useUserStore from '@/store/modules/user'
 import { listAuditinfo, addAuditinfo } from '@/api/trouble/auditinfo'
+import { fa } from 'element-plus/es/locales.mjs';
 const { proxy } = getCurrentInstance();
 const { ssp_proble_type, ssp_proble_sub_type } = proxy.useDict('ssp_proble_type', 'ssp_proble_sub_type');
 const formStep2Ref = ref();
@@ -218,6 +220,7 @@ const formStep3Ref = ref();
 const userStore = useUserStore()
 const emit = defineEmits(["success"]);
 let data = reactive({
+    simple: false,
     mode: '',
     loading: false,
     visible: false,
@@ -264,6 +267,7 @@ function validateStep2Images(rule, value, callback) {
 function showDrawer(row, mode) {
     data.mode = mode;
     data.row = row;
+
     step2Form.value.images = [];
     step2Form.value.opinion = "";
     step3Form.value.opinion = "";
@@ -288,6 +292,15 @@ function getListAuditinfo() {
             tmps[i].index = idx < 10 ? '0' + idx : idx;
         }
         data.auditinfoList = tmps;
+        if (data.row.checkState == 3) {
+            if (tmps.length == 2) {
+                data.simple = true;
+                data.stepActive = 3;
+            } else {
+                data.simple = false;
+                data.stepActive = 4;
+            }
+        }
     })
 
 }
@@ -394,6 +407,11 @@ defineExpose({
                 }
             }
 
+            .step-list {
+                overflow-y: auto;
+                height: calc(100vh - 128px);
+            }
+
             .el-card__body {
                 padding: 8px !important;
             }
@@ -427,7 +445,7 @@ defineExpose({
 
             .step-img {
                 .el-image {
-                    width: 95px;
+                    width: 90px;
                     height: 80px;
                     margin-left: 3px;
                 }

yanzhu-ui-vue3/src/views/trouble/problemmodify/index.vue

@@ -180,6 +180,12 @@ function handleDetail(row) {
   detailDrawerRef.value.showDrawer(row, 'show');
 }
 function getIsVdel(row) {
+  let isAdmin = userStore.isAdmin;
+  if (isAdmin) {
+    return true;
+  } else if (row.updateUser == userStore.uid && row.checkState != 3) {
+    return true;
+  }
   return false;
 }
 function getIsModify(row) {