safecheck-client 3.0.34-7 → 3.0.34-71

package/src/filiale/yuansheng/android.js

@@ -1,17 +1,17 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-// 手机特殊目录注册到该文件中
-let specialComp = {
-  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
-  'switch-valve': (resolve) => { require(['./android/SwitchValve'], resolve) },
-  'paper-feedback' : (resolve) => { require(['./android/PaperFeedback'], resolve) },
-  'paper-state': (resolve) => { require(['./android/PaperState.vue'], resolve) },
-  'safecheck-devices': (resolve) => { require(['./android/SafecheckDevices.vue'], resolve) },
-  'PhoneUpUserinfo': (resolve) => { require(['./android/PhoneUpUserinfo.vue'], resolve) },
-  'android-defect-deal': (resolve) => { require(['./android/AndroidDefectDeal'], resolve) },
-  'safecheck-userinfo': (resolve) => { require(['./android/SafecheckUserInfo.vue'], resolve) }
-}
-
-exports.specialComp = specialComp
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+// 手机特殊目录注册到该文件中
+let specialComp = {
+  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
+  'switch-valve': (resolve) => { require(['./android/SwitchValve'], resolve) },
+  'paper-feedback' : (resolve) => { require(['./android/PaperFeedback'], resolve) },
+  'paper-state': (resolve) => { require(['./android/PaperState.vue'], resolve) },
+  'safecheck-devices': (resolve) => { require(['./android/SafecheckDevices.vue'], resolve) },
+  'PhoneUpUserinfo': (resolve) => { require(['./android/PhoneUpUserinfo.vue'], resolve) },
+  'android-defect-deal': (resolve) => { require(['./android/AndroidDefectDeal'], resolve) },
+  'safecheck-userinfo': (resolve) => { require(['./android/SafecheckUserInfo.vue'], resolve) }
+}
+
+exports.specialComp = specialComp
+

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++) {