Merge branch 'develop' of http://git.censoft.com.cn/BCDH-HSE/bcdh-app into develop

src/App.vue

@@ -7,133 +7,147 @@
  * 版权所有，侵权必究！
  *
 -->
-
 <template>
-  <div id="app" :style="{height:appHeight}">
-      <transition :name="transitionName">
-        <keep-alive :include="cachePage">
-          <router-view class="router-view" />
-        </keep-alive>
-      </transition>
-    <div :style="{height:tabH}"></div>
-    <tab-bar  v-if="showTab"></tab-bar>
-  </div>
+    <div id="app">
+        <div :style="{ height: showTab ?appHeight:'100%' }" id="app-content">
+            <transition :name="transitionName">
+                <keep-alive :include="cachePage">
+                    <router-view class="router-view" />
+                </keep-alive>
+            </transition>
+        </div>
+        <tab-bar v-if="showTab"></tab-bar>
+    </div>
 </template>
 
 <script>
 import tabBar from "@/components/TabBar";
 
 export default {
-  components: {
-    tabBar,
-  },
-  data() {
-    return {
-      appHeight: "",
-      tabH: "",
-      rempx:0,
-      headH:'',
-      screenH: "",
-      transitionName: "slide-left",
-      cachePage: [
-        "add-danger",
-        "change-info",
-        "affirm-danger",
-        "risk-affirm",
-        "manager-survey",
-        "super-survey",
-        "major-survey",
-        "risk-add",
-        "noticeList",
-        "confirmNote",
-      ],
-    };
-  },
-  mounted() {
-    let tabH =
-      document.getElementsByTagName("html")[0].style.fontSize.split("px")[0] *
-      1.33333;
-    let sH = window.screen.height;
-    this.headH=document.getElementsByTagName("html")[0].style.fontSize.split("px")[0] *
-      1.5;+'px'
-    this.appHeight = sH - tabH + "px";
-    this.tabH = tabH + "px";
-    this.screenH = sH + "px";
-  },
-  computed: {
-    showTab() {
-      return !["login", "login2","choose-people"].includes(this.$route.name);
+    components: {
+        tabBar,
+    },
+    data() {
+        return {
+            appHeight: "",
+            tabH: "",
+            rempx: 0,
+            headH: "",
+            screenH: "",
+            transitionName: "slide-left",
+            cachePage: [
+                "add-danger",
+                "change-info",
+                "affirm-danger",
+                "risk-affirm",
+                "manager-survey",
+                "super-survey",
+                "major-survey",
+                "risk-add",
+                "noticeList",
+                "confirmNote",
+            ],
+        };
+    },
+
+    mounted() {
+        let tabH =
+            document
+                .getElementsByTagName("html")[0]
+                .style.fontSize.split("px")[0] * 1.33333;
+        let sH = document.documentElement.clientHeight;
+        this.headH =
+            document
+                .getElementsByTagName("html")[0]
+                .style.fontSize.split("px")[0] * 1.5;
+        +"px";
+        this.appHeight = sH - tabH + "px";
+        this.tabH = tabH + "px";
+        this.screenH = sH + "px";
+    },
+    computed: {
+        showTab() {
+            return !["login", "login2", "choose-people"].includes(
+                this.$route.name
+            );
+        },
     },
-  },
-  watch: {
-    $route(to, from) {
-      // 有主级到次级
-      if (to.meta.index > from.meta.index) {
-        this.transitionName = "slide-left"; // 向左滑动
-      } else if (to.meta.index < from.meta.index) {
-        // 由次级到主级
-        this.transitionName = "slide-right";
-      } else {
-        this.transitionName = ""; //同级无过渡效果
-      }
+    watch: {
+        $route(to, from) {
+            // 有主级到次级
+            if (to.meta.index > from.meta.index) {
+                this.transitionName = "slide-left"; // 向左滑动
+            } else if (to.meta.index < from.meta.index) {
+                // 由次级到主级
+                this.transitionName = "slide-right";
+            } else {
+                this.transitionName = ""; //同级无过渡效果
+            }
+        },
     },
-  },
 };
 </script>
 
 <style lang="less">
-// body{
-//   overflow: hidden;
-// }
 #app {
-  font-family: "Avenir", Helvetica, Arial, sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  // text-align: center;
-  color: #2c3e50;
-  box-sizing: border-box;
-  overflow: hidden;
-  position: relative;
-  overflow: hidden;
-  // z-index:999999999999
+    font-family: "Avenir", Helvetica, Arial, sans-serif;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    // text-align: center;
+    color: #2c3e50;
+    box-sizing: border-box;
+    overflow: hidden;
+    position: relative;
+    overflow: hidden;
+    height: 100vh;
+    // z-index:999999999999
+}
+#app-content {
+    box-sizing: border-box;
+    overflow: hidden;
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    overflow: hidden;
 }
 
 .router-view {
-  width: 100%;
-  height: auto;
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  margin: 0 auto;
-  -webkit-overflow-scrolling: touch;
-  background-color: #f0f1f5;
-  overflow: auto;
+    width: 100%;
+    height: auto;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    margin: 0 auto;
+    -webkit-overflow-scrolling: touch;
+    background-color: #f0f1f5;
+    overflow: auto;
 }
 
 .slide-right-enter-active,
 .slide-right-leave-active,
 .slide-left-enter-active,
 .slide-left-leave-active {
-  height: 100%;
-  will-change: transform;
-  transition: all 500ms;
-  position: absolute;
-  backface-visibility: hidden;
+    height: 100%;
+    will-change: transform;
+    transition: all 500ms;
+    position: absolute;
+    backface-visibility: hidden;
 }
 .slide-right-enter {
-  opacity: 0;
-  transform: translate3d(-100%, 0, 0);
+    opacity: 0;
+    transform: translate3d(-100%, 0, 0);
 }
 .slide-right-leave-active {
-  opacity: 0;
-  transform: translate3d(100%, 0, 0);
+    opacity: 0;
+    transform: translate3d(100%, 0, 0);
 }
 .slide-left-enter {
-  opacity: 0;
-  transform: translate3d(100%, 0, 0);
+    opacity: 0;
+    transform: translate3d(100%, 0, 0);
 }
 .slide-left-leave-active {
-  opacity: 0;
-  transform: translate3d(-100%, 0, 0);
+    opacity: 0;
+    transform: translate3d(-100%, 0, 0);
 }
 </style>

src/service/danger.js

@@ -25,7 +25,7 @@ export function postHdName(url, data) {
         data
     })
 }
