Sfoglia il codice sorgente

修改安全检查界面

yinbangyuan 1 anno fa
parent
commit
24b8cb00d9

+ 19 - 3
src/views/menu/securityCheckRegister/add.vue

@@ -33,12 +33,12 @@
           <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">
+          <van-collapse v-model="activeNames" v-for="(v,i) in resultList" :key="v.itemId">
+            <van-collapse-item :title="`${i+1}.${v.itemName}`" :name="v.itemName">
               <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>
+                    <pre> <span>{{`${i+1}-${index+1}`}}.</span> {{ item.pointName }}</pre>
                   </template>
                   <template #right-icon>
                     <span v-if="item.nfcList && item.nfcList.length">
@@ -546,6 +546,22 @@ export default {
   }
 }
 </script>
+<style lang="scss">
+.register-edit{
+  .van-collapse-item__content{
+    padding:0 30px;
+  }
+}
+.collapse-box{
+  .van-cell{
+    padding:20px 0;
+    border-bottom: 1px solid #f5f5f5;
+    &:last-child{
+      border-bottom: none;
+    }
+  }
+}
+</style>
 <style lang="scss" scoped>
 .register-edit {
   height: 100%;

+ 3 - 3
src/views/menu/securityCheckRegister/index.vue

@@ -33,7 +33,7 @@
               <van-cell :title="v.taskName" :border="false" :label="rangDate(formatDate(v.planStartTime,'DATE'),formatDate(v.planEndTime,'DATE'))" ></van-cell>
               <div class="collapse-title">
                 <div :class="{'active':v.active==2}" @click.stop="changeList(v,2)">
-                  <p> {{v.uncompleted.length}}</p>
+                  <p>{{v.uncompleted.length}}</p>
                   <p>未检查</p>
                 </div>
                 <div :class="{'active':v.active==1}" @click.stop="changeList(v,1)">
@@ -136,11 +136,11 @@ export default {
   methods: {
     formatDate,
     clickItem(item){
-      if(item.status == 3){
+      if(item.status == 3 || item.status == 4){
         this.$router.push(
           {
            path:'/securityDetail',
-           query:{id:item.taskId,enable:1}
+           query:{id:item.taskId,enable:0}
           }
         )
       }else {