safecheck-client 3.1.1-gaomi-5 → 4.0.1

package/src/components/android/SafecheckDevices.vue

@@ -17,9 +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="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' || 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 != 'checkbox'" v-show="row.isshow" class="fivelabel" :class="{'defectfront' :row.f_is_defect != ''}">{{row.f_item_name}}<br/>{{row.remark}}</label>
+              <label v-if="row.type == 'radio'" v-show="row.isshow" class="radiolabel"  :class="{'defectfront' :row.f_is_defect != ''}">{{row.f_item_name}}<br/>{{row.remark}}</label>
+              <label v-if="row.type == 'text'" v-show="row.isshow" class="textlabel1"  :class="{'defectfront' :row.f_is_defect != ''}">{{row.f_item_name}}<br/>{{row.remark}}</label>
+              <label v-if="row.type == 'checkbox'" v-show="row.isshow" class="textlabel"  :class="{'defectfront' :row.f_is_defect != ''}">{{row.f_item_name}}<br/>{{row.remark}}</label>
               <!--<span v-if="show" style="font-weight:bold">{{row.f_content}}</span>-->
               <!--<datepicker placeholder="请选择时间"-->
               <!--:value.sync="row.f_content"-->
@@ -28,17 +29,18 @@
               <!--v-if="!show && row.type == 'date'"-->
               <!--:readonly="true"-->
               <!--&gt;</datepicker>-->
-              <div style="clear: both" v-if="row.type == 'picture'" class="form-group col-sm-12" >
-                <div class="auto" >
+              <div style="float: left;width:60%" v-if="row.type == 'picture'" class="form-group" >
+                <button style="float: left;" v-show="!row.f_path" type="button" name="button" class="btn btn-primary" @click="takePic($index, row.f_item_name,1)">拍照</button>
+                <div class="auto" v-show="row.f_path" style="float: left;">
                   <div class="panel">
                     <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 160px;height: 160px;position: relative">
                       <div class="row" style="height: 160px;width:160px;overflow: scroll;top: 1px">
                         <div class="col-sm-4" v-show="row.f_path">
                           <img-self  :src="row.f_path" :alt="row.f_item_name"  width="140" height="140"></img-self>
                         </div>
-                        <div class="col-sm-4" v-show="!row.f_path" @click="takePic($index, row.f_item_name)">
-                          <img src="../../assets/tackpic.png" :alt="点击拍摄照片"  width="140" height="140"></img>
-                        </div>
+                        <!--                        <div class="col-sm-4" v-show="!row.f_path" @click="takePic($index, row.f_item_name,1)">-->
+                        <!--                          <img src="../../assets/tackpic.png" :alt="点击拍摄照片"  width="140" height="140"></img>-->
+                        <!--                        </div>-->
                         <img v-show="row.f_path" src="../../assets/remove.png" :class="style__"   @click="delfile($index, row.f_path)" v-if="role!='androidview'" style="width: 40px;height: 40px;position: absolute;left:110px;top:110px"></img>
                       </div>
                     </div>
@@ -48,8 +50,37 @@
               <div style="float: left;width:60%" class="form-group" v-if="row.type == 'string'" 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 col-sm-12" v-if="row.type == 'date'" v-show="row.isshow">
+                <datepicker id="f_making_date" :placeholder= row.f_item_name
+                            :value.sync="row.f_item_value"
+                            v-if="row.type == 'date'"
+                            v-show="row.isshow"
+                            :disabled-days-of-Week="[]"
+                            :format="'yyyy-MM-dd'"
+                            :show-reset-button="reset" readonly="readonly">
+                </datepicker>
+              </div>
+              <div style="float: left;width:60%" class="form-group" v-if="row.type == 'stringp'" v-show="row.isshow">
+
+                <input type="text" class="form-control" maxlength="100" v-model="row.f_item_value" :readonly="role == 'androidview' || row.readonly">
+                <div class="auto" v-if="row.f_item_value" >
+                  <div class="panel">
+                    <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 160px;height: 160px;position: relative">
+                      <div class="row" style="height: 160px;width:160px;overflow: scroll;top: 1px">
+                        <div class="col-sm-4" v-show="row.f_path">
+                          <img-self  :src="row.f_path" :alt="row.f_item_name"  width="140" height="140"></img-self>
+                        </div>
+                        <div class="col-sm-4" v-show="!row.f_path" @click="takePic($index, row.f_item_name)">
+                          <img src="../../assets/tackpic.png" :alt="点击拍摄照片"  width="140" height="140"></img>
+                        </div>
+                        <img v-show="row.f_path" src="../../assets/remove.png" :class="style__"   @click="delfile($index, row.f_path,1)" v-if="role!='androidview'" style="width: 40px;height: 40px;position: absolute;left:110px;top:110px"></img>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </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"   @change="row.f_item_value=replaceStr(row.f_item_value)" :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" >-->
@@ -65,18 +96,17 @@
               <v-select  style="float: left"  :value.sync="row.selected"
                          v-model="row.selected"
                          v-if="row.type == 'selector'"
