safecheck-client 3.0.34-gongyi → 3.0.35-2

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

@@ -380,6 +380,16 @@ div {
             <img-self-safe v-if="this.paperdata.f_entry_status=='到访不遇'" :src="showimg3" width="300"
                            height="400"></img-self-safe>
           </div>
+          <div class="col-md-6">
+            <img-self-plus v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer1_path"
+                           :src="showimg5" width="300"
+                           height="400"></img-self-plus>
+          </div>
+          <div class="col-md-6">
+            <img-self-plus v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer2_path"
+                           :src="showimg6" width="300"
+                           height="400"></img-self-plus>
+          </div>
           <div class="col-md-6">
             <img-self-safe v-if="this.paperdata.f_entry_status=='拒检'" :src="showimg4" width="300"
                            height="400"></img-self-safe>
@@ -417,8 +427,8 @@ let asyncReady = async function (self) {
         orderitem: 'id'
       }
     })/*.then(res=>{*/
-    console.log("aaaaaaaaaaaaaaaa")
-    console.log(JSON.stringify(res.data[0].f_dir))
+    //tag
+    //tag)
     if (!res.data[0].f_dir) {
       self.$showMessage("该公司无组织目录，无法获取配置文件，请联系管理员确认")
     } else {
@@ -428,7 +438,7 @@ let asyncReady = async function (self) {
           resolveMsg: '获取居民配置项成功！',
           rejectMsg: '获取居民配置项出错！'
         })/*.then(res=>{*/
-        console.log('111111111111居民===>', res1.data)
+        //tag
         //this.safeConfig["民用配置项"]=Object.assign({},res.data)
         Vue.config.safecheck.DevicesConfig = res1.data
         /*})*/
@@ -436,7 +446,7 @@ let asyncReady = async function (self) {
           resolveMsg: '获取非居民配置项成功！',
           rejectMsg: '获取非居民配置项出错！'
         })/*.then(res=>{*/
