safecheck-client 3.0.35-5 → 3.0.35-51

package/src/filiale/qianneng/android/SwitchValve.vue

@@ -303,6 +303,7 @@ export default {
       // let condition =  ` uf.f_filialeid = '${this.filialeid}'`
       let condition =  ` 1=1 `
       condition += this.condition
+      condition += ` and f_filialeid = '${this.filialeid}'`
       condition += this.f_meternumber ? ` and f_meternumber = '${this.f_meternumber}'` : ""
       condition += this.f_userinfo_code ? ` and f_userinfo_code = '${this.f_userinfo_code}'` : ""
       condition += this.f_enter_number ? ` and f_enter_number = '${this.f_enter_number}'` : ""

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

@@ -639,10 +639,15 @@ export default {
                   //tag)
                   //tag)
                   //tag)
-                  if (!this.config[this.data[device][item].f_device_type].items[items.f_item_name]) {
+                  if (!this.config[this.data[device][item].f_device_type].items[items.f_item_name]&& (items.isdefect && (items.isdefect == 'true' || items.isdefect == true))) {
                     continue
                   }
-                  let options = this.config[this.data[device][item].f_device_type].items[items.f_item_name].options
+                  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) {
@@ -652,13 +657,13 @@ export default {
                         // let level = options[option].level
                       }
                     }
-                  }
+                  }*/
                   //tag)
                 }
                 if (defects != '') {
                   deviceInfos.push(`${items.f_item_name}${defects.substring(0, defects.length - 1)}`)
                 }
-              } else if (items.type === 'string') {
+              } else if (items.type === 'string' && items.f_is_defect && items.f_item_value[0]) {
                 checkResult = '有隐患'
                 this.result = '有隐患'
                 deviceInfos.push(`${items.f_item_name}:${items.f_item_value[0]}`)