safecheck-client 3.0.34-gongyi → 3.0.35-2

package/src/components/android/SafecheckDevices.vue

@@ -17,10 +17,10 @@
             <!--<button type="button" name="button" class="btn btn-primary" @click='deletedetails()' :disabled="issee">删除</button>-->
             <!--</div>-->
             <div class="shuclass1"  v-show="row.isshow" v-for="(idxs,row) in f_items"  style="padding: 4px; border:1px solid #D4D4D4;border-bottom: 0" >
-              <label v-if="row.type != 'radio' && row.type != 'text' && row.type != 'picture' && row.type != 'checkbox'" v-show="row.isshow" class="fivelabel">{{row.f_item_name}}<br/>{{row.remark}}</label>
-              <label v-if="row.type == 'radio'" v-show="row.isshow" class="radiolabel">{{row.f_item_name}}<br/>{{row.remark}}</label>
-              <label v-if="row.type == 'text'" v-show="row.isshow" class="textlabel1">{{row.f_item_name}}<br/>{{row.remark}}</label>
-              <label v-if="row.type == 'picture' || row.type == 'checkbox'" v-show="row.isshow" class="textlabel">{{row.f_item_name}}<br/>{{row.remark}}</label>
+              <label v-if="row.type != 'radio' && row.type != 'text' && row.type != 'picture' && row.type != 'checkbox'" v-show="row.isshow" class="fivelabel">{{row.f_item_name}}<span v-if="row.unit">({{row.unit}})</span><br/>{{row.remark}}</label>
+              <label v-if="row.type == 'radio'" v-show="row.isshow" class="radiolabel">{{row.f_item_name}}<span v-if="row.unit">({{row.unit}})</span><br/>{{row.remark}}</label>
+              <label v-if="row.type == 'text'" v-show="row.isshow" class="textlabel1">{{row.f_item_name}}<span v-if="row.unit">({{row.unit}})</span><br/>{{row.remark}}</label>
+              <label v-if="row.type == 'picture' || row.type == 'checkbox'" v-show="row.isshow" class="textlabel">{{row.f_item_name}} <br/>{{row.remark}} <span v-show="row.verification_state" :style="{color:row.verification_state==='pass'?'green':'red'}">{{row.verification_text}}</span></label>
               <!--<span v-if="show" style="font-weight:bold">{{row.f_content}}</span>-->
               <!--<datepicker placeholder="请选择时间"-->
               <!--:value.sync="row.f_content"-->
@@ -55,13 +55,13 @@
                             v-if="row.type == 'date'"
                             v-show="row.isshow"
                             :disabled-days-of-Week="[]"
-                            :format="'yyyy-MM-dd 00:00:00'"
+                            :format="'yyyy-MM-dd HH:mm:ss'"
                             :show-reset-button="reset" readonly="readonly">
                 </datepicker>
               </div>
 
               <div style="float: left;width:60%" class="form-group" v-if="!show && row.type == 'number'" v-show="row.isshow">
-                <input type="text" class="form-control" maxlength="100" v-model="row.f_item_value"  onkeyup="value=value.replace(/[^\d\.]/g,'')" :readonly="row.readonly">
+                <input type="text" class="form-control" maxlength="100" v-model="row.f_item_value"  onkeyup="value=value.replace(/[^\d\.-]/g,'')" :readonly="row.readonly">
               </div>
               <!--<input type="text" class="form-control" v-model="row.f_content" v-if="!show && row.type == 'string' && row.f_project != '表号'" :disabled="(!(ischecked == '有')) || issee" :readonly="issee">-->
               <!--<input type="text" class="form-control" v-model="meternum" v-if="!show && row.type == 'string' && row.f_project == '表号' " :disabled="(!(ischecked == '有')) || issee" :readonly="issee" >-->
@@ -90,7 +90,6 @@
                 <div  class="col-xs-6 col-sm-6 col-md-6" v-for="item in row.options">
                   <!--                  <input type="radio" :name="row.f_item_name" @click="disSelect($parent.idxs,item.value)" :value="item.value" :disabled="(!(ischecked == '有')) || issee" v-model="row.f_item_value" >-->
                   <input type="radio" :name="row.f_item_name"  :value="item.value" :disabled="(!(ischecked == '有')) || issee" v-model="row.f_item_value" >
-
                   <span>{{item.label}}</span>
                 </div>
               </div>
