safecheck-client 4.0.2-5 → 4.0.2-50

package/src/filiale/xinkang/pc/NewCheckpaper.vue

@@ -635,44 +635,20 @@ export default {
             for (let i in this.data[device][item].f_items) {
               let defects = ''
               let items = this.data[device][item].f_items[i]
-              console.log('items.f_item_name', items.f_item_name)
-              console.log('items', items)
-
+              if (!this.item.f_defect_content.includes(items.f_item_name)){
+                continue
+              }
               if ((items.type === 'selector' || items.type === 'radio' || items.type === 'checkbox') && items.f_item_value != null && items.f_item_value instanceof Array) {
                 for (let i in items.f_item_value) {
                   let f_item_value = items.f_item_value[i]
-
-                  //tag)
-                  //tag)
-                  //tag)
-                  //tag)
                   if (!this.config[this.data[device][item].f_device_type].items[items.f_item_name] && (items.isdefect && (items.isdefect=='true' || items.isdefect==true))) {
                     continue
                   }
-                  // if(items.f_is_defect != true && items.f_is_defect != 'true'){
-                  //   continue
-                  // }
                   if (items.f_is_defect == 'true' || items.f_is_defect == true) {
                     checkResult = '有隐患'
                     this.result = '有隐患'
                     defects = `${defects}:${f_item_value}/`
                   }
-                  // let options = this.config[this.data[device][item].f_device_type].items[items.f_item_name].options
-                  // if(items.f_item_name == '是否开放式厨房') {
-                  //   console.log('是否开放式厨房', options)
-                  //   console.log('f_item_value', f_item_value)
-                  // }
-                  // for (let option in options) {
-                  //   if (options[option].data == f_item_value) {
-                  //     if ((options[option].isdefect == 'true' || options[option].isdefect == true) && (items.f_is_defect == 'true' || items.f_is_defect == true)) {
-                  //       checkResult = '有隐患'
-                  //       this.result = '有隐患'
-                  //       defects = `${defects}:${options[option].data}/`
-                  //       // let level = options[option].level
-                  //     }
-                  //   }
-                  // }
-                  //tag)
                 }
                 if (defects != '') {
                   deviceInfos.push(`${items.f_item_name}${defects.substring(0, defects.length - 1)}`)
@@ -752,14 +728,6 @@ export default {
         }
       }
       this.ajresult = JSON.parse(this.data.f_defect_content).result
-      if (this.deviceCollects.length > 0) {
-        this.hasDevice = true
-        for (let i = 0; i < this.deviceCollects.length; i++) {
-          if(this.deviceCollects[i].value==='有隐患'){
-            this.ajresult='有隐患'
-          }
-        }
-      }
       this.showimg3 = this.data.f_noanswer_path
       this.showimg4 = this.data.f_rejectcheck_path
       this.paperdata = this.data
@@ -870,23 +838,26 @@ export default {
       }
     },
     isred(val1, val2) {
-      //tag
       let f_is_defect = false
-      for (let i = 0; i < this.devicesAll.length; i++) {
-        for (let j = 0; j < this.devicesAll[i].length; j++) {
-          if (this.devicesAll[i][j].f_device_type == val1) {
-            for (let k = 0; k < this.devicesAll[i][j].f_items.length; k++) {
-              if (this.devicesAll[i][j].f_items[k].f_item_name == val2) {
-                if (!this.devicesAll[i][j].f_items[k].f_is_defect) {
-                  f_is_defect =  false
-                } else {
-                  f_is_defect =  true
+      if (this.item.f_defect_content.includes(val2)){
+        for (let i = 0; i < this.devicesAll.length; i++) {
+          for (let j = 0; j < this.devicesAll[i].length; j++) {
+            if (this.devicesAll[i][j].f_device_type == val1) {
+              for (let k = 0; k < this.devicesAll[i][j].f_items.length; k++) {
+                if (this.devicesAll[i][j].f_items[k].f_item_name == val2) {
+                  if (!this.devicesAll[i][j].f_items[k].f_is_defect) {
+                    f_is_defect =  false
+                  } else {
+                    f_is_defect =  true
+                  }
                 }
               }
-            }
 
+            }
           }
         }
+      }else {
+        f_is_defect =  false
       }
       // console.log("333",val2)
       if(this.level1.findIndex(item=>item == val2)!=-1 && f_is_defect){