safecheck-client 3.0.34-gongyi → 3.0.35-2

package/src/components/android/PaperFeedback.vue

@@ -42,9 +42,26 @@
         </div>
       </div>
     </div>
+    <div class="form-group col-sm-12 col-xs-12 col-md-12 "  :class="style__" v-if="isvideo == 'true'">
+      <label class="text-left font">安检视频</label>
+
+      <div class="auto" :class="style__">
+        <div class="panel" style="padding: 10px 10px 5px 10px;">
+          <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+            <div class="row">
+              <video width="320" height="200" controls v-if="paper.f_video_path">
+                <source :src="paper.f_video_path" type="video/mp4">
+              </video>
+            </div>
+            <div class="row text-right div-photo">
+              <button type="button" name="button" class="btn btn-photo" @click="takeVideo()">拍摄</button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
     <div class="form-group col-sm-12 col-xs-12 col-md-12 "  :class="style__">
       <label class="text-left font">总体隐患照片</label>
-
       <div class="auto" :class="style__">
         <div class="panel" style="padding: 10px 10px 5px 10px;">
           <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
@@ -54,11 +71,6 @@
                 <!--                <img src="../../assets/删除.png" @click="delfile('f_overall_path', img.f_overall_path,index)" style="width: 15px;margin-top: -80px" alt="">-->
               </div>
             </div>
-            <!--            <div class="row text-right div-photo">-->
-            <!--              <button type="button" name="button" class="btn btn-photo" @click="takePic('f_overall_path', '总体安检照片')">拍照</button>-->
-            <!--              &lt;!&ndash;<button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_overall_path', '总体安检照片1')">拍照</button>&ndash;&gt;-->
-            <!--              &lt;!&ndash;&nbsp;&nbsp;&nbsp;&nbsp;<img src="../../../assets/remove.png" :class="style__" @click="delfile('f_overall_path', img.f_overall_path)" style="width: 25%;"></img>&ndash;&gt;-->
-            <!--            </div>-->
           </div>
         </div>
       </div>
@@ -83,25 +95,6 @@
         </ol>
       </div>
     </div>
-
-    <!--<div class="form-group col-sm-12">-->
-    <!--<label class="text-left font">总体安检照片2</label>-->
-    <!--<div class="auto">-->
-    <!--<div class="panel">-->
-    <!--<div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">-->
-    <!--<div class="row" style="height: 240px;overflow: scroll;top: 1px">-->
-    <!--<div class="col-sm-4">-->
-    <!--<img-self  :src="paper.f_overall2_path" alt="总体安检照片2" width="150" height="200"></img-self>-->
-    <!--</div>-->
-    <!--</div>-->
-    <!--<div class="row text-right div-photo">-->
-    <!--<button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_overall2_path', '总体安检照片2')">拍照</button>-->
-    <!--&nbsp;&nbsp;&nbsp;&nbsp;<img src="../../../assets/remove.png" :class="style__"  @click="delfile('f_overall2_path', paper.f_overall2_path)" style="width: 25%;"></img>-->
-    <!--</div>-->
-    <!--</div>-->
-    <!--</div>-->
-    <!--</div>-->
-    <!--</div>-->
     <div class="form-group col-sm-12 col-xs-12 col-md-12 " :class="style__">
       <input type="checkbox" v-model="paper.f_read_instructions"/><label class="text-left font">我已阅读须知内容</label>
 
@@ -127,7 +120,7 @@
       <label>请输入超期原因:</label><br/>
       <textarea style="width: 100%;" v-model="paper.f_exceed_reason"></textarea>
     </div>
-    <div class="form-group col-md-12 col-sm-12 col-xs-12" :class="style__">
+    <div class="form-group col-md-12 col-sm-12 col-xs-12" :class="style__" v-show="showbacklist=='是'">
       <div class="col-xs-6 col-sm-6">
         <input type="checkbox" v-model="backlistisselect" :readonly="enabled"/><label class="text-left font" >限制该用户购气</label>
       </div>
@@ -322,6 +315,21 @@
       <button  type="button" name="button" class="col-sm-3 btn btn-primary" @click="deletecancel()">取消</button>
     </div>
   </modal>
