safecheck-client 4.0.1-8 → 4.0.1-80

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

@@ -16,11 +16,19 @@
             <!--<div class="{{shuclass}}" v-if="device.device != '燃气表' && candelete">-->
             <!--<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}}<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}}</label>
+            <div class="shuclass1"  v-show="row.isshow" v-for="row in f_items" track-by="$index"  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}}<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}}
+              </label>
               <!--<span v-if="show" style="font-weight:bold">{{row.f_content}}</span>-->
               <!--<datepicker placeholder="请选择时间"-->
               <!--:value.sync="row.f_content"-->
@@ -37,10 +45,10 @@
                         <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(idxs, row.f_item_name)">
+                        <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(idxs, row.f_path)" v-if="role!='androidview'" style="width: 40px;height: 40px;position: absolute;left:110px;top:110px"></img>
+                        <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>
                   </div>
@@ -73,7 +81,7 @@
                                :readonly="false"
                                :options="row.options"
                                @change="changse"
-                               @click="transelation(idxs)"></input-select>
+                               @click="transelation($index)"></input-select>
               <v-select  style="float: left"  :value.sync="row.selected"
                          v-model="row.selected"
                          v-if="row.type == 'selector'"
@@ -83,12 +91,12 @@
                          :options="row.options"
                          :disabled="role == 'androidview' || row.readonly"
                          @change="changse"
-                         @click="transelation(idxs)"
+                         @click="transelation($index)"
                          :multiple="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.idxs,item.value)" :value="item.value" :disabled="(!(ischecked == '有')) || issee" v-model="row.f_item_value" >-->
+                  <!--                  <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>
@@ -113,7 +121,7 @@
                               :options="deals"
                               :disabled="role == 'androidview'"
                               @change="changdeal"
-                              @click="transelation(idxs)"
+                              @click="transelation($index)"
                               close-on-select clear-button></v-select>
                 </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 != '' ">
@@ -127,10 +135,10 @@
                           <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(idxs, row.f_item_name)">
+                          <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(idxs, row.f_path)" v-if="role!='androidview'" style="width: 40px;height: 40px;position: absolute;left:110px;top:110px"></img>
+                          <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>
                     </div>
@@ -143,10 +151,10 @@
                           <div class="col-sm-4" v-show="row['f_p' + (itemIndex+1) + '_path']">
                             <img-self  :src="row['f_p' + (itemIndex+1) + '_path']" :alt="row.f_item_name"  width="140" height="140"></img-self>
                           </div>
-                          <div class="col-sm-4" v-show="!row['f_p' + (itemIndex+1) + '_path']" @click="takePic(idxs, row.f_item_name,'f_p' + (itemIndex+1)+ '_path')">
+                          <div class="col-sm-4" v-show="!row['f_p' + (itemIndex+1) + '_path']" @click="takePic($index, row.f_item_name,'f_p' + (itemIndex+1)+ '_path')">
                             <img src="../../../assets/tackpic.png" :alt="点击拍摄照片"  width="140" height="140"></img>
                           </div>
-                          <img v-show="row['f_p' + (itemIndex+1)+'_path']" src="../../../assets/remove.png" :class="style__"   @click="delfile(idxs,row['f_p' + (itemIndex+1)+'_path'],'f_p' + (itemIndex+1)+ '_path')" v-if="role!='androidview'" style="width: 40px;height: 40px;position: absolute;left:110px;top:110px"></img>
+                          <img v-show="row['f_p' + (itemIndex+1)+'_path']" src="../../../assets/remove.png" :class="style__"   @click="delfile($index,row['f_p' + (itemIndex+1)+'_path'],'f_p' + (itemIndex+1)+ '_path')" v-if="role!='androidview'" style="width: 40px;height: 40px;position: absolute;left:110px;top:110px"></img>
                         </div >
                       </div>
                     </div>
