修复bug

src/components/TopBar.vue

@@ -13,7 +13,7 @@
             <van-icon name="arrow" size="20" />
           </p>
           <p class="van-multi-ellipsis--l2 introduce-info ">
-            <span v-for="item in rolesList" :key="item.roleId">{{ item.roleName }}</span>
+            <span v-for="item in roleList" :key="item.roleId">{{ item.roleName }}</span>
           </p>
         </div>
       </div>
@@ -72,25 +72,16 @@ export default {
       show: false,
       info: '',
       active: this.defaultActive,
-      rolesList: [],
       color: '#ecf9ff',
       background: 'rgba(78,162,248,0.63)'
     }
   },
   computed: {
-    ...mapGetters(['userName', 'orgName', 'orgId'])
+    ...mapGetters(['userName', 'orgName','roleList', 'orgId'])
   },
   created() {},
   mounted() {
-    setTimeout(() => {
-      if(this.orgId){
-
-        this.getTheWeather()
-      }
-    }, 100);
-
-
-    // this.rolesList=JSON.parse(window.sessionStorage.getItem('SET_USER_ROLELIST'))||[]
+    this.getTheWeather();
   },
   methods: {
     onChange(index){
@@ -130,10 +121,6 @@ export default {
     getTheWeather() {
       getTheAreaWeather(this.orgId).then(res => {
         this.list = res.data || [];
-        setTimeout(() => {
-          this.rolesList = JSON.parse(window.sessionStorage.getItem('SET_USER_ROLELIST')) || []
-        }, 100)
-        console.log(this.rolesList)
       })
     }
   }

src/views/menu/securityCheckRegister/detail.vue

@@ -27,16 +27,16 @@
           />
         </van-cell-group>
       </div>
-      <!--  搜索框  -->
-      <van-search v-model="itemName" class="van-hairline--bottom" placeholder="请输入检查项名称"/>
       <!--  检查项目    -->
       <fieldset class="fieldset" :disabled="!enable">
         <div class="card">
           <p class="legend">检查项目 <span v-if="enable" @click="addCheck">添加检查内容</span></p>
+          <!--  搜索框  -->
+          <van-search v-model="itemName" class="van-hairline--top" placeholder="请输入检查项名称" />
           <van-collapse v-model="activeNames" v-for="v in resultList" :key="v.itemId">
             <van-collapse-item :title="v.itemName" :name="v.itemName">
-              <div v-for="(item, index) in v.pointList" :key="item.pointId">
-                <van-cell>
+              <div v-for="(item, index) in v.pointList" :key="item.pointId" class="collapse-box" :class="{'van-hairline--bottom':item.status}">
+                <van-cell :border="Boolean(item.status)">
                   <template #title>
                     <pre>{{ item.pointName }}</pre>
                   </template>
@@ -93,6 +93,7 @@
                   <select-cell
                     required
                     :disabled="!enable"
+                    is-row
                     title="整改期限"
                     v-model="item.rectificationDeadline"
                     :data-list="getDictItem('rectification_deadline')"
@@ -101,7 +102,7 @@
                     <uploader v-if="enable" :maxCount="5" v-model="item.imgData" />
                     <van-cell v-else-if="item.imgData">
                       <div
-                        class="nfc-img van-hairline--surround"
+                        class="nfc-img"
                         v-for="(v, i) in item.imgData"
                         :key="v.imgPath"
                         @click="clickWarnImage(item.imgData, i)"
@@ -382,9 +383,9 @@ export default {
           return '#008cd6';
         case '进行中':
           return '#bc9f71';
-        case '完成':
+        case '已完成':
           return '#009240';
-        case '已过期':
+        case '已逾期':
           return '#D7000F';
       }
     },
@@ -563,6 +564,9 @@ export default {
       margin-bottom: 0;
     }
   }
+  .collapse-box{
+    -padding-bottom: 10px;
+  }
   .check-area {
     background-color: #f1f1f1;
     margin: 10px;
@@ -584,7 +588,7 @@ export default {
     vertical-align: middle;
   }
   .upload-box {
-    margin: 30px;
+    padding: 30px;
   }
   .warning-msg {
     color: orange;

src/views/menu/securityCheckRegister/index.vue

@@ -135,9 +135,9 @@ export default {
           return '#008cd6';
         case '进行中':
           return '#bc9f71';
-        case '完成':
+        case '已完成':
           return '#009240';
-        case '已过期':
+        case '已逾期':
           return '#D7000F';
       }
     },