safecheck-client 3.0.34-33 → 3.0.34-35

package/src/filiale/yuansheng/android/SafecheckDevices.vue

@@ -713,7 +713,6 @@ export default {
       //tag ===> ' + Math.abs(this.f_items[this.f_gas_aberrant_number.index].f_item_value))
       //tag ===> ' + JSON.stringify(Number(this.gasDeviation)))
       // 计算差值是否在范围内
-
       if (Math.abs(this.f_items[this.f_meter_aberrant_number2.index].f_item_value) > Number(this.gasDeviation)) {
         this.f_items[this.f_meter_aberrant_number2.index].f_is_defect = true
         this.f_items[this.f_meter_aberrant_number2.index].f_deal_dispose = '未处理'
@@ -721,6 +720,17 @@ export default {
         this.f_items[this.f_meter_aberrant_number2.index].f_is_defect = null
         this.f_items[this.f_meter_aberrant_number2.index].f_deal_dispose = null
       }
+      if( this.f_items[this.f_meter_aberrant_number2.index].f_is_defect = true){
+        this.$showMessage(`表底数异常差值为:${this.f_items[this.f_meter_aberrant_number2.index].f_item_value},是否为隐患？`, ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            this.f_items[this.f_meter_aberrant_number2.index].f_is_defect = true
+            this.f_items[this.f_meter_aberrant_number2.index].f_deal_dispose = '未处理'
+          }else{
+            this.f_items[this.f_meter_aberrant_number2.index].f_is_defect = null
+            this.f_items[this.f_meter_aberrant_number2.index].f_deal_dispose = null
+          }
+        })
+      }
     },
 
     getGasAberrantNumber(val) {

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

@@ -689,8 +689,16 @@ export default {
                     deviceInfos.push(`${items.f_item_name}:${items.f_item_value[0]}`)
                   }
                 }
+              } else if (items.f_item_name === '表底数异常差值') {
+                var deviation = this.$appdata.getSingleValue('气量异常差值允许误差')
+                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 = '有隐患'
+                    this.result = '有隐患'
+                    deviceInfos.push(`${items.f_item_name}:${items.f_item_value[0]}`)
+                  }
+                }
               }
-
               //tag)
               //tag
               //tag
@@ -839,7 +847,7 @@ export default {
     },
     isred(val1, val2) {
       //tag
-      if (val2 == '气量异常差值' || val2 == '金额异常差值') {
+      if (val2 === '气量异常差值' || val2 === '金额异常差值') {
         return
       }
       for (let i = 0; i < this.devicesAll.length; i++) {

package/src/main.js

@@ -11,7 +11,7 @@ all()
 var Verificationfalg = false
 system(Verificationfalg)
 // system()
-safecheck('kelai')
+safecheck('huaran')
 // safecheck('rizhao')
 require('./bootstrap/less/bootstrap.less')
 require('./expandcss.less')