safecheck-client 3.0.39-8 → 3.0.39-80

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

@@ -1212,16 +1212,11 @@ export default {
     },
 
     devicesCollect() {
-      //tag
-      //tag)
-      //tag)
-      //tag
       this.deviceCollects = []
       this.deviceImgs = []
       let checkResult = '正常'
       this.result = '正常'
       let codata = JSON.parse(JSON.stringify(this.data))
-      //tag)
       for (let device in this.data) {
         let f_device_type
         if (device.startsWith("device")) {
@@ -1232,54 +1227,38 @@ export default {
             } else {
               f_device_type = this.data[device][item].f_device_type
             }
-            // //tag
             let deviceelse = []
             let deviceInfos = []
-
             for (let i in this.data[device][item].f_items) {
               let defects = ''
-
               let items = this.data[device][item].f_items[i]
-
-
-              if ((items.type === 'selector' || items.type === 'radio' || items.type === 'checkbox' || items.type === 'picture') && items.f_item_value != null && items.f_item_value instanceof Array) {
+              if (items.f_item_name == '用气设施安装是否符合规范'){
+                debugger
+              }
+              if ((items.type === 'selector' || items.type === 'radio' || items.type === 'checkbox' || items.type === 'picture') && items.f_item_value != null && items.f_item_value instanceof Array && items.f_item_value.length != 0) {
                 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}:${items.f_item_value}/`
                   }
-                  /*let options = this.config[this.data[device][item].f_device_type].items[items.f_item_name].options
-                  for (let option in options) {
-                    if (options[option].data == f_item_value) {
-                      if (options[option].isdefect == 'true' || options[option].isdefect == true) {
-                        checkResult = '有隐患'
-                        this.result = '有隐患'
-                        defects = `${defects}:${options[option].data}/`
-                        // let level = options[option].level
-                      }
-                    }
-                  }*/
-                  //tag)
                 }
                 if (defects != '') {
                   console.log('有隐患items', items)
                   deviceInfos.push(`${items.f_item_name}${defects.substring(0, defects.length - 1)}${items.f_else ? items.f_else : ''}`)
                   this.deviceImgs.push({f_overall_path:items.f_path})
                 }
+              } else if ((items.type === 'selector' || items.type === 'radio' || items.type === 'checkbox' || items.type === 'picture') && items.f_item_value && items.f_item_value.length == 0) {
+                if (items.f_is_defect == 'true' || items.f_is_defect == true) {
+                  checkResult = '有隐患'
+                  this.result = '有隐患'
+                  deviceInfos.push(items.f_item_name)
+                  this.deviceImgs.push({f_overall_path:items.f_path})
+                }
               } else if ((items.type === 'string' || items.type === 'number') && items.f_is_defect && items.f_item_value[0]) {
                 checkResult = '有隐患'
                 this.result = '有隐患'
@@ -1298,7 +1277,6 @@ export default {
                 }
               } else if (items.f_item_name == '气量异常差值') {
                 var deviation = this.$appdata.getSingleValue('气量异常差值允许误差')
-                //tag
                 if (parseFloat(items.f_item_value[0]).toString() != "NaN" && parseFloat(deviation).toString() != "NaN") {
                   if (parseFloat(items.f_item_value[0]) > parseFloat(deviation) || parseFloat(items.f_item_value[0]) < parseFloat(deviation) * -1) {
                     checkResult = '有隐患'
@@ -1307,9 +1285,7 @@ export default {
                   }
                 }
               }
-              if (!this.config[this.data[device][item].f_device_type].items[items.f_item_name]) {
-                // console.log('this.config[this.data[device][item].f_device_type]', this.config[this.data[device][item].f_device_type])
-                // console.log('this.deviceconfig2', this.deviceconfig2)
+                if (!this.config[this.data[device][item].f_device_type].items[items.f_item_name]) {
                 for (let dev in this.deviceconfig2) {
                   if (this.deviceconfig2[dev].checkname == this.data[device][item].f_device_type) {
                     this.deviceconfig2[dev].items.push({
@@ -1318,31 +1294,20 @@ export default {
                   }
                 }
               }
-              //tag)
-              //tag
-              //tag
               if (items.type === 'selector') {
                 items.selected = []
               } else if (items.type === 'inputSelector') {
                 items.selected = ''
               }
             }
-
-
-            //tag
             this.$set('deviceCollect.name', f_device_type)
             this.$set('deviceCollect.value', checkResult)
             this.$set('deviceCollect.devices', deviceInfos)
             this.$set('deviceCollect.else', deviceelse)
-            console.log('deviceCollect.devices', this.deviceCollect.devices)
-            console.log('deviceCollect.else', this.deviceCollect.else)
-            console.log('deviceCollect.imgs', this.deviceCollect.imgs)
-            //tag)
             if (this.deviceCollect.name) {
-              //tag
+              console.log("---------------"+JSON.stringify(this.deviceCollect))
               this.deviceCollects.push(JSON.parse(JSON.stringify(this.deviceCollect)))
             }
-
             checkResult = '正常'
             this.deviceCollect = {}
           }
@@ -1478,6 +1443,9 @@ export default {
       if (val2 == '气量异常差值' || val2 == '金额异常差值') {
         return
       }
+      if (val2 == '用气设施安装是否符合规范'){
+        debugger
+      }
       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) {
@@ -1936,15 +1904,9 @@ export default {
               console.log('Vue.config.safecheck.DevicesConfig', Vue.config.safecheck.DevicesConfig)
               // 如果没有用户类型 默认按民用配置走
               if (this.data.f_check_type == '非民用') {
-                this.deviceconfig = Vue.config.safecheck.DevicesSetConfig
-                if (typeof this.deviceconfig === 'string') {
-                  this.deviceconfig = JSON.parse(this.deviceconfig)
-                }
+                this.deviceconfig = JSON.parse(JSON.stringify(Vue.config.safecheck.DevicesSetConfig))
               }else{
-                  this.deviceconfig = Vue.config.safecheck.DevicesConfig
-                  if (typeof this.deviceconfig === 'string') {
-                    this.deviceconfig = JSON.parse(this.deviceconfig)
-                  }
+                this.deviceconfig = JSON.parse(JSON.stringify(Vue.config.safecheck.DevicesConfig))
               }
               if (this.data.f_collection_type == '按金额') {
                 if (this.deviceconfig["燃气表"]){

package/src/filiale/BFshiye/pc.js

@@ -6,8 +6,9 @@ let specialComp = {
   'check-user-list': (resolve) => { require(['./pc/checkUserList'], resolve) },
   'new-check-paper': (resolve) => { require(['./pc/NewCheckpaper.vue'], resolve) },
   'check-plan-area-list': (resolve) => { require(['./pc/CheckPlanAreaList.vue'], resolve) },
-  'check-plan': (resolve) => { require(['./pc/CheckPlan.vue'], resolve) },
-  'select-check-plan': (resolve) => { require(['./pc/SelectCheckPlan'], resolve) },
+  // 'check-plan': (resolve) => { require(['./pc/CheckPlan.vue'], resolve) },
+  // 'select-check-plan': (resolve) => { require(['./pc/SelectCheckPlan'], resolve) },
+  // 'safe-defect-list-new': (resolve) => { require(['./pc/DefectListNew.vue'], resolve) },
 }
 exports.specialComp = specialComp