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

.gitlab-ci.yml

+stages:
+  - build-develop
+build:
+  stage: build-develop
+  only: 
+    - develop
+    - master
+  allow_failure: true
+  script:
+    - chcp 65001
+    - cmd /c npm install
+    - cmd /c npm run build
+    - cmd /c npm run build
+    - cmd /c xcopy .\dist D:\BCDH-APP\nginx-1.18.0\html\dist /s /Y
+  tags:
+    - BCDH-APP
\ No newline at end of file

src/components/header.vue

@@ -10,11 +10,15 @@
 
 <template>
     <div>
-        <header class="header">
-            <van-icon @click="to" name="arrow-left" class="iconColorLeft"/>
-            <span>{{text}}</span>
-            <van-icon name="bars" class="iconColorRight"/>
-        </header>
+        <!-- 加个吸顶 -->
+        <van-sticky>
+            <header class="header">
+                <van-icon @click="to" name="arrow-left" class="iconColorLeft"/>
+                <span>{{text}}</span>
+                <!-- 为止有什么用图标注释 -->
+                <!-- <van-icon name="bars" class="iconColorRight"/> -->
+            </header>
+        </van-sticky>
     </div>
 </template>
 

src/permission.js

@@ -12,7 +12,7 @@ router.beforeEach(async(to, from, next) => {
     const hasToken = getToken()//确定用户是否已登录
      if (hasToken) {
         if (to.path === '/login2') {
-            next({ path: '/message-center' })
+            next({ path: '/save-workbench' })
         } else { 
             next()
         } 

src/router/index.js

@@ -262,6 +262,7 @@ const routes = [{
   },
 
 
+
   {
     path: '/add-danger',
     name: 'add-danger',
@@ -367,11 +368,12 @@ const routes = [{
     },
     component: () => import( /* webpackChunkName: "SaveWorkbench" */ '../views/danger/standBook'),
   },
+  
   {
     path: '/normal-detail',
     name: 'normal-detail',
     meta: {
-      title: '隐患历史台账详情',
+      title: '隐患详情',
       index: 1
     },
     component: () => import( /* webpackChunkName: "SaveWorkbench" */ '../views/danger/standBook/normalDetail'),
@@ -532,9 +534,16 @@ const routes = [{
     component: () => import( /* webpackChunkName: "SaveWorkbench" */ '../views/risk/riskAccount/riskBigDetail'),
   },
 
-
-
-
+  {
+    path:'/insert-danger',
+    name:'insert-danger',
+    meta:{
+      title:'我的上报',
+      index:1
+    },
+    component:()=>import('@/views/danger/insertDanger/list')
+  }
+  
 ]
 
 const router = new VueRouter({

src/service/danger.js

@@ -265,6 +265,33 @@ export function delayEdit(url, data) {
     })
 }
 
+// 隐患整改
+export function list1(url="/rectification/list1", data) {
+    return request({
+        url,
+        method: 'post',
+        data
+    })
+}
+
+// 隐患整改已退回
+export function list2(url="/rectification/list2", data) {
+    return request({
+        url,
+        method: 'post',
+        data
+    })
+}
+
+// 我的上报接口
+export function myHDList(url="/hdreport/myHDList",data=null){
+    return request({
+        url,
+        method:'post',
+        data
+    })
+}
+
 
 
 

src/views/Login2.vue

@@ -85,7 +85,7 @@ export default {
                     setUserInfo(userInfo)
                 })
                 setToken(Response.data)
-                this.$router.push('/message-center')
+                this.$router.push('/save-workbench')
             }else if(Response.code==301){
                 this.$toast.clear()
                 this.$toast.fail({
@@ -103,7 +103,7 @@ export default {
 .login {
   background-size: cover;
   background-repeat: no-repeat;
-  background-position: center;
+  // background-position: center;
   background-attachment: fixed;
   .login-logo {
     width: 120px;

src/views/checked/problem/list/index.vue

@@ -65,12 +65,12 @@
             />
             <van-field name="uploader" label="图像上传" :rules="[{ required: true, message: '请上传图像' }]">
                 <template #input>
-                    <van-uploader v-model="uploaderImg" />
+                    <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="uploaderImg" />
                 </template>
             </van-field>
             <van-field name="uploader2" label="视频上传" :rules="[{ required: true, message: '请上传视频' }]">
                 <template #input>
-                    <van-uploader v-model="uploaderVideo" />
+                    <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="uploaderVideo" />
                 </template>
             </van-field>
             <div style="margin: 0.5rem">

src/views/danger/addDanger/addDanger.vue

@@ -17,6 +17,7 @@
         label="退回原因"
         type="textarea"
       />
+      
 
       <van-field
         readonly
@@ -122,7 +123,7 @@
         :value="findTime"
         label="隐患发现时间"
         placeholder="点击选择日期"
-        @click="showFindTime = true"
+        @click="showFindTime = true; currentDate = new Date()"
         :rules="[{ required: true, message: '隐患发现时间不能为空' }]"
       />
       <van-popup v-model="showFindTime" position="bottom">
@@ -209,13 +210,13 @@
 
       <van-field name="hdPicture1" label="隐患照片">
         <template #input>
-          <van-uploader v-model="uploaderImg" />
+          <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="uploaderImg" />
         </template>
       </van-field>
 
       <van-field name="hdVideo1" label="隐患视频">
         <template #input>
-          <van-uploader v-model="uploaderVideo" accept="video/*" />
+          <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="uploaderVideo" accept="video/*" />
         </template>
       </van-field>
       <van-field
@@ -225,7 +226,7 @@
         :value="expireTime"
         label="隐患到期时间"
         placeholder="点击选择日期"
-        @click="showExpireTime = true"
+        @click="showExpireTime = true; currentDate = new Date()"
       />
       <van-popup v-model="showExpireTime" position="bottom">
         <van-datetime-picker
@@ -287,21 +288,27 @@ export default {
   components: {
     LHeader,
   },
-  activated() {
-    this.taskId = this.$route.params.taskId;
+  activated(){
+    this.taskId = this.$route.params.taskId || localStorage.getItem('dangerAddTaskId');
+    console.log(this.taskId );
     if (this.taskId) {
       this.isShowreturnCause = true;
       this.text = "隐患上报退回";
       this.postReturnEcho();
     }
     this.getList();
-
+  },
+  
+  mounted() {
     this.$bus.$on("sourceAyy", res => {
       this.source1 = res.join(",");
+      // 销毁一下监听事件 不然会越加越多
+      this.$bus.$off('riskLevelBus')
     });
   },
   beforeRouteLeave(to, from, next) {
     if (to.name != "choose-people") {
+      this.text = "新增隐患",
       this.projectId = ""; // 所属工程
       this.taskId = "";
       this.projectName = "";
@@ -337,6 +344,9 @@ export default {
       this.columnsRecPeople = [];
       this.isShowreturnCause = false;
       this.returnCause = ""; // 退回原因
+      this.currentDate = new Date()
+      // 清空 localStorage
+      localStorage.removeItem('dangerAddTaskId')
     }
     next();
   },
@@ -382,13 +392,10 @@ export default {
       currentDate : new Date()
     };
   },
-  created() {
-    
-  },
+ 
   methods: {
     onSubmit(values) {
       let formdata = new FormData();
-
       formdata.append("proId", this.projectId);
       formdata.append("hdRange", values.hdRange);
       formdata.append("hdType", values.hdType);
@@ -419,6 +426,7 @@ export default {
       if (this.taskId) {
         url = `/hdreport/editSave/${this.taskId}`;
       }
+      console.log(url);
 
       postHdReportAdd(url, formdata)
         .then((res) => {
@@ -544,6 +552,7 @@ export default {
     onConFindTime(date) {
       this.findTime = timestampToTime(date, "DT1", true);
       this.showFindTime = false;
+      // this.currentDate = new Date()
     },
     // 风险源
     onConSource(value) {
@@ -582,6 +591,7 @@ export default {
     onConExpireTime(date) {
       this.expireTime = timestampToTime(date, "DT1", true);
       this.showExpireTime = false;
+      // this.currentDate = new Date()
     },
     // 隐患整改人
     onConRecPeople(value) {

src/views/danger/changeDanger/changeInfo.vue

@@ -67,13 +67,13 @@
 
       <van-field name="uploader" label="整改照片" :rules="[{ required: true, message: '整改照片不能为空' }]">
         <template #input>
-          <van-uploader v-model="uploaderImg" />
+          <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="uploaderImg" />
         </template>
       </van-field>
 
       <van-field name="uploader2" label="整改视频">
         <template #input>
-          <van-uploader v-model="uploaderVideo" accept="video/*" />
+          <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="uploaderVideo" accept="video/*" />
         </template>
       </van-field>
 

src/views/danger/changeDanger/delayInfo.vue

@@ -14,7 +14,7 @@
         :value="delayTime"
         label="延期时间"
         placeholder="点击选择日期"
-        @click="showDelayTime = true"
+        @click="showDelayTime = true; currentDate = new Date()"
         :rules="[{ required: true, message: '延期时间不能为空' }]"
       />
       <van-popup v-model="showDelayTime" position="bottom">

src/views/danger/confirmeDanger/confirmeDanger.vue

@@ -59,7 +59,7 @@
           :value="value"
           label="整改截止时间"
           placeholder="点击选择日期"
-          @click="showCalendar = true"
+          @click="showCalendar = true;currentDate = new Date()"
           :rules="[{ required: true, message: '请选择日期' }]"
         />
         <van-popup v-model="showCalendar" position="bottom">
@@ -197,6 +197,7 @@ export default {
         vm.returnReason = "";
         vm.getFormList();
         // 清空数据
+        vm.currentDate = new Date()
       }
     });
   },
@@ -233,8 +234,8 @@ export default {
       let formdata = new FormData();
       formdata.append("confirmResult", this.radio);
       formdata.append("endTime", values.endTime);
-      formdata.append("rectificationUser", this.rectificationUser);
-      formdata.append("rectificationReview", this.rectificationReview);
+      formdata.append("rectificationUser", values.rectificationUser);
+      formdata.append("rectificationReview", values.rectificationReview);
       formdata.append("confirmOpinion", values.confirmOpinion);
       this.$toast.loading({
         message: "提交中...",

src/views/danger/confirmeDanger/index.vue

 <template>
   <div>
     <LHeader :text="text"></LHeader>
-    <van-search v-model="searchValue" placeholder="搜索" @search="onSearch" />
-
+    
     <!-- 内容列表 -->
-    <div class="con-list">
+    <div class="con-list" @touchmove="showIndex = null">
       <van-cell-group
         inset
         v-for="(item, index) in messageList"
         :key="index"
         @click="touchstart(index, item)"
       >
+        <van-row gutter="">
+          <van-col span="5">隐患编号:</van-col>
+          <van-col span="19">{{ item.businessId }}</van-col>
+        </van-row>
         <van-row gutter="">
           <van-col span="5">所属项目:</van-col>
           <van-col span="19">{{ item.proId }}</van-col>
@@ -19,6 +22,10 @@
           <van-col span="5">隐患级别:</van-col>
           <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
+        <van-row gutter="">
+          <van-col span="5">发现时间:</van-col>
+          <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
+        </van-row>
         <van-row gutter="">
           <van-col span="5">适用范围:</van-col>
           <van-col span="19">{{ item.hdRange }}</van-col>
@@ -27,13 +34,9 @@
           <van-col span="5">隐患类型:</van-col>
           <van-col span="19">{{ item.hdType }}</van-col>
         </van-row>
-        <van-row gutter="">
-          <van-col span="5">发现时间:</van-col>
-          <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
         <!-- 长按显示遮罩层 -->
         <van-overlay :show="showIndex == index">
-          <div class="wrapper" @click.stop>
+          <div class="wrapper" @click.stop ="showIndex = null">
             <van-button round type="primary" @click="goDetail(item)"
               >详情</van-button
             >
@@ -102,6 +105,7 @@ export default {
     touchstart(index, item) {
       if (this.showIndex != null) {
         this.showIndex = null;
+        return
       }
       this.showIndex = index;
     },

src/views/danger/delayApproval/index.vue

 <template>
   <div>
     <LHeader :text="text"></LHeader>
-    <van-search v-model="searchValue" placeholder="搜索" @search="onSearch" />
+    
      <!-- 内容列表 -->
      <!-- 接口对接4 START -->
-    <div class="con-list">
+    <div class="con-list" @touchmove="showIndex = null">
       <van-cell-group
         inset
         v-for="(item, index) in messageList"
         :key="index"
         @click="touchstart(index, item)"
       >
-
+      
         <van-row gutter="">
-          <van-col span="7">隐患编号:</van-col>
-          <van-col span="17">{{ item.businessId }}</van-col>
+          <van-col span="5">隐患编号:</van-col>
+          <van-col span="19">{{ item.businessId }}</van-col>
         </van-row>
-      
         <van-row gutter="">
-          <van-col span="7">隐患项目名称:</van-col>
-          <van-col span="17">{{ item.proId }}</van-col>
+          <van-col span="5">所属项目:</van-col>
+          <van-col span="19">{{ item.proId }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="7">隐患级别:</van-col>
-          <van-col span="17">{{ item.hdLev }}</van-col>
+          <van-col span="5">隐患级别:</van-col>
+          <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="7">发现时间:</van-col>
-          <van-col span="17">{{ item.startDate }}</van-col>
+          <van-col span="5">发现时间:</van-col>
+          <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
         </van-row>
    <!-- *接口对接4 END -->
 
         <!-- 长按显示遮罩层 -->
         <van-overlay :show="showIndex == index">
-          <div class="wrapper" @click.stop>
+          <div class="wrapper" @click.stop ="showIndex = null">
             <van-button round type="primary" @click="goDetail(item)"
               >详情</van-button
             >
@@ -110,6 +109,7 @@ export default {
     touchstart(index, item) {
       if (this.showIndex != null) {
         this.showIndex = null;
+        return
       }
       this.showIndex = index;
     },

src/views/danger/delayApproval/ratifyInfo.vue

@@ -9,6 +9,7 @@
     >
       <van-field
         v-model="applyDate"
+        readonly
         name="applyDate"
         label="延期时间"
         placeholder="请输入"

src/views/danger/insertDanger/list.vue

+
+<template>
+  <div>
+       <LHeader :text="text"></LHeader>
+       <!--    -->
+    <!-- 内容列表 -->
+    <div class="con-list" @touchmove="showIndex = null">
+      <van-cell-group
+        inset
+        v-for="(item, index) in messageList"
+        :key="index"
+        @click="touchstart(index, item)"
+      >
+        <van-row gutter="">
+          <van-col span="5">所属项目:</van-col>
+          <van-col span="19">{{ item.proId }}</van-col>
+        </van-row>
+        <van-row gutter="">
+          <van-col span="5">隐患级别:</van-col>
+          <van-col span="19">{{ item.hdLev }}</van-col>
+        </van-row>
+        <van-row gutter="">
+          <van-col span="5">适用范围:</van-col>
+          <van-col span="19">{{ item.hdRange }}</van-col>
+        </van-row>
+        <van-row gutter="">
+          <van-col span="5">隐患类型:</van-col>
+          <van-col span="19">{{ item.hdType }}</van-col>
+        </van-row>
+        <van-row gutter="">
+          <van-col span="5">发现时间:</van-col>
+          <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
+        </van-row>
+        <!-- <van-row gutter="">
+          <van-col span="5">状态:</van-col>
+          <van-col span="19">{{ item.taskName }}</van-col>
+        </van-row> -->
+
+        <!-- 长按显示遮罩层 -->
+        <van-overlay :show="showIndex == index">
+          <div class="wrapper" @click.stop ="showIndex = null">
+            <van-button round type="primary" @click="goDetail(item)"
+              >详情</van-button
+            >
+          </div>
+        </van-overlay>
+      </van-cell-group>
+    </div>
+    <!-- 暂无数据 -->
+    <div
+      style="width: 100%;text-align: center; font-size: .48rem;position: fixed; top: 30%;"
+      v-if="isHaveNews"
+    >
+      暂无数据
+    </div>
+  </div>
+</template>
+
+<script>
+import LHeader from "@/components/header.vue";
+import {dangerReturnDel,myHDList} from "@/service/danger";
+export default {
+  components: {
+    LHeader: LHeader
+  },
+  data() {
+    return {
+      text: "我的上报",
+      searchValue: "",
+      isHaveNews: false,
+      messageList: [],
+      Loop: "", // 定时器
+      showIndex: null // 是否显示遮罩层
+    };
+  },
+  created() {
+    this.postList();
+  },
+  methods: {
+    postList() {
+      this.$toast.loading({
+        message: "加载中...",
+        forbidClick: true,
+        loadingType: "spinner",
+        duration: 0
+      });
+      myHDList()
+        .then(res => {
+          this.$toast.clear();
+          this.messageList = res.data;
+           // 判断有无数据返回
+          if (this.messageList.length == 0) {
+            this.isHaveNews = true;
+          }
+        })
+        .catch(() => {
+          this.$toast.clear();
+          this.$toast.fail("加载失败,请稍后再试");
+        });
+    },
+
+    onSearch(val) {
+    },
+    touchstart(index, item) {
+      if (this.showIndex != null) {
+        this.showIndex = null;
+        return
+      }
+       this.showIndex = index;
+    },
+    goDetail(data){
+      this.$router.push({
+        // name: "insert-danger-detail",
+        name:"normal-detail",
+        params: {
+          id: data.id,
+          detailTitle:'上报详情'
+        }
+      });
+      this.showIndex = null;
+    },
+    // 提交
+    goSubmit(data) {
+      this.$router.push({
+        name: "add-danger",
+        params: {
+          status: "退回",
+          taskId: data.taskId
+        }
+      });
+      this.showIndex = null;
+    },
+    // 删除
+    goDelete(data) {
+      this.$toast.loading({
+        message: "删除中...",
+        forbidClick: true,
+        loadingType: "spinner",
+        duration: 0
+      });
+      dangerReturnDel(`/hdreport/delete/${data.taskId}`)
+        .then(res => {
+          this.$toast.clear();
+          this.$toast.success({
+            message: "删除成功",
+            duration: 2000
+          });
+          this.postList();
+        })
+        .catch(() => {
+          this.$toast.clear();
+          this.$toast.fail("删除失败,请稍后再试");
+        });
+      this.showIndex = null;
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+/* @import url(); 引入css类 */
+.con-list {
+  padding: 10px 10px 0.533333rem;
+  background-color: #f0f1f5;
+  .van-cell-group--inset {
+    margin: 0;
+    margin-bottom: 10px;
+    padding: 10px;
+    font-size: 13px;
+    position: relative;
+    .van-row {
+      margin-bottom: 0.133333rem;
+      line-height: 0.64rem;
+    }
+    .van-overlay {
+      position: absolute;
+      .wrapper {
+        display: flex;
+        align-items: center;
+        justify-content: space-evenly;
+        height: 100%;
+      }
+    }
+  }
+}
+</style>

src/views/danger/majorDanger/index.vue

 <template>
   <div>
     <LHeader :text="text"></LHeader>
-    <van-search v-model="searchValue" placeholder="搜索" @search="onSearch" />
+    
      <!-- 内容列表 -->
      <!-- 接口对接4 START -->
-    <div class="con-list">
+    <div class="con-list" @touchmove="showIndex = null">
       <van-cell-group
         inset
         v-for="(item, index) in messageList"
@@ -13,27 +13,26 @@
       >
 
         <van-row gutter="">
-          <van-col span="7">隐患编号:</van-col>
-          <van-col span="17">{{ item.businessId }}</van-col>
+          <van-col span="5">隐患编号:</van-col>
+          <van-col span="19">{{ item.businessId }}</van-col>
         </van-row>
-      
         <van-row gutter="">
-          <van-col span="7">隐患项目名称:</van-col>
-          <van-col span="17">{{ item.proId }}</van-col>
+          <van-col span="5">所属项目:</van-col>
+          <van-col span="19">{{ item.proId }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="7">隐患级别:</van-col>
-          <van-col span="17">{{ item.hdLev }}</van-col>
+          <van-col span="5">隐患级别:</van-col>
+          <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="7">发现时间:</van-col>
-          <van-col span="17">{{ item.startDate }}</van-col>
+          <van-col span="5">发现时间:</van-col>
+          <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
         </van-row>
    <!-- *接口对接4 END -->
 
         <!-- 长按显示遮罩层 -->
         <van-overlay :show="showIndex == index">
-          <div class="wrapper" @click.stop>
+          <div class="wrapper" @click.stop ="showIndex = null">
             <van-button round type="primary" @click="goDetail(item)"
               >详情</van-button
             >
@@ -124,6 +123,7 @@ export default {
     touchstart(index, item) {
       if (this.showIndex != null) {
         this.showIndex = null;
+        return
       }
       this.showIndex = index;
     },

src/views/danger/majorDanger/majorSurvey.vue

@@ -28,8 +28,6 @@
         <!-- 详情 -->
       <div class="detail">详情</div>
       </van-cell-group>
-
-
     <van-form
       @submit="onSubmit"
       :show-error='false'
@@ -69,7 +67,7 @@
         name="thinkHdLev"
         :value="thinkLevel"
         label="认定隐患级别"
-        placeholder="请选择"
+        placeholder="重大隐患"
         @click="showThinkLevel = true"
         :rules="[{ required: true, message: '认定隐患级别不能为空' }]"
       />
@@ -124,7 +122,7 @@ export default {
       text: "重大隐患审批",
       agreeOpinion: "",
       disagreeOpinion: "",
-      thinkLevel:'', //因为隐患级别
+      thinkLevel:'重大隐患', //因为隐患级别
       showThinkLevel: false,
       columnsThinkLevel:["重大隐患","一般隐患A","一般隐患B","一般隐患C",]
 
@@ -160,7 +158,7 @@ export default {
       let formdata = new FormData()
       formdata.append('isResult', values.isResult)
       formdata.append('details', values.details)
-      formdata.append('thinkHdLev', values.thinkHdLev)
+      formdata.append('thinkHdLev',values.isResult==1?'重大隐患':values.thinkHdLev)
       formdata.append('taskId', this.taskId)
       majorAdd(`/majorapprove/add`,formdata)
         .then(res => {

src/views/danger/managerDanger/index.vue

 <template>
   <div>
     <LHeader :text="text"></LHeader>
-    <van-search v-model="searchValue" placeholder="搜索" @search="onSearch" />
+    
      <!-- 内容列表 -->
      <!-- 接口对接4 START -->
-    <div class="con-list">
+    <div class="con-list"  @touchmove="showIndex = null">
       <van-cell-group
         inset
         v-for="(item, index) in messageList"
@@ -13,26 +13,26 @@
       >
 
         <van-row gutter="">
-          <van-col span="7">隐患编号:</van-col>
-          <van-col span="17">{{ item.hdProjectId }}</van-col>
+          <van-col span="5">隐患编号:</van-col>
+          <van-col span="19">{{ item.pid }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="7">隐患项目名称:</van-col>
-          <van-col span="17">{{ item.projectName }}</van-col>
+          <van-col span="5">所属项目:</van-col>
+          <van-col span="19">{{ item.projectName }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="7">隐患级别:</van-col>
-          <van-col span="17">{{ item.hdLev }}</van-col>
+          <van-col span="5">隐患级别:</van-col>
+          <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="7">隐患发现时间:</van-col>
-          <van-col span="17">{{ item.createTime }}</van-col>
+          <van-col span="5">发现时间:</van-col>
+          <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
         </van-row>
    <!-- *接口对接4 END -->
 
         <!-- 长按显示遮罩层 -->
         <van-overlay :show="showIndex == index">
-          <div class="wrapper" @click.stop>
+          <div class="wrapper" @click.stop ="showIndex = null">
             <van-button round type="primary" @click="goDetail(item)"
               >详情</van-button
             >
@@ -122,6 +122,7 @@ export default {
     touchstart(index, item) {
       if (this.showIndex != null) {
         this.showIndex = null;
+        return
       }
       this.showIndex = index;
     },

src/views/danger/reportReturn/index.vue

 <template>
   <div>
     <LHeader :text="text"></LHeader>
-    <van-search v-model="searchValue" placeholder="搜索" @search="onSearch" />
+    
     <!-- 内容列表 -->
-    <div class="con-list">
+    <div class="con-list" @touchmove="showIndex = null">
       <van-cell-group
         inset
         v-for="(item, index) in messageList"
         :key="index"
         @click="touchstart(index, item)"
       >
+      <van-row gutter="">
+          <van-col span="5">隐患编号:</van-col>
+          <van-col span="19">{{ item.businessId }}</van-col>
+        </van-row>
         <van-row gutter="">
           <van-col span="5">所属项目:</van-col>
           <van-col span="19">{{ item.proId }}</van-col>
@@ -18,6 +22,10 @@
           <van-col span="5">隐患级别:</van-col>
           <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
+        <van-row gutter="">
+          <van-col span="5">发现时间:</van-col>
+          <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
+        </van-row>
         <van-row gutter="">
           <van-col span="5">适用范围:</van-col>
           <van-col span="19">{{ item.hdRange }}</van-col>
@@ -26,18 +34,10 @@
           <van-col span="5">隐患类型:</van-col>
           <van-col span="19">{{ item.hdType }}</van-col>
         </van-row>
-        <van-row gutter="">
-          <van-col span="5">发现时间:</van-col>
-          <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
-        <van-row gutter="">
-          <van-col span="5">状态:</van-col>
-          <van-col span="19">{{ item.taskName }}</van-col>
-        </van-row>
 
         <!-- 长按显示遮罩层 -->
         <van-overlay :show="showIndex == index">
-          <div class="wrapper" @click.stop>
+          <div class="wrapper" @click.stop ="showIndex = null">
             <van-button round type="primary" @click="goSubmit(item)"
               >上报</van-button
             >
@@ -106,11 +106,12 @@ export default {
     touchstart(index, item) {
       if (this.showIndex != null) {
         this.showIndex = null;
+        return
       }
        this.showIndex = index;
     },
 
-    // 提交
+    // 上报
     goSubmit(data) {
       this.$router.push({
         name: "add-danger",
@@ -119,6 +120,8 @@ export default {
           taskId: data.taskId
         }
       });
+       // 存到缓存里 如果路由跳转或者是缓存中有 就是隐患上报退回
+    localStorage.setItem('dangerAddTaskId',data.taskId)
       this.showIndex = null;
     },
     // 删除

src/views/danger/reviewDanger/index.vue

 <template>
   <div>
     <LHeader :text="text"></LHeader>
-    <van-search v-model="searchValue" placeholder="搜索" @search="onSearch" />
+    
     <!-- 内容列表 -->
-    <div class="con-list">
+    <div class="con-list" @touchmove="showIndex = null">
       <van-cell-group
         inset
         v-for="(item, index) in messageList"
         :key="index"
         @click="touchstart(index, item)"
       >
+       <van-row gutter="">
+          <van-col span="5">隐患编号:</van-col>
+          <van-col span="19">{{ item.businessId }}</van-col>
+        </van-row>
         <van-row gutter="">
           <van-col span="5">所属项目:</van-col>
           <van-col span="19">{{ item.proId }}</van-col>
@@ -18,6 +22,10 @@
           <van-col span="5">隐患级别:</van-col>
           <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
+        <van-row gutter="">
+          <van-col span="5">发现时间:</van-col>
+          <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
+        </van-row>
         <van-row gutter="">
           <van-col span="5">适用范围:</van-col>
           <van-col span="19">{{ item.hdRange }}</van-col>
@@ -26,22 +34,14 @@
           <van-col span="5">隐患类型:</van-col>
           <van-col span="19">{{ item.hdType }}</van-col>
         </van-row>
-        <van-row gutter="">
-          <van-col span="5">发现时间:</van-col>
-          <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
         <van-row gutter="">
           <van-col span="5">超期标识:</van-col>
           <van-col span="19">{{ item | formatTime }}</van-col>
         </van-row>
-        <van-row gutter="">
-          <van-col span="5">状态:</van-col>
-          <van-col span="19">{{ item.taskName }}</van-col>
-        </van-row>
 
         <!-- 长按显示遮罩层 -->
         <van-overlay :show="showIndex == index">
-          <div class="wrapper" @click.stop>
+          <div class="wrapper" @click.stop ="showIndex = null">
             <van-button round type="primary" @click="goDetail(item)"
               >详情</van-button
             >
@@ -111,6 +111,7 @@ export default {
     touchstart(index, item) {
       if (this.showIndex != null) {
         this.showIndex = null;
+        return
       }
       this.showIndex = index;
     },

src/views/danger/reviewDanger/reviewAdd.vue

@@ -74,7 +74,7 @@
           label="隐患复查照片"
         >
           <template #input>
-            <van-uploader v-model="uploaderImg" />
+            <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="uploaderImg" />
           </template>
         </van-field>
       </div>

src/views/danger/standBook/index.vue

 <template>
   <div>
     <LHeader :text="text"></LHeader>
-    <van-search v-model="searchValue" placeholder="搜索" @search="onSearch" />
+    
     <!-- 内容列表 -->
-    <div class="con-list">
+    <div class="con-list" @touchmove="showIndex = null">
       <van-cell-group
         inset
         v-for="(item, index) in messageList"
         :key="index"
         @click="touchstart(index, item)"
       >
-
+        <van-row gutter="">
+          <van-col span="5">隐患编号:</van-col>
+          <van-col span="19">{{ item.businessId }}</van-col>
+        </van-row>
         <van-row gutter="">
           <van-col span="5">所属项目:</van-col>
           <van-col span="19">{{ item.proId }}</van-col>
@@ -19,6 +22,10 @@
           <van-col span="5">隐患级别:</van-col>
           <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
+        <van-row gutter="">
+          <van-col span="5">发现时间:</van-col>
+          <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
+        </van-row>
         <van-row gutter="">
           <van-col span="5">适用范围:</van-col>
           <van-col span="19">{{ item.hdRange }}</van-col>
@@ -27,23 +34,15 @@
           <van-col span="5">隐患类型:</van-col>
           <van-col span="19">{{ item.hdType }}</van-col>
         </van-row>
-        <van-row gutter="">
-          <van-col span="5">发现时间:</van-col>
-          <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
         <van-row gutter="">
           <van-col span="5">超期标识:</van-col>
           <van-col span="19">{{ item | formatTime }}</van-col>
         </van-row>
-        <van-row gutter="">
-          <van-col span="5">状态:</van-col>
-          <van-col span="19">{{ item.taskName }}</van-col>
-        </van-row>
 
 
         <!-- 长按显示遮罩层 -->
         <van-overlay :show="showIndex == index">
-          <div class="wrapper" @click.stop>
+          <div class="wrapper" @click.stop  ="showIndex = null">
             <van-button round type="primary" @click="goDetail(item)"
               >详情</van-button
             >
@@ -110,6 +109,7 @@ export default {
     touchstart(index, item) {
       if (this.showIndex != null) {
         this.showIndex = null;
+        return
       }
       this.showIndex = index;
     },

src/views/danger/standBook/normalDetail.vue

@@ -187,7 +187,7 @@
                   <van-col span="5"
                     ><span class="field-title">结果：</span></van-col
                   >
-                  <van-col span="19">{{['退回','合格'][item.isResult]}}</van-col>
+                  <van-col span="19">{{ item.isResult == 1 ? "通过" : "退回"}}</van-col>
                 </van-row>
                 <van-row>
                   <van-col span="5"
@@ -327,7 +327,7 @@
               <div class="step-wrap">
                 <van-row>
                   <van-col span="24"
-                    ><div class="info-title">日志信息</div></van-col
+                    ><div class="info-title">{{item.createTime}}</div></van-col
                   >
                 </van-row>
                 <van-row>
@@ -354,12 +354,7 @@
                   >
                   <van-col span="19">{{ item.deptName }}</van-col>
                 </van-row>
-                <van-row>
-                  <van-col span="5"
-                    ><span class="field-title">时间：</span></van-col
-                  >
-                  <van-col span="19">{{ item.createTime }}</van-col>
-                </van-row>
+               
               </div>
             </van-step>
           </van-steps>
@@ -443,7 +438,7 @@ export default {
   data() {
     return {
       id: "",
-      text: "隐患历史台账详情",
+      text: "隐患详情",
       reportOpen: false,
       reportOpenText: "展开 ▼",
       journalOpen: false,
@@ -468,10 +463,14 @@ export default {
     };
   },
   created() {
+    if(this.$route.params.detailTitle){
+      this.text=this.$route.params.detailTitle
+    }
     this.id = this.$route.params.id;
     if (this.id) {
       this.postDetail();
     }
+    
   },
   methods: {
     // 请求台账信息

src/views/danger/superviseDanger/index.vue

 <template>
   <div>
     <LHeader :text="text"></LHeader>
-    <van-search v-model="searchValue" placeholder="搜索" @search="onSearch" />
+    
     <!-- 内容列表 -->
     <!-- 接口对接4 START -->
-    <div class="con-list">
+    <div class="con-list" @touchmove="showIndex = null">
       <van-cell-group
         inset
         v-for="(item, index) in messageList"
         :key="index"
         @click="touchstart(index, item)"
       >
-        <van-row gutter="">
-          <van-col span="7">隐患编号:</van-col>
-          <van-col span="17">{{ item.processInstanceId }}</van-col>
+       <van-row gutter="">
+          <van-col span="5">隐患编号:</van-col>
+          <van-col span="19">{{ item.businessId }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="7">隐患项目名称:</van-col>
-          <van-col span="17">{{ item.projectName }}</van-col>
+          <van-col span="5">所属项目:</van-col>
+          <van-col span="19">{{ item.proId }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="7">隐患级别:</van-col>
-          <van-col span="17">{{ item.hdLev }}</van-col>
+          <van-col span="5">隐患级别:</van-col>
+          <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="7">隐患发现时间:</van-col>
-          <van-col span="17">{{ item.createTime }}</van-col>
+          <van-col span="5">发现时间:</van-col>
+          <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
         </van-row>
         <!-- *接口对接4 END -->
 
         <!-- 长按显示遮罩层 -->
         <van-overlay :show="showIndex == index">
-          <div class="wrapper" @click.stop>
+          <div class="wrapper" @click.stop ="showIndex = null">
             <van-button round type="primary" @click="goDetail(item)"
               >详情</van-button
             >
@@ -118,6 +118,7 @@ export default {
     touchstart(index, item) {
       if (this.showIndex != null) {
         this.showIndex = null;
+        return
       }
       this.showIndex = index;
     },

src/views/messageCenter/index.vue

@@ -20,10 +20,10 @@
         <van-tab title="消息信息" name="消息信息" :badge="messageNewsNum>0?messageNewsNum : ''">
           <message-news @messageLength="getMessageLength"></message-news>
         </van-tab>
-        <van-tab title="待办事项" name="待办事项" badge="">
+        <van-tab title="" name="" disabled badge="">
           <wait-event></wait-event>
         </van-tab>
-        <van-tab title="通知公告" name="通知公告" badge="">
+        <van-tab title="" name="" disabled badge="">
           <notice-info></notice-info>
         </van-tab>
       </van-tabs>

src/views/messageCenter/messageNews/index.vue

@@ -14,12 +14,11 @@
       </div>
 
       <!-- 搜索 -->
-      <div class="search-wrap">
+      <!-- <div class="search-wrap">
         <van-search v-model="searchVal" placeholder="搜索" @search="onSearch" />
-      </div>
-
+      </div> -->
       <!-- 内容列表 -->
-      <div class="con-list">
+      <div class="con-list" @touchmove="showIndex = null">
         <!-- <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
           <van-list
             v-model="loading"
@@ -34,7 +33,7 @@
           @click="touchstart(index, item)"
         >
           <!--@touchend.prevent="touchend(index)"  长按备份-->
-          <div class="messgae-title">{{ item.noticeTitle }}</div>
+          <div class="messgae-title"><span>{{ item.noticeTitle }}</span> <span>{{item.sendTime}}</span> </div>
           <div class="message-content">
             {{ item.upcomingUserName }},您好！您有一条来自{{
               item.createUserName
@@ -43,18 +42,14 @@
 
           <!-- 长按显示遮罩层 -->
 
-          <van-overlay :show="showIndex == index">
-            <div class="wrapper" @click.stop>
-              <van-button round type="primary" @click="goDetail(item)"
-                >详情</van-button
-              >
-              <!-- @touchstart="goDetail(item)" 长按备份-->
-              <van-button round type="info" @click="goConfirm(item)"
-                >整改</van-button
-              >
+          <van-overlay :show="showIndex == index"  v-if="item.status == '未读'">
+            <div class="wrapper" @click.stop ="showIndex = null">
+              <!-- <van-button round type="primary" @click="goDetail(item)"
+                >查看</van-button
+              > -->
               <van-button
                 round
-                type="warning"
+                type="info"
                 @click="read(item)"
                 v-if="item.status == '未读'"
                 >已读</van-button
@@ -203,7 +198,7 @@ export default {
       // clearTimeout(this.Loop); //再次清空延时器，防止重复注册定时器
       if (this.showIndex != null) {
         this.showIndex = null;
-        // return;
+        return;
       }
       this.showIndex = index;
       // this.Loop = setTimeout(
@@ -222,10 +217,7 @@ export default {
     goDetail(data) {
       this.showIndex = null;
     },
-    // 整改
-    goConfirm(data) {
-      this.showIndex = null;
-    }
+   
   }
 };
 </script>
@@ -266,12 +258,18 @@ export default {
   }
   //  内容
   .con-list {
+    margin-top: .266667rem;
     .van-cell-group--inset {
       margin: 0;
       margin-bottom: 10px;
       padding: 10px;
       font-size: 13px;
       position: relative;
+      .messgae-title{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+      }
 
       .message-content {
         margin-top: 10px;

src/views/risk/riskAccount/index.vue

 <template>
   <div>
     <LHeader :text="text"></LHeader>
-    <van-search v-model="searchValue" placeholder="搜索" @search="onSearch" />
+    
      <!-- 内容列表 -->
      <!-- 接口对接4 START -->
-    <div class="con-list">
+    <div class="con-list" @touchmove="showIndex = null">
       <van-cell-group
         inset
         v-for="(item, index) in messageList"
@@ -13,30 +13,30 @@
       >
 
         <van-row gutter="">
-          <van-col span="7">风险编号:</van-col>
-          <van-col span="17">{{ item.processInstanceId }}</van-col>
+          <van-col span="5">风险编号:</van-col>
+          <van-col span="19">{{ item.businessId }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="7">所属工程名称:</van-col>
-          <van-col span="17">{{ item.proId }}</van-col>
+          <van-col span="5">所属项目:</van-col>
+          <van-col span="19">{{ item.proId }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="7">风险等级:</van-col>
-          <van-col span="17">{{ item.riskLevel }}</van-col>
+          <van-col span="5">风险级别:</van-col>
+          <van-col span="19">{{ item.riskLevel }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="7">风险源:</van-col>
-          <van-col span="17">{{ item.riskSource }}</van-col>
+          <van-col span="5">发现时间:</van-col>
+          <van-col span="19">{{ item.startDate }}</van-col>
         </van-row>
-         <van-row gutter="">
-          <van-col span="7">创建时间:</van-col>
-          <van-col span="17">{{ item.startDate }}</van-col>
+        <van-row gutter="">
+          <van-col span="5">风险源:</van-col>
+          <van-col span="19">{{ item.riskSource }}</van-col>
         </van-row>
    <!-- *接口对接4 END -->
 
         <!-- 长按显示遮罩层 -->
         <van-overlay :show="showIndex == index">
-          <div class="wrapper" @click.stop>
+          <div class="wrapper" @click.stop  ="showIndex = null">
             <van-button round type="primary" @click="goDetail(item)"
               >详情</van-button
             >
@@ -123,6 +123,7 @@ export default {
     touchstart(index, item) {
       if (this.showIndex != null) {
         this.showIndex = null;
+        return
       }
       this.showIndex = index;
     },

src/views/risk/riskAccount/riskBigDetail.vue

@@ -157,7 +157,7 @@
               <div class="step-wrap">
                 <van-row>
                   <van-col span="24"
-                    ><div class="info-title">日志信息</div></van-col
+                    ><div class="info-title">{{item.createTime}}</div></van-col
                   >
                 </van-row>
                 <van-row>
@@ -184,12 +184,7 @@
                   >
                   <van-col span="19">{{item.deptName}}</van-col>
                 </van-row>
-                <van-row>
-                  <van-col span="5"
-                    ><span class="field-title">时间：</span></van-col
-                  >
-                  <van-col span="19">{{item.createTime}}</van-col>
-                </van-row>
+                
               </div>
             </van-step>
           </van-steps>

src/views/risk/riskAdd/index.vue

@@ -10,6 +10,7 @@
       <van-field
         v-if="isShowreturnCause"
         v-model="returnCause"
+        required
         readonly
         rows="1"
         autosize=""
@@ -19,6 +20,7 @@
       />
       <van-field
         v-if="!isShowreturnCause"
+        required
         readonly
         clickable
         name="projectName"
@@ -40,6 +42,7 @@
 
       <van-field
         readonly
+        required
         clickable
         name="factor"
         :value="factor"
@@ -60,6 +63,7 @@
 
       <van-field
         readonly
+        required
         clickable
         name="source"
         :value="source"
@@ -80,6 +84,7 @@
 
       <van-field
         readonly
+        required
         clickable
         name="trouble"
         :value="trouble"
@@ -101,6 +106,7 @@
       <van-field
         readonly
         clickable
+        required
         name="setRank"
         :value="setRank"
         label="风险定级"
@@ -119,8 +125,9 @@
 
       <van-field
         readonly
+        required
         clickable
-        name="setRank"
+        name="riskRank"
         :value="riskRank"
         label="风险等级"
         placeholder="请选择"
@@ -146,6 +153,7 @@
       /> -->
 
       <van-field
+        v-show="showSetRankMode"
         v-model="setRankMode"
         name="setRankMode"
         label="定级方式"
@@ -154,14 +162,15 @@
         autosize
         placeholder="请输入"
       />
-      <van-field name="setRankModeFile" label=" ">
+      <van-field name="setRankModeFile" label=" " v-show="showSetRankMode">
         <template #input>
-          <van-uploader v-model="setRankModeImg" accept="file" />
+          <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="setRankModeImg" accept="file" />
         </template>
       </van-field>
 
       <van-field
         v-model="location"
+         required
         name="location"
         label="风险部位"
         type="textarea"
@@ -174,6 +183,7 @@
       <van-field
         readonly
         clickable
+         required
         name="control"
         :value="control"
         label="管控层级"
@@ -239,7 +249,7 @@
       />
       <van-field name="technologyFile" label=" ">
         <template #input>
-          <van-uploader v-model="technologyImg" accept="file" />
+          <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="technologyImg" accept="file" />
         </template>
       </van-field>
 
@@ -254,7 +264,7 @@
       />
       <van-field name="administrationFile" label=" ">
         <template #input>
-          <van-uploader v-model="administrationImg" accept="file" />
+          <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="administrationImg" accept="file" />
         </template>
       </van-field>
 
@@ -269,7 +279,7 @@
       />
       <van-field name="urgentFile" label=" ">
         <template #input>
-          <van-uploader v-model="urgentImg" accept="file" />
+          <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="urgentImg" accept="file" />
         </template>
       </van-field>
 
@@ -315,11 +325,19 @@ export default {
 
     this.$bus.$on("riskLevelBus", res => {
       this.showSetRank = false // 再次关闭弹出层 以防万一
-      this.riskRank = res
+      console.log(Boolean(res))
+      if(res){
+        this.riskRank = res
+      }else{
+        this.setRank = ""
+      }
+      // 销毁一下监听事件 不然会越加越多
+      this.$bus.$off('riskLevelBus')
     });
   },
   beforeRouteLeave(to, from, next) {
     if (to.name != "matrix-grad") {
+      this.text = "新增风险",
       this.taskId = "",
       this.id = "",
       this.projectId = "", // 所属工程
@@ -390,6 +408,7 @@ export default {
       riskRank: "", // 风险等级
       showRiskRank: false,
       columnsRiskRank: ["一般风险", "较小风险", "较大风险", "重大风险"],
+      showSetRankMode: false, // 是否显示定级方式
       setRankMode: "", // 定级方式文字
       setRankModeImg: [], // 定级方式图片
       location: "", //风险部位
@@ -470,7 +489,6 @@ export default {
         formdata.append("id", this.id);
         url = `/riskMain/editSave/${this.taskId}`;
       }
-
       postReAdd(url, formdata)
         .then(res => {
           this.$toast.clear();
@@ -484,6 +502,7 @@ export default {
           this.$toast.clear();
           this.$toast.fail("提交失败,请稍后再试");
         });
+           this.$toast.clear();
     },
 
     // 请求表单数据
@@ -637,7 +656,16 @@ export default {
     cancel() {
       this.$router.go(-1);
     }
-  }
+  },
+  watch:{
+    setRank(newVal, oldVal){
+      if(newVal == '其他定级方式'){
+        this.showSetRankMode = true
+      }else{
+        this.showSetRankMode = false
+      }
+    }
+  },
 };
 </script>
 <style scoped>

src/views/risk/riskAdd/matrixGrad/index.vue

@@ -86,6 +86,7 @@ export default {
             message: "提交成功",
             duration: 2000
           });
+          
           this.$bus.$emit("riskLevelBus", res.data.evaluateLevel)
           history.go(-1);
         })
@@ -96,7 +97,9 @@ export default {
     },
 
     cancel() {
+      this.$bus.$emit("riskLevelBus", 0)
       this.$router.go(-1);
+
     }
   }
 };

src/views/risk/riskConfirme/index.vue

 <template>
   <div>
     <LHeader :text="text"></LHeader>
-    <van-search v-model="searchValue" placeholder="搜索" @search="onSearch" />
+    
 
     <!-- 内容列表 -->
-    <div class="con-list">
+    <div class="con-list" @touchmove="showIndex = null">
       <van-cell-group
         inset
         v-for="(item, index) in messageList"
         :key="index"
         @click="touchstart(index, item)"
       >
+        <van-row gutter="">
+          <van-col span="5">风险编号:</van-col>
+          <van-col span="19">{{ item.businessId }}</van-col>
+        </van-row>
         <van-row gutter="">
           <van-col span="5">所属项目:</van-col>
           <van-col span="19">{{ item.proId }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="5">风险等级:</van-col>
+          <van-col span="5">风险级别:</van-col>
           <van-col span="19">{{ item.riskLevel }}</van-col>
         </van-row>
+        <van-row gutter="">
+          <van-col span="5">发现时间:</van-col>
+          <van-col span="19">{{ item.startDate }}</van-col>
+        </van-row>
         <van-row gutter="">
           <van-col span="5">风险源:</van-col>
           <van-col span="19">{{ item.riskSource }}</van-col>
@@ -45,7 +53,7 @@
         </van-row>
         <!-- 长按显示遮罩层 -->
         <van-overlay :show="showIndex == index">
-          <div class="wrapper" @click.stop>
+          <div class="wrapper" @click.stop ="showIndex = null">
             <van-button round type="primary" @click="goDetail(item)"
               >详情</van-button
             >
@@ -117,6 +125,7 @@ export default {
     touchstart(index, item) {
       if (this.showIndex != null) {
         this.showIndex = null;
+        return
       }
       this.showIndex = index;
     },

src/views/risk/riskReturn/index.vue

 <template>
   <div>
     <LHeader :text="text"></LHeader>
-    <van-search v-model="searchValue" placeholder="搜索" @search="onSearch" />
+    
         <!-- 内容列表 -->
-    <div class="con-list">
+    <div class="con-list" @touchmove="showIndex = null">
       <van-cell-group
         inset
         v-for="(item, index) in messageList"
         :key="index"
-        @change="touchstart(index, item)"
+        @click="touchstart(index, item)"
       >
+       <van-row gutter="">
+          <van-col span="5">风险编号:</van-col>
+          <van-col span="19">{{ item.businessId }}</van-col>
+        </van-row>
         <van-row gutter="">
           <van-col span="5">所属项目:</van-col>
           <van-col span="19">{{ item.proId }}</van-col>
         </van-row>
         <van-row gutter="">
-          <van-col span="5">风险等级:</van-col>
+          <van-col span="5">风险级别:</van-col>
           <van-col span="19">{{ item.riskLevel }}</van-col>
         </van-row>
+        <van-row gutter="">
+          <van-col span="5">发现时间:</van-col>
+          <van-col span="19">{{ item.startDate }}</van-col>
+        </van-row>
         <van-row gutter="">
           <van-col span="5">风险源:</van-col>
           <van-col span="19">{{ item.riskSource }}</van-col>
@@ -46,7 +54,7 @@
 
         <!-- 长按显示遮罩层 -->
         <van-overlay :show="showIndex == index">
-          <div class="wrapper" @click.stop>
+          <div class="wrapper" @click.stop ="showIndex = null">
             <van-button round type="primary" @click="goDetail(item)"
               >上报</van-button
             >
@@ -117,6 +125,7 @@ export default {
     touchstart(index, item) {
       if (this.showIndex != null) {
         this.showIndex = null;
+        return
       }
       this.showIndex = index;
     },
@@ -130,6 +139,8 @@ export default {
            taskId: data.taskId
            }
          });
+     // 存到缓存里 如果路由跳转或者是缓存中有 就是隐患上报退回
+    localStorage.setItem('riskAddTaskId',data.taskId)
       this.showIndex = null;
     },
     // 删除

src/views/saveWorkbench/index.vue

@@ -144,6 +144,13 @@ export default {
         }
       ],
       dangerList: [
+        {
+          key: "11",
+          // path: "/danger",
+          path: "/insert-danger",
+          imgUrl: require("@/assets/workbench/risk-confirm.png"),
+          text: "我的上报"
+        },
         // 隐患排查治理
         {
           key: "1",