Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc_app into V0.0.5

src/views/menu/resumption/detail.vue

@@ -103,10 +103,12 @@
           <van-col span="8">
             <van-cell>
               <div class="okAll">
-                <van-button type="default" icon="checked" size="small" @click="changeSwitch">一键正常</van-button>
-                <!--<van-radio-group v-if="enable" v-model="selectRadio" @change="changeSwitch">
-                  <van-radio name="1" icon-size="20px">一键正常</van-radio>
-                </van-radio-group>-->
+<!--                <van-button type="default" icon="checked" size="small" @click="changeSwitch">一键正常</van-button>-->
+                <span  v-for="(va, i) in areas" :key="va.areaId">
+                  <van-radio-group  v-if="va.areaId === areaId"  v-model="selectRadio[va.areaId]" @change="changeAreaSwitch(va.areaId)">
+                    <van-radio name="1" icon-size="20px">一键正常</van-radio>
+                  </van-radio-group>
+                </span>
               </div>
             </van-cell>
           </van-col>
@@ -298,7 +300,7 @@ export default {
       areasMap: {},
       checks: [],
       nfcs: [],
-      selectRadio: 0,
+      selectRadio: {},
       total_show: false,
       enable: false,
       activeNames: [],
@@ -503,9 +505,12 @@ export default {
         this.nfcs = res.data.nfcs
         this.areas = res.data.areas
         let obj = {};
+        let tts = {};
         res.data.areas.forEach(function(v,i){
           obj[v.areaId] = v.areaName;
+          tts[v.areaId] = 0;
         });
+        this.selectArea = tts;
         this.areasMap = obj;
         this.activeArea(this.areas[0], 0)
         this.openCollapseItems()
@@ -520,18 +525,45 @@ export default {
         this.activeNames.push(title)
       }
     },
+    changeAreaSwitch(areaId) {
+      let num = 0;
+      let total = 0;
+      for (let i = 0; i < this.checks.length; i++) {
+        total = total + this.checks[i].points.length;
+        for (let j = 0; j < this.checks[i].points.length; j++) {
+          if(this.checks[i].areaId === areaId){
+            this.checks[i].points[j].dataStatus = 2
+            num++
+          }else{
+            if(this.checks[i].points[j].dataStatus === 2){
+              num++
+            }
+          }
+        }
+      }
+      this.resumptionData.yesPointNums = num
+      this.resumptionData.noPointNums = total - num
+      this.validateAreaAll();
+      this.openCollapseItems()
+    },
     changeSwitch() {
-      let num = 0
+      let num = 0;
+      let total = 0;
       for (let i = 0; i < this.checks.length; i++) {
+        total = total + this.checks[i].points.length;
         for (let j = 0; j < this.checks[i].points.length; j++) {
           if(this.checks[i].areaId === this.areaId){
             this.checks[i].points[j].dataStatus = 2
             num++
+          }else{
+            if(this.checks[i].points[j].dataStatus === 2){
+              num++
+            }
           }
         }
       }
       this.resumptionData.yesPointNums = num
-      this.resumptionData.noPointNums = 0
+      this.resumptionData.noPointNums = total - num
       this.validateAreaAll();
       this.openCollapseItems()
     },