@@ -107,25 +106,37 @@
                 </div>
               </div>
               <div style="clear: both">
-                <div class="form-group" style="display: flex;flex-wrap: wrap" v-if="(row.type == 'selector' || row.type == 'radio' || row.type =='checkbox') && (row.f_path != '' || row.f_is_defect != '') && (livedispose == 'true' || livedispose == true) " >
-                  <label class="fivelabel">现场已处理</label>
-                  <v-select   :value="row.f_live_dispose"
-                              :value-single="true"
-                              :options="lives"
-                              :disabled="role == 'androidview'"
-                              @change="changlive"
-                              @click="transelation(idxs)"
-                              close-on-select clear-button></v-select>
-                </div>
+                <!--                <div class="form-group" style="display: flex;flex-wrap: wrap" v-if="(row.type == 'selector' || row.type == 'radio' || row.type =='checkbox') && (row.f_path != '' || row.f_is_defect != '') && (livedispose == 'true' || livedispose == true) " >-->
+                <!--                  <label class="fivelabel">现场已处理</label>-->
+                <!--                  <v-select   :value="row.f_live_dispose"-->
+                <!--                              :value-single="true"-->
+                <!--                              :options="lives"-->
+                <!--                              :disabled="role == 'androidview'"-->
+                <!--                              @change="changlive"-->
+                <!--                              @click="transelation(idxs)"-->
+                <!--                              close-on-select clear-button></v-select>-->
+                <!--                </div>-->
                 <div class="form-group" style="display: flex;flex-wrap: wrap" v-if="(row.type == 'selector' || row.type == 'radio' || row.type =='checkbox') && (row.f_path != '' || row.f_is_defect != '') && (dealdispose == 'true' || dealdispose == true) " >
                   <label class="fivelabel">处理方式</label>
-                  <v-select   :value="row.f_deal_dispose"
-                              :value-single="true"
-                              :options="deals"
-                              :disabled="role == 'androidview'"
-                              @change="changdeal"
-                              @click="transelation(idxs)"
-                              close-on-select clear-button></v-select>
+                  <v-select
+                    :value="row.f_deal_dispose"
+                    :value-single="true"
+                    :options="deals"
+                    :disabled="role == 'androidview'"
+                    @change="changdeal"
+                    @click="transelation(idxs)"
+                    close-on-select clear-button>
+                  </v-select>
+                </div>
+                <div style="display: flex;flex-wrap: wrap" v-if="row.f_deal_dispose == '自行处理' && this.showZXTime">
+                  <label class="fivelabel">处理时效:</label>
+                  <datepicker
+                    :value.sync="row.f_handle_date"
+                    v-model="row.f_handle_date"
+                    :format="'yyyy-MM-dd 00:00:00'"
+                    placeholder="请选择"
+                    style="width: 60%">
+                  </datepicker>
                 </div>
                 <div style="margin-left: 10px" class="form-group col-sm-10" v-if="(row.type == 'selector' || row.type == 'radio' || row.type =='checkbox') && row.tooltip != undefined  && row.tooltip != '' ">
                   ☆{{row.tooltip}}
@@ -162,6 +173,24 @@
                       </div>
                     </div>
                   </div>
+                  <div style="display: flex;flex-wrap: wrap;margin-top: 10px" v-if="row.f_deal_dispose == '现场整改' && (row.type == 'selector' || row.type == 'radio' || row.type =='checkbox') && this.showXCImg">
+                    <label class="fivelabel">整改照片:</label>
+                    <div class="auto" style="margin:1px;">
+                      <div class="panel">
+                        <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 160px;height: 160px;position: relative">
+                          <div class="col-xs-6" style="height: 160px;width:160px;overflow: scroll;top: 1px">
+                            <div class="col-sm-4" v-show="row.f_repair_path">
+                              <img-self  :src="row.f_repair_path" :alt="row.f_item_name"  width="140" height="140"></img-self>
+                            </div>
+                            <div class="col-sm-4" v-show="!row.f_repair_path" @click="takePic(idxs, row.f_item_name,'f_repair_path',row.f_defect_level)">
+                              <img src="../../assets/tackpic.png" alt="点击拍摄照片"  width="140" height="140"></img>
+                            </div>
+                            <img v-show="row.f_repair_path" src="../../assets/remove.png" :class="style__"   @click="delfile(idxs, row.f_repair_path, 'f_repair_path')" v-if="role!='androidview'" style="width: 40px;height: 40px;position: absolute;left:110px;top:110px"></img>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
                 </div>
               </div>
 