-                         :search="false"
                          v-show="row.isshow"
                          placeholder='请选择'
                          :options="row.options"
                          :disabled="role == 'androidview' || row.readonly"
                          @change="changse"
                          @click="transelation($index)"
-                         :multiple="row.multiple"
+                         :multi ple="row.multiple"
                          :close-on-select="!row.multiple" clear-button></v-select>
               <div style="float: left;width: 30%" class="form-group" v-if="!show && row.type == 'radio'">
                 <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.$index,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>
@@ -94,8 +124,8 @@
               </div>
               <div style="clear: both">
                 <div class="form-group"  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"
+                  <label class="fivelabel">处理方式</label>
+                  <v-select   :value="row.f_processing"
                               :value-single="true"
                               :options="lives"
                               :disabled="role == 'androidview'"
@@ -103,23 +133,39 @@
                               @click="transelation($index)"
                               close-on-select clear-button></v-select>
                 </div>
-                <div class="form-group col-sm-12"  v-if="(row.type == 'selector' || row.type == 'radio' || row.type =='checkbox') && (row.f_path != '' || row.f_is_defect != '')" style="margin-top: 40px">
-                  <div class="auto" >
+                <div class="form-group col-sm-12"  v-if="(row.type == 'selector' || row.type == 'radio' || row.type =='checkbox' || row.type =='string') && (row.f_path != '' || row.f_is_defect != '')" style="margin-top: 40px">
+                  <div class="auto" style="display: inline-block;">
                     <div class="panel">
                       <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 160px;height: 160px;position: relative">
                         <div class="row" style="height: 160px;width:160px;overflow: scroll;top: 1px">
                           <div class="col-sm-4" v-show="row.f_path">
                             <img-self  :src="row.f_path" :alt="row.f_item_name"  width="140" height="140"></img-self>
                           </div>
-                          <div class="col-sm-4" v-show="!row.f_path" @click="takePic($index, row.f_item_name)">
+                          <div class="col-sm-4" v-show="!row.f_path" @click="takePic($index, row.f_item_name,1)">
+                            <img src="../../assets/tackpic.png" :alt="点击拍摄照片"  width="140" height="140"></img>
+                          </div>
+                          <img v-show="row.f_path" src="../../assets/remove.png" :class="style__"   @click="delfile($index, row.f_path,1)" v-if="role!='androidview'" style="width: 40px;height: 40px;position: absolute;left:110px;top:110px"></img>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <div class="auto" style="display: inline-block;">
+                    <div class="panel">
+                      <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 160px;height: 160px;position: relative">
+                        <div class="row" style="height: 160px;width:160px;overflow: scroll;top: 1px">
+                          <div class="col-sm-4" v-show="row.f_second_path">
+                            <img-self  :src="row.f_second_path" :alt="row.f_item_name"  width="140" height="140"></img-self>
+                          </div>
+                          <div class="col-sm-4" v-show="!row.f_second_path" @click="takePic($index, row.f_item_name,2)">
                             <img src="../../assets/tackpic.png" :alt="点击拍摄照片"  width="140" height="140"></img>
                           </div>
-                          <img v-show="row.f_path" src="../../assets/remove.png" :class="style__"   @click="delfile($index, row.f_path)" v-if="role!='androidview'" style="width: 40px;height: 40px;position: absolute;left:110px;top:110px"></img>
+                          <img v-show="row.f_second_path" src="../../assets/remove.png" :class="style__"   @click="delfile($index, row.f_second_path,2)" v-if="role!='androidview'" style="width: 40px;height: 40px;position: absolute;left:110px;top:110px"></img>
                         </div>
                       </div>
                     </div>
                   </div>
                 </div>
+
                 <div class="auto" v-if="(row.type == 'selector' || row.type == 'radio' || row.type =='checkbox') && row.tooltip != undefined  && row.tooltip != '' ">
                   <div class="panel">
                     <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: auto">
@@ -128,15 +174,7 @@
                   </div>
                 </div>
               </div>
