safecheck-client 3.0.34-gongyi → 3.0.35-2

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

@@ -45,7 +45,7 @@
                   </div>
                 </div>
               </div>
-              <div style="float: left;width:60%" class="form-group" v-if="row.type == 'string'" v-show="row.isshow">
+              <div style="float: left;width:60%" class="form-group" v-if="row.type == 'string' ||row.type == 'errorstring'  " v-show="row.isshow">
                 <input type="text" class="form-control" maxlength="100" v-model="row.f_item_value" :readonly="role == 'androidview' || row.readonly">
               </div>
               <div style="float: left;width:60%" class="form-group" v-if="!show && row.type == 'number'" v-show="row.isshow">
@@ -369,7 +369,7 @@
         }
         HostApp.__callback__ = this.cameraCallBack
         HostApp.__this__ = this
-        console.log('this.f_items[prop]:' + prop)
+        //tag
         let fileName
         if(!this.f_items[prop].f_path || this.f_items[prop].f_path.includes("nopic.png")) {
           fileName = Util.guid() + '-' + 'device'+this.device.n + '-' + this.idx + '-'+'f_items'+prop+ '.jpg'
@@ -383,13 +383,13 @@
       },
       cameraCallBack(prop, fileName) {
         HostApp.__this__.$set( 'f_items['+prop+'].f_path', fileName + '?' + Math.random())
-        console.log(HostApp.__this__.f_items[prop].f_path)
+        //tag
         HostApp.__callback__ = null
         HostApp.__this__ = null
       },
       delfile(prop, fileName) {
-        console.log('照片路径')
-        console.log(JSON.stringify(fileName))
+        //tag
+        //tag)
         if(fileName == Vue.nopic)
           return
         else {
@@ -428,11 +428,11 @@
             // 监听下拉框，如果有隐患，需要拍照
             this.$watch('f_items['+n+'].selected',function(val) {
                 // 下拉框值
-                console.log('val'+JSON.stringify(val))
+                //tag)
                 // 下拉框所属设备
-                console.log('this.piece.f_device_type==》'+this.piece.f_device_type)
+                //tag
                 // 下拉框所属项
-                console.log('this.f_items[n].f_item_name==》'+this.f_items[n].f_item_name)
+                //tag
                 let shImage = false
                 if(val.indexOf('其他') == -1){
                   this.f_items[n].f_else = ''
@@ -455,7 +455,7 @@
                       }else if (this.config[this.device.device].items[item].type == 'inputSelector'){
                         value = val
                       }
-                      console.log('options[i]'+JSON.stringify(options[i]))
+                      //tag)
                       // 如果未选择，清空图片、隐患信息等
                       if((type == 'selector' && val.length == 0) || (type == 'inputSelector' && val == '')){
                         this.f_items[n].f_path = ''
@@ -466,14 +466,14 @@
                       }
                       if((type == 'selector' && multiple == false && options[i].data == val[0]) || (type == 'inputSelector' && options[i].data == val) || (type == 'selector' && multiple == true && val.indexOf(options[i].data) > -1)){
                         // 找到选中的项了
-                        console.log('firstIf')
+                        //tag
                         if(options[i].isdefect == true ){
                           shImage = true
                         }
                         if(options[i].isdefect == false || this.f_items[n].f_item_value == ''){
                           shImage = false
                         }
-                        console.log('shImage'+shImage)
+                        //tag
                         if(shImage){
                           this.f_items[n].f_is_defect =true
                           this.f_items[n].f_defect_level = options[i].level
@@ -494,7 +494,7 @@
               }
             )
             // this.$watch('other',function(val){
-            //   console.log('other val===>'+val)
+            //   //tag
             //   if(this.selectindex != null) {
             //     let index = this.f_items[this.selectindex].f_item_value.indexOf('其他')
             //     if(index > -1){
@@ -507,11 +507,11 @@
           else if(this.f_items[n].type  == 'radio') {
             // 监听单选框，如果有隐患，需要拍照
             this.$watch('f_items[' + n + '].f_item_value', function (val) {
-              console.log('radio selected ===> ' + JSON.stringify(val))
+              //tag)
               let options = this.f_items[n].options
-              console.log('this.f_items[n].options ===> ' + JSON.stringify(this.f_items[n].options))
+              //tag)
               for (let i = 0; i < options.length; i++) {
-                console.log('option ===> ' + JSON.stringify(options[i]))
+                //tag)
                 // 找到选中的项了
                 if (options[i].value == val) {
                   // 如果有隐患，拍图片
@@ -521,7 +521,7 @@
                     this.f_items[n].f_path = Vue.nopic
                     this.f_items[n].f_live_dispose = '否'
                     this.f_items[n].tooltip = options[i].tooltip
-                    console.log('this.f_items[n] ===> ' + JSON.stringify(this.f_items[n]))
+                    //tag)
                     return
                   }
                 }
@@ -536,14 +536,14 @@
           {
             // 监听单选框，如果有隐患，需要拍照
             this.$watch('f_items[' + n + '].f_item_value', function (val) {
-              console.log('checkbox selected ===> ' + JSON.stringify(val))
+              //tag)
               // 如果是手动赋值，不执行下面逻辑
               if (this.f_items[n].isReSet) {
                 this.f_items[n].isReSet = false
                 return
               }
               let options = this.f_items[n].options
-              console.log('this.f_items[n].options ===> ' + JSON.stringify(this.f_items[n].options))
+              //tag)
               // 取出选中项中有隐患的详细信息
               let selected = options.filter(item => { return val.indexOf(item.value) != -1 && item.isdefect })
 
@@ -571,7 +571,7 @@
                   this.f_items[n].f_live_dispose = '否'
                   this.f_items[n].tooltip = selected[0].tooltip
                 }
-                console.log('this.f_items[n] ===> ' + JSON.stringify(this.f_items[n]))
+                //tag)
                 return
               }
               this.f_items[n].f_path = ''
@@ -582,7 +582,7 @@
             })
           }
         }
-        console.log('deviceitem.f_items=====>'+JSON.stringify(this.f_items))
+        //tag)
       },
       // 计算气量差值或剩余气量  气量差值=安检员录入数-上期表读数
       getAirVolumeDifference(){
@@ -606,7 +606,7 @@
         }
       },
       getGasAberrantNumber(val) {
-        console.log('检测到气量变化了 ===> ')
+        //tag
 
         // 先清空
         this.f_items[this.f_gas_aberrant_number.index].f_item_value = null
@@ -630,17 +630,17 @@
         if (isNaN(this.f_items[this.f_gas_aberrant_number.index].f_item_value)) {
           this.f_items[this.f_gas_aberrant_number.index].f_item_value = null
         }
-        console.log('Math.abs(this.f_items[this.f_gas_aberrant_number.index].f_item_value) ===> ' + Math.abs(this.f_items[this.f_gas_aberrant_number.index].f_item_value))
-        console.log('Number(this.gasDeviation) ===> ' + JSON.stringify(Number(this.gasDeviation)))
+        //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_gas_aberrant_number.index].f_item_value) > Number(this.gasDeviation)) {
           this.f_items[this.f_gas_aberrant_number.index].f_is_defect = true
         }
 
-        console.log('this.f_items[this.f_gas_aberrant_number.index] ===> ' + JSON.stringify(this.f_items[this.f_gas_aberrant_number.index]))
+        //tag)
       },
       getFeeAberrantNumber(val) {
-        console.log('检测到金额变化了 ===> ')
+        //tag
 
         // 先清空
         this.f_items[this.f_fee_aberrant_number.index].f_item_value = null
@@ -663,55 +663,55 @@
         if (isNaN(this.f_items[this.f_fee_aberrant_number.index].f_item_value)) {
           this.f_items[this.f_fee_aberrant_number.index].f_item_value = null
         }
-        console.log('Math.abs(this.f_items[this.f_fee_aberrant_number.index].f_item_value) ===> ' + Math.abs(this.f_items[this.f_fee_aberrant_number.index].f_item_value))
-        console.log('Number(this.feeDeviation) ===> ' + JSON.stringify(Number(this.feeDeviation)))
+        //tag ===> ' + Math.abs(this.f_items[this.f_fee_aberrant_number.index].f_item_value))
+        //tag ===> ' + JSON.stringify(Number(this.feeDeviation)))
         // 计算差值是否在范围内
         if (Math.abs(this.f_items[this.f_fee_aberrant_number.index].f_item_value) > Number(this.feeDeviation)) {
           this.f_items[this.f_fee_aberrant_number.index].f_is_defect = true
         }
 
-        console.log('this.f_items[this.f_fee_aberrant_number.index] ===> ' + JSON.stringify(this.f_items[this.f_fee_aberrant_number.index]))
+        //tag)
       },
       //物联网表字轮数改变触发
       getmeteraberrantnumber() {
-        console.log('检测到字轮数改变 ===> '+this.f_items[this.f_meter_base.index].f_item_value + this.f_items[this.f_meter_base1.index].f_item_value)
+        //tag
 
         // 先清空
         this.f_items[this.f_meter_aberrant_number1.index].f_item_value = null
         this.f_items[this.f_meter_aberrant_number1.index].f_is_defect = false
-        console.log('检测到字轮数改变 ===>111111111111111 ')
+        //tag
         // 只有两个值都填了才会计算
         if (!this.f_items[this.f_meter_base.index].f_item_value || !this.f_items[this.f_meter_base1.index].f_item_value) {
           return
         }
-        console.log("-----到了吗？"+this.f_items[this.f_meter_base.index].f_item_value+'----'+this.f_items[this.f_meter_base1.index].f_item_value)
+        //tag
         // 计算公式 =>   表数异常差值= - 字轮数 - 后台表读数
         this.f_items[this.f_meter_aberrant_number1.index].f_item_value = this.f_items[this.f_meter_base1.index].f_item_value - this.f_items[this.f_meter_base.index].f_item_value
         this.f_items[this.f_meter_aberrant_number1.index].f_item_value = this.f_items[this.f_meter_aberrant_number1.index].f_item_value.toFixed(3)
         if (isNaN(this.f_items[this.f_meter_aberrant_number1.index].f_item_value)) {
           this.f_items[this.f_meter_aberrant_number1.index].f_item_value = null
         }
-        console.log('Math.abs(this.f_items[this.f_fee_aberrant_number.index].f_item_value) ===> ' + Math.abs(this.f_items[this.f_meter_aberrant_number1.index].f_item_value))
+        //tag ===> ' + Math.abs(this.f_items[this.f_meter_aberrant_number1.index].f_item_value))
         // 计算差值是否在范围内
-        console.log("字轮数异常范围"+Number(this.feeDeviation))
+        //tag)
         if (Math.abs(this.f_items[this.f_meter_aberrant_number1.index].f_item_value) > Number(this.meterbase)){
           this.f_items[this.f_meter_aberrant_number1.index].f_is_defect = true
         }
 
-        console.log('this.f_items[this.f_fee_aberrant_number.index] ===> ' + JSON.stringify(this.f_items[this.f_meter_aberrant_number1.index]))
+        //tag)
       },
 
       disSelect(index, itemValue) {
-        console.log('this.f_items[index] ===> ' + JSON.stringify(this.f_items[index]))
-        console.log('itemValue ===> ' + JSON.stringify(itemValue))
+        //tag)
+        //tag)
         if (this.f_items[index].f_item_value == itemValue) {
           this.$set(`f_items[${index}].f_item_value`, '')
         }
       }
     },
     ready() {
-      console.log('deviec--role=>'+this.role)
-      console.log('device=>',this.device)
+      //tag
+      //tag
       if(Vue.config.safecheck != undefined){
         if(Vue.config.safecheck.ApproveConfig != undefined){
           if(Vue.config.safecheck.ApproveConfig.livedispose != undefined) {
@@ -719,21 +719,21 @@
           }
         }
       }
-      console.log('开始准备数据')
-      console.log('this.paper ===> ' + JSON.stringify(this.paper))
-      console.log('this.paper[\'device\'+this.device.n] ===> ' + JSON.stringify(this.paper['device'+this.device.n]))
-      console.log('this.paper[\'device\'+this.device.n][this.idx] ===> ' + JSON.stringify(this.paper['device'+this.device.n][this.idx]))
+      //tag
+      //tag)
+      //tag)
+      //tag)
       //创建页面所需数据
       this.$set('piece', this.paper['device'+this.device.n][this.idx])
-      console.log('set之后的piece====》'+JSON.stringify(this.piece))
-      console.log('this.config====》'+JSON.stringify(this.config))
+      //tag)
+      //tag)
       let n = 0
       for (let item in this.config[this.device.device].items) {
         let index = this.config[this.device.device].items[item].index-1
         this.$set('page.options' + index, [])
-        console.log('this.config[this.device.device].items='+JSON.stringify(this.config[this.device.device].items))
-        console.log('item='+JSON.stringify(item))
-        console.log('this.device.device='+JSON.stringify(this.device.device))
+        //tag)
+        //tag)
+        //tag)
         // 先根据配置组接页面
         let f_item_value
         if(this.config[this.device.device].items[item].type == 'selector' || this.config[this.device.device].items[item].type == 'checkbox'){
@@ -742,7 +742,7 @@
           for (let defitem in this.config[this.device.device].items[item].options) {
             let defopt = this.config[this.device.device].items[item].options[defitem]
             if (defopt.isdefault) {
-              console.log('defopt', defopt)
+              //tag
               f_item_value[0] = defopt.data
             }
           }
@@ -752,19 +752,19 @@
         }else if(this.config[this.device.device].items[item].type == 'radio'){
           //为radio添加默认值
           f_item_value=''
-          console.log('进入单选-', JSON.stringify(this.config[this.device.device].items[item]))
+          //tag)
           for (let defitem in this.config[this.device.device].items[item].options) {
-            console.log('选项1111-', JSON.stringify(defitem))
+            //tag)
             let defopt = this.config[this.device.device].items[item].options[defitem]
             if (defopt.isdefault) {
-              console.log('defopt', JSON.stringify(defopt))
+              //tag)
               f_item_value = defopt.data
             }
           }
         }else{
           f_item_value = this.config[this.device.device].items[item].data ? this.config[this.device.device].items[item].data : ''
         }
-        console.log('f_item_value ====== > '+JSON.stringify(f_item_value))
+        //tag)
         let it = {
           type: this.config[this.device.device].items[item].type,
           f_item_name: item,
@@ -780,8 +780,8 @@
           f_live_dispose:'',
           f_else:''
         }
-        console.log('index ===> ' + JSON.stringify(index))
-        console.log('it ===> ' + JSON.stringify(it))
+        //tag)
+        //tag)
         this.$set('f_items['+index+']',it)
         if (this.config[this.device.device].items[item].type == 'selector' ||this.config[this.device.device].items[item].type == 'inputSelector') {
           if(this.config[this.device.device].items[item].type == 'selector'){
@@ -804,7 +804,7 @@
 
           this.$set('f_items['+index+'].options',this.page['options' + index])
 
-          console.log('lllllllllllllllllllthis.f_items===>'+JSON.stringify(this.f_items))
+          //tag)
         } else if (this.config[this.device.device].items[item].type == 'radio' || this.config[this.device.device].items[item].type == 'checkbox') {
           for (let i in this.config[this.device.device].items[item].options) {
             this.page['options' + index].push({
@@ -816,7 +816,7 @@
           }
           this.$set('f_items[' + index + '].options', this.page['options' + index])
           this.$set('f_items[' + index + '].f_item_value', f_item_value)
-          console.log('添加radio后的this.f_items===>'+JSON.stringify(this.f_items))
+          //tag)
         }
         n = n + 1
       }
@@ -829,89 +829,89 @@
         for (let f in this.f_items){
           for(let p in this.piece.f_items) {
             if (this.f_items[f].f_item_name == this.piece.f_items[p].f_item_name) {
-              console.log('this.f_items[f] ===> ' + JSON.stringify(this.f_items[f]))
-              console.log('this.piece.f_items[p] ===> ' + JSON.stringify(this.piece.f_items[p]))
+              //tag)
+              //tag)
               this.f_items[f] = Object.assign(this.f_items[f], this.piece.f_items[p])
-              console.log('----> this.f_items[f] ===> ' + JSON.stringify(this.f_items[f]))
+              //tag)
               if (this.f_items[f].type == 'selector' || this.f_items[f].type == 'inputSelector') {
-                console.log('this.piece.f_items[p].f_item_value==>'+ JSON.stringify(this.piece.f_items[p].f_item_value))
-                console.log('this.f_items[f].selected==>' + JSON.stringify(this.f_items[f].selected))
+                //tag)
+                //tag)
                 this.f_items[f].selected = this.piece.f_items[p].f_item_value
-                console.log('this.f_items[f].selected==>' + JSON.stringify(this.f_items[f].selected))
+                //tag)
               }
               // 取出特殊值
               if (this.f_items[f].f_item_name == '初始表底') {
-                console.log('初始表底: ' + JSON.stringify(f))
+                //tag)
                 this.f_initial_base.index = f
               } else if (this.f_items[f].f_item_name == '累购气量') {
-                console.log('累购气量: ' + JSON.stringify(f))
+                //tag)
                 this.f_total_gas.index = f
               } else if (this.f_items[f].f_item_name == '已用气量') {
-                console.log('已用气量: ' + JSON.stringify(f))
+                //tag)
                 this.f_table_base.index = f
                 this.$watch('f_items[' + f + '].f_item_value', function () {
                   // this.getGasAberrantNumber('已用气量') 计算气量异常差值
                   this.getAirVolumeDifference()
                 })
               } else if (this.f_items[f].f_item_name == '剩余气量') {
-                console.log('剩余气量: ' + JSON.stringify(f))
+                //tag)
                 this.f_gas_balance.index = f
                 this.$watch('f_items[' + f + '].f_item_value', function () {
                   // this.getGasAberrantNumber('')  计算剩余气量
                   this.getAirVolumeDifference()
                 })
               } else if (this.f_items[f].f_item_name == '气量差值') {
-                console.log('气量差值: ' + JSON.stringify(f))
+                //tag)
                 this.f_air_volume_difference.index = f
               } else
              /* if (this.f_items[f].f_item_name == '气量异常差值') {
-                console.log('气量异常差值: ' + JSON.stringify(f))
+                //tag)
                 this.f_gas_aberrant_number.index = f
               } else*/
                 if (this.f_items[f].f_item_name == '累购金额') {
-                console.log('累购金额: ' + JSON.stringify(f))
+                //tag)
                 this.f_total_fee.index = f
               } else if (this.f_items[f].f_item_name == '已用金额') {
-                console.log('已用金额: ' + JSON.stringify(f))
+                //tag)
                 this.f_fee_base.index = f
                 this.$watch('f_items[' + f + '].f_item_value', function () {
                   this.getFeeAberrantNumber('已用金额')
                 })
               } else if (this.f_items[f].f_item_name == '剩余金额') {
-                console.log('剩余金额: ' + JSON.stringify(f))
+                //tag)
                 this.f_fee_balance.index = f
                 this.$watch('f_items[' + f + '].f_item_value', function () {
                   this.getFeeAberrantNumber('')
                 })
               } else if (this.f_items[f].f_item_name == '金额异常差值') {
-                console.log('金额异常差值: ' + JSON.stringify(f))
+                //tag)
                 this.f_fee_aberrant_number.index = f
               }else if (this.f_items[f].f_item_name == '表读数') {
-                console.log('物联网表上期表读数: ' + JSON.stringify(f))
+                //tag)
                 this.f_meter_base.index = f
               }else if (this.f_items[f].f_item_name == '上期表读数') {
-                console.log('上期表读数: ' + JSON.stringify(f))
+                //tag)
                 this.f_prior_reading_number.index = f
                   /* this.$watch('f_items[' + f + '].f_item_value', function () {
                     this.getAirVolumeDifference()
                   })*/
               }else if (this.f_items[f].f_item_name == '表剩余金额') {
-                console.log('表剩余金额: ' + JSON.stringify(f))
+                //tag)
                 this.f_balance_amount.index = f
               }else if (this.f_items[f].f_item_name == '字轮数') {
-                console.log('字轮数: ' + JSON.stringify(f))
+                //tag)
                 this.f_meter_base1.index = f
                 this.$watch('f_items[' + f + '].f_item_value', function () {
                   this.getmeteraberrantnumber()
                 })
               }else if (this.f_items[f].f_item_name == '表余额') {
-                console.log('表余额: ' + JSON.stringify(f))
+                //tag)
                 this.f_balance_amount1.index = f
                 this.$watch('f_items[' + f + '].f_item_value', function () {
                   // this.getfeeaberrantnumber1()
                 })
               }else if (this.f_items[f].f_item_name == '表数异常差值') {
-                console.log('表数异常差值: ' + JSON.stringify(f))
+                //tag)
                 this.f_meter_aberrant_number1.index = f
               }
             }
@@ -928,7 +928,7 @@
             }
           }
         }
-        console.log('循环完f_items====》'+JSON.stringify(this.f_items))
+        //tag)
         this.$set('piece.f_items',this.f_items)
       }
       this.towatch()
@@ -939,10 +939,10 @@
       //判断当前是否有选中项
       for (let row in this.f_items){
         if(this.f_items[row].selected  && this.f_items[row].selected != '' && this.f_items[row].selected instanceof Array){
-          console.log('selected是数组')
+          //tag
           this.f_items[row].f_item_value = this.f_items[row].selected
         }else if(this.f_items[row].selected  && this.f_items[row].selected != ''){
-          console.log('selected不是数组')
+          //tag
           this.f_items[row].f_item_value = this.f_items[row].selected
         }
         // if(this.f_items[row].f_item_value instanceof Array && this.f_items[row].f_item_value.length != 0 ){
@@ -959,7 +959,7 @@
       // }
       //   picture.push(a)
       this.$set(`paper['device${this.device.n}'][${this.idx}]`, this.piece)
-      console.log('完成')
+      //tag
     },
     computed:{