@@ -207,9 +236,9 @@ export default {
       page:{},
       selectindex:null,
       lives:[{label: '是', value: '是'},{label: '否', value: '否'}],
-      deals:[{label: '现场整改', value: '现场整改'},{label: '自行处理', value: '自行处理'},{label: '报修', value: '报修'}],
+      deals:[{label: '现场处理', value: '现场处理'},{label: '自行处理', value: '自行处理'}],
       f_live_dispose:'否',
-      f_deal_dispose:'报修',
+      f_deal_dispose:'未处理',
       // 初始表底
       f_initial_base: {},
       // 气量异常差值  计算公式 =>  气量异常差值 = 累计购气量 - （已用气量 - 初始表底） - 剩余气量
@@ -228,6 +257,8 @@ export default {
       f_gas_balance: {},
       // 剩余金额
       f_fee_balance: {},
+      // 表端剩余金额
+      f_table_balance: {},
       // 气量异常差值允许误差
 
       //物联网表数据存储
@@ -270,6 +301,8 @@ export default {
         }
       )(this),
       showElse:false, //控制其他选项是否显示
+      showXCImg: false, //  是否显示现场整改拍照选项
+      showZXTime: false //  是否显示自行整改处理时效
     }
   },
   props: ['config','device','idx','operation','role'],
@@ -404,7 +437,7 @@ export default {
       }
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
-      console.log('this.f_items[prop]:' + prop)
+      //tag
       let fileName
       if (pathname == 'null') {
         if (!this.f_items[prop].f_path || this.f_items[prop].f_path.includes("nopic.png")) {
@@ -419,33 +452,62 @@ export default {
           fileName = Util.getFileName(this.f_items[prop][pathname])
         }
       }
-      console.log('fileName === >' + fileName)
-      console.log('prop === >' + prop)
+      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
+        this.f_items[prop].f_latitude = obj.latitude
+      }
+      //tag
+      //tag
       HostApp._open_a_page({type: 'boomerang',
         page: 'com.aofeng.hybrid.android.peripheral.CameraActivity',
-        param: {file: fileName, requestCode: 111, callback:'javascript:HostApp.__callback__("'+ prop +'", "%s","'+pathname+'");', watermark: title + '\t时间：'+ Util.toStandardTimeString() + '\t' + Vue.user.name}
+        param: {file: fileName, requestCode: 111, callback:'javascript:HostApp.__callback__("'+ prop +'","'+ title +'", "%s","'+pathname+'");', watermark: title + '\t时间：'+ Util.toStandardTimeString() + '\t' + Vue.user.name + jingweidu}
       })
     },