-// 隐患项目编号和隐患级别
+// 隐患单编号和隐患级别
 export function postHdInventories(url, data) {
     return request({
         url: url,

src/views/danger/addDanger/addDanger.vue

@@ -128,9 +128,9 @@
         v-model="dangerNum"
         readonly
         name="hdProjectId"
-        label="隐患项目编号"
+        label="隐患单编号"
         placeholder="请选择"
-        :rules="[{ required: true, message: '隐患项目编号不能为空' }]"
+        :rules="[{ required: true, message: '隐患单编号不能为空' }]"
       />
       <van-field
         required
@@ -421,7 +421,7 @@ export default {
       this.dangerName = ""; //隐患项目名称
       this.showDangerName = false;
       this.columnsDangerName = [];
-      this.dangerNum = ""; //隐患项目编号
+      this.dangerNum = ""; //隐患单编号
       this.dangerLevel = ""; //隐患项目级别
       this.findTime = ""; //隐患发现时间
       this.showFindTime = false;
@@ -470,7 +470,7 @@ export default {
       dangerName: "", //隐患项目名称
       showDangerName: false,
       columnsDangerName: [],
-      dangerNum: "", //隐患项目编号
+      dangerNum: "", //隐患单编号
       dangerLevel: "", //隐患项目级别
       findTime: "", //隐患发现时间
       showFindTime: false,
@@ -744,7 +744,7 @@ export default {
       }
       this.dangerName = value.hdName;
       this.showDangerName = false;
-      // 请求隐患项目编号和隐患级别
+      // 请求隐患单编号和隐患级别
       postHdInventories(
         `/hdreport/showHdInventories/${this.range}/${this.type}/${this.dangerName}`
       ).then((res) => {

src/views/danger/changeDanger/changeInfo.vue

@@ -8,32 +8,32 @@
       @click="goDetail(item.taskId)"
     >
       <van-row gutter="">
-        <van-col span="6">所属项目：</van-col>
-        <van-col span="18">{{ item.proId }}</van-col>
+        <van-col span="7">所属项目：</van-col>
+        <van-col span="17">{{ item.proId }}</van-col>
       </van-row>
       <van-row gutter="">
-        <van-col span="6">隐患级别：</van-col>
-        <van-col span="18">{{ item.hdLev | dangerText }}</van-col>
+        <van-col span="7">隐患级别：</van-col>
+        <van-col span="17">{{ item.hdLev | dangerText }}</van-col>
       </van-row>
       <van-row gutter="">
-        <van-col span="6">适用范围：</van-col>
-        <van-col span="18">{{ item.hdRange }}</van-col>
+        <van-col span="7">适用范围：</van-col>
+        <van-col span="17">{{ item.hdRange }}</van-col>
       </van-row>
       <van-row gutter="">
-        <van-col span="6">隐患类型：</van-col>
-        <van-col span="18">{{ item.hdType }}</van-col>
+        <van-col span="7">隐患类型：</van-col>
+        <van-col span="17">{{ item.hdType }}</van-col>
       </van-row>
       <!-- <van-row gutter="">
-        <van-col span="6">发现时间：</van-col>
-        <van-col span="18">{{ item.hdDiscoveryTime }}</van-col>
+        <van-col span="7">发现时间：</van-col>
+        <van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
       </van-row> -->
       <van-row gutter="">
-        <van-col span="6">超期标识：</van-col>
-        <van-col span="18">{{ item.dueDate | formatTime }}</van-col>
+        <van-col span="7">超期标识：</van-col>
+        <van-col span="17">{{ item.dueDate | formatTime }}</van-col>
       </van-row>
       <van-row gutter="">
-        <van-col span="6">工单状态：</van-col>
-        <van-col span="18">{{ item.taskName }}</van-col>
+        <van-col span="7">工单状态：</van-col>
+        <van-col span="17">{{ item.taskName }}</van-col>
       </van-row>
       <!-- 详情 -->
       <div class="detail">详情</div>

src/views/danger/changeDanger/index.vue

@@ -37,42 +37,42 @@
                         @click="touchstart(index, item)"
                     >
                         <van-row gutter="">
-                            <van-col span="6">隐患编号：</van-col>
-                            <van-col span="18">
+                            <van-col span="7">隐患单编号：</van-col>
+                            <van-col span="17">
                                 {{ item.businessId || item.id }}
                             </van-col>
                         </van-row>
                         <van-row gutter="">
-                            <van-col span="6">所属项目：</van-col>
-                            <van-col span="18">{{ item.proId }}</van-col>
+                            <van-col span="7">所属项目：</van-col>
+                            <van-col span="17">{{ item.proId }}</van-col>
                         </van-row>
                         <van-row gutter="">
-                            <van-col span="6">隐患级别：</van-col>
-                            <van-col span="18">{{
+                            <van-col span="7">隐患级别：</van-col>
+                            <van-col span="17">{{
                                 item.hdLev | dangerText
                             }}</van-col>
                         </van-row>
                         <!-- <van-row gutter="">
-                          <van-col span="6">发现时间：</van-col>
-                          <van-col span="18">{{ item.hdDiscoveryTime }}</van-col>
+                          <van-col span="7">发现时间：</van-col>
+                          <van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
                         </van-row> -->
                         <van-row gutter="">
-                            <van-col span="6">适用范围：</van-col>
-                            <van-col span="18">{{ item.hdRange }}</van-col>
+                            <van-col span="7">适用范围：</van-col>
+                            <van-col span="17">{{ item.hdRange }}</van-col>
                         </van-row>
                         <van-row gutter="">
-                            <van-col span="6">隐患类型：</van-col>
-                            <van-col span="18">{{ item.hdType }}</van-col>
+                            <van-col span="7">隐患类型：</van-col>
+                            <van-col span="17">{{ item.hdType }}</van-col>
                         </van-row>
                         <van-row gutter="">
-                            <van-col span="6">超期标识：</van-col>
-                            <van-col span="18">{{
+                            <van-col span="7">超期标识：</van-col>
+                            <van-col span="17">{{
                                 item.dueDate | formatTime
                             }}</van-col>
                         </van-row>
                         <van-row gutter="" v-if="item.taskName">
-                          <van-col span="6">工单状态：</van-col>
-                          <van-col span="18">{{ item.taskName }}</van-col>
+                          <van-col span="7">工单状态：</van-col>
+                          <van-col span="17">{{ item.taskName }}</van-col>
                         </van-row>
 
 

src/views/danger/confirmeDanger/confirmeDanger.vue

@@ -7,34 +7,34 @@
       :key="index"
       @click="goDetail(item)"
     >
-      {{item}}
+      <!-- {{item}} -->
       <van-row gutter="">
-        <van-col span="6">隐患编号：</van-col>
-        <van-col span="18">{{ item.businessId || item.id}}</van-col>
+        <van-col span="7">隐患单编号：</van-col>
+        <van-col span="17">{{ item.businessId || item.id}}</van-col>
       </van-row>
       <van-row gutter="">
-        <van-col span="6">所属项目：</van-col>
-        <van-col span="18">{{ item.proId }}</van-col>
+        <van-col span="7">所属项目：</van-col>
+        <van-col span="17">{{ item.proId }}</van-col>
       </van-row>
       <van-row gutter="">
-        <van-col span="6">隐患级别：</van-col>
-        <van-col span="18">{{ item.hdLev | dangerText }}</van-col>
+        <van-col span="7">隐患级别：</van-col>
+        <van-col span="17">{{ item.hdLev | dangerText }}</van-col>
       </van-row>
       <van-row gutter="">
-        <van-col span="6">适用范围：</van-col>
-        <van-col span="18">{{ item.hdRange }}</van-col>
+        <van-col span="7">适用范围：</van-col>
+        <van-col span="17">{{ item.hdRange }}</van-col>
       </van-row>
       <van-row gutter="">
-        <van-col span="6">隐患类型：</van-col>
-        <van-col span="18">{{ item.hdType }}</van-col>
+        <van-col span="7">隐患类型：</van-col>
+        <van-col span="17">{{ item.hdType }}</van-col>
       </van-row>
       <van-row gutter="" v-if="item.taskName">
-        <van-col span="6">工单状态：</van-col>
-        <van-col span="18">{{ item.taskName }}</van-col>
+        <van-col span="7">工单状态：</van-col>
+        <van-col span="17">{{ item.taskName }}</van-col>
       </van-row>
       <!-- <van-row gutter="">
-        <van-col span="6">发现时间：</van-col>
-        <van-col span="18">{{ item.hdDiscoveryTime }}</van-col>
+        <van-col span="7">发现时间：</van-col>
+        <van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
       </van-row> -->
       <!-- 详情 -->
       <div class="detail">详情</div>

src/views/danger/confirmeDanger/index.vue

@@ -35,34 +35,34 @@
                         @click="touchstart(index, item)"
                     >
                         <van-row gutter="">
-                            <van-col span="6">隐患编号：</van-col>
-                            <van-col span="18">{{ item.businessId||item.id }}</van-col>
+                            <van-col span="7">隐患单编号：</van-col>
+                            <van-col span="17">{{ item.businessId||item.id }}</van-col>
                         </van-row>
                         <van-row gutter="">
-                            <van-col span="6">所属项目：</van-col>
-                            <van-col span="18">{{ item.proId }}</van-col>
+                            <van-col span="7">所属项目：</van-col>
+                            <van-col span="17">{{ item.proId }}</van-col>
                         </van-row>
                         <van-row gutter="">
-                            <van-col span="6">隐患级别：</van-col>
-                            <van-col span="18">{{
+                            <van-col span="7">隐患级别：</van-col>
+                            <van-col span="17">{{
                                 item.hdLev | dangerText
                             }}</van-col>
                         </van-row>
                         <!-- <van-row gutter="">
-                        <van-col span="6">发现时间：</van-col>
-                        <van-col span="18">{{ item.hdDiscoveryTime }}</van-col>
+                        <van-col span="7">发现时间：</van-col>
+                        <van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
                       </van-row> -->
                         <van-row gutter="">
-                            <van-col span="6">适用范围：</van-col>
-                            <van-col span="18">{{ item.hdRange }}</van-col>
+                            <van-col span="7">适用范围：</van-col>
+                            <van-col span="17">{{ item.hdRange }}</van-col>
                         </van-row>
                         <van-row gutter="">
-                            <van-col span="6">隐患类型：</van-col>
-                            <van-col span="18">{{ item.hdType }}</van-col>
+                            <van-col span="7">隐患类型：</van-col>
+                            <van-col span="17">{{ item.hdType }}</van-col>
                         </van-row>
                         <van-row gutter="" v-if="item.taskName">
-                            <van-col span="6">工单状态：</van-col>
-                            <van-col span="18">{{ item.taskName }}</van-col>
+                            <van-col span="7">工单状态：</van-col>
+                            <van-col span="17">{{ item.taskName }}</van-col>
                         </van-row>
                         <!-- 长按显示遮罩层 -->
                         <van-overlay :show="showIndex == index">

src/views/danger/insertDanger/list.vue

@@ -23,28 +23,28 @@
                 @click="touchstart(index, item)"
             >
                 <van-row gutter="">
-                    <van-col span="6">隐患编号：</van-col>
-                    <van-col span="18">{{ item.id }}</van-col>
+                    <van-col span="7">隐患单编号：</van-col>
+                    <van-col span="17">{{ item.id }}</van-col>
                 </van-row>
                 <van-row gutter="">
-                    <van-col span="6">所属项目：</van-col>
-                    <van-col span="18">{{ item.proId }}</van-col>
+                    <van-col span="7">所属项目：</van-col>
+                    <van-col span="17">{{ item.proId }}</van-col>
                 </van-row>
                 <van-row gutter="">
-                    <van-col span="6">隐患级别：</van-col>
-                    <van-col span="18">{{ item.hdLev | dangerText }}</van-col>
+                    <van-col span="7">隐患级别：</van-col>
+                    <van-col span="17">{{ item.hdLev | dangerText }}</van-col>
                 </van-row>
                 <van-row gutter="">
-                    <van-col span="6">适用范围：</van-col>
-                    <van-col span="18">{{ item.hdRange }}</van-col>
+                    <van-col span="7">适用范围：</van-col>
+                    <van-col span="17">{{ item.hdRange }}</van-col>
                 </van-row>
                 <van-row gutter="">
-                    <van-col span="6">隐患类型：</van-col>
-                    <van-col span="18">{{ item.hdType }}</van-col>
+                    <van-col span="7">隐患类型：</van-col>
+                    <van-col span="17">{{ item.hdType }}</van-col>
                 </van-row>
                 <van-row gutter="">
-                    <van-col span="6">工单状态：</van-col>
-                    <van-col span="18">{{ item.taskName }}</van-col>
+                    <van-col span="7">工单状态：</van-col>
+                    <van-col span="17">{{ item.taskName }}</van-col>
                 </van-row>
                 <!-- 长按显示遮罩层 -->
                 <van-overlay :show="showIndex == index">

src/views/danger/majorDanger/index.vue

@@ -3,18 +3,18 @@
         <van-sticky :offset-top="0">
             <LHeader :text="text"></LHeader>
         </van-sticky>
-        <!-- <van-sticky offset-top="1.5rem">
-        <van-search
-          v-model="searchValue"
-          show-action
-          placeholder="请输入搜索内容"
-          @search="onSearch"
-        >
-        <template #action>
-          <div @click="onSearch">搜索</div>
-            </template>
-          </van-search>
-        </van-sticky> -->
+        <van-sticky offset-top="1.5rem">
+            <van-search
+                v-model="searchValue"
+                show-action
+                placeholder="请输入搜索内容"
+                @search="onSearch"
+            >
+                <template #action>
+                    <div @click="onSearch">搜索</div>
+                </template>
+            </van-search>
+        </van-sticky>
         <!-- 内容列表 -->
         <!-- 接口对接4 START -->
         <van-tabs
@@ -26,7 +26,7 @@
             color="#2980f7"
             animated
             :sticky="true"
-            offset-top="1.5rem"
+            offset-top="3rem"
         >
             <van-tab v-for="(item, key) in tabs" :key="key" :title="item.title">
                 <div class="con-list" @touchmove="showIndex = null">
@@ -37,24 +37,24 @@
                         @click="touchstart(index, item)"
                     >
                         <van-row gutter="">
-                            <van-col span="6">隐患编号：</van-col>
-                            <van-col span="18">{{
+                            <van-col span="7">隐患单编号：</van-col>
+                            <van-col span="16">{{
                                 item.businessId || item.id
                             }}</van-col>
                         </van-row>
                         <van-row gutter="">
-                            <van-col span="6">所属项目：</van-col>
-                            <van-col span="18">{{ item.proId }}</van-col>
+                            <van-col span="7">所属项目：</van-col>
+                            <van-col span="17">{{ item.proId }}</van-col>
                         </van-row>
                         <van-row gutter="">
-                            <van-col span="6">隐患级别：</van-col>
-                            <van-col span="18">{{
+                            <van-col span="7">隐患级别：</van-col>
+                            <van-col span="17">{{
                                 item.hdLev | dangerText
                             }}</van-col>
                         </van-row>
                         <van-row gutter="">
-                            <van-col span="6">工单状态：</van-col>
-                            <van-col span="18">{{ item.taskName }}</van-col>
+                            <van-col span="7">工单状态：</van-col>
+                            <van-col span="17">{{ item.taskName }}</van-col>
                         </van-row>
                         <!-- *接口对接4 END -->
 
@@ -68,7 +68,7 @@
                                     >详情</van-button
                                 >
                                 <van-button
-                                    v-show="active == 1"
+                                    v-show="active == 0"
                                     round
                                     type="info"
                                     @click="goConfirm(item)"
@@ -129,7 +129,7 @@ export default {
             active: 0,
             tabs: [
                 {
-                    title: "待确认",
+                    title: "待审批",
                     api: "/majorapprove/list",
                 },
                 {
@@ -186,7 +186,7 @@ export default {
             this.$router.push({
                 name: "normal-detail",
                 params: {
-                    id: data.taskId||data.id,
+                    id: data.taskId || data.id,
                 },
             });
             this.showIndex = null;

src/views/danger/majorDanger/majorSurvey.vue

@@ -9,7 +9,7 @@
         >
             <!-- {{item}} -->
             <van-row gutter="">
-                <van-col span="7">隐患编号：</van-col>
+                <van-col span="7">隐患单编号：</van-col>
                 <van-col span="17">{{ item.businessId }}</van-col>
             </van-row>
 
@@ -84,8 +84,8 @@
                     rows="3"
                     type="textarea"
                     placeholder="请输入"
-                    required
-                    :rules="[{ required: true, message: '审批意见不能为空' }]"
+                    :required="radio==1?false:true"
+                    :rules="[{ required: radio==1?false:true, message: '审批意见不能为空' }]"
                 />
             </div>
 

src/views/danger/managerDanger/index.vue

@@ -23,24 +23,24 @@
                 @click="touchstart(index, item)"
             >
                 <van-row gutter="">
-                    <van-col span="6">隐患编号：</van-col>
-                    <van-col span="18">{{ item.pid }}</van-col>
+                    <van-col span="7">隐患单编号：</van-col>
+                    <van-col span="17">{{ item.pid }}</van-col>
                 </van-row>
                 <van-row gutter="">
-                    <van-col span="6">所属项目：</van-col>
-                    <van-col span="18">{{ item.projectName }}</van-col>
+                    <van-col span="7">所属项目：</van-col>
+                    <van-col span="17">{{ item.projectName }}</van-col>
                 </van-row>
                 <van-row gutter="">
-                    <van-col span="6">隐患级别：</van-col>
-                    <van-col span="18">{{ item.hdLev | dangerText }}</van-col>
+                    <van-col span="7">隐患级别：</van-col>
+                    <van-col span="17">{{ item.hdLev | dangerText }}</van-col>
                 </van-row>
                 <van-row gutter="" v-if="item.taskName">
-                    <van-col span="6">工单状态：</van-col>
-                    <van-col span="18">{{ item.taskName }}</van-col>
+                    <van-col span="7">工单状态：</van-col>
+                    <van-col span="17">{{ item.taskName }}</van-col>
                 </van-row>
                 <!-- <van-row gutter="">
-          <van-col span="6">发现时间：</van-col>
-          <van-col span="18">{{ item.hdDiscoveryTime }}</van-col>
+          <van-col span="7">发现时间：</van-col>
+          <van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
         </van-row> -->
                 <!-- *接口对接4 END -->
 

src/views/danger/managerDanger/managerSurvey.vue

@@ -8,7 +8,7 @@
       @click="goDetail(item.pid)"
     >
       <van-row gutter="">
-        <van-col span="7">隐患编号：</van-col>
+        <van-col span="7">隐患单编号：</van-col>
         <van-col span="17">{{ item.pid }}</van-col>
       </van-row>
       <van-row gutter="">

src/views/danger/reportReturn/index.vue

@@ -22,32 +22,32 @@
         @click="touchstart(index, item)"
       >
         <van-row gutter="">
-          <van-col span="6">隐患编号：</van-col>
-          <van-col span="18">{{ item.businessId }}</van-col>
+          <van-col span="7">隐患单编号：</van-col>
+          <van-col span="17">{{ item.businessId }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="6">所属项目：</van-col>
-          <van-col span="18">{{ item.proId }}</van-col>
+          <van-col span="7">所属项目：</van-col>
+          <van-col span="17">{{ item.proId }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="6">隐患级别：</van-col>
-          <van-col span="18">{{ item.hdLev | dangerText}}</van-col>
+          <van-col span="7">隐患级别：</van-col>
+          <van-col span="17">{{ item.hdLev | dangerText}}</van-col>
         </van-row>
         <!-- <van-row gutter="">
-          <van-col span="6">发现时间：</van-col>
-          <van-col span="18">{{ item.hdDiscoveryTime }}</van-col>
+          <van-col span="7">发现时间：</van-col>
+          <van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
         </van-row> -->
         <van-row gutter="">
-          <van-col span="6">适用范围：</van-col>
-          <van-col span="18">{{ item.hdRange }}</van-col>
+          <van-col span="7">适用范围：</van-col>
+          <van-col span="17">{{ item.hdRange }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="6">隐患类型：</van-col>
-          <van-col span="18">{{ item.hdType }}</van-col>
+          <van-col span="7">隐患类型：</van-col>
+          <van-col span="17">{{ item.hdType }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="6">工单状态：</van-col>
-          <van-col span="18">{{ item.taskName }}</van-col>
+          <van-col span="7">工单状态：</van-col>
+          <van-col span="17">{{ item.taskName }}</van-col>
         </van-row>
         <!-- {{ item.taskName }} -->
 

src/views/danger/reviewDanger/index.vue

@@ -36,38 +36,38 @@
                         @click="touchstart(index, item)"
                     >
                         <van-row gutter="">
-                            <van-col span="6">隐患编号：</van-col>
-                            <van-col span="18">{{ item.businessId || item.id}}</van-col>
+                            <van-col span="7">隐患单编号：</van-col>
+                            <van-col span="17">{{ item.businessId || item.id}}</van-col>
                         </van-row>
                         <van-row gutter="">
-                            <van-col span="6">所属项目：</van-col>
-                            <van-col span="18">{{ item.proId }}</van-col>
+                            <van-col span="7">所属项目：</van-col>
+                            <van-col span="17">{{ item.proId }}</van-col>
                         </van-row>
                         <van-row gutter="">
-                            <van-col span="6">隐患级别：</van-col>
-                            <van-col span="18">{{
+                            <van-col span="7">隐患级别：</van-col>
+                            <van-col span="17">{{
                                 item.hdLev | dangerText
                             }}</van-col>
                         </van-row>
                         <!-- <van-row gutter="">
-                        <van-col span="6">发现时间：</van-col>
-                        <van-col span="18">{{ item.hdDiscoveryTime }}</van-col>
+                        <van-col span="7">发现时间：</van-col>
+                        <van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
                         </van-row> -->
                         <van-row gutter="">
-                            <van-col span="6">适用范围：</van-col>
-                            <van-col span="18">{{ item.hdRange }}</van-col>
+                            <van-col span="7">适用范围：</van-col>
+                            <van-col span="17">{{ item.hdRange }}</van-col>
                         </van-row>
                         <van-row gutter="">
-                            <van-col span="6">隐患类型：</van-col>
-                            <van-col span="18">{{ item.hdType }}</van-col>
+                            <van-col span="7">隐患类型：</van-col>
+                            <van-col span="17">{{ item.hdType }}</van-col>
                         </van-row>
                         <van-row gutter="">
-                            <van-col span="6">超期标识：</van-col>
-                            <van-col span="18">{{ item | formatTime }}</van-col>
+                            <van-col span="7">超期标识：</van-col>
+                            <van-col span="17">{{ item | formatTime }}</van-col>
                         </van-row>
                         <van-row gutter="">
-                            <van-col span="6">工单状态：</van-col>
-                            <van-col span="18">{{ item.taskName }}</van-col>
+                            <van-col span="7">工单状态：</van-col>
+                            <van-col span="17">{{ item.taskName }}</van-col>
                           </van-row>
                         <!-- 长按显示遮罩层 -->
                         <van-overlay :show="showIndex == index">

src/views/danger/reviewDanger/reviewAdd.vue

@@ -8,32 +8,32 @@
       @click="goDetail(item.taskId)"
     >
       <van-row gutter="">
-        <van-col span="6">所属项目：</van-col>
-        <van-col span="18">{{ item.proId }}</van-col>
+        <van-col span="7">所属项目：</van-col>
+        <van-col span="17">{{ item.proId }}</van-col>
       </van-row>
       <van-row gutter="">
-        <van-col span="6">隐患级别：</van-col>
-        <van-col span="18">{{ item.hdLev | dangerText }}</van-col>
+        <van-col span="7">隐患级别：</van-col>
+        <van-col span="17">{{ item.hdLev | dangerText }}</van-col>
       </van-row>
       <van-row gutter="">
-        <van-col span="6">适用范围：</van-col>
-        <van-col span="18">{{ item.hdRange }}</van-col>
+        <van-col span="7">适用范围：</van-col>
+        <van-col span="17">{{ item.hdRange }}</van-col>
       </van-row>
       <van-row gutter="">
-        <van-col span="6">隐患类型：</van-col>
-        <van-col span="18">{{ item.hdType }}</van-col>
+        <van-col span="7">隐患类型：</van-col>
+        <van-col span="17">{{ item.hdType }}</van-col>
       </van-row>
       <!-- <van-row gutter="">
-          <van-col span="6">发现时间：</van-col>
-          <van-col span="18">{{ item.hdDiscoveryTime }}</van-col>
+          <van-col span="7">发现时间：</van-col>
+          <van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
         </van-row> -->
       <van-row gutter="">
-        <van-col span="6">超期标识：</van-col>
-        <van-col span="18">{{ item | formatTime }}</van-col>
+        <van-col span="7">超期标识：</van-col>
+        <van-col span="17">{{ item | formatTime }}</van-col>
       </van-row>
       <van-row gutter="">
-        <van-col span="6">工单状态：</van-col>
-        <van-col span="18">{{ item.taskName }}</van-col>
+        <van-col span="7">工单状态：</van-col>
+        <van-col span="17">{{ item.taskName }}</van-col>
       </van-row>
       <!-- 详情 -->
       <div class="detail">详情</div>

src/views/danger/superviseDanger/index.vue

@@ -23,20 +23,20 @@
         @click="touchstart(index, item)"
       >
        <van-row gutter="">
-          <van-col span="6">隐患编号：</van-col>
-          <van-col span="18">{{ item.pid }}</van-col>
+          <van-col span="7">隐患单编号：</van-col>
+          <van-col span="17">{{ item.pid }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="6">所属项目：</van-col>
-          <van-col span="18">{{ item.projectName }}</van-col>
+          <van-col span="7">所属项目：</van-col>
+          <van-col span="17">{{ item.projectName }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="6">隐患级别：</van-col>
-          <van-col span="18">{{ item.hdLev | dangerText }}</van-col>
+          <van-col span="7">隐患级别：</van-col>
+          <van-col span="17">{{ item.hdLev | dangerText }}</van-col>
         </van-row>
         <!-- <van-row gutter="">
-          <van-col span="6">发现时间：</van-col>
-          <van-col span="18">{{ item.hdDiscoveryTime }}</van-col>
+          <van-col span="7">发现时间：</van-col>
+          <van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
         </van-row> -->
         <!-- *接口对接4 END -->
 

src/views/danger/superviseDanger/superSurvey.vue

@@ -8,7 +8,7 @@
         @click="goDetail(item.pid)"
       >
         <van-row gutter="">
-          <van-col span="7">隐患编号：</van-col>
+          <van-col span="7">隐患单编号：</van-col>
           <van-col span="17">{{ item.pid }}</van-col>
         </van-row>
         <van-row gutter="">

src/views/my/index.vue

@@ -10,7 +10,7 @@
             <!-- 个人信息 -->
             <van-cell-group inset>
                 <van-row gutter="20">
-                    <van-col span="6">
+                    <van-col span="7">
                         <div>
                             <van-image
                                 width="2rem"
@@ -20,15 +20,15 @@
                             />
                         </div>
                     </van-col>
-                    <van-col span="18">
+                    <van-col span="17">
                         <div class="user-info-wrap">
                             <div class="user-name">{{ userInfo.name }}</div>
                             <p>{{ userInfo.position }}</p>
-                            <div class="tag-wrap">
+                            <!-- <div class="tag-wrap">
                                 <van-tag color="#cbcdfb">隐患上报人</van-tag>
                                 <van-tag color="#b5e2f1">隐患整改人</van-tag>
                                 <van-tag color="#bed9fd">检查专员</van-tag>
-                            </div>
+                            </div> -->
                         </div>
                     </van-col>
                 </van-row>
@@ -90,8 +90,8 @@ export default {
             ],
             userInfo: {
                 portrait: require("@/assets/myTerritory/touxiang.png"),
-                name: getUserInfo() ? getUserInfo().userName : "刘华强",
-                position: getUserInfo() ? getUserInfo().deptName : "技术安全部",
+                name: getUserInfo() ? getUserInfo().userName : "xxx",
+                position: getUserInfo() ? getUserInfo().deptName : "xx部",
                 // name: "刘华强",
                 // position: "技术安全部"
                 // jurisdiction: [
@@ -135,7 +135,8 @@ export default {
         flex-direction: column;
         justify-content: space-between;
         .user-name {
-            font-size: 17px;
+            padding-top:0.3rem;
+            font-size: 18px;
             font-weight: none;
         }
 

src/views/my/role.vue

@@ -5,27 +5,45 @@
         <!-- 通知 -->
         <van-sticky offset-top="1.5rem">
             <van-notice-bar
-            left-icon="volume-o"
-            text="提示：系统使用时请核实应用权限如有问题请联系管理员。"
-        />
+                left-icon="volume-o"
+                text="提示：系统使用时请核实应用权限如有问题请联系管理员。"
+            />
         </van-sticky>
         <!-- 权限卡片 -->
+        <div>
+            <template>
+                <div class="title">{{ userInfo.position }}</div>
+                <van-cell-group inset>
+                    <div class="tag-wrap">
+                        <van-tag :color="getColor()" plain round
+                            >隐患上报人</van-tag
+                        >
+                        <van-tag :color="getColor()" plain round
+                            >隐患整改人</van-tag
+                        >
+                        <van-tag :color="getColor()" plain round>检查专员</van-tag>
+                    </div>
+                </van-cell-group>
+            </template>
+        </div>
         <div v-for="(item, key) in role_list" :key="key">
             <template v-if="item">
                 <div class="title">{{ key }}</div>
                 <van-cell-group inset>
                     <div class="tag-wrap">
-                        <van-tag
-                            :color="getColor()"
-                            v-for="(i, index) in item"
-                            :key="index"
-                             plain
-                             round
-                        >
-                            <template v-if="i">
-                                {{ i }}
-                            </template>
-                        </van-tag>
+                        <van-skeleton title :row="2" :loading="!item['length']">
+                            <van-tag
+                                :color="getColor()"
+                                v-for="(i, index) in item"
+                                :key="index"
+                                plain
+                                round
+                            >
+                                <template v-if="i">
+                                    {{ i }}
+                                </template>
+                            </van-tag>
+                        </van-skeleton>
                     </div>
                 </van-cell-group>
             </template>
@@ -36,13 +54,14 @@
 <script>
 import LHeader from "@/components/header.vue";
 import { getFun, postFun } from "@/service/table.js";
+import { getUserInfo } from "@/utils/userInfo";
 export default {
     components: {
         LHeader,
     },
     data() {
         return {
-            tabColor: ["red", "orange", "skyblue",'yellowgreen'],
+            tabColor: ["red", "orange", "skyblue", "yellowgreen"],
 
             role_list: {
                 "政务大数据项目cs-401": [],
@@ -51,6 +70,11 @@ export default {
                 "项目工程cs-001": [],
                 "项目工程cs-002": [],
             },
+            userInfo: {
+                portrait: require("@/assets/myTerritory/touxiang.png"),
+                name: getUserInfo() ? getUserInfo().userName : "xxx",
+                position: getUserInfo() ? getUserInfo().deptName : "xx部",
+            },
         };
     },
     methods: {
@@ -59,7 +83,7 @@ export default {
             // console.log(res)
             if (res) {
                 this.role_list = res.data;
-            }else{
+            } else {
                 this.$toast.fail("加载失败,请稍后再试");
             }
         },
@@ -158,8 +182,8 @@ export default {
     margin-right: 0.3rem;
     margin-bottom: 0.3rem;
 }
-.van-tag{
+.van-tag {
     padding: 0.03rem 0.2rem;
     font-size: 0.25rem;
-} 
+}
 </style>
\ No newline at end of file

src/views/risk/my-insert/index.vue

@@ -24,40 +24,40 @@
                 @click="touchstart(index, item)"
             >
                 <van-row gutter="">
-                    <van-col span="6">风险编号：</van-col>
-                    <van-col span="18">{{ item.id }}</van-col>
+                    <van-col span="7">风险编号：</van-col>
+                    <van-col span="17">{{ item.id }}</van-col>
                 </van-row>
                 <van-row gutter="">
-                    <van-col span="6">所属项目：</van-col>
-                    <van-col span="18">{{ item.pId }}</van-col>
+                    <van-col span="7">所属项目：</van-col>
+                    <van-col span="17">{{ item.pId }}</van-col>
                 </van-row>
                 <van-row gutter="">
-                    <van-col span="6">隐患级别：</van-col>
-                    <van-col span="18">{{ item.riskLevel | riskText }}</van-col>
+                    <van-col span="7">隐患级别：</van-col>
+                    <van-col span="17">{{ item.riskLevel | riskText }}</van-col>
                 </van-row>
                 <van-row gutter="">
-                    <van-col span="6">风险源：</van-col>
-                    <van-col span="18">{{ item.riskSource }}</van-col>
+                    <van-col span="7">风险源：</van-col>
+                    <van-col span="17">{{ item.riskSource }}</van-col>
                 </van-row>
                 <van-row gutter="">
-                    <van-col span="6">事故类型：</van-col>
-                    <van-col span="18">{{ item.accidentType }}</van-col>
+                    <van-col span="7">事故类型：</van-col>
+                    <van-col span="17">{{ item.accidentType }}</van-col>
                 </van-row>
                 <van-row gutter="">
-                    <van-col span="6">管控层级：</van-col>
-                    <van-col span="18">{{ item["controlLevel"] }}</van-col>
+                    <van-col span="7">管控层级：</van-col>
+                    <van-col span="17">{{ item["controlLevel"] }}</van-col>
                 </van-row>
                 <van-row gutter="">
-                    <van-col span="6">主责部门：</van-col>
-                    <van-col span="18">{{ item.responsibilityDept }}</van-col>
+                    <van-col span="7">主责部门：</van-col>
+                    <van-col span="17">{{ item.responsibilityDept }}</van-col>
                 </van-row>
                 <van-row gutter="">
-                    <van-col span="6">主责人员：</van-col>
-                    <van-col span="18">{{ item.responsibilityMember }}</van-col>
+                    <van-col span="7">主责人员：</van-col>
+                    <van-col span="17">{{ item.responsibilityMember }}</van-col>
                 </van-row>
                 <van-row gutter="">
-                    <van-col span="6">工单状态：</van-col>
-                    <van-col span="18">{{ item.taskName }}</van-col>
+                    <van-col span="7">工单状态：</van-col>
+                    <van-col span="17">{{ item.taskName }}</van-col>
                 </van-row>
                 <!-- 长按显示遮罩层 -->
                 <van-overlay :show="showIndex == index">

src/views/risk/riskAccount/index.vue

@@ -4,18 +4,18 @@
         <van-sticky offset-top="0">
             <LHeader :text="text"></LHeader>
         </van-sticky>
-        <!-- <van-sticky offset-top="1.5rem">
-      <van-search
-        v-model="searchValue"
-        show-action
-        placeholder="请输入搜索内容"
-        @search="onSearch"
-      >
-        <template #action>
-          <div @click="onSearch">搜索</div>
-        </template>
-      </van-search>
-    </van-sticky> -->
+        <van-sticky offset-top="1.5rem">
+            <van-search
+                v-model="searchValue"
+                show-action
+                placeholder="请输入搜索内容"
+                @search="onSearch"
+            >
+                <template #action>
+                    <div @click="onSearch">搜索</div>
+                </template>
+            </van-search>
+        </van-sticky>
         <van-tabs
             v-model="active"
             @change="
@@ -25,9 +25,13 @@
             color="#2980f7"
             animated
             :sticky="true"
-            offset-top="1.5rem"
+            offset-top="3rem"
         >
-            <van-tab v-for="(item, key) in tabs" :key="key" :title="item.title">
+            <van-tab
+                v-for="(item, key) in tabs"
+                :key="key"
+                :title="item.title"
+            >
                 <div class="con-list" @touchmove="showIndex = null">
                     <van-cell-group
                         inset
@@ -36,29 +40,29 @@
                         @click="touchstart(index, item)"
                     >
                         <van-row gutter="">
-                            <van-col span="6">风险编号：</van-col>
-                            <van-col span="18">{{ item.businessId }}</van-col>
+                            <van-col span="7">风险编号：</van-col>
+                            <van-col span="17">{{ item.businessId }}</van-col>
                         </van-row>
                         <van-row gutter="">
-                            <van-col span="6">所属项目：</van-col>
-                            <van-col span="18">{{ item.proId }}</van-col>
+                            <van-col span="7">所属项目：</van-col>
+                            <van-col span="17">{{ item.proId }}</van-col>
                         </van-row>
                         <van-row gutter="">
-                            <van-col span="6">风险级别：</van-col>
-                            <van-col span="18">{{ item.riskLevel }}</van-col>
+                            <van-col span="7">风险级别：</van-col>
+                            <van-col span="17">{{ item.riskLevel }}</van-col>
                         </van-row>
-                       
+
                         <!-- <van-row gutter="">
-          <van-col span="6">发现时间：</van-col>
-          <van-col span="18">{{ item.startDate }}</van-col>
+          <van-col span="7">发现时间：</van-col>
+          <van-col span="17">{{ item.startDate }}</van-col>
         </van-row> -->
                         <van-row gutter="">
-                            <van-col span="6">风险源：</van-col>
-                            <van-col span="18">{{ item.riskSource }}</van-col>
+                            <van-col span="7">风险源：</van-col>
+                            <van-col span="17">{{ item.riskSource }}</van-col>
                         </van-row>
-                         <van-row gutter="">
-                            <van-col span="6">工单状态：</van-col>
-                            <van-col span="18">{{ item.taskName }}</van-col>
+                        <van-row gutter="">
+                            <van-col span="7">工单状态：</van-col>
+                            <van-col span="17">{{ item.taskName }}</van-col>
                         </van-row>
                         <!-- *接口对接4 END -->
 
@@ -142,7 +146,7 @@ export default {
         this.getList();
     },
     methods: {
-        getList() {
+        getList(select='') {
             /*接口对接3 START*/
             // 例子：
             this.$toast.loading({
@@ -151,7 +155,9 @@ export default {
                 loadingType: "spinner",
                 duration: 0,
             });
-            postFun(this.tabs[this.active]["api"])
+            let formdata= new FormData();
+            formdata.append('select',select)
+            postFun(this.tabs[this.active]["api"],formdata)
                 .then((res) => {
                     this.$toast.clear();
                     this.messageList = res.rows;
@@ -162,7 +168,9 @@ export default {
                 });
             /*接口对接3 END*/
         },
-        onSearch(val) {},
+        onSearch(val) {
+            this.getList(this.searchValue)
+        },
 
         touchstart(index, item) {
             if (this.showIndex != null) {

src/views/risk/riskAccount/riskBigDetail.vue

@@ -167,28 +167,28 @@
                   >
                 </van-row>
                 <van-row>
-                  <van-col span="6"
+                  <van-col span="7"
                     ><span class="field-title">操作人：</span></van-col
                   >
-                  <van-col span="18">{{item.userName}}</van-col>
+                  <van-col span="17">{{item.userName}}</van-col>
                 </van-row>
                 <van-row>
-                  <van-col span="6"
+                  <van-col span="7"
                     ><span class="field-title">节点：</span></van-col
                   >
-                  <van-col span="18">{{item.logNode}}</van-col>
+                  <van-col span="17">{{item.logNode}}</van-col>
                 </van-row>
                 <van-row>
-                  <van-col span="6"
+                  <van-col span="7"
                     ><span class="field-title">结果：</span></van-col
                   >
-                  <van-col span="18">{{item.logResult}}</van-col>
+                  <van-col span="17">{{item.logResult}}</van-col>
                 </van-row>
                 <van-row>
-                  <van-col span="6"
+                  <van-col span="7"
                     ><span class="field-title">部门：</span></van-col
                   >
-                  <van-col span="18">{{item.deptName}}</van-col>
+                  <van-col span="17">{{item.deptName}}</van-col>
                 </van-row>
                 
               </div>

src/views/risk/riskConfirme/index.vue

@@ -41,44 +41,44 @@
             @click="touchstart(index, item)"
           >
             <van-row gutter="">
-              <van-col span="6">风险编号：</van-col>
-              <van-col span="18">{{ item['businessId']||item['id']}}</van-col>
+              <van-col span="7">风险编号：</van-col>
+              <van-col span="17">{{ item['businessId']||item['id']}}</van-col>
             </van-row>
             <van-row gutter="">
-              <van-col span="6">所属项目：</van-col>
-              <van-col span="18">{{item['proId']||item['pId']}}</van-col>
+              <van-col span="7">所属项目：</van-col>
+              <van-col span="17">{{item['proId']||item['pId']}}</van-col>
             </van-row>
             <van-row gutter="">
-              <van-col span="6">风险级别：</van-col>
-              <van-col span="18">{{ item.riskLevel }}</van-col>
+              <van-col span="7">风险级别：</van-col>
+              <van-col span="17">{{ item.riskLevel }}</van-col>
             </van-row>
             <!-- <van-row gutter="">
-              <van-col span="6">发现时间：</van-col>
-              <van-col span="18">{{ item.startDate }}</van-col>
+              <van-col span="7">发现时间：</van-col>
+              <van-col span="17">{{ item.startDate }}</van-col>
             </van-row> -->
             <van-row gutter="">
-              <van-col span="6">风险源：</van-col>
-              <van-col span="18">{{ item.riskSource }}</van-col>
+              <van-col span="7">风险源：</van-col>
+              <van-col span="17">{{ item.riskSource }}</van-col>
             </van-row>
             <van-row gutter="">
-              <van-col span="6">事故类型：</van-col>
-              <van-col span="18">{{ item.accidentType }}</van-col>
+              <van-col span="7">事故类型：</van-col>
+              <van-col span="17">{{ item.accidentType }}</van-col>
             </van-row>
             <van-row gutter="">
-              <van-col span="6">管控层级：</van-col>
-              <van-col span="18">{{ item[['controllevel','controlLevel'][active]] }}</van-col>
+              <van-col span="7">管控层级：</van-col>
+              <van-col span="17">{{ item[['controllevel','controlLevel'][active]] }}</van-col>
             </van-row>
             <van-row gutter="">
-              <van-col span="6">主责部门：</van-col>
-              <van-col span="18">{{ item.responsibilityDept }}</van-col>
+              <van-col span="7">主责部门：</van-col>
+              <van-col span="17">{{ item.responsibilityDept }}</van-col>
             </van-row>
             <van-row gutter="">
-              <van-col span="6">主责人员：</van-col>
-              <van-col span="18">{{ item.responsibilityMember }}</van-col>
+              <van-col span="7">主责人员：</van-col>
+              <van-col span="17">{{ item.responsibilityMember }}</van-col>
             </van-row>
             <van-row gutter="" v-show="item.taskName">
-              <van-col span="6">工单状态：</van-col>
-              <van-col span="18">{{ item.taskName }}</van-col>
+              <van-col span="7">工单状态：</van-col>
+              <van-col span="17">{{ item.taskName }}</van-col>
             </van-row>
             <!-- 长按显示遮罩层 -->
             <van-overlay :show="showIndex == index">

src/views/risk/riskConfirme/riskAffirm.vue

@@ -9,36 +9,36 @@
         @click="goDetail(item.taskId)"
       >
         <van-row gutter="">
-          <van-col span="6">所属项目：</van-col>
-          <van-col span="18">{{ item.proId }}</van-col>
+          <van-col span="7">所属项目：</van-col>
+          <van-col span="17">{{ item.proId }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="6">风险等级：</van-col>
-          <van-col span="18">{{ item.riskLevel }}</van-col>
+          <van-col span="7">风险等级：</van-col>
+          <van-col span="17">{{ item.riskLevel }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="6">风险源：</van-col>
-          <van-col span="18">{{ item.riskSource }}</van-col>
+          <van-col span="7">风险源：</van-col>
+          <van-col span="17">{{ item.riskSource }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="6">事故类型：</van-col>
-          <van-col span="18">{{ item.accidentType }}</van-col>
+          <van-col span="7">事故类型：</van-col>
+          <van-col span="17">{{ item.accidentType }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="6">管控层级：</van-col>
-          <van-col span="18">{{ item.controllevel }}</van-col>
+          <van-col span="7">管控层级：</van-col>
+          <van-col span="17">{{ item.controllevel }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="6">主责部门：</van-col>
-          <van-col span="18">{{ item.responsibilityDept }}</van-col>
+          <van-col span="7">主责部门：</van-col>
+          <van-col span="17">{{ item.responsibilityDept }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="6">主责人员：</van-col>
-          <van-col span="18">{{ item.responsibilityMember }}</van-col>
+          <van-col span="7">主责人员：</van-col>
+          <van-col span="17">{{ item.responsibilityMember }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="6">工单状态：</van-col>
-          <van-col span="18">{{ item.taskName }}</van-col>
+          <van-col span="7">工单状态：</van-col>
+          <van-col span="17">{{ item.taskName }}</van-col>
         </van-row>
         <!-- 详情 -->
         <div class="detail">详情</div>

src/views/risk/riskReturn/index.vue

@@ -22,44 +22,44 @@
         @click="touchstart(index, item)"
       >
         <van-row gutter="">
-          <van-col span="6">风险编号：</van-col>
-          <van-col span="18">{{ item.businessId }}</van-col>
+          <van-col span="7">风险编号：</van-col>
+          <van-col span="17">{{ item.businessId }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="6">所属项目：</van-col>
-          <van-col span="18">{{ item.proId }}</van-col>
+          <van-col span="7">所属项目：</van-col>
+          <van-col span="17">{{ item.proId }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="6">风险级别：</van-col>
-          <van-col span="18">{{ item.riskLevel }}</van-col>
+          <van-col span="7">风险级别：</van-col>
+          <van-col span="17">{{ item.riskLevel }}</van-col>
         </van-row>
         <!-- <van-row gutter="">
-          <van-col span="6">发现时间：</van-col>
-          <van-col span="18">{{ item.startDate }}</van-col>
+          <van-col span="7">发现时间：</van-col>
+          <van-col span="17">{{ item.startDate }}</van-col>
         </van-row> -->
         <van-row gutter="">
-          <van-col span="6">风险源：</van-col>
-          <van-col span="18">{{ item.riskSource }}</van-col>
+          <van-col span="7">风险源：</van-col>
+          <van-col span="17">{{ item.riskSource }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="6">事故类型：</van-col>
-          <van-col span="18">{{ item.accidentType }}</van-col>
+          <van-col span="7">事故类型：</van-col>
+          <van-col span="17">{{ item.accidentType }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="6">管控层级：</van-col>
-          <van-col span="18">{{ item.controllevel }}</van-col>
+          <van-col span="7">管控层级：</van-col>
+          <van-col span="17">{{ item.controllevel }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="6">主责部门：</van-col>
-          <van-col span="18">{{ item.responsibilityDept }}</van-col>
+          <van-col span="7">主责部门：</van-col>
+          <van-col span="17">{{ item.responsibilityDept }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="6">主责人员：</van-col>
-          <van-col span="18">{{ item.responsibilityMember }}</van-col>
+          <van-col span="7">主责人员：</van-col>
+          <van-col span="17">{{ item.responsibilityMember }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="6">工单状态：</van-col>
-          <van-col span="18">{{ item.taskName }}</van-col>
+          <van-col span="7">工单状态：</van-col>
+          <van-col span="17">{{ item.taskName }}</van-col>
         </van-row>
         
         <!-- 长按显示遮罩层 -->