@@ -814,9 +822,28 @@ export default {
         if(Vue.config.safecheck.ApproveConfig.dealdispose != undefined) {
           this.dealdispose = Vue.config.safecheck.ApproveConfig.dealdispose
         }
+        if(Vue.config.safecheck.ApproveConfig.showtorepair) {
+          this.deals=[{label: '现场整改', value: '现场整改'},
+            {label: '自行处理', value: '自行处理'},
+            {label: '转维修', value: '报修'}
+          ]
+        }
+        if(Vue.config.safecheck.ApproveConfig.Processing) {
+          if(Vue.config.safecheck.ApproveConfig.Processing.length > 0){
+            this.deals = Vue.config.safecheck.ApproveConfig.Processing
+          }
+        }
+        if(Vue.config.safecheck.ApproveConfig.showXCImg) {
+          this.showXCImg = true
+        }
+        if(Vue.config.safecheck.ApproveConfig.showZXTime) {
+          this.showZXTime = true
+        }
+        if(Vue.config.safecheck.ApproveConfig.showtorepair) {
+        }
         if(Vue.config.safecheck.ApproveConfig.hiddendanger != undefined) {
-          if (parseInt(Vue.config.safecheck.ApproveConfig.hiddendanger) >= 3) {
-            this.hiddenDangerImgNumber = 3
+          if (parseInt(Vue.config.safecheck.ApproveConfig.hiddendanger) >= 5) {
+            this.hiddenDangerImgNumber = 5
           }else {
             this.hiddenDangerImgNumber = parseInt(Vue.config.safecheck.ApproveConfig.hiddendanger)
           }
@@ -883,6 +910,9 @@ export default {
         f_item_name: item,
         checkmust: this.config[this.device.device].items[item].checkmust,
         f_item_value: f_item_value,
+        is_verification:this.config[this.device.device].items[item].is_verification,
+        verification_text:'',
+        verification_state:'',// ai验证是否通过 npass(未通过)/pass(通过)
         f_is_defect: '',
         multiple:this.config[this.device.device].items[item].multiple == true?this.config[this.device.device].items[item].multiple:false,
         isshow:this.config[this.device.device].items[item].isshow == false?this.config[this.device.device].items[item].isshow:true,
@@ -896,7 +926,9 @@ export default {
         f_else: '',
         f_p1_path: '',
         f_p2_path: '',
-        f_p3_path: ''
+        f_p3_path: '',
+        f_longitude:'',
+        f_latitude:''
       }
       //tag)
       //tag)
@@ -952,7 +984,7 @@ export default {
       }
       n = n + 1
     }
-    if(JSON.stringify(this.piece) == '{}') {
+    if(!this.piece || JSON.stringify(this.piece) == '{}') {
       // 如果没有，则新建
       this.$set('piece.f_items',this.f_items)
       this.$set('piece.f_device_type',this.device.device)
@@ -963,7 +995,6 @@ export default {
           continue
         }
         for(let p in this.piece.f_items) {
-          //
           if(typeof this.piece.f_items[p]=='function'){
             continue
           }
@@ -1029,8 +1060,7 @@ export default {
             }else if (this.f_items[f].f_item_name == '表读数') {
               //tag)
               this.f_meter_base.index = f
-            }
-            else if (this.f_items[f].f_item_name == '表剩余金额') {
+            }else if (this.f_items[f].f_item_name == '表剩余金额') {
               //tag)
               this.f_balance_amount.index = f
             }else if (this.f_items[f].f_item_name == '字轮数') {

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

@@ -1529,8 +1529,6 @@ export default {
     //   this.isneedDate=res.data[0]["f_subscribe_date"]
     // },
     putDevices() {
-      //tag)
-      //tag)
       this.$set('data.approve', "true")
       this.$set('data.writeback', "false")
       if (Vue.config.safecheck != undefined) {
@@ -1544,68 +1542,51 @@ export default {
           if (Vue.config.safecheck.ApproveConfig.livedispose != undefined) {
             this.livedispose = Vue.config.safecheck.ApproveConfig.livedispose
           }
-        }
-        //tag
-        //tag)
-        //tag)
-        //tag
-        if(this.item.f_user_type == '民用'){
-          // 民用户
-
-          if (Vue.config.safecheck.DevicesConfig != undefined){
-            if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined) {
-              this.config = this.extend(this.config, Vue.config.safecheck.DevicesConfig)
-            }else{
-              //tag
-              //tag
-              //tag
-              this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type]])
-            }
-            // this.config = this.extend(this.config, Vue.config.safecheck.DevicesConfig)
+          if (Vue.config.safecheck.ApproveConfig.showtorepair) {
+            this.show_torepair = Vue.config.safecheck.ApproveConfig.showtorepair
           }
-        }else {
+          if (Vue.config.safecheck.ApproveConfig.notencountered != undefined){
+            this.notencountered = Vue.config.safecheck.ApproveConfig.notencountered
+          }
+          if (Vue.config.safecheck.ApproveConfig.refuseinspection != undefined){
+            this.refuseinspection = Vue.config.safecheck.ApproveConfig.refuseinspection
+          }
+        }
+        if(this.item.f_user_type == '非民用'){
           // 非民用
           if (Vue.config.safecheck.DevicesSetConfig != undefined){
-            if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined) {
+            if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined || !Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type]]) {
               this.config = this.extend(this.config, Vue.config.safecheck.DevicesSetConfig)
             }else{
-              //tag
-              //tag
-              //tag
               this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type]])
             }
-            //this.config = this.extend(this.config, Vue.config.safecheck.DevicesSetConfig)
+          }
+
+        }else{
+          // 民用户
+          if (Vue.config.safecheck.DevicesConfig != undefined){
+            if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined || !Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type]]) {
+              this.config = this.extend(this.config, Vue.config.safecheck.DevicesConfig)
+            }else{
+              this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type?this.item.f_user_type:'民用']])
+            }
           }
         }
 
       }
