safecheck-client 4.0.1-5 → 4.0.1-52

package/src/filiale/xinkang/android/AddPlanItem.vue

@@ -188,7 +188,7 @@
   import {HttpResetClass, PagedList} from 'vue-client'
   import Vue from 'vue'
   import * as Util from '../../Util'
-  import {toStandardTimeString} from "../../Util";
+  import {isEmpty, toStandardTimeString} from "../../Util";
 
   export default {
     title: '安检员B',
@@ -304,42 +304,76 @@
         })
         //tag
       },
-      inspect (info){
+      inspect(info) {
         // 当前系统时间
         let newdate = Util.toStandardTimeString()
-        if(info.f_last_check_state == '入户' && info.f_last_check_date){
-          // 解析上次安检时间
-          let lastCheckDate = new Date(info.f_last_check_date)
-          let currentDate = new Date(newdate)
-          // 计算时间差（毫秒）
-          let timeDiff = currentDate.getTime() - lastCheckDate.getTime()
-
-          // 6个月 = 6 * 30 * 24 * 60 * 60 * 1000 毫秒（约15552000000毫秒）
-          // 更精确的计算：6个月 = 6 * 平均每月30.44天 * 24 * 60 * 60 * 1000
-          let sixMonthsInMs = 6 * 30 * 24 * 60 * 60 * 1000
+        if(isEmpty(info.f_last_check_date) || info.f_user_type == '非民用'){
+          info.id = ''
+          info.f_state = '未检'
+          info.f_no_checkplan = '无计划安检'
+          //tag
+          this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: info.f_userinfo_id}}).then((response) => {
+            //tag)
+            info['f_plan_meters'] = response.data
+            var pardate = {
+              _this: this,
+              tittle: '安检详情',
+              safe: true
+            }
+            this.$dispatch('gotoson', pardate)
+            this.$goto('safecheck-order-v', {item: info, role: 'inspect', parentPage: 'AddPlanItem'}, 'self', this.reload)
+          })
+        }else {
+          if (info.f_last_check_state == '入户' && info.f_last_check_date && info.f_user_type == '民用') {
+            // 解析上次安检时间
+            let lastCheckDate = new Date(info.f_last_check_date)
+            let currentDate = new Date(newdate)
+            // 计算时间差（毫秒）
+            let timeDiff = currentDate.getTime() - lastCheckDate.getTime()
 
-          if(timeDiff > sixMonthsInMs){
-            this.$showMessage("该用户半年内已进行入户安检，无需再次安检",['confirm'])
-            // 超过6个月，结束方法
-            return
+            // 6个月 = 6 * 30 * 24 * 60 * 60 * 1000 毫秒（约15552000000毫秒）
+            // 更精确的计算：6个月 = 6 * 平均每月30.44天 * 24 * 60 * 60 * 1000
+            let sixMonthsInMs = 6 * 30 * 24 * 60 * 60 * 1000
+            if (timeDiff < sixMonthsInMs) {
+              this.$showMessage('该用户半年内已进行入户安检，是否继续安检?', ['confirm', 'cancel']).then((res) => {
+                if (res == 'confirm') {
+                  info.id = ''
+                  info.f_state = '未检'
+                  info.f_no_checkplan = '无计划安检'
+                  //tag
+                  this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: info.f_userinfo_id}}).then((response) => {
+                    //tag)
+                    info['f_plan_meters'] = response.data
+                    var pardate = {
+                      _this: this,
+                      tittle: '安检详情',
+                      safe: true
+                    }
+                    this.$dispatch('gotoson', pardate)
+                    this.$goto('safecheck-order-v', {item: info, role: 'inspect', parentPage: 'AddPlanItem'}, 'self', this.reload)
+                  })
+                }
+              })
+            }else{
+              info.id = ''
+              info.f_state = '未检'
+              info.f_no_checkplan = '无计划安检'
+              //tag
+              this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: info.f_userinfo_id}}).then((response) => {
+                //tag)
+                info['f_plan_meters'] = response.data
+                var pardate = {
+                  _this: this,
+                  tittle: '安检详情',
+                  safe: true
+                }
+                this.$dispatch('gotoson', pardate)
+                this.$goto('safecheck-order-v', {item: info, role: 'inspect', parentPage: 'AddPlanItem'}, 'self', this.reload)
+              })
+            }
           }
         }