-        console.log('22222222222222非居民===>', res2.data)
+        //tag
         //this.safeConfig["非民用配置项"]=Object.assign({},res.data)
         Vue.config.safecheck.DevicesSetConfig = res2.data
         /*}).then(res=> {
@@ -479,6 +489,8 @@ export default {
       showimg2: '',
       showimg3: '',
       showimg4: '',
+      showimg5: '',
+      showimg6: '',
       startClick: false, //开始安检按钮是否可点击
       isStrat: false, //是否开始安检
       checkResult: {},//查询结果
@@ -561,7 +573,7 @@ export default {
       },
       set(val) {
         if (this.isStrat) {
-          debugger;
+          //;
           this.$goto(val, {userinfo: this.data}, 'paper-router')
         } else {
           this.$showMessage('未开始安检！')
@@ -576,16 +588,16 @@ export default {
   },
   methods: {
     devicesCollect() {
-      console.log("4444444")
-      console.log(JSON.stringify(this.config))
-      console.log(JSON.stringify(this.deviceconfig2))
-      console.log("4444444")
+      //tag
+      //tag)
+      //tag)
+      //tag
 
       this.deviceCollects = []
       let checkResult = '正常'
       this.result = '正常'
       let codata = JSON.parse(JSON.stringify(this.data))
-      console.log("111111111111" + JSON.stringify(codata))
+      //tag)
       for (let device in this.data) {
         let f_device_type
         if (device.startsWith("device")) {
@@ -596,7 +608,7 @@ export default {
             } else {
               f_device_type = this.data[device][item].f_device_type
             }
-            // console.log('codata[device][item]=>',codata[device][item])
+            // //tag
             let deviceInfos = []
             for (let i in this.data[device][item].f_items) {
               let defects = ''
@@ -605,10 +617,10 @@ export default {
                 for (let i in items.f_item_value) {
                   let f_item_value = items.f_item_value[i]
 
-                  console.log('f_item_value => ' + JSON.stringify(f_item_value))
-                  console.log('f_device_type => ' + JSON.stringify(f_device_type))
-                  console.log('this.paper[device][item] => ' + JSON.stringify(this.data[device][item]))
-                  console.log('this.config[this.paper[device][item].f_device_type] => ' + JSON.stringify(this.config[this.data[device][item].f_device_type]))
+                  //tag)
+                  //tag)
+                  //tag)
+                  //tag)
                   if (!this.config[this.data[device][item].f_device_type].items[items.f_item_name]) {
                     continue
                   }
@@ -623,7 +635,7 @@ export default {
                       }
                     }
                   }
-                  console.log('defects=====>' + JSON.stringify(defects))
+                  //tag)
                 }
                 if (defects != '') {
                   deviceInfos.push(`${items.f_item_name}${defects.substring(0, defects.length - 1)}`)
@@ -634,7 +646,7 @@ export default {
                 deviceInfos.push(`${items.f_item_name}:${items.f_item_value[0]}`)
               } else if (items.f_item_name == '金额异常差值') {
                 var deviation = this.$appdata.getSingleValue('金额异常差值允许误差')
-                console.log(items.f_item_value[0] + '金额异常差值允许误差' + deviation)
+                //tag
                 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 = '有隐患'
@@ -644,7 +656,7 @@ export default {
                 }
               } else if (items.f_item_name == '气量异常差值') {
                 var deviation = this.$appdata.getSingleValue('气量异常差值允许误差')
-                console.log(items.f_item_value[0] + '气量异常差值允许误差' + deviation)
+                //tag
                 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 = '有隐患'
@@ -653,9 +665,9 @@ export default {
                   }
                 }
               }
-              console.log('deviceInfos========>' + JSON.stringify(deviceInfos))
-              console.log('items.f_is_defect')
-              console.log(items.f_is_defect)
+              //tag)
+              //tag
+              //tag
               if (items.type === 'selector') {
                 items.selected = []
               } else if (items.type === 'inputSelector') {
@@ -664,13 +676,13 @@ export default {
             }
 
 
-            console.log('deviceCollect', this.deviceCollect)
+            //tag
             this.$set('deviceCollect.name', f_device_type)
             this.$set('deviceCollect.value', checkResult)
             this.$set('deviceCollect.devices', deviceInfos)
-            console.log("5555555555" + JSON.stringify(this.deviceCollect))
+            //tag)
             if (this.deviceCollect.name) {
-              console.log("999999998888888" + this.deviceCollect.name)
+              //tag
               this.deviceCollects.push(JSON.parse(JSON.stringify(this.deviceCollect)))
             }
 
@@ -684,6 +696,8 @@ export default {
       }
       this.ajresult = JSON.parse(this.data.f_defect_content).result
       this.showimg3 = this.data.f_noanswer_path
+      this.showimg5 = this.data.f_noanswer1_path
+      this.showimg6 = this.data.f_noanswer2_path
       this.showimg4 = this.data.f_rejectcheck_path
       this.paperdata = this.data
       this.loading = false
@@ -692,7 +706,7 @@ export default {
       this.imgshow = false
     },
     putDevices() {
-      //console.log('Vue.config.safecheck', Vue.config.safecheck.safetype)
+      ////tag
       this.$set('data.approve', "true")
       this.$set('data.writeback', "false")
       if (Vue.config.safecheck.ApproveConfig != undefined) {
@@ -706,9 +720,9 @@ export default {
           this.livedispose = Vue.config.safecheck.ApproveConfig.livedispose
         }
       }
-      console.log('当前安检类型----' + this.item.f_safecheck_type)
+      //tag
 
-      console.log(JSON.stringify(this.data))
+      //tag)
       if (!this.item.f_safecheck_type) {
         this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType['年度普检'][this.item.f_check_type]])
       } else {
@@ -743,8 +757,8 @@ export default {
 
     },
     showpath(val1, val2) {
-      console.log("555555555555555555")
-      console.log(val1)
+      //tag
+      //tag
       if (val1) {
         this.showimg1 = val1
         this.picturename = val2
@@ -752,7 +766,7 @@ export default {
       }
     },
     showpicture(val1, val2) {
-      console.log("77777777777777")
+      //tag
       if (val2 == '气量异常差值' || val2 == '金额异常差值') {
         return
       }
@@ -778,7 +792,7 @@ export default {
       }
     },
     isred(val1, val2) {
-      console.log("77777777777777")
+      //tag
       if (val2 == '气量异常差值' || val2 == '金额异常差值') {
         return
       }
@@ -841,14 +855,14 @@ export default {
     getDeviceAll() {
       let keyall = Object.keys(this.data)
       for (let i = 0; i < keyall.length; i++) {
-        console.log(JSON.stringify(keyall))
+        //tag)
         if (keyall[i].startsWith('device') && keyall[i] != 'deviceundefined') {
           this.devicesAll.push(this.data[keyall[i]])
-          console.log(keyall[i])
+          //tag
         }
       }
-      console.log("666666666666666666")
-      console.log(JSON.stringify(this.devicesAll))
+      //tag
+      //tag)
       this.devicesCollect()
 
     },
@@ -874,7 +888,7 @@ export default {
     },
 
     viewPic(fileName) {
-      console.log('view pic: ' + fileName)
+      //tag
       if (this.role == 'view') {
         if (!fileName.endsWith('nopic.png')) {
           this.pic_to_be_viewed = fileName
@@ -932,11 +946,11 @@ export default {
         HostApp.__this__.$set('data', paper)
         HostApp.__this__.$goto('paper-state', {}, 'paper-router')
         // 如果打回重检则重新计时
-        console.log('HostApp.__this__.role' + HostApp.__this__.role + ' HostApp.__this__.f_approved:' + HostApp.__this__.data.f_approved)
+        //tag
         if (HostApp.__this__.role == 'inspect'
           && HostApp.__this__.data.f_approved
           && HostApp.__this__.data.f_approved == '打回') {
-          console.log('打回')
+          //tag
           HostApp.__this__.data.f_onsite_time = Util.toStandardTimeString()
           HostApp.__this__.tick()
         }
@@ -1188,12 +1202,12 @@ export default {
         let isxianfeng = false; //是否是先锋集中器气表品牌
 
         this.$resetpost(`rs/path/getUserinfomation`, {data: {condition: `id = '${id}'`}}).then((respanse) => {
-            console.log('result....', respanse)
+            //tag
             if (respanse.data.length != 0) {
               // 包含 其它 特殊处理的数组
               // 对应位置
 
-              console.log('devices => ', respanse.data[0])
+              //tag
 
               that.data = Object.assign(that.data, respanse.data[0])
               if (respanse.data[0].f_devices) {
@@ -1205,15 +1219,15 @@ export default {
 
                     if (that.devices[de].device == item.f_device_type) {
                       item.f_items.forEach((f_item) => {
-                        console.log('f_item====>', f_item)
-                        console.log('f_item.f_path====>', f_item.f_path)
+                        //tag
+                        //tag
                         let itemValues = []
                         f_item.f_item_lists.forEach((tempItem) => {
-                          console.log('emm => ', f_item.f_item_name, '   ', tempItem.f_item_value)
+                          //tag
                           if (tempItem.f_item_value !== 'null') {
                             itemValues.push(tempItem.f_item_value)
                             //判断是否为先锋集中器
-                            debugger
+                            //
                             if (f_item.f_item_name=='气表品牌' && tempItem.f_item_value!=null && tempItem.f_item_value=='先锋集中器' ) {
                               isxianfeng = true;
                             }
@@ -1240,29 +1254,29 @@ export default {
               } else {
                 Util.androidRatifyPics(that.data, this.$androidUtil.getProxyUrl())
               }
-              console.log("that.data:", that.data)
+              //tag
             }
             // this.$goto('paper-message-blank', {userinfo:this.data,devices:this.devices,config:this.config,role:this.role}, 'self')
             this.isshow = true
             asyncReady(this).then(() => {
-              console.log("66666666666")
-              console.log(JSON.stringify(this.data))
+              //tag
+              //tag)
               if (this.data.f_check_type == '民用') {
                 this.deviceconfig = Vue.config.safecheck.DevicesConfig
-                console.log("deviceconfig1==>" + JSON.stringify(this.deviceconfig))
+                //tag)
               } else if (this.data.f_check_type == '非民用') {
                 this.deviceconfig = Vue.config.safecheck.DevicesSetConfig
-                console.log("deviceconfig2==>" + JSON.stringify(this.deviceconfig))
+                //tag)
               }
               if (this.data.f_collection_type == '按金额'&& !isxianfeng) {
                 let aaa = Object.assign({}, this.config2["燃气表"].items, this.deviceconfig["燃气表"].items)
                 this.deviceconfig["燃气表"].items = aaa
                 //this.deviceconfig["燃气表"]=this.config2["燃气表"]
-                console.log("deviceconfig3==>" + JSON.stringify(this.deviceconfig))
+                //tag)
               } else {
                 let aaa = Object.assign({}, this.config["燃气表"].items, this.deviceconfig["燃气表"].items)
                 this.deviceconfig["燃气表"].items = aaa
-                console.log("deviceconfig4==>" + JSON.stringify(this.deviceconfig))
+                //tag)
               }
               this.deviceconfig2 = ObjConfig.getObjConfig(this.deviceconfig)
               this.deviceconfig2[0].items = jsonSort(this.deviceconfig2[0].items, "index")
@@ -1275,7 +1289,7 @@ export default {
           }
         ).catch(
           (respanse) => {
-            console.log('respanse', respanse)
+            //tag
             alert('查找安检单失败')
           })
       }
@@ -1284,11 +1298,11 @@ export default {
   },
   watch: {
     //   'isUpload'(val){
-    //     console.log('isUpload发生变化===>'+val)
+    //     //tag
     //   }
   },
   destroyed() {
-    console.log('退出当前页Set')
+    //tag
     this.disableTimer()
   }
 }