-    cameraCallBack(prop, fileName,pathname) {
-      console.log('fileName === >' + fileName + ';prop === >' + prop + ';pathname === >' + pathname)
+    cameraCallBack(prop,title, fileName,pathname) {
+      //tag
       if (pathname == 'null') {
-        console.log('!pathname')
+        //tag
         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
       } else {
-        console.log('f_items_pathname')
-        console.log(JSON.stringify(HostApp.__this__.f_items[prop]))
+        //tag
+        //tag)
         HostApp.__this__.$set( 'f_items['+prop+'].'+pathname+'', fileName + '?' + Math.random())
         HostApp.__callback__ = null
         HostApp.__this__ = null
       }
+      if(this.f_items[prop].is_verification){
+        let path=fileName.replace('http://newimg','')
+        path=path.replace('file://','')
+        console.log('fileName',fileName)
+        console.log(path)
+        let res=HostApp.pictureVerificationAI(path,title)
+        if(res.code==200){
+          if(res.type_result){
+            // this.$showMessage("检测通过，当前照片为"+title)
+            this.f_items[prop].verification_text=`检测通过，当前照片为 ${title}`
+            this.f_items[prop].verification_state='pass'
+          }else{
+            // this.$showMessage("检测失败，未识别到当前照片为 "+title+"，请重新拍摄！")
+            this.f_items[prop].verification_text=`检测失败，未识别到当前照片为'${title}'，请重新拍摄！`
+            this.f_items[prop].verification_state='npass'
+          }
+        }else{
+          // this.$showMessage("检测失败，请重试！")
+          this.f_items[prop].verification_text=`检测失败，请重试！`
+          this.f_items[prop].verification_state='npass'
+        }
+      }
     },
     delfile(prop, fileName, pathname='null') {
       if (pathname == 'null') {
-        console.log('照片路径')
-        console.log(JSON.stringify(fileName))
+        //tag
+        //tag)
         if(fileName == Vue.nopic){
           return
         } else {
@@ -453,8 +515,8 @@ export default {
           this.f_items[prop].f_path = Vue.nopic
         }
       }else {
-        console.log('照片路径')
-        console.log(JSON.stringify(fileName))
+        //tag
+        //tag)
         if(fileName == Vue.nopic){
           return
         } else {
@@ -495,13 +557,26 @@ export default {
         }
         if(this.f_items[n].type  == 'selector' || this.f_items[n].type  == 'inputSelector'){
           // 监听下拉框，如果有隐患，需要拍照
-          this.$watch('f_items['+n+'].selected',function(val) {
+          this.$watch('f_items['+n+'].selected',function(val,old) {
+              if(val==old){
+                return
+              }
               // 下拉框值
-              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
+              if (val == undefined || val.length == 0 || val[0] == ''){
+                this.f_items[n].f_path = ''
+                this.f_items[n].f_is_defect = ''
+                this.f_items[n].f_defect_level = ''
+                this.f_items[n].f_live_dispose = ''
+                this.f_items[n].f_deal_dispose = ''
+                this.f_items[n].tooltip = ''
+                this.f_items[n].f_else = ''
+                return
+              }
               let shImage = false
               if(val.indexOf('其他') == -1){
                 this.f_items[n].f_else = ''
@@ -530,7 +605,7 @@ export default {
                     }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 = ''
@@ -542,21 +617,21 @@ export default {
                     }
                     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
                         this.f_items[n].f_path = Vue.nopic
                         this.f_items[n].f_live_dispose = '否'
-                        this.f_items[n].f_deal_dispose = '报修'
-                        console.log('给tooltip赋值',options[i].tooltip)
+                        this.f_items[n].f_deal_dispose = '未处理'
+                        //tag
                         this.f_items[n].tooltip= options[i].tooltip
                       }else{
                         this.f_items[n].f_path = ''
@@ -573,7 +648,7 @@ export default {
             }
           )
           // 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){
@@ -585,11 +660,11 @@ export default {
         }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) {
                 // 如果有隐患，拍图片
@@ -598,9 +673,9 @@ export default {
                   this.f_items[n].f_defect_level = options[i].level
                   this.f_items[n].f_path = Vue.nopic
                   this.f_items[n].f_live_dispose = '否'
-                  this.f_items[n].f_deal_dispose = '报修'
+                  this.f_items[n].f_deal_dispose = '未处理'
                   this.f_items[n].tooltip = options[i].tooltip
-                  console.log('this.f_items[n] ===> ' + JSON.stringify(this.f_items[n]))
+                  //tag)
                   return
                 }
               }
@@ -615,14 +690,14 @@ export default {
         }else if(this.f_items[n].type  == 'checkbox') {
           // 监听单选框，如果有隐患，需要拍照
           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 })
 
@@ -649,11 +724,11 @@ export default {
                 this.f_items[n].f_defect_level = selected[0].level
                 this.f_items[n].f_path = Vue.nopic
                 this.f_items[n].f_live_dispose = '否'
-                this.f_items[n].f_deal_dispose = '报修'
-                console.log('赋值',selected[0].tooltip)
+                this.f_items[n].f_deal_dispose = '未处理'
+                //tag
                 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 = ''
@@ -665,59 +740,71 @@ export default {
           })
         }
       }
-      console.log('deviceitem.f_items=====>'+JSON.stringify(this.f_items))
+      //tag)
     },
     getGasAberrantNumber(val) {
-      console.log('检测到气量变化了 ===> ')
-      return
+      //tag
+      if(!this.f_table_base.index || !this.f_gas_balance.index){
+        //tag
+        return
+      }
       // 先清空
       this.f_items[this.f_gas_aberrant_number.index].f_item_value = null
       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
         }
       }
+
       // 只有两个值都填了才会计算
       if (!this.f_items[this.f_table_base.index].f_item_value || !this.f_items[this.f_gas_balance.index].f_item_value) {
         return
       }
-      console.log("已用气量-初始表底数==>" + (this.f_items[this.f_table_base.index].f_item_value - this.f_items[this.f_initial_base.index].f_item_value))
-      console.log("累计购气量==>" + this.f_items[this.f_total_gas.index].f_item_value)
-      console.log("剩余气量==>" + this.f_items[this.f_gas_balance.index].f_item_value)
+      //tag)
+      //tag
+      //tag
 
       // 计算公式 =>  气量异常差值 = 累计购气量 - （已用气量 - 初始表底） - 剩余气量
-      this.f_items[this.f_gas_aberrant_number.index].f_item_value = this.f_items[this.f_total_gas.index].f_item_value - this.f_items[this.f_gas_balance.index].f_item_value - (this.f_items[this.f_table_base.index].f_item_value - this.f_items[this.f_initial_base.index].f_item_value)
+      this.f_items[this.f_gas_aberrant_number.index].f_item_value = this.f_items[this.f_total_gas.index].f_item_value - this.f_items[this.f_gas_balance.index].f_item_value - (this.f_items[this.f_table_base.index].f_item_value - (this.f_initial_base.index?this.f_items[this.f_initial_base.index].f_item_value:0))
       this.f_items[this.f_gas_aberrant_number.index].f_item_value = this.f_items[this.f_gas_aberrant_number.index].f_item_value.toFixed(3)
       // 如果数值有误，清空结果s
       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)) {
+      if (Math.abs(this.f_items[this.f_gas_aberrant_number.index].f_item_value) > Number(this.gasDeviation)|| Math.abs(this.f_items[this.f_gas_aberrant_number.index].f_item_value) < Number(this.gasDeviation) * -1) {
         this.f_items[this.f_gas_aberrant_number.index].f_is_defect = true
+        this.f_items[this.f_gas_aberrant_number.index].f_deal_dispose = '未处理'
+      }else{
+        this.f_items[this.f_gas_aberrant_number.index].f_is_defect = null
+        this.f_items[this.f_gas_aberrant_number.index].f_deal_dispose = null
       }
 
-      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('检测到金额变化了 ===> ')
-      return
+      //tag
+      // 只有两个值都填了才会计算
+      if(!this.f_fee_base.index || !this.f_fee_balance.index){
+        //tag
+        return
+      }
       // 先清空
       this.f_items[this.f_fee_aberrant_number.index].f_item_value = null
       this.f_items[this.f_fee_aberrant_number.index].f_is_defect = false
 
       if(val=='已用金额'){
-        this.f_items[this.f_fee_balance.index].f_item_value=this.f_items[this.f_total_fee.index].f_item_value-this.f_items[this.f_fee_base.index].f_item_value
+        this.f_items[this.f_fee_balance.index].f_item_value=(this.f_items[this.f_total_fee.index].f_item_value-this.f_items[this.f_fee_base.index].f_item_value).toFixed(3)
         if (isNaN(this.f_items[this.f_fee_balance.index].f_item_value)) {
           this.f_items[this.f_fee_balance.index].f_item_value = null
         }
       }
-      // 只有两个值都填了才会计算
+
       if (!this.f_items[this.f_fee_base.index].f_item_value || !this.f_items[this.f_fee_balance.index].f_item_value) {
         return
       }
@@ -728,55 +815,92 @@ export default {
       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
+        this.f_items[this.f_fee_aberrant_number.index].f_deal_dispose = '未处理'
+      }else{
+        this.f_items[this.f_fee_aberrant_number.index].f_is_defect = null
+        this.f_items[this.f_fee_aberrant_number.index].f_deal_dispose = null
+      }
+
+      //tag)
+    },
+    //  计算剩余金额和剩余金额差值
+    getFeeAberrantNumber2(val) {
+      //tag
+      // 只有两个值都填了才会计算
+      if(!this.f_table_balance.index || !this.f_fee_balance.index){
+        //tag
+        return
+      }
+      // 先清空
+      this.f_items[this.f_fee_aberrant_number.index].f_item_value = null
+      this.f_items[this.f_fee_aberrant_number.index].f_is_defect = false
+
+      // 计算公式 =>  金额异常差值 = 系统剩余金额 - 表端剩余金额
+      this.f_items[this.f_fee_aberrant_number.index].f_item_value = this.f_items[this.f_fee_balance.index].f_item_value - this.f_items[this.f_table_balance.index].f_item_value
+      this.f_items[this.f_fee_aberrant_number.index].f_item_value = this.f_items[this.f_fee_aberrant_number.index].f_item_value.toFixed(3)
+      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
+      }
+      //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
+        this.f_items[this.f_fee_aberrant_number.index].f_deal_dispose = '未处理'
+      }else{
+        this.f_items[this.f_fee_aberrant_number.index].f_is_defect = null
+        this.f_items[this.f_fee_aberrant_number.index].f_deal_dispose = null
       }
+      console.log('--------------------------------')
+      console.log(this.f_items[this.f_fee_aberrant_number.index].f_item_value)
 
-      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) {
@@ -785,6 +909,25 @@ 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
@@ -794,14 +937,14 @@ export default {
         }
       }
     }
