修改11月4日测试多个问题

src/views/Login2.vue

@@ -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

@@ -63,12 +63,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

@@ -122,7 +122,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 +209,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 +225,7 @@
         :value="expireTime"
         label="隐患到期时间"
         placeholder="点击选择日期"
-        @click="showExpireTime = true"
+        @click="showExpireTime = true; currentDate = new Date()"
       />
       <van-popup v-model="showExpireTime" position="bottom">
         <van-datetime-picker
@@ -289,6 +289,7 @@ export default {
   },
   activated() {
     this.taskId = this.$route.params.taskId;
+    console.log(this.taskId );
     if (this.taskId) {
       this.isShowreturnCause = true;
       this.text = "隐患上报退回";
@@ -302,6 +303,7 @@ export default {
   },
   beforeRouteLeave(to, from, next) {
     if (to.name != "choose-people") {
+      this.text = "新增隐患",
       this.projectId = ""; // 所属工程
       this.taskId = "";
       this.projectName = "";
@@ -337,6 +339,7 @@ export default {
       this.columnsRecPeople = [];
       this.isShowreturnCause = false;
       this.returnCause = ""; // 退回原因
+      this.currentDate = new Date()
     }
     next();
   },
@@ -544,6 +547,7 @@ export default {
     onConFindTime(date) {
       this.findTime = timestampToTime(date, "DT1", true);
       this.showFindTime = false;
+      // this.currentDate = new Date()
     },
     // 风险源
     onConSource(value) {
@@ -582,6 +586,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/changeDanger/index.vue

@@ -3,7 +3,7 @@
     <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"
@@ -42,7 +42,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
             >
@@ -112,6 +112,7 @@ export default {
      touchstart(index, item) {
       if (this.showIndex != null) {
         this.showIndex = null;
+        return
       }
       this.showIndex = index;
     },

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()
       }
     });
   },

src/views/danger/confirmeDanger/index.vue

@@ -4,7 +4,7 @@
     <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"
@@ -33,7 +33,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
             >
@@ -102,6 +102,7 @@ export default {
     touchstart(index, item) {
       if (this.showIndex != null) {
         this.showIndex = null;
+        return
       }
       this.showIndex = index;
     },

src/views/danger/delayApproval/index.vue

@@ -4,7 +4,7 @@
     <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"
@@ -33,7 +33,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
             >
@@ -110,6 +110,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/majorDanger/index.vue

@@ -4,7 +4,7 @@
     <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"
@@ -33,7 +33,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
             >
@@ -124,6 +124,7 @@ export default {
     touchstart(index, item) {
       if (this.showIndex != null) {
         this.showIndex = null;
+        return
       }
       this.showIndex = index;
     },

src/views/danger/managerDanger/index.vue

@@ -4,7 +4,7 @@
     <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"
@@ -32,7 +32,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
             >
@@ -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

@@ -3,7 +3,7 @@
     <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"
@@ -37,7 +37,7 @@
 
         <!-- 长按显示遮罩层 -->
         <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,6 +106,7 @@ export default {
     touchstart(index, item) {
       if (this.showIndex != null) {
         this.showIndex = null;
+        return
       }
        this.showIndex = index;
     },

src/views/danger/reviewDanger/index.vue

@@ -3,7 +3,7 @@
     <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"
@@ -41,7 +41,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
             >
@@ -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

@@ -3,7 +3,7 @@
     <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"
@@ -43,7 +43,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
             >
@@ -110,6 +110,7 @@ export default {
     touchstart(index, item) {
       if (this.showIndex != null) {
         this.showIndex = null;
+        return
       }
       this.showIndex = index;
     },

src/views/danger/superviseDanger/index.vue

@@ -4,7 +4,7 @@
     <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"
@@ -31,7 +31,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
             >
@@ -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,12 @@
       </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 +34,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 +43,15 @@
 
           <!-- 长按显示遮罩层 -->
 
-          <van-overlay :show="showIndex == index">
-            <div class="wrapper" @click.stop>
+          <van-overlay :show="showIndex == index" >
+            <div class="wrapper" @click.stop ="showIndex = null">
               <van-button round type="primary" @click="goDetail(item)"
-                >详情</van-button
-              >
-              <!-- @touchstart="goDetail(item)" 长按备份-->
-              <van-button round type="info" @click="goConfirm(item)"
-                >整改</van-button
+                >查看</van-button
               >
+             
               <van-button
                 round
-                type="warning"
+                type="info"
                 @click="read(item)"
                 v-if="item.status == '未读'"
                 >已读</van-button
@@ -203,7 +200,7 @@ export default {
       // clearTimeout(this.Loop); //再次清空延时器，防止重复注册定时器
       if (this.showIndex != null) {
         this.showIndex = null;
-        // return;
+        return;
       }
       this.showIndex = index;
       // this.Loop = setTimeout(
@@ -222,10 +219,7 @@ export default {
     goDetail(data) {
       this.showIndex = null;
     },
-    // 整改
-    goConfirm(data) {
-      this.showIndex = null;
-    }
+   
   }
 };
 </script>
@@ -266,12 +260,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

@@ -4,7 +4,7 @@
     <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"
@@ -36,7 +36,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
             >
@@ -123,6 +123,7 @@ export default {
     touchstart(index, item) {
       if (this.showIndex != null) {
         this.showIndex = null;
+        return
       }
       this.showIndex = index;
     },

src/views/risk/riskAdd/index.vue

@@ -120,7 +120,7 @@
       <van-field
         readonly
         clickable
-        name="setRank"
+        name="riskRank"
         :value="riskRank"
         label="风险等级"
         placeholder="请选择"
@@ -146,6 +146,7 @@
       /> -->
 
       <van-field
+        v-show="showSetRankMode"
         v-model="setRankMode"
         name="setRankMode"
         label="定级方式"
@@ -154,9 +155,9 @@
         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>
 
@@ -239,7 +240,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 +255,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 +270,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 +316,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', this.myhandle)
     });
   },
   beforeRouteLeave(to, from, next) {
     if (to.name != "matrix-grad") {
+      this.text = "新增风险",
       this.taskId = "",
       this.id = "",
       this.projectId = "", // 所属工程
@@ -390,6 +399,7 @@ export default {
       riskRank: "", // 风险等级
       showRiskRank: false,
       columnsRiskRank: ["一般风险", "较小风险", "较大风险", "重大风险"],
+      showSetRankMode: false, // 是否显示定级方式
       setRankMode: "", // 定级方式文字
       setRankModeImg: [], // 定级方式图片
       location: "", //风险部位
@@ -637,7 +647,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

@@ -4,7 +4,7 @@
     <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"
@@ -45,7 +45,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 +117,7 @@ export default {
     touchstart(index, item) {
       if (this.showIndex != null) {
         this.showIndex = null;
+        return
       }
       this.showIndex = index;
     },

src/views/risk/riskReturn/index.vue

@@ -3,7 +3,7 @@
     <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"
@@ -46,7 +46,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 +117,7 @@ export default {
     touchstart(index, item) {
       if (this.showIndex != null) {
         this.showIndex = null;
+        return
       }
       this.showIndex = index;
     },