+  <modal :show.sync="showgas && showgasmodel" v-ref:modal>
+    <div slot="modal-header" class="modal-header">
+      <h4 class="modal-title">
+        用户须知
+      </h4>
+    </div>
+    <div slot="modal-body" class="modal-body">
+      <div class="row" style="margin-top: 6px">
+        <sapn>{{ gasinstructions ? gasinstructions : '请配置用户须知' }}</sapn>
+      </div>
+    </div>
+    <div slot="modal-footer" class="modal-footer">
+      <button type="button" name="button" class="col-sm-3 btn btn-primary" @click="closeshowgas()">确认</button>
+    </div>
+  </modal>
 </template>
 
 <script>
@@ -343,12 +351,12 @@ import co from 'co'
 //     data.toRepair = '一级派单'
 //   }
 //   data.$parent.$parent.model.f_attendant = data.loginUser.name
-//   //console.log('===================')
-//   //console.log(data)
+//   ////tag
+//   ////tag
 //   let res
 //   let errString = self.$parent.  $parent.errorVerify()
 //   if(errString){
-//     //console.log(errString)
+//     ////tag
 //     if (Vue.android)
 //       self.undo()
 //     this.$showMessage(errString)
@@ -368,13 +376,13 @@ import co from 'co'
 //         this.$showMessage("请选择报修类型!")
 //         return
 //       }
-//       //console.log("转维修数据1：==》"+JSON.stringify(data))
+//       ////tag)
 //       let checkResult = '正常'
 //       let options = [{"data": "已处理"},{"data": "未处理"}]
 //       let value = ''
 //       let codata = JSON.parse(JSON.stringify(self.paper))
 //       for(let device in codata){
-//         //console.log('转维修codata[device]'+JSON.stringify(codata[device]))
+//         ////tag)
 //         let f_device_type
 //         if(device.startsWith("device")){
 //           for(let item in codata[device]) {
@@ -384,16 +392,16 @@ import co from 'co'
 //             }else{
 //               f_device_type = codata[device][item].f_device_type
 //             }
-//             // //console.log('codata[device][item]=>',codata[device][item])
+//             // ////tag
 //             let details = []
 //             for(let i in codata[device][item].f_items){
 //               let items = codata[device][item].f_items[i]
-//               //console.log('items',items)
+//               ////tag
 //               if(items.f_is_defect == true || items.f_is_defect == 'true'){
 //                 checkResult = '有隐患'
-//                 //console.log('类型----',f_device_type)
+//                 ////tag
 //                 let res = yield self.$resetpost(`${self.Url}/rs/sql/getDeviceItem`,{data:{f_device_id:codata[device][item].f_device_id,f_item_name:items.f_item_name}})
-//                 //console.log('获取安检设备信息结果=》'+JSON.stringify(res))
+//                 ////tag)
 //                 self.$set('detail.f_defect_id', res.data[0].id)
 //                 self.$set('detail.f_project',`${items.f_item_name}：${items.f_item_value}`)
 //                 self.$set('detail.type',items.type)
@@ -405,40 +413,40 @@ import co from 'co'
 //               }
 //               self.detail = {}
 //             }
-//             //console.log('details',details)
+//             ////tag
 //             self.$set('defectDevice.f_type',f_device_type)
 //             self.$set('defectDevice.details',details)
 //             if(self.defectDevice.details.length >0 ){
 //               self.repairitems.push(JSON.parse(JSON.stringify(self.defectDevice)))
 //             }
 //             self.defectDevice = {}
-//             //console.log('repairitems===>'+self.repairitems)
+//             ////tag
 //           }
 //         }
 //       }
 //       self.$set('$parent.$parent.model.f_repairitems.data',self.repairitems)
 //
 //
-//       //console.log("转维修数据2：==》"+JSON.stringify(data))
+//       ////tag)
 //       res = self.$androidUtil.bzLogic('safecheckToRepair',data)
-//       //console.log('res==========')
-//       //console.log(res.code)
-//       //console.log(res.data)
+//       ////tag
+//       ////tag
+//       ////tag
 //       if(res.code == 200){
 //         self.$parent.$parent.isSafeCheckToRepair = true
 //         self.undo()
 //         self.$set('paper.f_SafeToRepair_id',res.data.f_service_id)
-//         //console.log('更新维修单id')
+//         ////tag
 //         self.$resetpost(`${self.Url}/rs/logic/updatePaperRepair`,{data:{f_paper_id:self.paper.f_paper_id,f_SafeToRepair_id:res.data.f_service_id}}).then((ret)=>{
-//           //console.log('ret==>'+ret)
+//           ////tag
 //           if(ret.data.code ==200){