-              <datepicker id="f_making_date" :placeholder= row.f_item_name
-                          v-if="row.type == 'date'"
-                          :value.sync="row.f_item_value"
-                          v-show="row.isshow"
-                          :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM'"
-                          class="col-xs-8"
-                          :show-reset-button="reset" readonly="readonly">
-              </datepicker>
+
               <!--<v-select :value.sync="row.f_content" :options='getOptions(row.f_project)' placeholder='请选择' :disabled="(!(ischecked == '有')) || issee"  close-on-select  :value-single="true" v-if="!show && row.type == 'selector' && row.f_project != '气表品牌'"-->
               <!--&gt;</v-select>-->
               <!--<v-select :value.sync="row.f_content" :options='getOptions(row.f_project)' @change="getgasmodel" placeholder='请选择' :disabled="(!(ischecked == '有')) || issee"  close-on-select  :value-single="true" v-if="!show && row.type == 'selector' && row.f_project == '气表品牌'"-->
@@ -177,10 +215,10 @@
         f_items:[],
         page:{},
         selectindex:null,
-        lives:[{label: '是', value: '是'},{label: '否', value: '否'}],
-        f_live_dispose:'否',
+        lives:[{label: '现场处理', value: '现场处理'},{label: '用户自行处理', value: '用户自行处理'},{label: '需转维修处理', value: '需转维修处理'}],
+        f_live_dispose:'需转维修处理',
         // 初始表底
-        f_initial_base: {},
+        //f_initial_base: {},
         // 气量异常差值  计算公式 =>  气量异常差值 = 累计购气量 - （已用气量 - 初始表底） - 剩余气量
         f_gas_aberrant_number: {},
         // 金额异常差值  计算公式 =>  金额异常差值 = 累计购金额 - 已用金额 - 剩余金额
@@ -197,6 +235,15 @@
         f_gas_balance: {},
         // 剩余金额
         f_fee_balance: {},
+
+        //物联网表数据存储
+        f_balance_amount:{},//物联网表剩余金额
+        f_meter_base:{},//物联网表读数
+        f_balance_amount1:{},//物联网表现场录入的表上剩余金额
+        f_meter_base1:{},//物联网表现场录入的表字轮数
+        f_meter_aberrant_number1: {},//物联网表 表数异常差值
+        f_fee_aberrant_number1: {},//物联网 表金额异常差值
+
         // 气量异常差值允许误差
         gasDeviation: (
           function (_this) {
@@ -208,6 +255,17 @@
             }
           }
         )(this),
+        // 气量异常差值允许误差
+        meterbase: (
+          function (_this) {
+            let deviation = _this.$appdata.getSingleValue('字轮异常差值允许误差')
+            if (deviation && !isNaN(deviation)) {
+              return deviation
+            } else {
+              return 0
+            }
+          }
+        )(this),
         // 金额异常差值允许误差
         feeDeviation: (
           function (_this) {
@@ -251,6 +309,14 @@
     //   issee:''
     // },
     methods: {
+      replaceStr(value){
+        if(value){
+          if(value.indexOf(".")==0 || ((value.split('.')).length-1)>1 || value.lastIndexOf(".")==(value.length-1)){
+            return ''
+          }
+          return value.replace(/[^\d\.]/g,'')
+        }
+      },
       changse(val){
         if(val == undefined){
           return
@@ -268,7 +334,32 @@
           return
         }
         if(this.selectindex != null) {
-          this.f_items[this.selectindex].f_live_dispose = val
+          if (val === '现场处理') {
+            this.f_items[this.selectindex].f_processing = '现场处理' // 处理方式 【现场处理、用户自行处理、需转维修处理】
+            this.f_items[this.selectindex].f_is_repaired = '不转维修' // 是否已经转维修处理过了 【已转维修、维修已处理、需转维修、不转维修，空字符串（目前空串都是异常差值）】
+            this.f_items[this.selectindex].f_live_dispose = '是' //  是否现场处理 【是、否】
+            this.f_items[this.selectindex].f_user_changes = '否'  //用户自行整改 【是、否】
+          } else if (val ==='用户自行处理') {
+            this.f_items[this.selectindex].f_processing = '用户自行处理' // 处理方式 【现场处理、用户自行处理、需转维修处理】
+            this.f_items[this.selectindex].f_is_repaired = '不转维修' // 是否已经转维修处理过了  【已转维修、维修已处理、需转维修、不转维修，空字符串（目前空串都是异常差值）】
+            this.f_items[this.selectindex].f_live_dispose = '否'  // 是否现场处理 【是、否】
+            this.f_items[this.selectindex].f_user_changes = '是' // 用户自行整改 【是、否】
+          } else if (val === '需转维修处理') {
+            this.f_items[this.selectindex].f_processing = '需转维修处理' // 处理方式 【现场处理、用户自行处理、需转维修处理】
+            this.f_items[this.selectindex].f_is_repaired = '需转维修'  // 是否已经转维修处理过了  【已转维修、维修已处理、需转维修、不转维修，空字符串（目前空串都是异常差值）】
+            this.f_items[this.selectindex].f_live_dispose = '否' // 是否现场处理 【是、否】
+            this.f_items[this.selectindex].f_user_changes = '否' // 用户自行整改 【是、否】
+          }
+          // 如果选项里面的所有内容中 用户自行整改有一个为 “是” 则勾选隐患整改单必须拍照
+          for (let nindex in this.f_items) {
+            if (this.f_items[nindex].f_user_changes=== '是') {
+              this.$parent.$parent.data.f_defect_notified = true
+              break
+            } else {
+              this.$parent.$parent.data.f_defect_notified = false;
+            }
+          }
+          // this.f_items[this.selectindex].f_live_dispose = val
         }
       },
       switchDetails(detailsType, event){
@@ -340,7 +431,7 @@
           }
         })
       },