-      //tag)
-      // 预留设备项位置
       for (let i in this.config) {
         this.tabs.splice(1,0,null)
       }
-      //遍历安检项配置
       for (let i in this.config) {
-        //取得安检项索引值
         let n = this.config[i].index
-        //tag
         this.devices[n - 1] = {device: i, n: n, checkmust: this.config[i].checkmust}
         this.$set('data.' + 'device' + n, [])
-        //tag
-        // this.tabs.splice(2 + n - 1, 0,
-        //   {
-        //     header:i,
-        //     complete:'safecheck-devices',
-        //     class:'repair-details-class',
-        //     number:n
-        //   })
         this.tabs[n] = {
           header: i,
           complete: 'safecheck-devices',
           class: 'repair-details-class',
           number: n
         }
-
         if(this.config[i].quantity &&  this.config[i].quantity >0){
           let items = []
           for (let it in this.config[i].items) {
@@ -1631,12 +1612,8 @@ export default {
             )
           }
         }
-        // this.data['device' + n].push(
-        //   {f_device_type: i, f_items: items}
-        // )
         n = n + 1
       }
-      //tag
       this.faultshow.number = this.tabs.length
     },
     //组织config数据---
@@ -2373,22 +2350,16 @@ export default {
         HostApp.__this__ = this
         let that = this
         let value = {}
-        //tag
         if (this.role == 'inspect') {
-          //tag
+          let condition=` f_check_item_id ='${this.item.id}'`
           if (this.item.f_no_checkplan == '无计划安检') {
-            value = this.$androidUtil.path({
-              alias: 'getUserinfomation',
-              data: {condition: "f_check_item_id = '" + this.item.id + "' and f_no_checkplan = '无计划安检'"}
-            })
-          } else {
-            value = this.$androidUtil.bzLogic('FetchCheckPaper', {id: this.item.id})
+            condition += ` and f_no_checkplan = '无计划安检'`
           }
+          value = this.$androidUtil.bzLogic('path_getPhoneCheckPaper', {condition: condition})
         } else {
           value = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/path/getUserinfomation`, {data: {condition: `id = '${this.item.f_paper_id}'`}})
         }
         Util.replaceFalse(value)
-        //tag)
         if (value.data.length != 0) {
           that.$set('data', value.data[0])
           //tag)
@@ -2402,14 +2373,10 @@ export default {
               that.$set('data.device' + that.devices[da].n, [])
             }
             value.data[0].f_devices.forEach((item) => {
-              //tag)
               for (let i in item.f_items) {
                 if(typeof item.f_items[i]=='function'){
                   continue
                 }
-                // if (item.f_items[i].f_path != '' && item.f_items[i].f_path != null) {
-                //   this.picture.push({f_path: item.f_items[i].f_path, name: item.f_items[i].f_item_name})
-                // }
                 for (let de in that.config[item.f_device_type].items) {
                   if(typeof that.config[item.f_device_type].items[de]=='function'){
                     continue
@@ -2422,36 +2389,16 @@ export default {
                     }
                   }
                 }
-                //tag)
-
-                // if (item.f_items[i].f_item_name=='累购气量'){
-                //   item.f_items[i].f_item_value=this.item.f_plan_meters[0].f_total_gas
-                // }else if (item.f_items[i].f_item_name=='累购金额'){
-                //   item.f_items[i].f_item_value=this.item.f_plan_meters[0].f_total_fee
-                // }else if (item.f_items[i].f_item_name=='基表编号'){
-                //   item.f_items[i].f_item_value=this.item.f_plan_meters[0].f_meter_no
-                // }else if (item.f_items[i].f_item_name=='气表品牌'){
-                //   item.f_items[i].f_item_value=this.item.f_plan_meters[0].f_aliasname
-                // }else if (item.f_items[i].f_item_name=='进气方向'){
-                //   item.f_items[i].f_item_value=this.item.f_plan_meters[0].f_flow_direction
-                // }else if (item.f_items[i].f_item_name=='气表型号'){
-                //   item.f_items[i].f_item_value=this.item.f_plan_meters[0].f_diaphgram_size
-                // }else if (item.f_items[i].f_item_name=='表箱号'){
-                //   item.f_items[i].f_item_value=this.item.f_plan_meters[0].f_metertitles
-                // }
-                // else{
                 for (let j in item.f_items[i].f_item_lists) {
                   if(typeof item.f_items[i].f_item_lists[j]=='function'){
                     continue
                   }
-                  //tag)
                   if (item.f_items[i].f_item_value instanceof Array) {
                     item.f_items[i].f_item_value.push(item.f_items[i].f_item_lists[j].f_item_value)
                   } else {
                     item.f_items[i].f_item_value = item.f_items[i].f_item_lists[j].f_item_value
                   }
                 }
-                // }
 
               }
               for (let de in that.devices) {
@@ -2475,11 +2422,9 @@ export default {
             //tag)
           }
         } else {
-          //tag
           this.init()
         }
         if(this.parentPage && this.parentPage=='CurrentCreate'){
-          //tag
           let isRecodr = this.$appdata.getSingleValue('无限制录音'); //单值参数，为true则是开启全程录音
           if (isRecodr) {
             if (isRecodr=='true') {
@@ -2528,7 +2473,6 @@ export default {
               }else{
                 Util.androidRatifyPics(that.data,this.$androidUtil.getProxyUrl())
               }
-              //tag
             } else {
               alert("该安检单可能已不在本地!")
               this.init()

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

@@ -368,7 +368,7 @@ export default {
         title: '购气记录',
         safe: false
       })
-      this.$parent.$parent.$goto('phone-sell-info', {f_userinfo_id: f_userinfo_id})
+      this.$parent.$parent.$goto('safe-phone-sell-info', {f_userinfo_id: f_userinfo_id})
     },
     cameraCallBack (prop, fileName) {
       if (prop == 'f_noanswers_path') {

package/src/filiale/xinkang/pc/CheckSearchUser.vue

@@ -548,7 +548,7 @@ export default {
       checkboxModel: {},
       c_year_list: options,
       c_month_list: moptions,
-      areas: this.areas(),
+      // areas: this.areas(),
       checkstatus: this.checkstatus(),
       usertypes: this.usertypes(),
       userstates: this.userstates(),
@@ -873,17 +873,17 @@ export default {
     cancel() {
       this.showModal = false
     },
-    areas() {
-      let rs = []
-      for (let i = 0; i < this.$login.f.f_allArea.length; i++) {
-        let temp = {
-          label: this.$login.f.f_allArea[i].label,
-          value: this.$login.f.f_allArea[i].label
-        }
-        rs.push(temp)
-      }
-      return [{label: '全部', value: ''}, ...rs]
-    },
+    // areas() {
+    //   let rs = []
+    //   for (let i = 0; i < this.$login.f.f_allArea.length; i++) {
+    //     let temp = {
+    //       label: this.$login.f.f_allArea[i].label,
+    //       value: this.$login.f.f_allArea[i].label
+    //     }
+    //     rs.push(temp)
+    //   }
+    //   return [{label: '全部', value: ''}, ...rs]
+    // },
     initAdjustables() {
       //tag
       let arr = []

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

@@ -376,43 +376,10 @@ import {HttpResetClass} from "vue-client";
 let asyncReady = async function (self) {
   // 获取配置信息
   try {
-    let res = await new HttpResetClass().load('post', 'api/af-safecheck/sql/safe_singleTable_OrderBy', {
-      data: {
-        items: 'f_dir',
-        tablename: 't_organization',
-        condition: `id  = '${self.item.f_filialeid}'`,
-        orderitem: 'id'
-      }
-    })/*.then(res=>{*/
-    //tag
-    //tag)
-    if (!res.data[0].f_dir) {
-      self.$showMessage("该公司无组织目录，无法获取配置文件，请联系管理员确认")
-    } else {
-      //this.f_dir=res.data[0].f_dir
-      try {
-        let res1 = await new HttpResetClass().load('GET', `/safecheck/rs/vue/DevicesConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
-          resolveMsg: '获取居民配置项成功！',
-          rejectMsg: '获取居民配置项出错！'
-        })/*.then(res=>{*/
-        //tag
-        //this.safeConfig["民用配置项"]=Object.assign({},res.data)
-        Vue.config.safecheck.DevicesConfig = res1.data
-        /*})*/
-        let res2 = await new HttpResetClass().load('GET', `/safecheck/rs/vue/DevicesSetConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
-          resolveMsg: '获取非居民配置项成功！',
-          rejectMsg: '获取非居民配置项出错！'
-        })/*.then(res=>{*/
-        //tag
-        //this.safeConfig["非民用配置项"]=Object.assign({},res.data)
-        Vue.config.safecheck.DevicesSetConfig = res2.data
-        /*}).then(res=> {
-        })*/
-
-      } catch (e) {
-        self.$showMessage("获取配置文件失败" + e)
-      }
-    }
+    let res = await new HttpResetClass().load('get','/api/af-safecheck/vue',null, {resolveMsg: null, rejectMsg: null})
+    self.delConfigKey(res.data)
+    Vue.config.safecheck=res.data
+    console.log('获取配置结果===', res.data)
   } catch (error) {
     // 忽略704,文件找不到异常R
     if (error.status !== 704) {
@@ -630,6 +597,18 @@ export default {
     }
   },
   methods: {
+    delConfigKey(obj){
+      // 从琉璃中获取的配置中会包含 $开头的一些额外描述新的key。为了兼容v3的代码逻辑在此函数中去掉
+      Object.keys(obj).forEach(key =>{
+        Object.keys(obj[key]).forEach(col => {
+          // 检查键是否以$开头
+          if (col.startsWith('$')) {
+            // 使用delete操作符删除键
+            delete obj[key][col];
+          }
+        })
+      })
+    },
     devicesCollect() {
       //tag
       //tag)
@@ -670,24 +649,29 @@ export default {
                   if (!this.config[this.data[device][item].f_device_type].items[items.f_item_name] && (items.isdefect && (items.isdefect=='true' || items.isdefect==true))) {
                     continue
                   }
-                  if(items.f_is_defect != true && items.f_is_defect != 'true'){
-                    continue
-                  }
-                  let options = this.config[this.data[device][item].f_device_type].items[items.f_item_name].options
-                  if(items.f_item_name == '是否开放式厨房') {
-                    console.log('是否开放式厨房', options)
-                    console.log('f_item_value', f_item_value)
-                  }
-                  for (let option in options) {
-                    if (options[option].data == f_item_value) {
-                      if ((options[option].isdefect == 'true' || options[option].isdefect == true) && (items.f_is_defect == 'true' || items.f_is_defect == true)) {
-                        checkResult = '有隐患'
-                        this.result = '有隐患'
-                        defects = `${defects}:${options[option].data}/`
-                        // let level = options[option].level
-                      }
-                    }
+                  // if(items.f_is_defect != true && items.f_is_defect != 'true'){
+                  //   continue
+                  // }
+                  if (items.f_is_defect == 'true' || items.f_is_defect == true) {
+                    checkResult = '有隐患'
+                    this.result = '有隐患'
+                    defects = `${defects}:${f_item_value}/`
                   }
+                  // let options = this.config[this.data[device][item].f_device_type].items[items.f_item_name].options
+                  // if(items.f_item_name == '是否开放式厨房') {
+                  //   console.log('是否开放式厨房', options)
+                  //   console.log('f_item_value', f_item_value)
+                  // }
+                  // for (let option in options) {
+                  //   if (options[option].data == f_item_value) {
+                  //     if ((options[option].isdefect == 'true' || options[option].isdefect == true) && (items.f_is_defect == 'true' || items.f_is_defect == true)) {
+                  //       checkResult = '有隐患'
+                  //       this.result = '有隐患'
+                  //       defects = `${defects}:${options[option].data}/`
+                  //       // let level = options[option].level
+                  //     }
+                  //   }
+                  // }
                   //tag)
                 }
                 if (defects != '') {
@@ -971,20 +955,24 @@ export default {
     },
 
     back() {
-      if (this.role == 'inspect') {
-        if (!this.isStrat) {
-          this.$back()
-          return
+        if (this.role == 'inspect') {
+          if (!this.isStrat) {
+            this.$emit('showback')
+            return
+          } else {
+            this.savePaper(true).then(() => {
+              this.$emit('showback')
+              this.isStrat = false
+            })
+          }
         } else {
-          this.savePaper(true).then(() => {
+          if(this.gotoitem){
             this.$back()
-            this.isStrat = false
-          })
+            return
+          }
+          this.$emit('showback')
         }
-      } else {
-        this.$back()
-      }
-    },
+      },
     checkIsStart() {
       alert('asdad')
       return
@@ -1343,6 +1331,7 @@ export default {
   },
 
   ready() {
+  asyncReady(this).then(async ()  => {
     this.putDevices()
     if (this.item.f_state != '未检' || this.item.f_no_checkplan == '无计划安检') {
       if (this.role != 'inspect') {
@@ -1353,7 +1342,7 @@ export default {
         } else if (this.role == 'androidview') {
           id = this.item.f_paper_id
         }
-        this.$resetpost(`rs/path/getUserinfomation`, {data: {condition: `id = '${id}'`}}).then((respanse) => {
+        this.$resetpost(`api/af-safecheck/logic/path_getCheckPaper`, {data: {id:id}}).then((respanse) => {
             //tag
             if (respanse.data.length != 0) {
               // 包含 其它 特殊处理的数组
@@ -1401,7 +1390,6 @@ export default {
             }
             // this.$goto('paper-message-blank', {userinfo:this.data,devices:this.devices,config:this.config,role:this.role}, 'self')
             this.isshow = true
-            asyncReady(this).then(async ()  => {
               //tag
               //tag)
               if (this.data.f_check_type == '民用') {
@@ -1419,7 +1407,7 @@ export default {
               }
               console.log('this.data.f_collection_type--------------',this.data.f_collection_type)
               if(!this.data.f_collection_type){
-                await this.$resetpost('api/af-safecheck/sql/SafecheckTableModel', {data: {condition: ` 1 = 1 and pim.f_plan_item_id = '${this.item.f_check_item_id}'`}}).then((res) => {
+                 this.$resetpost('api/af-safecheck/sql/SafecheckTableModel', {data: {condition: ` 1 = 1 and pim.f_plan_item_id = '${this.item.f_check_item_id}'`}}).then((res) => {
                   //tag)
                   if(res.data.length>0){
                     this.meter_classify = res.data[0].f_meter_classify
@@ -1459,9 +1447,6 @@ export default {
               this.deviceconfig2[1].items = jsonSort(this.deviceconfig2[1].items, "index")
               this.deviceconfig2 = jsonSort(this.deviceconfig2, "index")
               this.getDeviceAll()
-
-
-            })
           }
         ).catch(
           (respanse) => {
@@ -1470,7 +1455,7 @@ export default {
           })
       }
     }
-
+  })
   },
   watch: {
     //   'isUpload'(val){