-    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) {
       if(typeof this.config[this.device.device].items[item]=='function'){
@@ -809,9 +952,9 @@ export default {
       }
       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'){
@@ -823,7 +966,7 @@ export default {
           }
           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
           }
         }
@@ -833,43 +976,49 @@ export default {
       }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) {
           if(typeof this.config[this.device.device].items[item].options[defitem]=='function'){
             continue
           }
-          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,
         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,
         readonly: this.config[this.device.device].items[item].readonly == true?true:false,
         remark: this.config[this.device.device].items[item].remark ? this.config[this.device.device].items[item].remark : '',
         f_path: '',
+        unit: this.config[this.device.device].items[item].unit ? this.config[this.device.device].items[item].unit : '',
         tooltip:'',
         f_live_dispose:'',
         f_deal_dispose:'',
         f_else: '',
         f_p1_path: '',
         f_p2_path: '',
-        f_p3_path: ''
+        f_p3_path: '',
+        f_longitude:'',
+        f_latitude:''
       }
-      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'){
@@ -896,16 +1045,16 @@ export default {
 
         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') {
-        console.log('this.config[this.device.device].items[item].options'+JSON.stringify(this.config[this.device.device].items[item].options))
-        console.log('this.config[this.device.device].items[item].options.length'+this.config[this.device.device].items[item].options.length)
-        console.log('this.page====='+JSON.stringify(this.page))
+        //tag)
+        //tag
+        //tag)
         for (let i in this.config[this.device.device].items[item].options) {
           if(typeof this.config[this.device.device].items[item].options[i]=='function'){
             continue
           }
-          console.log('i====='+i+"----"+typeof this.config[this.device.device].items[item].options[i])
+          //tag
           this.page['options' + index].push({
             label: this.config[this.device.device].items[item].options[i].data,
             value: this.config[this.device.device].items[item].options[i].data,
@@ -913,16 +1062,16 @@ export default {
             level: this.config[this.device.device].items[item].options[i].level,
             tooltip: this.config[this.device.device].items[item].options[i].tooltip
           })
-          console.log('this.page[options + index]====='+JSON.stringify(this.page['options' + index]))
+          //tag)
         }
-        console.log('this.page==222==='+JSON.stringify(this.page))
+        //tag)
         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
     }
-    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)
@@ -937,79 +1086,85 @@ export default {
             continue
           }
           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('已用气量')
               })
             } 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('')
               })
             } 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('')
+                this.getFeeAberrantNumber2('')
+              })
+            } else if (this.f_items[f].f_item_name == '表端剩余金额') {
+              this.f_table_balance.index = f
+              this.$watch('f_items[' + f + '].f_item_value', function () {
+                this.getFeeAberrantNumber2('')
               })
             } 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_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
             }else if (this.f_items[f].f_item_name == '表金额异常差值') {
-              console.log('表金额异常差值: ' + JSON.stringify(f))
+              //tag)
               this.f_fee_aberrant_number1.index = f
             }
           }
@@ -1032,7 +1187,7 @@ export default {
           }
         }
       }
-      console.log('循环完f_items====》'+JSON.stringify(this.f_items))
+      //tag)
       this.$set('piece.f_items',this.f_items)
     }
     this.towatch()
@@ -1046,10 +1201,10 @@ export default {
         continue
       }
       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 ){
@@ -1066,7 +1221,7 @@ export default {
     // }
     //   picture.push(a)
     this.$set(`paper['device${this.device.n}'][${this.idx}]`, this.piece)
-    console.log('完成')
+    //tag
   },
   computed:{