-      takePic(prop, title) {
+      takePic(prop, title,order) {
         if (this.role == 'androidview') {
           return
         }
@@ -348,30 +439,45 @@
         HostApp.__this__ = this
         console.log('this.f_items[prop]:' + prop)
         let fileName
-        if(!this.f_items[prop].f_path || this.f_items[prop].f_path.includes("nopic.png")) {
+        if(order==1 && (!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'
-        } else {
+        }else if(order==2 && (!this.f_items[prop].f_second_path || this.f_items[prop].f_path.includes("nopic.png"))) {
+          fileName = Util.guid() + '-' + 'device'+this.device.n + '-' + this.idx + '-'+'f_items'+prop+ '.jpg'
+        }else {
           fileName = Util.getFileName(this.f_items[prop].f_path)
         }
         HostApp._open_a_page({type: 'boomerang',
           page: 'com.aofeng.hybrid.android.peripheral.CameraActivity',
-          param: {file: fileName, requestCode: 111, callback:'javascript:HostApp.__callback__("'+ prop +'", "%s");', watermark: title + '\t时间：'+ Util.toStandardTimeString() + '\t' + Vue.user.name}
+          param: {file: fileName, requestCode: 111, callback:'javascript:HostApp.__callback__("'+ prop +'", "%s",'+order+');', watermark: title + '\t时间：'+ Util.toStandardTimeString() + '\t' + Vue.user.name+'\t'+`安检员地址：${this.$parent.$parent.gps.address}`+'\t'+`用户地址：${this.$parent.$parent.item.f_address}`}
         })
       },
-      cameraCallBack(prop, fileName) {
-        HostApp.__this__.$set( 'f_items['+prop+'].f_path', fileName + '?' + Math.random())
-        console.log(HostApp.__this__.f_items[prop].f_path)
+      cameraCallBack(prop, fileName,order) {
+        console.log("传入参数---"+order)
+        if(order==2){
+          HostApp.__this__.$set( 'f_items['+prop+'].f_second_path', fileName + '?' + Math.random())
+          console.log("path11111111111111111111111111:"+this.f_items[prop].f_second_path)
+          console.log(HostApp.__this__.f_items[prop].f_second_path)
+        }else{
+          HostApp.__this__.$set( 'f_items['+prop+'].f_path', fileName + '?' + Math.random())
+          console.log("path000000000000000000000000000:"+this.f_items[prop].f_path)
+          console.log(HostApp.__this__.f_items[prop].f_path)
+        }
         HostApp.__callback__ = null
         HostApp.__this__ = null
       },
-      delfile(prop, fileName) {
+      delfile(prop, fileName,order) {
         console.log('照片路径')
         console.log(JSON.stringify(fileName))
         if(fileName == Vue.nopic)
           return
         else {
-          HostApp.delfile(fileName)
-          this.f_items[prop].f_path = Vue.nopic
+          if(order==2){
+            HostApp.delfile(fileName)
+            this.f_items[prop].f_second_path = Vue.nopic
+          }else{
+            HostApp.delfile(fileName)
+            this.f_items[prop].f_path = Vue.nopic
+          }
         }
       },
       adddetails(){
@@ -401,6 +507,7 @@
       },
       towatch(){
         for(let n in this.f_items){
+
           if(this.f_items[n].type  == 'selector' || this.f_items[n].type  == 'inputSelector'){
             // 监听下拉框，如果有隐患，需要拍照
             this.$watch('f_items['+n+'].selected',function(val) {
@@ -455,12 +562,18 @@
                           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_live_dispose = '否' //是否现场处理 【是、否】
+                          this.f_items[n].f_processing = '需转维修处理' //处理方式 【现场处理、用户自行处理、需转维修处理】
+                          this.f_items[n].f_is_repaired = '需转维修' // 是否已经转维修处理过了 【已转维修、维修已处理、需转维修、不转维修，空字符串（目前空串都是异常差值）】
+                          this.f_items[n].f_user_changes = '否' // 用户自行整改 【是、否】
                           this.f_items[n].tooltip= options[i].tooltip
                         }else{
                           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_processing = ''
+                          this.f_items[n].f_is_repaired = ''
+                          this.f_items[n].f_user_changes = ''
                           this.f_items[n].f_live_dispose = ''
                           this.f_items[n].tooltip = ''
                         }
@@ -481,21 +594,71 @@
             //
             // })
           }else if(this.f_items[n].type  == 'radio') {
+            //如果radio有默认值 就判断级联项是否显示
+            if (this.f_items[n].correlation) {
+              if(this.f_items[n].f_item_value){
+                for (let i = 0; i < this.f_items[n].options.length; i++){
+                  if(this.f_items[n].f_item_value==this.f_items[n].options[i].value){
+                    if (this.f_items[n].options[i].selcorrelation) {
+                      for (let itm = 1; itm <= this.f_items[n].correlationnum; itm++){
+                        console.log('111this.f_items[n+itm] ===> ' + JSON.stringify(this.f_items[n+itm]))
+                        console.log('111n-------------itm ' + n+"-------"+itm)
+                        let idex=parseInt(n)+parseInt(itm)
+                        console.log("indx"+idex)
+                        this.f_items[idex].isshow=false
+                        this.f_items[idex].f_path=''
+                        this.f_items[idex].f_item_value=''
+                      }
+                    }
+                  }
+                }
+              }
+            }
             // 监听单选框，如果有隐患，需要拍照
             this.$watch('f_items[' + n + '].f_item_value', function (val) {
+              console.log('11this.f_items ===> ' + JSON.stringify(this.f_items))
               console.log('radio selected ===> ' + JSON.stringify(val))
+              console.log('this.f_items[n] ===> ' + JSON.stringify(JSON.stringify(this.f_items[n])))
               let options = this.f_items[n].options
               console.log('this.f_items[n].options ===> ' + JSON.stringify(this.f_items[n].options))
               for (let i = 0; i < options.length; i++) {
                 console.log('option ===> ' + JSON.stringify(options[i]))
                 // 找到选中的项了
                 if (options[i].value == val) {
+                  //当项是否有级联显示开关
+                  if (this.f_items[n].correlation) {
+                    //当选中值是否有级联显示开关
+                    if (options[i].selcorrelation) {
+                      //如果有就关闭所有子项的显示 并且清空数据
+                      for (let itm = 1; itm <= this.f_items[n].correlationnum; itm++){
+                        console.log('1this.f_items[n+itm] ===> ' + JSON.stringify(this.f_items[n+itm]))
+                        console.log('n-------------itm ' + n+"-------"+itm)
+                        let idex=parseInt(n)+parseInt(itm)
+                        console.log("indx"+idex)
+                        this.f_items[idex].isshow=false
+                        this.f_items[idex].f_path=''
+                        this.f_items[idex].f_item_value=''
+                      }
+                    }else{
+                      for (let itm = 1; itm <= this.f_items[n].correlationnum; itm++){
+                        console.log('2this.f_items[n+itm] ===> ' + JSON.stringify(this.f_items[n+itm]))
+                        console.log('n-------------itm ' + n+"-------"+itm)
+                        let idex=parseInt(n)+parseInt(itm)
+                        console.log("indx"+idex)
+                        this.f_items[idex].isshow=true
+                      }
+                    }
+                    console.log('this.f_items ===> ' + JSON.stringify(JSON.stringify(this.f_items)))
+                  }
                   // 如果有隐患，拍图片
                   if (options[i].isdefect) {
                     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_live_dispose = '否' //是否现场处理 【是、否】
+                    this.f_items[n].f_processing = '需转维修处理' //处理方式 【现场处理、用户自行处理、需转维修处理】
+                    this.f_items[n].f_is_repaired = '需转维修' // 是否已经转维修处理过了 【已转维修、维修已处理、需转维修、不转维修，空字符串（目前空串都是异常差值）】
+                    this.f_items[n].f_user_changes = '否' // 用户自行整改 【是、否】
                     this.f_items[n].tooltip = options[i].tooltip
                     console.log('this.f_items[n] ===> ' + JSON.stringify(this.f_items[n]))
                     return
@@ -505,6 +668,9 @@
               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_processing = ''
+              this.f_items[n].f_is_repaired = ''
+              this.f_items[n].f_user_changes = ''
               this.f_items[n].f_live_dispose = ''
               this.f_items[n].tooltip = ''
             })
@@ -532,6 +698,9 @@
                   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_processing = ''
+                  this.f_items[n].f_is_repaired = ''
+                  this.f_items[n].f_user_changes = ''
                   this.f_items[n].f_live_dispose = ''
                   this.f_items[n].tooltip = ''
                   return
@@ -543,7 +712,10 @@
                   this.f_items[n].f_is_defect = true
                   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_live_dispose = '否' //是否现场处理 【是、否】
+                  this.f_items[n].f_processing = '需转维修处理' //处理方式 【现场处理、用户自行处理、需转维修处理】
+                  this.f_items[n].f_is_repaired = '需转维修' // 是否已经转维修处理过了 【已转维修、维修已处理、需转维修、不转维修，空字符串（目前空串都是异常差值）】
+                  this.f_items[n].f_user_changes = '否' // 用户自行整改 【是、否】
                   this.f_items[n].tooltip = selected[0].tooltip
                 }
                 console.log('this.f_items[n] ===> ' + JSON.stringify(this.f_items[n]))
@@ -552,33 +724,57 @@
               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_processing = ''
+              this.f_items[n].f_is_repaired = ''
+              this.f_items[n].f_user_changes = ''
               this.f_items[n].f_live_dispose = ''
               this.f_items[n].tooltip = ''
             })
+          }else if(this.f_items[n].type  == 'string') {
+            this.$watch('f_items[' + n + '].f_item_value', function (val) {
+              if (this.f_items[n].f_item_value && this.f_items[n].isdefect){
+                this.f_items[n].f_is_defect = true
+                this.f_items[n].f_defect_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].tooltip = ''
+              }else {
+                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 = ''
+              }
+            })
+          }
+          if(this.f_items[n].f_item_name=='燃气灶购买年份' || this.f_items[n].f_item_name=='壁挂炉购买年份' || this.f_items[n].f_item_name=='热水器购买年份'){
+            this.$watch('f_items[' + n + '].f_item_value',function(val){
+              if(val){
+                let d1=new Date(val)
+                let idex=parseInt(n)+1
+                this.f_items[idex].f_item_value =(d1.getFullYear()+8)+'-'+(d1.getMonth()+1)
+              }
+            })
           }
         }
         console.log('deviceitem.f_items=====>'+JSON.stringify(this.f_items))
       },
-      getGasAberrantNumber(val) {
+      getGasAberrantNumber() {
         console.log('检测到气量变化了 ===> ')
 
         // 先清空
         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
-          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
         }
 
         // 计算公式 =>  气量异常差值 = 累计购气量 - （已用气量 - 初始表底） - 剩余气量
-        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_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)) {
@@ -593,19 +789,13 @@
 
         console.log('this.f_items[this.f_gas_aberrant_number.index] ===> ' + JSON.stringify(this.f_items[this.f_gas_aberrant_number.index]))
       },
-      getFeeAberrantNumber(val) {
+      getFeeAberrantNumber() {
         console.log('检测到金额变化了 ===> ')
 
         // 先清空
         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
-          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
@@ -626,6 +816,60 @@
 
         console.log('this.f_items[this.f_fee_aberrant_number.index] ===> ' + JSON.stringify(this.f_items[this.f_fee_aberrant_number.index]))
       },
+      //物联网表字轮数改变触发
+      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)
+
+        // 先清空
+        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 ')
+        // 只有两个值都填了才会计算
+        if ((!this.f_items[this.f_meter_base.index].f_item_value && this.f_items[this.f_meter_base.index].f_item_value !== 0) || (!this.f_items[this.f_meter_base1.index].f_item_value && this.f_items[this.f_meter_base1.index].f_item_value !== 0)) {
+          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)
+        // 计算公式 =>   表数异常差值= - 字轮数 - 后台表读数
+        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))
+        // 计算差值是否在范围内
+        console.log("字轮数异常范围"+Number(this.feeDeviation))
+        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]))
+      },
+      //物联网表余额改变触发
+      getfeeaberrantnumber1() {
+        console.log('检测到表余额改变 ===> '+this.f_items[this.f_balance_amount1.index].f_item_value+this.f_items[this.f_balance_amount.index].f_item_value)
+        // 先清空
+        this.f_items[this.f_fee_aberrant_number1.index].f_item_value = null
+        this.f_items[this.f_fee_aberrant_number1.index].f_is_defect = false
+
+        // 只有两个值都填了才会计算
+        if ((!this.f_items[this.f_balance_amount1.index].f_item_value && this.f_items[this.f_balance_amount1.index].f_item_value !== 0) || (!this.f_items[this.f_balance_amount.index].f_item_value && this.f_items[this.f_balance_amount.index].f_item_value !== 0)) {
+          return
+        }
+        console.log("-----到了吗？"+this.f_items[this.f_balance_amount1.index].f_item_value+'----'+this.f_items[this.f_balance_amount.index].f_item_value)
+        // 计算公式 =>  表金额异常差值 =  已用金额 - 剩余金额
+        this.f_items[this.f_fee_aberrant_number1.index].f_item_value = this.f_items[this.f_balance_amount.index].f_item_value - this.f_items[this.f_balance_amount1.index].f_item_value
+        this.f_items[this.f_fee_aberrant_number1.index].f_item_value = this.f_items[this.f_fee_aberrant_number1.index].f_item_value.toFixed(3)
+        if (isNaN(this.f_items[this.f_fee_aberrant_number1.index].f_item_value)) {
+          this.f_items[this.f_fee_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_fee_aberrant_number1.index].f_item_value))
+        // 计算差值是否在范围内
+        if (Number(this.f_items[this.f_fee_aberrant_number1.index].f_item_value) < Number(0)) {
+          this.f_items[this.f_fee_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_fee_aberrant_number1.index]))
+      },
 
       disSelect(index, itemValue) {
         console.log('this.f_items[index] ===> ' + JSON.stringify(this.f_items[index]))
@@ -635,6 +879,7 @@
         }
       }
     },