-//             //console.log('维修单id修改成功')
+//             ////tag
 //             self.$parent.$parent.$back()
 //           }else{
 //             self.$showMessage('安检转维修失败！')
 //           }
 //         }).catch(v=>{
-//           //console.log('v=>'+JSON.stringify(v))
+//           ////tag)
 //           self.$showMessage('安检转维修失败！')
 //         })
 //       }else{
@@ -467,9 +475,9 @@ import co from 'co'
 //         self.$parent.$parent.model.f_area = self.$parent.$parent.user.f_area
 //       }
 //     }else{
-//       //console.log('pc')
+//       ////tag
 //       self.$resetpost(`${self.Url}/rs/sql/safeCheckgetUserInfo`,{data:{id:self.paper.f_userinfoid}},{resolveMsg: null, rejectMsg: null}).then((res)=>{
-//         //console.log('res',res)
+//         ////tag
 //         if(res.data.length != 0){
 //           self.$parent.$parent.user = res.data[0]
 //           self.$parent.$parent.model.f_area = self.$parent.$parent.user.f_area
@@ -478,7 +486,7 @@ import co from 'co'
 //       // path({alias:'getUserInfo',data:{id:this.paper.f_userinfoid}})
 //     }
 //   } catch (error) {
-//     //console.log('error',error)
+//     ////tag
 //   }
 // }
 
