修复bug

src/router/router.config.js

@@ -224,7 +224,7 @@ export let routers = [
         path: '/problemItem',
         name: 'problemItem',
         component: () => import('@/views/menu/problemItem/index'),
-        meta: { title: '隐患问题清单', keepAlive: true }
+        meta: { title: '隐患问题清单', keepAlive: false }
       },
       {
         path: '/problemDetail',

src/views/home/menu.vue

@@ -2,7 +2,7 @@
   <div class="menu-container">
     <top-bar></top-bar>
     <!-- 天气预警 -->
-    <van-swipe v-if="list.length > 0" style="height: 50px" vertical autoplay="2000">
+    <van-swipe v-if="list && list.length > 0" style="height: 50px" vertical autoplay="2000">
       <van-swipe-item v-for="item in list" :key="item.id" @click="clickHandler(item)">
         <div class="color" :style="{ color: item.bgc, backgroundColor: '#fff' }">
           <van-icon name="warn-o" /> {{ item.alarmTitle }}
@@ -13,6 +13,7 @@
         <div class="custom-indicator"></div>
       </template>
     </van-swipe>
+
     <div class="menu-list">
       <div class="menu-list-item" v-for="(v, i) in menuList" :key="i">
         <p @click="onclick">{{ v.meta.title }}</p>
@@ -72,7 +73,7 @@ export default {
     //获取天气数据
     getTheWeather() {
       getTheAreaWeather(this.orgId).then(res => {
-        
+
         this.list = res.data||[]
         this.list.forEach(item => {
           if (item.alarmLevel == '橙色') {

src/views/menu/LZRegister/edit.vue

@@ -257,8 +257,6 @@ export default {
         taskId:this.$route.query.id,
       }
       taskDetails(data).then(res=>{
-        //res = json;
-        console.log(res,'res')
         let {areaScanN,areaScanY,nfcScanN,nfcScanY} = res.data;
         this.taskInfo = {
           areaScanN,

src/views/menu/message/index.vue

@@ -1,6 +1,6 @@
 <template>
 <div class="message">
-  <NavBar />
+  <NavBar v-show="!show" />
   <div v-if="!show" class="page-container">
     <van-tabs v-model="query.type" @change="changeList">
       <van-tab title="公告/通知" name="1"></van-tab>
@@ -34,6 +34,11 @@
     </div>
   </div>
   <div v-else class="message-detail">
+    <van-nav-bar
+      title="消息详情"
+      left-arrow
+      @click-left="onClickLeft"
+    />
     <van-panel v-if="selected" :title="selected.title" :desc="selected.orgName">
       <div class="message-content">
         <p>{{selected.content}}</p>
@@ -75,6 +80,9 @@ export default {
     this.getDataList();
   },
   methods:{
+    onClickLeft(){
+      this.show = false;
+    },
     clickItem(v){
       this.selected = v;
       this.show = true;
@@ -83,14 +91,13 @@ export default {
       this.getDataList();
     },
     changeList(v,type){
-      console.log(v,type,'type')
       this.query.pageNum = 1;
+      this.dataList = []
       this.getDataList();
     },
     getDataList(){
       let data = {};
       if(this.query.type == 1){
-        console.log(this.orgId,'tttttttttttt')
         data = {
           ...this.query,
           userId:this.id,
@@ -173,7 +180,7 @@ export default {
   }
 }
 .message-detail{
-  height: calc(100vh - 192px);
+  height: calc(100vh - 102px);
   background-color: #fff;
 }
 .message-content{

src/views/menu/problemItem/detail.vue

@@ -235,15 +235,17 @@ export default {
           queryMethod = reform;
       }
       if(type === '确认' || type === '审核'){
-        if(!data.description) {
+        if(!data && !data.description) {
           return this.$toast("请填写完整信息");
         }
       }else {
         if(!data.reformDate || !data.description){
           return this.$toast("请填写完整信息");
         }
-        let img = data.images.map(v=>{return v.imgPath});
-        data.images = img.toString();
+        if(data.images){
+          let img = data.images.map(v=>{return v.imgPath});
+          data.images = img.toString();
+        }
       }
       data.id = this.taskInfo.id;
       queryMethod(data).then((r) => {

src/views/menu/problemItem/index.vue

@@ -32,7 +32,7 @@
                   </van-button>
                   <van-button
                     style="width: 60px;"
-                    v-if="v.submitorId== id && v.confirmStatus==1"
+                    v-else-if="v.submitorId== id && v.confirmStatus==1"
                     hairline
                     size="mini"
                     type="info"
@@ -41,7 +41,7 @@
                   </van-button>
                   <van-button
                     style="width: 60px;"
-                    v-if="v.orgId==orgId && v.confirmStatus==2 && v.reformStatus!=11"
+                    v-else-if="v.orgId==orgId && v.confirmStatus==2 && v.reformStatus!=11"
                     hairline
                     size="mini"
                     type="info"
@@ -49,8 +49,8 @@
                     整改
                   </van-button>
                   <van-button
-                    style="width: 60px;"
-                    v-if="v.confirmStatus ===3"
+                    style="display: block;width: 60px;"
+                    v-else
                     hairline
                     size="mini"
                     type="info"

src/views/menu/securityCheckRegister/detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="register-edit">
-    <nav-bar></nav-bar>
+    <nav-bar :go="go"></nav-bar>
     <div class="page-container">
       <!--   基本信息   -->
       <div class="card" v-if="taskInfo">
@@ -62,24 +62,23 @@
                     type="textarea"
                     placeholder="请输入"/>
                   <div class="upload-box" >
-                    <uploader :maxCount="5" v-if="enable" v-model="item.imgData"/>
-                    <van-cell v-else>
+                    <uploader v-if="enable" :maxCount="5"  v-model="item.imgData"/>
+                    <van-cell v-else-if="item.imgData">
                       <div class="nfc-img van-hairline--surround" v-for="(v,i) in item.imgData" :key="v.imgPath" @click="clickWarnImage(item.imgData,i)">
                         <img :src="imgUrl(v.imgPath)" alt="" >
-                        <span>{{v.checkName}}</span>
                       </div>
 <!--                      <img class="nfc-img" v-for="v in item.imgData" :src="imgUrl(v.imgPath)" alt="" :key="v.id">-->
                     </van-cell>
                   </div>
                 </van-cell-group>
-                <date-cell
-                  :disabled="!enable"
-                  v-if="item.businessType === 1"
-                  v-for="(val,ind) in item.protectionVo"
-                  :title="val.protectionName"
-                  v-model="val.statusUpdateTime"
-                  :key="val.id"
-                  date-type="datetime" />
+<!--                <date-cell-->
+<!--                  :disabled="!enable"-->
+<!--                  v-if="item.businessType === 1"-->
+<!--                  v-for="(val,ind) in item.protectionVo"-->
+<!--                  :title="val.protectionName"-->
+<!--                  v-model="val.statusUpdateTime"-->
+<!--                  :key="val.id"-->
+<!--                  date-type="datetime" />-->
               </div>
             </van-collapse-item>
           </van-collapse>
@@ -147,9 +146,18 @@ export default {
       dicts:['safety_check_status'],
       showPreView:false,
       selected:null,
+      go:{
+        type:'replace',
+        path:'/securityCheckRegister',
+      },
     }
   },
   beforeRouteEnter: (to, from, next) => {
+    if(from.name === 'securityCheckRegister'){
+      next(vm => {
+        vm.id = to.query.id;
+      })
+    }
     if(from.name === 'addCheck'){
       let str = sessionStorage.getItem('selected') ;
       next(vm => {
@@ -160,6 +168,9 @@ export default {
     next()
   },
   watch:{
+    id(){
+      this.getData();
+    },
     selected:{
       handler(val){
         console.log(val,'val')

src/views/menu/securityCheckRegister/index.vue

@@ -45,34 +45,9 @@
           <van-empty description="暂无数据" v-if="!dataList || dataList.length === 0" />
           <div  v-else class="list-item">
             <van-panel v-for="(v,i) in dataList" :title="v.taskName" :desc="`${formatDate(v.planStartTime,'YYYY-MM-DD')}~${formatDate(v.planEndTime,'YYYY-MM-DD')}`" >
-<!--              <van-tabs v-model="active">-->
-<!--                <van-tab title="完成">-->
-<!--                  <van-collapse v-if="v.completed.length > 0" v-model="activeNames" :key="v.planId">-->
-<!--                    <van-collapse-item title="标题1" name="1"  >-->
-<!--                      <van-cell-->
-<!--                        v-for="(a,index) in v.completed" :key="a.taskId"-->
-<!--                        :title="a.beCheckedOrgName"-->
-<!--                        :value="getDictLabel(a.status,'safety_check_status')"-->
-<!--                        :to="{path:path,query:{id:a.taskId,enable:1}}"-->
-<!--                        is-link/>-->
-<!--                    </van-collapse-item>-->
-<!--                  </van-collapse>-->
-<!--                </van-tab>-->
-<!--                <van-tab title="未完成">-->
-<!--                  <van-collapse v-if="v.uncompleted.length > 0" v-model="activeNames" :key="v.planId">-->
-<!--                    <van-collapse-item title="标题1" name="1" >-->
-<!--                      <van-cell-->
-<!--                        v-for="(a,index) in v.uncompleted" :key="a.taskId"-->
-<!--                        :title="a.beCheckedOrgName"-->
-<!--                        :value="getDictLabel(a.status,'safety_check_status')"-->
-<!--                        :to="{path:path,query:{id:a.taskId,enable:1}}"-->
-<!--                        is-link/>-->
-<!--                    </van-collapse-item>-->
-<!--                  </van-collapse>-->
-<!--                </van-tab>-->
-<!--              </van-tabs>-->
-              <van-collapse v-model="activeNames" :key="v.planId">
-                <van-collapse-item name="1" >
+
+              <van-collapse v-model="active" :key="v.planId">
+                <van-collapse-item :name="v.planId" >
                   <template #title>
                     <div class="collapse-title">
                       <div :class="{'active':v.active==1}" @click.stop="changeList(v,1)">完成</div>
@@ -90,24 +65,6 @@
               </van-collapse>
             </van-panel>
           </div>
-
-
-<!--            <van-button type="info" @click="to">详情</van-button>-->
-<!--            <van-cell-group v-for="v in dataList">-->
-<!--              <van-cell :title="v.orgName" >-->
-<!--                <template #extra>-->
-<!--                  <div class="card-num">-->
-<!--                    {{v.finishRate}}-->
-<!--                  </div>-->
-<!--                </template>-->
-<!--                <template #label>-->
-<!--                  <div class="flex-box">-->
-<!--                    <div>应培训数：{{v.shouldFinish}}</div>-->
-<!--                    <div>已培训数：{{v.finish}}</div>-->
-<!--                  </div>-->
-<!--                </template>-->
-<!--              </van-cell>-->
-<!--            </van-cell-group>-->
         </Scroll>
       </div>
 
@@ -137,7 +94,7 @@ export default {
   },
   data() {
     return {
-      activeNames:['1'],
+      active:['1'],
       //配置子页面路径
       path:'/securityDetail',
       query:{
@@ -205,6 +162,9 @@ export default {
           v.active = 1
           return v
         });
+        this.active = res.rows.map(v=>{
+          return v.planId
+        })
       })
     }
   }