+
     ready() {
       console.log('deviec--role=>'+this.role)
       console.log('device=>',this.device)
@@ -656,6 +901,7 @@
       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.config[this.device.device].items[item].isshow=this.config[this.device.device].items[item].isshow==undefined || this.config[this.device.device].items[item].isshow==null?true:this.config[this.device.device].items[item].isshow
         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))
@@ -675,8 +921,20 @@
           // if(this.config[this.device.device].items[item].data){
           //   f_item_value.push(this.config[this.device.device].items[item].data)
           // }
+        }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]))
+          for (let defitem in this.config[this.device.device].items[item].options) {
+            console.log('选项1111-', JSON.stringify(defitem))
+            let defopt = this.config[this.device.device].items[item].options[defitem]
+            if (defopt.isdefault) {
+              console.log('defopt', JSON.stringify(defopt))
+              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 : ''
+          f_item_value = this.config[this.device.device].items[item].f_item_value ? this.config[this.device.device].items[item].f_item_value : ''
         }
         console.log('f_item_value ====== > '+JSON.stringify(f_item_value))
         let it = {
@@ -685,14 +943,22 @@
           checkmust: this.config[this.device.device].items[item].checkmust,
           f_item_value: f_item_value,
           f_is_defect: '',
+          isdefect: this.config[this.device.device].items[item].isdefect,
           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,
+          isshow:this.config[this.device.device].items[item].isshow,
           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: '',
+          f_second_path:'',
           tooltip:'',
           f_live_dispose:'',
-          f_else:''
+          f_processing: '',
+          f_user_changes:'',
+          f_is_repaired:'',
+          f_else:'',
+          index:this.config[this.device.device].items[item].index,
+          correlation:this.config[this.device.device].items[item].correlation?this.config[this.device.device].items[item].correlation:false,
+          correlationnum:this.config[this.device.device].items[item].correlationnum?this.config[this.device.device].items[item].correlationnum:0
         }
         console.log('index ===> ' + JSON.stringify(index))
         console.log('it ===> ' + JSON.stringify(it))
@@ -725,7 +991,8 @@
               label: this.config[this.device.device].items[item].options[i].data,
               value: this.config[this.device.device].items[item].options[i].data,
               isdefect: this.config[this.device.device].items[item].options[i].isdefect,
-              level: this.config[this.device.device].items[item].options[i].level
+              level: this.config[this.device.device].items[item].options[i].level,
+              selcorrelation: this.config[this.device.device].items[item].options[i].selcorrelation
             })
           }
           this.$set('f_items[' + index + '].options', this.page['options' + index])