-        info.id = ''
-        info.f_state = '未检'
-        info.f_no_checkplan = '无计划安检'
-        //tag
-        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
-          //tag)
-          info['f_plan_meters'] = response.data
-          var pardate = {
-            _this:this,
-            tittle:'安检详情',
-            safe:true
-          }
-          this.$dispatch('gotoson',pardate)
-          this.$goto('safecheck-order-v', {item: info, role: 'inspect',parentPage:'AddPlanItem'}, 'self', this.reload)
 
-        })
       },
       Mreadibook(){
         this.cbc=[]

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

@@ -814,9 +814,28 @@ export default {
         if(Vue.config.safecheck.ApproveConfig.dealdispose != undefined) {
           this.dealdispose = Vue.config.safecheck.ApproveConfig.dealdispose
         }
+        if(Vue.config.safecheck.ApproveConfig.showtorepair) {
+          this.deals=[{label: '现场整改', value: '现场整改'},
+            {label: '自行处理', value: '自行处理'},
+            {label: '转维修', value: '报修'}
+          ]
+        }
+        if(Vue.config.safecheck.ApproveConfig.Processing) {
+          if(Vue.config.safecheck.ApproveConfig.Processing.length > 0){
+            this.deals = Vue.config.safecheck.ApproveConfig.Processing
+          }
+        }
+        if(Vue.config.safecheck.ApproveConfig.showXCImg) {
+          this.showXCImg = true
+        }
+        if(Vue.config.safecheck.ApproveConfig.showZXTime) {
+          this.showZXTime = true
+        }
+        if(Vue.config.safecheck.ApproveConfig.showtorepair) {
+        }
         if(Vue.config.safecheck.ApproveConfig.hiddendanger != undefined) {
-          if (parseInt(Vue.config.safecheck.ApproveConfig.hiddendanger) >= 3) {
-            this.hiddenDangerImgNumber = 3
+          if (parseInt(Vue.config.safecheck.ApproveConfig.hiddendanger) >= 5) {
+            this.hiddenDangerImgNumber = 5
           }else {
             this.hiddenDangerImgNumber = parseInt(Vue.config.safecheck.ApproveConfig.hiddendanger)
           }
@@ -883,6 +902,9 @@ export default {
         f_item_name: item,
         checkmust: this.config[this.device.device].items[item].checkmust,
         f_item_value: f_item_value,
+        is_verification:this.config[this.device.device].items[item].is_verification,
+        verification_text:'',
+        verification_state:'',// ai验证是否通过 npass(未通过)/pass(通过)
         f_is_defect: '',
         multiple:this.config[this.device.device].items[item].multiple == true?this.config[this.device.device].items[item].multiple:false,
         isshow:this.config[this.device.device].items[item].isshow == false?this.config[this.device.device].items[item].isshow:true,
@@ -896,7 +918,9 @@ export default {
         f_else: '',
         f_p1_path: '',
         f_p2_path: '',
-        f_p3_path: ''
+        f_p3_path: '',
+        f_longitude:'',
+        f_latitude:''
       }
       //tag)
       //tag)
@@ -952,7 +976,7 @@ export default {
       }
       n = n + 1
     }
-    if(JSON.stringify(this.piece) == '{}') {
+    if(!this.piece || JSON.stringify(this.piece) == '{}') {
       // 如果没有，则新建
       this.$set('piece.f_items',this.f_items)
       this.$set('piece.f_device_type',this.device.device)
@@ -963,7 +987,6 @@ export default {
           continue
         }
         for(let p in this.piece.f_items) {
-          //
           if(typeof this.piece.f_items[p]=='function'){
             continue
           }
@@ -1029,8 +1052,7 @@ export default {
             }else if (this.f_items[f].f_item_name == '表读数') {
               //tag)
               this.f_meter_base.index = f
-            }
-            else if (this.f_items[f].f_item_name == '表剩余金额') {
+            }else if (this.f_items[f].f_item_name == '表剩余金额') {
               //tag)
               this.f_balance_amount.index = f
             }else if (this.f_items[f].f_item_name == '字轮数') {

package/src/filiale/xinkang/android/SafecheckOrderV.vue

@@ -1529,8 +1529,6 @@ export default {
     //   this.isneedDate=res.data[0]["f_subscribe_date"]
     // },
     putDevices() {
-      //tag)
-      //tag)
       this.$set('data.approve', "true")
       this.$set('data.writeback', "false")
       if (Vue.config.safecheck != undefined) {
@@ -1544,68 +1542,51 @@ export default {
           if (Vue.config.safecheck.ApproveConfig.livedispose != undefined) {
             this.livedispose = Vue.config.safecheck.ApproveConfig.livedispose
           }
-        }
-        //tag
-        //tag)
-        //tag)
-        //tag
-        if(this.item.f_user_type == '民用'){
-          // 民用户
-
-          if (Vue.config.safecheck.DevicesConfig != undefined){
-            if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined) {
-              this.config = this.extend(this.config, Vue.config.safecheck.DevicesConfig)
-            }else{
-              //tag
-              //tag
-              //tag
-              this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type]])
-            }
-            // this.config = this.extend(this.config, Vue.config.safecheck.DevicesConfig)
+          if (Vue.config.safecheck.ApproveConfig.showtorepair) {
+            this.show_torepair = Vue.config.safecheck.ApproveConfig.showtorepair
           }
-        }else {
+          if (Vue.config.safecheck.ApproveConfig.notencountered != undefined){
+            this.notencountered = Vue.config.safecheck.ApproveConfig.notencountered
+          }
+          if (Vue.config.safecheck.ApproveConfig.refuseinspection != undefined){
+            this.refuseinspection = Vue.config.safecheck.ApproveConfig.refuseinspection
+          }
+        }
+        if(this.item.f_user_type == '非民用'){
           // 非民用
           if (Vue.config.safecheck.DevicesSetConfig != undefined){
-            if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined) {
+            if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined || !Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type]]) {
               this.config = this.extend(this.config, Vue.config.safecheck.DevicesSetConfig)
             }else{
-              //tag
-              //tag
-              //tag
               this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type]])
             }
-            //this.config = this.extend(this.config, Vue.config.safecheck.DevicesSetConfig)
+          }
+
+        }else{
+          // 民用户
+          if (Vue.config.safecheck.DevicesConfig != undefined){
+            if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined || !Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type]]) {
+              this.config = this.extend(this.config, Vue.config.safecheck.DevicesConfig)
+            }else{
+              this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type?this.item.f_user_type:'民用']])
+            }
           }
         }
 
       }
-      //tag)
-      // 预留设备项位置
       for (let i in this.config) {
         this.tabs.splice(1,0,null)
       }
-      //遍历安检项配置
       for (let i in this.config) {
-        //取得安检项索引值
         let n = this.config[i].index
-        //tag
         this.devices[n - 1] = {device: i, n: n, checkmust: this.config[i].checkmust}
         this.$set('data.' + 'device' + n, [])
-        //tag
-        // this.tabs.splice(2 + n - 1, 0,
-        //   {
-        //     header:i,
-        //     complete:'safecheck-devices',
-        //     class:'repair-details-class',
-        //     number:n
-        //   })
         this.tabs[n] = {
           header: i,
           complete: 'safecheck-devices',
           class: 'repair-details-class',
           number: n
         }
-
         if(this.config[i].quantity &&  this.config[i].quantity >0){
           let items = []
           for (let it in this.config[i].items) {
@@ -1631,12 +1612,8 @@ export default {
             )
           }
         }
-        // this.data['device' + n].push(
-        //   {f_device_type: i, f_items: items}
-        // )
         n = n + 1
       }
-      //tag
       this.faultshow.number = this.tabs.length
     },
     //组织config数据---