@@ -486,6 +494,7 @@ export default {
   title: '用户反馈',
   data() {
     return {
+      isvideo:'false',
       defectImgs: [],
       defectToolTip: [],
       defectReason: [],
@@ -500,7 +509,11 @@ export default {
       enabled: false,//控制限制购气是否可选
       deleteenabled: false,
       showmodel: false,
+      showbacklist:'是',
       backlistisselect: false,
+      showgas: false,
+      showgasmodel:this.$appdata.getSingleValue('用户须知查看') || false,
+      gasinstructions:'',
       deletebacklistisselect: false,
       radios: [
         {
@@ -549,7 +562,7 @@ export default {
   },
   methods: {
     timeSet(val) {
-      ////console.log("我执行过了")
+      //////tag
       if (!val) {
         return
       }
@@ -560,16 +573,16 @@ export default {
       }
     },
     // async isoverDate(){
-    //   //console.log("进入了这个方法")
+    //   ////tag
     //   let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/androidGetuserinfo`, {data:{
     //       condition:"f_plan_item_id='"+this.$parent.$parent.item.id+"'"
     //     }
     //   })
     //   this.isneedDate=res.data[0]["f_subscribe_date"]
-    //   //console.log("打印一下=========》"+this.$parent.$parent.item.id)
+    //   ////tag
     // },
     check(index) {
-      //console.log('index', index)
+      ////tag
       // 先取消所有选中项
       for (let item of this.radios) {
         item.isChecked = false;
@@ -578,11 +591,30 @@ export default {
       this.paper.f_client_evaluation = this.radios[index].label;
       // 设置值，以供传递
       this.radios[index].isChecked = true;
-      //console.log('paper.f_client_evaluation==', this.paper.f_client_evaluation);
+      ////tag;
     },
     getSignValue(fileName) {
       this.f_signname = fileName
     },
+    videoCallBack(fileName) {
+      this.$set('paper.f_video_path', fileName)
+      HostApp.__callback__ = null
+      HostApp.__this__ = null
+    },
+    takeVideo() {
+      HostApp.__callback__ = this.videoCallBack
+      HostApp.__this__ = this
+      let fileName = Util.guid() + '.mp4'
+      HostApp._open_a_page({
+        type: 'boomerang',
+        page: 'com.aofeng.hybrid.android.peripheral.VideoActivity',
+        param: {
+          file: fileName,
+          requestCode: 111,
+          callback: 'javascript:HostApp.__callback__("%s");'
+        }
+      })
+    },
     cameraCallBack(prop, fileName) {
       if (prop == 'f_overall_path') {
         let f_overall_path = fileName + '?' + Math.random()
@@ -598,8 +630,8 @@ export default {
     takePic(prop, title, index) {
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
-      //console.log("prop:" + prop)
-      //console.log("this.prop:" + this.paper[prop])
+      ////tag
+      ////tag
       let fileName
       if (prop == 'f_overall_path') {
         if (!this.paper.f_overall_imgs[index] || this.paper.f_overall_imgs[index].f_overall_path.includes("nopic.png")) {
@@ -614,7 +646,11 @@ export default {
           fileName = Util.getFileName(this.paper[prop])
         }
       }
-
+      let jingweidu = ''
+      if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
+        jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
+      }
       HostApp._open_a_page({
         type: 'boomerang',
         page: 'com.aofeng.hybrid.android.peripheral.CameraActivity',
@@ -623,6 +659,7 @@ export default {
           requestCode: 111,
           callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");',
           watermark: title + '\t时间：' + Util.toStandardTimeString() + '\t' + Vue.user.name + '\t' + this.paper.f_userinfo_code+ '\t' + this.paper.f_user_name+ '\t' + this.paper.f_address
+            +jingweidu
         }
       })
     },
@@ -747,7 +784,7 @@ export default {
     print() {
       let errString = this.verify()
       if (errString) {
-        //console.log(errString)
+        ////tag
         if (Vue.android)
           this.$showMessage(errString)
         return
@@ -771,7 +808,7 @@ export default {
       this.getCheck()
       this.printContent.push(feedPageEnd)
       let arrstr = JSON.stringify(this.printContent)
-      //console.log(arrstr)
+      ////tag
       this.$androidUtil.print(arrstr)
       this.$set('printContent', [])
     },
@@ -1005,8 +1042,8 @@ export default {
     },
     showToRepair() {
       let res = this.hasDefect()
-      //console.log('==========检测结果========')
-      //console.log(res)
+      ////tag
+      ////tag
       if (res == '正常') {
         this.showrepair = false
       } else {
@@ -1050,7 +1087,7 @@ export default {
           for (let item in this.paper[device]) {
             for (let i in this.paper[device][item].f_items) {
               let items = this.paper[device][item].f_items[i]
-              //console.log('items', items)
+              ////tag
               if (items.f_is_defect == true || items.f_is_defect == 'true') {
                 checkResult = '有隐患'
               }
@@ -1062,10 +1099,10 @@ export default {
     },
     uploadPaper() {
       if (this.showrepair) {
-        //console.log('this.meading===>' + this.meading)
-        //console.log('this.$parent.$parent.meading===>' + this.$parent.$parent.meading)
-        //console.log('typeof this.$parent.$parent.meading===>' + typeof this.$parent.$parent.meading)
-        //console.log('this.$parent.$parent.model.f_repairtype===>' + this.$parent.$parent.model.f_repairtype)
+        ////tag
+        ////tag
+        ////tag
+        ////tag
 
         if (this.meading == '转维修员' && (this.$parent.$parent.model.serviceacitivity[0].f_reciever == '' || this.$parent.$parent.model.serviceacitivity[0].f_reciever == undefined)) {
           this.$showMessage("请选择维修员!")
@@ -1082,9 +1119,9 @@ export default {
         this.$parent.$parent.isToRepair = true
         this.$parent.$parent.uploadCheckPaper()
         // this.$parent.$parent.savePaper(false).then((res) => {
-        //   //console.log(`res=${res}`)
+        //   ////tag
         //   if(res != true){
-        //     //console.log('失败')
+        //     ////tag
         //     return
         //   }else{
         // this.$parent.$parent.todo()
@@ -1095,6 +1132,9 @@ export default {
       }
 
     },
+    closeshowgas() {
+      this.showgas = false
+    },
     //确认安检转维修
 
     undo() {
@@ -1111,9 +1151,9 @@ export default {
         return
       }
       this.paper.f_blocking_cause = this.deletecause
-      //console.log("vue.user:-" + JSON.stringify(Vue.user))
+      ////tag)
       let http = new HttpResetClass()
-      //console.log("即将进行取消拉黑！")
+      ////tag
       let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
         data: {
           items: "version",
@@ -1122,14 +1162,14 @@ export default {
           orderitem: "f_userinfo_id"
         }
       }, {resolveMsg: null, rejectMsg: null})
-      //console.log("查询版本号---" + JSON.stringify(res1))
-      //console.log("打印参数---" + this.paper.f_user_name + "-" + this.paper.f_blocking_cause + "-" + Vue.user.name + "-" + Vue.user.id + "-" + Vue.user.orgid + "-" + Vue.user.orgs + "-" + Vue.user.depids + "-" + Vue.user.deps + "-" + this.paper.f_userinfoid)
+      ////tag)
+      ////tag
       let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/backlistOperate`, {
         data: {
           "f_operat_type": "取消拉黑",
           "f_state": "有效",
           "f_user_name": this.paper.f_user_name,
-          "f_comments": this.paper.f_delete_cause,
+          "f_comments": this.paper.f_blocking_cause,
           "f_operator": Vue.user.name,
           "f_operatorid": Vue.user.id,
           "f_orgid": Vue.user.orgid,
@@ -1147,7 +1187,7 @@ export default {
         }
       }, {resolveMsg: null, rejectMsg: null})
 
-      //console.log("取消拉黑结果---" + JSON.stringify(res2))
+      ////tag)
       if (res2.data.code == 200) {
         this.showmodelthree = false
         this.deleteenabled = true
@@ -1163,9 +1203,9 @@ export default {
         return
       }
       this.paper.f_blocking_cause = this.cause
-      //console.log("vue.user:-" + JSON.stringify(Vue.user))
+      ////tag)
       let http = new HttpResetClass()
-      //console.log("即将进行拉黑！")
+      ////tag
       let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
         data: {
           items: "version",
@@ -1174,8 +1214,16 @@ export default {
           orderitem: "f_userinfo_id"
         }
       }, {resolveMsg: null, rejectMsg: null})
-      //console.log("查询版本号---" + JSON.stringify(res1))
-      //console.log("打印参数---" + this.paper.f_user_name + "-" + this.paper.f_blocking_cause + "-" + Vue.user.name + "-" + Vue.user.id + "-" + Vue.user.orgid + "-" + Vue.user.orgs + "-" + Vue.user.depids + "-" + Vue.user.deps + "-" + this.paper.f_userinfoid)
+      ////tag)
+      ////tag
+      let limit_times=1
+      let limit_value=3
+      let limit_amount=3
+      if(Vue.config.safecheck && Vue.config.safecheck.ApproveConfig.limit_times && Vue.config.safecheck.ApproveConfig.limit_value && Vue.config.safecheck.ApproveConfig.limit_amount){
+        limit_times = Vue.config.safecheck.ApproveConfig.limit_times
+        limit_value = Vue.config.safecheck.ApproveConfig.limit_value
+        limit_amount = Vue.config.safecheck.ApproveConfig.limit_amount
+      }
       let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/backlistOperate`, {
         data: {
           data:this.$parent.$parent.data,
@@ -1185,6 +1233,7 @@ export default {
           "f_user_name": this.paper.f_user_name,
           "f_comments": this.paper.f_blocking_cause,
           "f_operator": Vue.user.name,
+          "f_operate_date":Util.toStandardTimeString(),
           "f_operatorid": Vue.user.id,
           "f_orgid": Vue.user.orgid,
           "f_orgname": Vue.user.orgs,
@@ -1192,16 +1241,16 @@ export default {
           "f_depname": Vue.user.deps,
           "f_describe": `${Vue.user.name}对用户${this.paper.f_user_name}进行拉黑`,
           "f_userinfo_id": {
-            "f_userinfo_id": this.paper.f_userinfoid,
-            "f_user_state": "正常",
-            "version": res1.data[0].version
+            "f_userinfo_id": this.paper.f_userinfoid
           },
-          "f_limit_times":"1",
-          "f_limit_value":"3"
+          "f_limit_times":limit_times,
+          "f_limit_value":limit_value,
+          "f_limit_amount":limit_amount,
+          'f_limit_type':'气量'
         }
       }, {resolveMsg: null, rejectMsg: null})
 
-      //console.log("拉黑结果---" + JSON.stringify(res2))
+      ////tag)
       if (res2.data.code == 200) {
         this.showmodel = false
         this.enabled = true
@@ -1225,7 +1274,7 @@ export default {
     },
     repiarmancg(val) {
       if (val) {
-        //console.log(val)
+        ////tag
         this.$parent.$parent.model.serviceacitivity[0].f_reciever = val.name
         let http1 = new HttpResetClass()
         http1.load('POST', `${this.Url}/rs/sql/tel_singleTable_OrderBy`, {
@@ -1242,23 +1291,34 @@ export default {
     },
   },
   async ready() {
-    this.isRecodr = this.$appdata.getSingleValue('无限制录音');
+    this.isRecodr = this.$appdata.getSingleValue('无限制录音')
+    this.isvideo = this.$appdata.getSingleValue('安检录视频')
+    if(this.$appdata.getSingleValue('安检时显示拉黑')){
+      this.showbacklist = this.$appdata.getSingleValue('安检时显示拉黑');
+    }
     // await this.isoverDate()
-    //console.log(this.isneedDate)
-    //console.log("拿到了！！！！！！！")
-    //console.log('查询到的已办的返回内容' + JSON.stringify(this.$parent.$parent.item.f_upload_state))
-    //console.log('查询到的已办的返回内容' + JSON.stringify(JSON.stringify(this.$parent.$parent.data)))
+    ////tag
+    ////tag
+    ////tag)
+    ////tag))
     if (this.$parent.$parent.role == 'repair') {
       this.$set('style__', 'divmask')
       this.$set('style_view_', '')
     } else if (this.$parent.$parent.role == 'view' || this.$parent.$parent.item.f_upload_state == '已传') {
       this.$set('style__', 'divmask')
       this.$set('style_view_', 'divmask')
-      //console.log('set style for ....')
+      ////tag
     } else {
       this.$set('style__', '')
       this.$set('style_view_', '')
     }
+    if (Vue.config.safecheck != undefined) {
+      if (Vue.config.safecheck.ApproveConfig != undefined) {
+        if (Vue.config.safecheck.ApproveConfig.gasinstructions != undefined) {
+          this.gasinstructions = Vue.config.safecheck.ApproveConfig.gasinstructions
+        }
+      }
+    }
 
     for (let item of this.radios) {
       if (this.paper.f_client_evaluation == item.label) {
@@ -1269,12 +1329,12 @@ export default {
       this.$set('paper.f_notified_path', Vue.nopic)
     if (!this.paper.f_sign_path)
       this.$set('paper.f_sign_path', Vue.nopic)
-    //console.log('!this.paper.f_overall_imgs==>' + !this.paper.f_overall_imgs)
+    ////tag
     if (!this.paper.f_overall_imgs) {
       let imgs = []
       // imgs.push({f_overall_path:Vue.nopic})
       this.$set('paper.f_overall_imgs', imgs)
-      //console.log('进入setpaper.f_overall_imgs')
+      ////tag
     }
     if (!this.paper.f_overall2_path)
       this.$set('paper.f_overall2_path', Vue.nopic)
@@ -1290,7 +1350,10 @@ export default {
     let device = this.$parent.$parent.data
     for (const deviceitem in device) {
       if (deviceitem.startsWith('device')){
-        console.log('device[deviceitem][0].f_items', JSON.stringify(device[deviceitem][0].f_items))
+        //tag)
+        if(device[deviceitem].length == 0){
+          continue
+        }
         let items = device[deviceitem][0].f_items
         let deviceType = device[deviceitem][0].f_device_type
         for (let i = 0; i < items.length; i++) {
@@ -1303,7 +1366,6 @@ export default {
                 }else{
                   reason += items[i].f_item_value[j] + ","
                 }
-
               }
             }else{
               reason += items[i].f_item_value
@@ -1324,28 +1386,36 @@ export default {
               this.defectToolTip.push(items[i].tooltip)
             }
             this.defectReason.push({device:deviceType,deviceitem:reason})
+          }else if(items[i].type === 'errorstring' && items[i].f_item_value ){
+            let reason = items[i].f_item_name+":" + items[i].f_item_value
+            this.defectReason.push({device:deviceType,deviceitem:reason})
           }
 
         }
       }
     }
-    //console.log(`this.safeCheckToRepair==========${this.safeCheckToRepair}`)
-    //console.log(Vue.config)
-    console.log("77777777777777777777")
-    //console.log(this.paper)
-    console.log(JSON.stringify(this.defectToolTip))
-    console.log(JSON.stringify(this.defectImgs))
-    console.log(JSON.stringify(this.defectReason))
-    //console.log(this.paper.f_userinfo_code)
-    //console.log(this.paper.f_user_name)
-    //console.log(this.paper.f_address)
+    ////tag
+    ////tag
+    //tag
+    ////tag
+    //tag)
+    //tag)
+    //tag)
+    ////tag
+    ////tag
+    ////tag
   },
   watch: {
     '$parent.$parent.isUpload'(val) {
-      //console.log('isUpload发生变化===>' + val)
+      ////tag
+    },
+    'paper.f_read_instructions'(val) {
+      if (val == true) {
+        this.showgas = true
+      }
     },
     'meading'(val) {
-      //console.log('meading发生变化===>' + val)
+      ////tag
       this.$parent.$parent.meading = val
     },
     'backlistisselect'(val) {