@@ -734,17 +1001,20 @@
         }
         n = n + 1
       }
+
       if(JSON.stringify(this.piece) == '{}') {
         // 如果没有，则新建
         this.$set('piece.f_items',this.f_items)
         this.$set('piece.f_device_type',this.device.device)
       } else {
         // 已经存在，把之前的数据重新填入
-        for (let f in this.f_items){
-          for(let p in this.piece.f_items) {
+        console.log("start---------------"+new Date())
+        console.log('this.piece.f_items[p] 11111===> ' + JSON.stringify(this.piece.f_items))
+        for (let f=0 ;f< this.f_items.length;f++){
+          for(let p=0 ; p<this.piece.f_items.length;p++) {
+            //console.log('this.f_items[f] 1111===> ' + JSON.stringify(this.f_items[f]))
+            //console.log('this.piece.f_items[p] 11111===> ' + JSON.stringify(this.piece.f_items[p]))
             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]))
               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]))
               if (this.f_items[f].type == 'selector' || this.f_items[f].type == 'inputSelector') {
@@ -753,24 +1023,20 @@
                 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))
               }
-              // 取出特殊值
-              if (this.f_items[f].f_item_name == '初始表底') {
-                console.log('初始表底: ' + JSON.stringify(f))
-                this.f_initial_base.index = f
-              } else if (this.f_items[f].f_item_name == '累购气量') {
+              if (this.f_items[f].f_item_name == '累购气量') {
                 console.log('累购气量: ' + JSON.stringify(f))
                 this.f_total_gas.index = f
               } else if (this.f_items[f].f_item_name == '已用气量') {
                 console.log('已用气量: ' + JSON.stringify(f))
                 this.f_table_base.index = f
                 this.$watch('f_items[' + f + '].f_item_value', function () {
-                  this.getGasAberrantNumber('已用气量')
+                  this.getGasAberrantNumber()
                 })
               } else if (this.f_items[f].f_item_name == '剩余气量') {
                 console.log('剩余气量: ' + JSON.stringify(f))
                 this.f_gas_balance.index = f
                 this.$watch('f_items[' + f + '].f_item_value', function () {
-                  this.getGasAberrantNumber('')
+                  this.getGasAberrantNumber()
                 })
               } else if (this.f_items[f].f_item_name == '气量异常差值') {
                 console.log('气量异常差值: ' + JSON.stringify(f))
@@ -782,18 +1048,43 @@
                 console.log('已用金额: ' + JSON.stringify(f))
                 this.f_fee_base.index = f
                 this.$watch('f_items[' + f + '].f_item_value', function () {
-                  this.getFeeAberrantNumber('已用金额')
+                  this.getFeeAberrantNumber()
                 })
               } else if (this.f_items[f].f_item_name == '剩余金额') {
                 console.log('剩余金额: ' + JSON.stringify(f))
                 this.f_fee_balance.index = f
                 this.$watch('f_items[' + f + '].f_item_value', function () {
-                  this.getFeeAberrantNumber('')
+                  this.getFeeAberrantNumber()
                 })
               } else if (this.f_items[f].f_item_name == '金额异常差值') {
                 console.log('金额异常差值: ' + JSON.stringify(f))
                 this.f_fee_aberrant_number.index = f
+              }else if (this.f_items[f].f_item_name == '表读数') {
+                console.log('表读数: ' + JSON.stringify(f))
+                this.f_meter_base.index = f
+              }else if (this.f_items[f].f_item_name == '表剩余金额') {
+                console.log('表剩余金额: ' + JSON.stringify(f))
+                this.f_balance_amount.index = f
+              }else if (this.f_items[f].f_item_name == '字轮数') {
+                console.log('字轮数: ' + JSON.stringify(f))
+                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))
+                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))
+                this.f_meter_aberrant_number1.index = f
+              }else if (this.f_items[f].f_item_name == '表金额异常差值') {
+                console.log('表金额异常差值: ' + JSON.stringify(f))
+                this.f_fee_aberrant_number1.index = f
               }
