safecheck-client 3.0.34-4 → 3.0.34-6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "3.0.34-4",
+  "version": "3.0.34-6",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",

package/src/components/android/AreaPlan.vue

@@ -424,13 +424,7 @@
           {label: '未检', value: '未检'},
           {label: '已检', value: '已检'},
         ],
-        last_check_states: [
-          {label: '请选择上次安检状态', value: ''},
-          {label: '入户', value: '入户'},
-          {label: '拒检', value: '拒检'},
-          {label: '到访不遇', value: '到访不遇'},
-          {label: '未使用天然气', value: '未使用天然气'}
-        ],
+        last_check_states: Vue.$appdata.getParam('安检状态'),
         upload_states: [
           {label: '请选择上传状态', value: ''},
           {label: '未传', value: '未传'},

package/src/components/android/PaperFeedback.vue

@@ -610,7 +610,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic(prop, title, index) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       ////tag
@@ -631,6 +630,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       HostApp._open_a_page({

package/src/components/android/PaperFeedbackTemp.vue

@@ -610,7 +610,6 @@
         HostApp.__this__ = null
       },
       takePic(prop, title, index) {
-        const obj = HostApp.getGpsDetailAddress()
         HostApp.__callback__ = this.cameraCallBack
         HostApp.__this__ = this
         ////tag
@@ -631,6 +630,7 @@
         }
         let jingweidu = ''
         if (this.$parent.$parent.is_has_jingweidu == 'true'){
+          const obj = HostApp.getGpsDetailAddress()
           jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
         }
         HostApp._open_a_page({

package/src/components/android/SafecheckDevices.vue

@@ -435,7 +435,6 @@ export default {
       if (this.role == 'androidview') {
         return
       }
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -455,6 +454,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       this.f_items[prop].f_longitude = obj.longitude
@@ -753,7 +753,7 @@ export default {
       this.f_items[this.f_gas_aberrant_number.index].f_is_defect = false
       if(val=='已用气量'){
         //剩余气量 = 累购-已用
-        this.f_items[this.f_gas_balance.index].f_item_value= this.f_items[this.f_total_gas.index].f_item_value-this.f_items[this.f_table_base.index].f_item_value
+        this.f_items[this.f_gas_balance.index].f_item_value= (this.f_items[this.f_total_gas.index].f_item_value-this.f_items[this.f_table_base.index].f_item_value).toFixed(2)
         if (isNaN(this.f_items[this.f_gas_balance.index].f_item_value)) {
           this.f_items[this.f_gas_balance.index].f_item_value = null
         }

package/src/components/android/SafecheckDevicesTemp.vue

@@ -435,7 +435,6 @@
         if (this.role == 'androidview') {
           return
         }
-        const obj = HostApp.getGpsDetailAddress()
         HostApp.__callback__ = this.cameraCallBack
         HostApp.__this__ = this
         //tag
@@ -455,6 +454,7 @@
         }
         let jingweidu = ''
         if (this.$parent.$parent.is_has_jingweidu == 'true'){
+          const obj = HostApp.getGpsDetailAddress()
           jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
         }
         //tag

package/src/components/android/userinfo/SafecheckUserInfo.vue

@@ -412,7 +412,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic (type ,prop, title) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -438,6 +437,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       let page = 'com.aofeng.hybrid.android.peripheral.CameraActivity'

package/src/filiale/bayan/android/PaperFeedback.vue

@@ -707,7 +707,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic(prop, title, index) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       ////tag
@@ -728,6 +727,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       HostApp._open_a_page({

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

@@ -430,7 +430,6 @@ export default {
       if (this.role == 'androidview') {
         return
       }
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -450,6 +449,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       //tag

package/src/filiale/bayan/android/SafecheckUserInfo.vue

@@ -500,7 +500,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic(type, prop, title) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -526,6 +525,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true') {
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu = '\t经度：' + obj.longitude + '\t纬度：' + obj.latitude
       }
       let page = 'com.aofeng.hybrid.android.peripheral.CameraActivity'

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

@@ -430,7 +430,6 @@ export default {
       if (this.role == 'androidview') {
         return
       }
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -450,6 +449,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       //tag

package/src/filiale/hanzhong/android/PaperFeedback.vue

@@ -608,7 +608,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic(prop, title, index) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       ////tag
@@ -629,6 +628,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       HostApp._open_a_page({

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

@@ -435,7 +435,6 @@
         if (this.role == 'androidview') {
           return
         }
-        const obj = HostApp.getGpsDetailAddress()
         HostApp.__callback__ = this.cameraCallBack
         HostApp.__this__ = this
         //tag
@@ -455,6 +454,7 @@
         }
         let jingweidu = ''
         if (this.$parent.$parent.is_has_jingweidu == 'true'){
+          const obj = HostApp.getGpsDetailAddress()
           jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
         }
         //tag

package/src/filiale/hanzhong/android/SafecheckUserInfo.vue

@@ -422,7 +422,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic (type ,prop, title) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -448,6 +447,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       let page = 'com.aofeng.hybrid.android.peripheral.CameraActivity'

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

@@ -435,7 +435,6 @@ export default {
       if (this.role == 'androidview') {
         return
       }
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -455,6 +454,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       this.f_items[prop].f_longitude = obj.longitude

package/src/filiale/jingyang/android/PaperFeedback.vue

@@ -625,7 +625,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic(prop, title, index) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       ////tag
@@ -646,6 +645,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       HostApp._open_a_page({

package/src/filiale/jingyang/android/SafecheckUserInfo.vue

@@ -417,7 +417,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic (type ,prop, title) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -443,6 +442,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       let page = 'com.aofeng.hybrid.android.peripheral.CameraActivity'

package/src/filiale/pingxiang/android/PaperFeedback.vue

@@ -532,7 +532,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic(prop, title, index) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       ////tag
@@ -553,6 +552,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       HostApp._open_a_page({

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

@@ -435,7 +435,6 @@ export default {
       if (this.role == 'androidview') {
         return
       }
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -455,6 +454,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       //tag

package/src/filiale/qingjian/android/SafecheckUserInfo.vue

@@ -431,7 +431,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic (type ,prop, title) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -457,6 +456,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       let page = 'com.aofeng.hybrid.android.peripheral.CameraActivity'

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

@@ -439,7 +439,6 @@
         if (this.role == 'androidview') {
           return
         }
-        const obj = HostApp.getGpsDetailAddress()
         HostApp.__callback__ = this.cameraCallBack
         HostApp.__this__ = this
         //tag
@@ -459,6 +458,7 @@
         }
         let jingweidu = ''
         if (this.$parent.$parent.is_has_jingweidu == 'true'){
+          const obj = HostApp.getGpsDetailAddress()
           jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
         }
         //tag

package/src/filiale/siyang/android/SafecheckUserInfo.vue

@@ -425,7 +425,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic(type, prop, title) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -451,6 +450,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true') {
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu = '\t经度：' + obj.longitude + '\t纬度：' + obj.latitude
       }
       let page = 'com.aofeng.hybrid.android.peripheral.CameraActivity'

package/src/filiale/yangchunboneng/android/CurrentCreate.vue

@@ -662,15 +662,7 @@
           {label: '未检', value: '未检'},
           {label: '已检', value: '已检'},
         ],
-        last_check_states: [
-          {label: '请选择', value: ''},
-          {label: '入户', value: '入户'},
-          {label: '拒检', value: '拒检'},
-          {label: '到访不遇', value: '到访不遇'},
-          {label: '拆除', value: '拆除'},
-          {label: '停用', value: '停用'},
-          {label: '未通气', value: '未通气'}
-        ],
+        last_check_states: Vue.$appdata.getParam('安检状态'),
         upload_states: [
           {label: '请选择上传状态', value: ''},
           {label: '未传', value: '未传'},

package/src/filiale/yangchunboneng/android/DailyworkloadQuery.vue

@@ -302,15 +302,7 @@ export default {
         {label: '左表', value: '左表'},
         {label: '右表', value: '右表'}
       ],
-      check_states: [
-        {label: '请选择安检状态', value: ''},
-        {label: '入户', value: '入户'},
-        {label: '到访不遇', value: '到访不遇'},
-        {label: '拒检', value: '拒检'},
-        {label: '停用', value: '停用'},
-        {label: '未通气', value: '未通气'},
-        {label: '拆除', value: '拆除'}
-      ],
+      check_states: Vue.$appdata.getParam('安检状态'),
       last_check_states: [
         {label: '请选择上次安检状态', value: ''},
         {label: '入户', value: '入户'},

package/src/filiale/yangchunboneng/android/PaperFeedback.vue

@@ -676,7 +676,6 @@
         HostApp.__this__ = null
       },
       takePic(prop, title, index) {
-        const obj = HostApp.getGpsDetailAddress()
         HostApp.__callback__ = this.cameraCallBack
         HostApp.__this__ = this
         ////tag
@@ -697,6 +696,7 @@
         }
         let jingweidu = ''
         if (this.$parent.$parent.is_has_jingweidu == 'true') {
+          const obj = HostApp.getGpsDetailAddress()
           jingweidu = '\t经度:' + obj.longitude + '\t纬度:' + obj.latitude
         }
         HostApp._open_a_page({

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

@@ -452,7 +452,6 @@ export default {
       if (this.role == 'androidview') {
         return
       }
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -472,6 +471,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       //tag
@@ -747,7 +747,7 @@ export default {
       this.f_items[this.f_gas_aberrant_number.index].f_is_defect = false
       if(val=='已用气量'){
         //剩余气量 = 累购-已用
-        this.f_items[this.f_gas_balance.index].f_item_value= this.f_items[this.f_total_gas.index].f_item_value-this.f_items[this.f_table_base.index].f_item_value
+        this.f_items[this.f_gas_balance.index].f_item_value= (this.f_items[this.f_total_gas.index].f_item_value-this.f_items[this.f_table_base.index].f_item_value).toFixed(2)
         if (isNaN(this.f_items[this.f_gas_balance.index].f_item_value)) {
           this.f_items[this.f_gas_balance.index].f_item_value = null
         }

package/src/filiale/yangchunboneng/android/SafecheckUserInfo.vue

@@ -505,7 +505,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic (type ,prop, title) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -531,6 +530,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       let page = 'com.aofeng.hybrid.android.peripheral.CameraActivity'

package/src/filiale/yangchunboneng/android/safeHistoryLook.vue

@@ -303,15 +303,7 @@ export default {
         {label: '左表', value: '左表'},
         {label: '右表', value: '右表'}
       ],
-      check_states: [
-        {label: '请选择安检状态', value: ''},
-        {label: '入户', value: '入户'},
-        {label: '到访不遇', value: '到访不遇'},
-        {label: '拒检', value: '拒检'},
-        {label: '停用', value: '停用'},
-        {label: '未通气', value: '未通气'},
-        {label: '拆除', value: '拆除'}
-      ],
+      check_states: Vue.$appdata.getParam('安检状态'),
       last_check_states: [
         {label: '请选择上次安检状态', value: ''},
         {label: '入户', value: '入户'},

package/src/filiale/yongzhou/android/PaperFeedback.vue

@@ -634,7 +634,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic(prop, title, index) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       ////tag
@@ -661,6 +660,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       HostApp._open_a_page({

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

@@ -435,7 +435,6 @@ export default {
       if (this.role == 'androidview') {
         return
       }
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -455,6 +454,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       //tag

package/src/filiale/yongzhou/android/SafecheckUserInfo.vue

@@ -412,7 +412,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic (type ,prop, title) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -438,6 +437,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       let page = 'com.aofeng.hybrid.android.peripheral.CameraActivity'

package/src/filiale/yunchengminsheng/android/PaperFeedback.vue

@@ -626,7 +626,6 @@
         HostApp.__this__ = null
       },
       takePic(prop, title, index) {
-        const obj = HostApp.getGpsDetailAddress()
         HostApp.__callback__ = this.cameraCallBack
         HostApp.__this__ = this
         ////tag
@@ -647,6 +646,7 @@
         }
         let jingweidu = ''
         if (this.$parent.$parent.is_has_jingweidu == 'true'){
+          const obj = HostApp.getGpsDetailAddress()
           jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
         }
         HostApp._open_a_page({

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

@@ -435,7 +435,6 @@ export default {
       if (this.role == 'androidview') {
         return
       }
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -455,6 +454,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       //tag

package/src/filiale/yunchengminsheng/android/SafecheckUserInfo.vue

@@ -420,7 +420,6 @@
         HostApp.__this__ = null
       },
       takePic (type ,prop, title) {
-        const obj = HostApp.getGpsDetailAddress()
         HostApp.__callback__ = this.cameraCallBack
         HostApp.__this__ = this
         //tag
@@ -450,6 +449,7 @@
         }
         let jingweidu = ''
         if (this.$parent.$parent.is_has_jingweidu == 'true'){
+          const obj = HostApp.getGpsDetailAddress()
           jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
         }
         HostApp._open_a_page({