修复隐患问题bug

src/assets/css/index.scss

@@ -36,10 +36,7 @@ pre{
 
 .van-button--info{
   -background-color: #008cd6;
-}
-
-.van-button--info{
-  -background-color: #008cd6;
+  -border: 1px solid #008cd6;
 }
 
 .van-picker__confirm{

src/components/dateCell/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="date-cell" >
-    <van-cell v-if="disabled" :title="title" :label="label" />
-    <van-cell v-else :title="title" :label="label" @click="clickItem">
+    <van-cell v-if="disabled" :required="required" :title="title" :label="label" />
+    <van-cell v-else :title="title" :required="required" :label="label" @click="clickItem">
       <template #right-icon>
         <van-icon name="notes-o" class="date-icon"/>
       </template>
@@ -47,6 +47,10 @@ export default {
       type: String,
       default: 'date',
     },
+    required:{
+      type: [Boolean,String],
+      default: false,
+    },
   },
   data(){
     return{
@@ -116,3 +120,25 @@ export default {
   margin: 0;
 }
 </style>
+<style lang="scss" scoped>
+.date-cell{
+  position: relative;
+  box-sizing: border-box;
+  width: 100%;
+  overflow: hidden;
+  color: #323233;
+  background-color: #fff;
+}
+.date-cell::after{
+  position: absolute;
+  box-sizing: border-box;
+  content: ' ';
+  pointer-events: none;
+  right: 30px;
+  bottom: 0;
+  left: 30px;
+  border-bottom: 1px solid #ebedf0;
+  -webkit-transform: scaleY(.5);
+  transform: scaleY(.5);
+}
+</style>

src/components/nfcPopup/more.vue

@@ -152,7 +152,7 @@ export default {
         nfcCode:this.selectNFC,
         url: this.nfcImage,
       }
-      alert(JSON.stringify(data));
+      //alert(JSON.stringify(data));
       this.$emit('change',data);
       this.visible = false;
       this.clear();

src/views/home/menu.vue

@@ -101,7 +101,7 @@ export default {
   margin: 30px;
   > p {
     font-size: 30px;
-    padding: 10px 10px 10px 20px;
+    padding: 0 10px 20px 0;
   }
   > ul {
     display: flex;

src/views/menu/educationStatistics/index.vue

@@ -5,7 +5,7 @@
       <org-tree v-model="query.orgId" @change="getDataList"></org-tree>
       <div class="search-flex">
         <select-cell
-          class="van-hairline--right"
+          style="border-right:1px solid #f5f5f5;"
           title="教育计划名称"
           v-model="query.planId"
           :dataList="planList"

src/views/menu/problemItem/detail.vue

@@ -97,6 +97,8 @@
               v-model="confirmData.description"
               rows="1"
               autosize
+              required
+              :maxlength="200"
               label="异议内容"
               type="textarea"
               placeholder="请输入"/>
@@ -130,7 +132,10 @@
               v-model="confirmDissentData.description"
               rows="1"
               autosize
+              required
+              :maxlength="200"
               label="原因"
+              :rules="[{ required: true, message: '请输入' }]"
               type="textarea"
               placeholder="请输入"/>
             <div class="big-btn-box" v-if="taskInfo.submitorId == id && taskInfo.confirmStatus==1">
@@ -149,6 +154,7 @@
               v-model="reformData.description"
               rows="1"
               autosize
+              :maxlength="200"
               label="整改描述："
               type="textarea"
               placeholder="请输入"/>
@@ -236,8 +242,8 @@ export default {
           queryMethod = reform;
       }
       if(type === '确认' || type === '审核'){
-        if(!data && !data.description) {
-          return this.$toast("请填写完整信息");
+        if(data.status == 1 && !data.description) {
+          return this.$toast("请填写信息");
         }
       }else {
         if(!data.reformDate || !data.description){
@@ -281,14 +287,23 @@ export default {
 
     //清空数据
     clearData(){
-      this.areaList = [];
       this.taskInfo= [];
-      this.selectArea = [];
-      this.NFCList = [];
-      this.checkList = [];
-      this.checkItemList = [];
-      this.NFCNum = 0;
-      this.enable = false;
+      //确认
+      this.confirmData = {
+        status: 0,
+        description: null,
+      }
+      //审核
+      this.confirmDissentData = {
+        status: 0,
+        description: null,
+      }
+      //整改
+      this.reformData = {
+        reformDate: null,
+        description: null,
+        images: null,
+      }
     },
   }
 }

src/views/menu/resumption/list.vue

@@ -6,9 +6,8 @@
       <div class="lz-list">
         <div class="list-item">
           <p>每日履职</p>
-          <van-tabs >
-            <van-tab title="待完成">
-              <template #title>待完成 {{dayList.unfinished.length}} </template>
+          <van-tabs>
+            <van-tab title="待完成" :badge="dayList.unfinished.length">
               <Empty v-if="!dayList.unfinished.length"/>
               <div class="list-container" v-else>
                   <van-cell
@@ -27,8 +26,7 @@
                   </van-cell>
               </div>
             </van-tab>
-            <van-tab title="未完成">
-              <template #title>未完成 {{dayList.proceed.length}} </template>
+            <van-tab title="未完成" :badge="dayList.proceed.length">
               <Empty v-if="!dayList.proceed.length"/>
               <div class="list-container" v-else>
                   <van-cell
@@ -45,8 +43,7 @@
                   </van-cell>
               </div>
             </van-tab>
-            <van-tab title="已完成">
-              <template #title>已完成 {{dayList.finished.length}} </template>
+            <van-tab title="已完成" :badge="dayList.finished.length">
               <Empty v-if="!dayList.finished.length"/>
               <div class="list-container" v-else>
                   <van-cell
@@ -70,8 +67,7 @@
         <div class="list-item">
           <p>周期履职</p>
           <van-tabs >
-            <van-tab title="待完成">
-              <template #title>待完成 {{otherList.unfinished.length}} </template>
+            <van-tab title="待完成" :badge="dayList.unfinished.length">
               <Empty v-if="!otherList.unfinished.length"/>
               <div class="list-container" v-else>
                   <van-cell
@@ -90,8 +86,7 @@
                   </van-cell>
               </div>
             </van-tab>
-            <van-tab title="未完成">
-              <template #title>未完成 {{otherList.proceed.length}} </template>
+            <van-tab title="未完成" :badge="dayList.proceed.length">
               <Empty v-if="!otherList.proceed.length"/>
               <div class="list-container" v-else>
                   <van-cell
@@ -108,8 +103,7 @@
                   </van-cell>
               </div>
             </van-tab>
-            <van-tab title="已完成">
-              <template #title>已完成 {{otherList.finished.length}} </template>
+            <van-tab title="已完成" :badge="dayList.finished.length">
               <Empty v-if="!otherList.finished.length"/>
               <div class="list-container" v-else>
                   <van-cell
@@ -284,6 +278,9 @@ export default {
   .van-tabs__line{
     background-color: #008cd6;
   }
+  .van-info {
+    background-color: #008cd6;
+  }
 }
 </style>
 <style lang="scss" scoped>

src/views/menu/securityCheckRegister/detail.vue

@@ -39,7 +39,7 @@
                   </template>
                   <template #right-icon>
                     <span v-if="item.nfcList && item.nfcList.length">
-                        <span>{{ getNfcState(item.nfcList) }}</span>/<span >{{item.nfcList.length}}</span>
+                        <span style="color:#009240;">{{ getNfcState(item.nfcList) }}</span>/<span >{{item.nfcList.length}}</span>
                     </span>
                     <img
                       v-if="enable && item.nfcList && item.nfcList.length"
@@ -330,7 +330,7 @@ export default {
         case '待检查':
           return '#008cd6';
         case '进行中':
-          return '#e39218';
+          return '#bc9f71';
         case '完成':
           return '#009240';
         case '已过期':

src/views/menu/securityCheckRegister/index.vue

@@ -144,7 +144,7 @@ export default {
         case '待检查':
           return '#008cd6';
         case '进行中':
-          return '#e39218';
+          return '#bc9f71';
         case '完成':
           return '#009240';
         case '已过期':