+              break
             }
           }
           for (let em in this.config[this.device.device].items) {
@@ -805,13 +1096,16 @@
                   value: this.config[this.device.device].items[em].options[k].data
                 })
               }
+              break
             }
           }
         }
         console.log('循环完f_items====》'+JSON.stringify(this.f_items))
         this.$set('piece.f_items',this.f_items)
+        console.log("start2222---------------"+new Date())
       }
       this.towatch()
+      console.log("start333333---------------"+new Date())
     },
     destroyed(){
       let nullCount = 0
@@ -850,9 +1144,12 @@
   .class-erro {
     color: #a94442;
   }
+  .defectfront{
+    color: red;
+  }
   .fivelabel{
     border: none;
-    border-left: 5px solid #A2C2EB;
+    border-left: 5px solid #0075FF;
     float: left;
     width: 35%;
     margin-bottom: 3px;
@@ -862,7 +1159,7 @@
   }
   .radiolabel{
     border: none;
-    border-left: 5px solid #A2C2EB;
+    border-left: 5px solid #0075FF;
     float: left;
     width: 65%;
     margin-bottom: 3px;
@@ -873,7 +1170,16 @@
 
   .textlabel {
     border: none;
-    border-left: 5px solid #A2C2EB;
+    border-left: 5px solid #0075FF;
+    width: 100%;
+    margin-bottom: 3px;
+    text-align: left;
+    word-wrap: break-word;
+    white-space: normal;
+  }
+  .textlabel1 {
+    border: none;
+    border-left: 5px solid #2BA245;
     width: 100%;
     margin-bottom: 3px;
     text-align: left;