safecheck-client 3.0.31-gongyi → 3.0.32-10

package/src/components/pc/NewCheckpaper.vue

@@ -1,4 +1,4 @@
-<style scoped>
+<style scoped id="printStyle">
 .img {
   border: 1px solid #9773ed;
   width: auto;
@@ -58,12 +58,18 @@ div {
         <img src="../../assets/back.png" style="margin: 0px"/>
       </div>
     </div>
+    <div v-show="showPdfDownload" class="page-header app-header auto"
+         style="padding: 15px;margin-right: 3.7%;right: 0%;height: 7%">
+      <div @click="exportToPDF()">
+        <img src="../../assets/下载_.png" style="margin: 0px;width: 30px"/>
+      </div>
+    </div>
     <work-busy :is-busy="loading"></work-busy>
     <div class="container-fluid" style="overflow: scroll">
       <div class="row">
         <div class="col-md-5" style="margin-right: 2%;margin-left: 2%;height: 100%;overflow: scroll">
           <div style="width: 100%;margin: auto">
-            <table class="table table-striped table-bordered" style="margin-bottom: 6px">
+            <table class="table table-striped table-bordered" style="margin-bottom: 6px;margin-top: 35px">
               <thead>
               <tr>
                 <th colspan="6" style="text-align: center">用户基本信息</th>
@@ -86,7 +92,7 @@ div {
                 <td style="text-align: center;border: #E9E9E9 solid 1px">用户电话:</td>
                 <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_user_phone }}</td>
                 <td style="text-align: center;border: #E9E9E9 solid 1px">区 / 县:</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_area }}</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_slice_area }}</td>
               </tr>
               <tr>
                 <td style="text-align: center;border: #E9E9E9 solid 1px">街 道:</td>
@@ -118,7 +124,8 @@ div {
               </tr>
               </tbody>
             </table>
-            <table class="table table-striped table-bordered" v-show="paperdata.f_entry_status=='入户'">
+            <table class="table table-striped table-bordered" style="margin-top: 40px"
+                   v-show="paperdata.f_entry_status=='入户'">
               <thead>
               <tr>
                 <th colspan="4" style="text-align: center">用户安检概况</th>
@@ -144,13 +151,15 @@ div {
                   }}
                 </td>
                 <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">安检结果:</td>
-                <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">{{ ajresult }}</td>
+                <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;"
+                    :style="{'color':ajresult=='有隐患'?'red':''}">{{ ajresult }}
+                </td>
               </tr>
               <tr>
                 <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">备注:</td>
                 <td colspan="3"
                     style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%">
-                  {{ paperdata.f_remarks }}
+                  {{ paperdata.f_repair_approved_note }}
                 </td>
               </tr>
               <tr>
@@ -166,9 +175,9 @@ div {
                <lable>
                  隐患:
                </lable>
-               <span class="li-font" v-for="val in deviceCollect.devices">
-                        {{ val }}&nbsp;&nbsp;&nbsp;
-                      </span><br>
+                <span v-for="val in deviceCollect.devices">
+    {{ val }}
+  </span><br>
              </span>
 
            </span>
@@ -177,7 +186,8 @@ div {
 
               </tbody>
             </table>
-            <table class="table table-striped table-bordered" v-show="paperdata.f_entry_status!='入户'">
+            <table class="table table-striped table-bordered" style="margin-top: 40px"
+                   v-show="paperdata.f_entry_status!='入户'">
               <thead>
               <tr>
                 <th colspan="4" style="text-align: center">用户安检概况</th>
@@ -205,7 +215,63 @@ div {
 
               </tbody>
             </table>
-            <table class="table table-striped table-bordered" v-show="paperdata.f_entry_status=='入户'">
+            <table class="table table-striped table-bordered" style="margin-top: 40px"
+                   v-show="item.f_no_checkplan == '复检'">
+              <thead>
+              <tr>
+                <th colspan="4" style="text-align: center">上次安检情况</th>
+              </tr>
+              </thead>
+              <tbody>
+              <tr>
+                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">上次安检到达时间:</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{
+                    lastCheckData.f_onsite_time
+                  }}
+                </td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">上次安检离开时间:</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{
+                    lastCheckData.f_offsite_time
+                  }}
+                </td>
+              </tr>
+              <tr>
+                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">上次安检员:</td>
+                <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">
+                  {{ lastCheckData.f_checker_name }}
+                </td>
+              </tr>
+              <tr>
+                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">安检结果:</td>
+                <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">
+                  {{ lastCheckData.f_defect_text }}
+                </td>
+              </tr>
+
+              </tbody>
+            </table>
+            <table class="table table-striped table-bordered" style="margin-top: 35px"
+                   v-show="paperdata.f_entry_status=='入户' && paperdata.f_usegas == '未用气'">
+              <thead>
+              <tr>
+                <th style="text-align: center">未用气照片</th>
+              </tr>
+              </thead>
+              <tbody>
+              <tr>
+                <td style="margin: auto;text-align: center">
+                  <div class="container" style="max-width: 550px;background: #FFFFFF">
+                    <div class="img">
+                      <img-self-plus :src="paperdata.f_nongasuser_path" style="float: left" width="150"
+                                     height="200"></img-self-plus>
+                    </div>
+                  </div>
+                </td>
+              </tr>
+              </tbody>
+            </table>
+            <table class="table table-striped table-bordered" style="margin-top: 35px"
+                   v-show="paperdata.f_entry_status=='入户'">
               <thead>
               <tr>
                 <th style="text-align: center">总体安检照片</th>
@@ -216,8 +282,9 @@ div {
                 <td style="margin: auto;text-align: center">
                   <div class="container" style="max-width: 550px;background: #FFFFFF">
                     <div class="img" v-for="img in paperdata.f_overall_imgs">
-                      <img-self-safe :src="img.f_overall_path" style="float: left" width="150"
-                                     height="200"></img-self-safe>
+                      <img-self-plus :list="paperdata.f_overall_imgs " :src="img.f_overall_path" style="float: left"
+                                     width="150"
+                                     height="200"></img-self-plus>
                     </div>
                   </div>
 
@@ -227,7 +294,8 @@ div {
               </tr>
               </tbody>
             </table>
-            <table class="table table-striped table-bordered" v-show="paperdata.f_entry_status=='入户'">
+            <table class="table table-striped table-bordered" style="width: 100%"
+                   v-show="paperdata.f_entry_status=='入户' && (paperdata.f_sign_path || f_user_path) ">
               <thead>
               <tr>
                 <th style="text-align: center">用户签名照片</th>
@@ -235,20 +303,30 @@ div {
               </thead>
               <tbody>
               <tr>
-                <td style="margin: auto;text-align: center">
-                  <div class="container" style="max-width: 500px;background: #FFFFFF">
+                <td style="margin: auto;text-align: center" v-if="paperdata.f_sign_path">
+                  <div class="container" style="max-width: 500px;background: #FFFFFF"  >
                     <div class="img" style="float: none">
-                      <img-self-safe :src="paperdata.f_sign_path" width="486" height="300"></img-self-safe>
+                      <img-self-plus :src="paperdata.f_sign_path" width="200" height="200"></img-self-plus>
                     </div>
                   </div>
                 </td>
+                <td style="margin: auto;text-align: center" v-if="f_user_path">
+                      <div class="container" style="max-width: 550px;background: #FFFFFF" >
+                        <div class="img" style="float: none">
+                          <img-self-plus :src="'rs/image/file/'+f_user_path"
+                                         width="200"
+                                         height="200"></img-self-plus>
+                        </div>
+                      </div>
+                  </td>
               </tr>
               </tbody>
             </table>
-            <table class="table table-striped table-bordered" v-show="paperdata.f_entry_status=='入户' && paperdata.f_notified_path">
+            <table class="table table-striped table-bordered"
+                   v-show="paperdata.f_entry_status=='入户' && paperdata.f_defect_notified">
               <thead>
               <tr>
-                <th style="text-align: center">安检隐患通知单</th>
+                <th style="text-align: center">安检通知书/隐患整改通知书</th>
               </tr>
               </thead>
               <tbody>
@@ -256,14 +334,34 @@ div {
                 <td style="margin: auto;text-align: center">
                   <div class="container" style="max-width: 500px;background: #FFFFFF">
                     <div class="img" style="float: none">
-                      <img-self-safe :src="paperdata.f_notified_path" width="486" height="300"></img-self-safe>
+                      <img-self-plus :src="paperdata.f_notified_path" width="486" height="300"></img-self-plus>
                     </div>
                   </div>
                 </td>
               </tr>
               </tbody>
             </table>
-            <table class="table table-striped table-bordered" v-show="paperdata.f_entry_status=='入户'&& item.f_recording1_path">
+            <table class="table table-striped table-bordered"
+                   v-show="paperdata.f_entry_status=='入户'&& paperdata.f_video_path">
+              <thead>
+              <tr>
+                <th style="text-align: center">安检视频</th>
+              </tr>
+              </thead>
+              <tbody>
+              <tr>
+                <td style="margin: auto;text-align: center">
+                  <div class="container" style="max-width: 500px;background: #FFFFFF">
+                    <video width="320" height="200" controls v-if="paperdata.f_video_path">
+                      <source :src="paperdata.f_video_path" type="video/mp4">
+                    </video>
+                  </div>
+                </td>
+              </tr>
+              </tbody>
+            </table>
+            <table class="table table-striped table-bordered"
+                   v-show="item.f_recording1_path">
               <thead>
               <tr>
                 <th style="text-align: center">录音文件</th>
@@ -273,8 +371,9 @@ div {
               <tr>
                 <td style="margin: auto;text-align: center">
                   <div class="container" style="max-width: 500px;background: #FFFFFF">
-                    <a class="button_spacing button_search-1" :download="item.f_user_name+'-'+item.f_check_type+'-'+录音文件.arm"
-                       :href="'rs/image/file/'+item.f_recording1_path" >录音下载</a>
+                    <a class="button_spacing button_search-1"
+                       :download="item.f_user_name+'-'+item.f_check_type+'-'+'录音文件.arm'"
+                       :href="'rs/image/file/'+item.f_recording1_path">录音下载</a>
                   </div>
                 </td>
               </tr>
@@ -285,7 +384,7 @@ div {
         <div class style="width: 1%;height: 100%;background-color: #F1F8FF;float: left;"></div>
         <div class="col-md-6" style="height: 100%;overflow: scroll">
           <div style="width: 95%;margin-left: 5%">
-            <table class="table table-striped table-bordered" v-for="config in deviceconfig2">
+            <table class="table table-striped table-bordered" v-for="config in deviceconfig2" style="margin-top: 35px">
               <thead v-show="!(config.checkname!='燃气表'&&paperdata.f_entry_status!='入户')">
               <tr>
                 <th style="text-align: center">{{ config.checkname }}</th>
@@ -293,7 +392,7 @@ div {
               </thead>
               <tbody v-show="!(config.checkname!='燃气表'&&paperdata.f_entry_status!='入户')">
               <tr v-for="dev in config.items">
-                <td v-if="dev.type!='text'">
+                <td v-if="dev.type!='text' && dev.isshow != false">
                   <div class="row">
                     <div class="col-md-8" style="text-align: center;">
                       <label>
@@ -305,7 +404,9 @@ div {
                     </div>
                     <div class="col-md-4" style="text-align: center">
                       <label style="font-weight: normal"
-                             v-if="dev.type!='picture'">{{ getDeviceValue(config.checkname, dev.lname) ? getDeviceValue(config.checkname, dev.lname) : '无' }}</label>
+                             v-if="dev.type!='picture'">{{
+                          getDeviceValue(config.checkname, dev.lname) ? getDeviceValue(config.checkname, dev.lname) : '无'
+                        }}</label>
                       <label style="font-weight: normal" v-if="dev.type=='picture'">
                         <div v-show="getDevicePath(config.checkname,dev.lname)">
                           <button-link style="color: black" type="button" class="btn btn-link"
@@ -317,17 +418,380 @@ div {
                     </div>
                   </div>
                 </td>
-                <td v-if="dev.type==='text'">
+                <td v-if="dev.type==='text' && dev.isshow != false">
                   <label style="width: 100%;text-align: center">{{ dev.lname }}</label>
                 </td>
               </tr>
               </tbody>
             </table>
+            <div v-show="showButton">
+              <button class="button_spacing button_search" @click="auditSuccesss()">通过</button>
+              <button class="button_spacing button_search" @click="auditFail()">不通过</button>
+            </div>
           </div>
         </div>
 
       </div>
     </div>
+    <div v-show="false">
+      <div class="container-fluid" id="toPdf" style="overflow: scroll">
+        <div class="row">
+          <div style="margin-right: 2%;margin-left: 2%;height: 100%;overflow: scroll">
+            <div style="width: 100%;margin: auto">
+              <table class="table table-striped table-bordered" style="margin-bottom: 6px;margin-top: 35px">
+                <thead>
+                <tr>
+                  <th colspan="6" style="text-align: center">用户基本信息</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">用户编号:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{
+                      paperdata.f_userinfo_code
+                    }}
+                  </td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">用户名称:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_user_name }}</td>
+                </tr>
+                <tr>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px">证件号码:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_idnumber }}</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px">用户类型:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_check_type }}</td>
+                </tr>
+                <tr>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px">用户电话:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_user_phone }}</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px">区 / 县:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_slice_area }}</td>
+                </tr>
+                <tr>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px">街 道:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_street }}</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px">楼 号:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_building }}</td>
+                </tr>
+                <tr>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px">单 元:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_unit }}</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px">楼 层:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_floor }}</td>
+                </tr>
+                <tr>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px">门 牌 号 :</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_room }}</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px">用户性质:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_userproperties }}</td>
+                </tr>
+                <tr>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px">备注信息:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_comments }}</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px">小区名称:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_residential_area }}</td>
+                </tr>
+                <tr>
+                  <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px">详细住址:</td>
+                  <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_address }}</td>
+                </tr>
+                </tbody>
+              </table>
+              <table class="table table-striped table-bordered" style="margin-top: 40px"
+                     v-show="paperdata.f_entry_status=='入户'">
+                <thead>
+                <tr>
+                  <th colspan="4" style="text-align: center">用户安检概况</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">到达时间:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_onsite_time }}</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">离开时间:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{
+                      paperdata.f_offsite_time
+                    }}
+                  </td>
+                </tr>
+                <tr>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">入户状态:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{
+                      paperdata.f_entry_status
+                    }}
+                  </td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">燃气使用:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_usegas }}</td>
+                </tr>
+                <tr>
+                  <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">用户满意度:</td>
+                  <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">{{
+                      paperdata.f_client_evaluation
+                    }}
+                  </td>
+                  <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">安检结果:</td>
+                  <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;"
+                      :style="{'color':ajresult=='有隐患'?'red':''}">{{ ajresult }}
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">备注:</td>
+                  <td colspan="3"
+                      style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%">
+                    {{ paperdata.f_repair_approved_note }}
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">隐患详情:</td>
+                  <td colspan="3"
+                      style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%">
+             <span v-for="deviceCollect in deviceCollects">
+                      <span class="li-font">
+                        {{ deviceCollect.name }}:{{ deviceCollect.value }}&nbsp;&nbsp;&nbsp;
+                      </span>
+                <br>
+             <span v-if="deviceCollect.value == '有隐患'">
+               <lable>
+                 隐患:
+               </lable>
+                <span v-for="val in deviceCollect.devices">
+    {{ val }}
+  </span><br>
+             </span>
+
+           </span>
+                  </td>
+                </tr>
+
+                </tbody>
+              </table>
+              <table class="table table-striped table-bordered" style="margin-top: 40px"
+                     v-show="paperdata.f_entry_status!='入户'">
+                <thead>
+                <tr>
+                  <th colspan="4" style="text-align: center">用户安检概况</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">到达时间:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_onsite_time }}</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">离开时间:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{
+                      paperdata.f_offsite_time
+                    }}
+                  </td>
+                </tr>
+                <tr>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">入户状态:</td>
+                  <td colspan="2" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">
+                    {{ paperdata.f_entry_status }}
+                  </td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">
+                    <button-link style="color: black" type="button" class="btn btn-link" @click="showpicture2()">
+                      {{ dev.lname }}
+                      查看{{ data.f_entry_status }}照片
+                    </button-link>
+                  </td>
+                </tr>
+
+                </tbody>
+              </table>
+              <table class="table table-striped table-bordered" style="margin-top: 40px"
+                     v-show="item.f_no_checkplan == '复检'">
+                <thead>
+                <tr>
+                  <th colspan="4" style="text-align: center">上次安检情况</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">上次安检到达时间:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{
+                      lastCheckData.f_onsite_time
+                    }}
+                  </td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">上次安检离开时间:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{
+                      lastCheckData.f_offsite_time
+                    }}
+                  </td>
+                </tr>
+                <tr>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">上次安检员:</td>
+                  <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">
+                    {{ lastCheckData.f_checker_name }}
+                  </td>
+                </tr>
+                <tr>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">安检结果:</td>
+                  <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">
+                    {{ lastCheckData.f_defect_text }}
+                  </td>
+                </tr>
+
+                </tbody>
+              </table>
+              <table class="table table-striped table-bordered" style="margin-top: 35px"
+                     v-show="paperdata.f_entry_status=='入户'">
+                <thead>
+                <tr>
+                  <th style="text-align: center">总体安检照片</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                  <td style="margin: auto;text-align: center">
+                    <div class="container" style="max-width: 550px;background: #FFFFFF">
+                      <div class="img" v-for="img in paperdata.f_overall_imgs">
+                        <img-self-plus :list="paperdata.f_overall_imgs " :src="img.f_overall_path" style="float: left"
+                                       width="150"
+                                       height="200"></img-self-plus>
+                      </div>
+                    </div>
+
+
+                  </td>
+
+                </tr>
+                </tbody>
+              </table>
+              <table class="table table-striped table-bordered" style="width: 100%"
+                     v-show="paperdata.f_entry_status=='入户'">
+                <thead>
+                <tr>
+                  <th style="text-align: center">用户签名照片</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                  <td style="margin: auto;text-align: center">
+                    <div class="container" style="max-width: 500px;background: #FFFFFF">
+                      <div class="img" style="float: none">
+                        <img-self-plus :src="paperdata.f_sign_path" width="200" height="200"></img-self-plus>
+                      </div>
+                    </div>
+                  </td>
+                  <td style="margin: auto;text-align: center">
+                      <div class="container" style="max-width: 550px;background: #FFFFFF" v-if="f_user_path">
+                        <div class="img" style="float: none">
+                          <img-self-plus :src="'rs/image/file/'+f_user_path"
+                                         width="200"
+                                         height="200"></img-self-plus>
+                        </div>
+                      </div>
+                  </td>
+                </tr>
+                </tbody>
+              </table>
+              <table class="table table-striped table-bordered"
+                     v-show="paperdata.f_entry_status=='入户' && paperdata.f_defect_notified">
+                <thead>
+                <tr>
+                  <th style="text-align: center">安检通知书/隐患整改通知书</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                  <td style="margin: auto;text-align: center">
+                    <div class="container" style="max-width: 500px;background: #FFFFFF">
+                      <div class="img" style="float: none">
+                        <img-self-plus :src="paperdata.f_notified_path" width="486" height="300"></img-self-plus>
+                      </div>
+                    </div>
+                  </td>
+                </tr>
+                </tbody>
+              </table>
+              <table class="table table-striped table-bordered"
+                     v-show="paperdata.f_entry_status=='入户'&& paperdata.f_video_path">
+                <thead>
+                <tr>
+                  <th style="text-align: center">安检视频</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                  <td style="margin: auto;text-align: center">
+                    <div class="container" style="max-width: 500px;background: #FFFFFF">
+                      <video width="320" height="200" controls v-if="paperdata.f_video_path">
+                        <source :src="paperdata.f_video_path" type="video/mp4">
+                      </video>
+                    </div>
+                  </td>
+                </tr>
+                </tbody>
+              </table>
+              <table class="table table-striped table-bordered"
+                     v-show="item.f_recording1_path">
+                <thead>
+                <tr>
+                  <th style="text-align: center">录音文件</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                  <td style="margin: auto;text-align: center">
+                    <div class="container" style="max-width: 500px;background: #FFFFFF">
+                      <a class="button_spacing button_search-1"
+                         :download="item.f_user_name+'-'+item.f_check_type+'-'+'录音文件.arm'"
+                         :href="'rs/image/file/'+item.f_recording1_path">录音下载</a>
+                    </div>
+                  </td>
+                </tr>
+                </tbody>
+              </table>
+            </div>
+          </div>
+          <div style="margin-right: 2%;margin-left: 2%;height: 100%;overflow: scroll">
+            <div style="width: 95%;margin-left: 5%">
+              <table class="table table-striped table-bordered" v-for="config in deviceconfig2"
+                     style="margin-top: 35px">
+                <thead v-show="!(config.checkname!='燃气表'&&paperdata.f_entry_status!='入户')">
+                <tr>
+                  <th style="text-align: center">{{ config.checkname }}</th>
+                </tr>
+                </thead>
+                <tbody v-show="!(config.checkname!='燃气表'&&paperdata.f_entry_status!='入户')">
+                <tr v-for="dev in config.items">
+                  <td v-if="dev.type!='text' && dev.isshow != false">
+                    <div class="row">
+                      <div class="col-md-8" style="text-align: center;">
+                        <label>
+                          <button-link type="button" class="btn btn-link"
+                                       @click="showpicture(config.checkname,dev.lname)"
+                                       :style="isred(config.checkname,dev.lname)?'color:red':'color:black'">
+                            {{ dev.lname }}
+                          </button-link>
+                        </label>
+                      </div>
+                      <div class="col-md-4" style="text-align: center">
+                        <label style="font-weight: normal"
+                               v-if="dev.type!='picture'">{{
+                            getDeviceValue(config.checkname, dev.lname) ? getDeviceValue(config.checkname, dev.lname) : '无'
+                          }}</label>
+                        <label style="font-weight: normal" v-if="dev.type=='picture'">
+                          <div v-show="getDevicePath(config.checkname,dev.lname)">
+                            <button-link style="color: black" type="button" class="btn btn-link"
+                                         @click="showpath(getDevicePath(config.checkname,dev.lname),dev.lname)">查看照片
+                            </button-link>
+                          </div>
+                          <div v-show="!getDevicePath(config.checkname,dev.lname)">无照片</div>
+                        </label>
+                      </div>
+                    </div>
+                  </td>
+                  <td v-if="dev.type==='text' && dev.isshow != false">
+                    <label style="width: 100%;text-align: center">{{ dev.lname }}</label>
+                  </td>
+                </tr>
+                </tbody>
+              </table>
+            </div>
+          </div>
+
+        </div>
+      </div>
+    </div>
   </div>
   <modal :show.sync="imgshow" v-ref:modal backdrop="true">
     <header slot="modal-header" class="modal-header">
@@ -337,13 +801,13 @@ div {
       <div class="from-group">
         <div class="row">
           <div class="col-md-6">
-            <img-self-safe v-if="showimg1" :src="showimg1" width="240" height="300"></img-self-safe>
+            <img-self-plus v-if="showimg1" :src="showimg1" width="240" height="300"></img-self-plus>
           </div>
           <div class="col-md-6">
-            <img-self-safe v-if="showimg2" :src="showimg2" width="240" height="300"></img-self-safe>
+            <img-self-plus v-if="showimg2" :src="showimg2" width="240" height="300"></img-self-plus>
           </div>
           <div class="col-md-6" v-for="item in otherDarginShowImgs">
-            <img-self-safe v-if="item.path" :src="item.path" width="240" height="300"></img-self-safe>
+            <img-self-plus v-if="item.path" :src="item.path" width="240" height="300"></img-self-plus>
           </div>
         </div>
       </div>
@@ -360,16 +824,34 @@ div {
       <div class="from-group">
         <div class="row">
           <div class="col-md-6">
-            <img-self-safe v-if="this.paperdata.f_entry_status=='到访不遇'" :src="showimg3" width="300"
-                           height="400"></img-self-safe>
-            <img-self-safe v-if="this.paperdata.f_entry_status=='到访不遇' && showimg5" :src="showimg5" width="300"
-                           height="400"></img-self-safe>
+            <img-self-plus v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer_path" :src="showimg3"
+                           width="282"
+                           height="400"></img-self-plus>
           </div>
           <div class="col-md-6">
-            <img-self-safe v-if="this.paperdata.f_entry_status=='拒检'" :src="showimg4" width="300"
-                           height="400"></img-self-safe>
-            <img-self-safe v-if="this.paperdata.f_entry_status=='拒检' && showimg6" :src="showimg6" width="300"
-                           height="400"></img-self-safe>
+            <img-self-plus v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer1_path"
+                           :src="showimg5" width="282"
+                           height="400"></img-self-plus>
+          </div>
+          <div class="col-md-6">
+            <img-self-plus v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer2_path"
+                           :src="showimg6" width="282"
+                           height="400"></img-self-plus>
+          </div>
+          <div class="col-md-6">
+            <img-self-plus v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck_path"
+                           :src="showimg4" width="282"
+                           height="400"></img-self-plus>
+          </div>
+          <div class="col-md-6">
+            <img-self-plus v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck1_path"
+                           :src="showimg7" width="282"
+                           height="400"></img-self-plus>
+          </div>
+          <div class="col-md-6">
+            <img-self-plus v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck2_path"
+                           :src="showimg8" width="282"
+                           height="400"></img-self-plus>
           </div>
         </div>
       </div>
@@ -378,6 +860,25 @@ div {
       <button type="button" class="btn btn-success" @click='imgclose'>关闭</button>
     </footer>
   </modal>
+  <modal :show.sync="showModel" :width="'50%'" :backdrop="false">
+    <div slot="modal-header" class="modal-header">
+      <h4 class="modal-title">
+        安检审核备注
+      </h4>
+    </div>
+    <div slot="modal-body" class="modal-body">
+      <div class="row">
+        <div class="form-group col-sm-4">
+          <label class="font_normal_body">审核备注:</label>
+          <textarea v-model="message"></textarea>
+        </div>
+      </div>
+    </div>
+    <div slot="modal-footer" class="modal-footer" style="text-align: center">
+      <button class="button_search" style="margin-right: 15px" @click="auditFailOK()">确定</button>
+      <button class="button_search" style="margin-right: 15px" @click="auditFailCancel()">取消</button>
+    </div>
+  </modal>
 </template>
 
 <script>
@@ -385,6 +886,7 @@ div {
 // import PaperStatem from './PaperStatem'
 // import Devicesm from './Devicesm'
 // import PaperFeedbackm from './PaperFeedbackm'
+import html2pdf from 'html2pdf.js'
 import ObjConfig from '../../utils/GerJsonObjectConfig'
 import RadioGroup from 'vue-client/src/vue-strap/src/radioGroup'
 import Radio from 'vue-client/src/vue-strap/src/radioBtn'
@@ -396,7 +898,7 @@ import {HttpResetClass} from "vue-client";
 let asyncReady = async function (self) {
   // 获取配置信息
   try {
-    let res = await new HttpResetClass().load('post', 'rs/sql/tel_singleTable_OrderBy', {
+    let res = await new HttpResetClass().load('post', 'rs/sql/safe_singleTable_OrderBy', {
       data: {
         items: 'f_dir',
         tablename: 't_organization',
@@ -404,26 +906,32 @@ let asyncReady = async function (self) {
         orderitem: 'id'
       }
     })/*.then(res=>{*/
-    console.log("aaaaaaaaaaaaaaaa")
-    console.log(JSON.stringify(res.data[0].f_dir))
+    //tag
+    //tag)
+    console.log(res)
     if (!res.data[0].f_dir) {
       self.$showMessage("该公司无组织目录，无法获取配置文件，请联系管理员确认")
     } else {
       //this.f_dir=res.data[0].f_dir
+      let url = self.newConfig == '是' ? '/safecheck/rs/safe_vue' : '/safecheck/rs/vue'
       try {
-        let res1 = await new HttpResetClass().load('GET', `/safecheck/rs/vue/DevicesConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
+        let res1 = await new HttpResetClass().load('GET', `${url}/DevicesConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
           resolveMsg: '获取居民配置项成功！',
           rejectMsg: '获取居民配置项出错！'
         })/*.then(res=>{*/
-        console.log('111111111111居民===>', res1.data)
+        //tag
         //this.safeConfig["民用配置项"]=Object.assign({},res.data)
+        if (!Vue.config.safecheck) {
+          Vue.config = {safecheck: {}}
+        }
         Vue.config.safecheck.DevicesConfig = res1.data
+        console.log(Vue.config.safecheck.DevicesConfig)
         /*})*/
-        let res2 = await new HttpResetClass().load('GET', `/safecheck/rs/vue/DevicesSetConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
+        let res2 = await new HttpResetClass().load('GET', `${url}/DevicesSetConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
           resolveMsg: '获取非居民配置项成功！',
           rejectMsg: '获取非居民配置项出错！'
         })/*.then(res=>{*/
-        console.log('22222222222222非居民===>', res2.data)
+        //tag
         //this.safeConfig["非民用配置项"]=Object.assign({},res.data)
         Vue.config.safecheck.DevicesSetConfig = res2.data
         /*}).then(res=> {
@@ -431,13 +939,26 @@ let asyncReady = async function (self) {
 
       } catch (e) {
         self.$showMessage("获取配置文件失败" + e)
+        self.loading = false
       }
     }
+    if (self.data.f_recheck_id) {
+      let res3 = await new HttpResetClass().load('post', 'rs/sql/safe_singleTable_OrderBy', {
+        data: {
+          items: '*',
+          tablename: 't_check_paper',
+          condition: `id  = '${self.data.f_recheck_id}'`,
+          orderitem: 'id'
+        }
+      })
+      self.lastCheckData = res3.data[0]
+    }
   } catch (error) {
     // 忽略704,文件找不到异常R
     if (error.status !== 704) {
       throw error
     }
+    this.loading = false
   }
 }
 export default {
@@ -445,10 +966,16 @@ export default {
   props: ['f_plan_id', 'item', 'role'],
   data() {
     return {
+      f_user_path:'',
+      message: '',
+      showButton: false,
+      showModel: false,
       data: {
         f_devices: [],
         f_defect_content: ''
       },
+      showPdfDownload: this.$appdata.getSingleValue('安检结果pdf下载') ? this.$appdata.getSingleValue('安检结果pdf下载') : false,
+      lastCheckData: {},
       paperdata: {},
       picturename: '隐患照片',
       defectDevice: {},
@@ -468,6 +995,8 @@ export default {
       showimg4: '',
       showimg5: '',
       showimg6: '',
+      showimg7: '',
+      showimg8: '',
       hiddenDangerImgNumber: 0, //配置项中隐患照片数
       otherDarginShowImgs: [],//其他隐患图片
       startClick: false, //开始安检按钮是否可点击
@@ -483,6 +1012,7 @@ export default {
       configAJ: [],
       configRQ: [],
       deviceconfig: {},
+      newConfig: '',
       deviceconfig2: [],
       f_devices: [],
       config: {
@@ -490,18 +1020,19 @@ export default {
           "checkmust": true,
           "index": 1,
           "items": {
-            //"燃气表照片":{"index":1,"type":"picture","remark":"(拍摄清晰的表具编号、字轮数、剩余气量等)"},
             "基表编号": {"index": 1, "type": "string", "readonly": true},
             "气表型号": {"index": 2, "type": "string", "readonly": true},
             "气表品牌": {"index": 3, "type": "string", "readonly": true},
             "进气方向": {"index": 4, "type": "string", "readonly": true},
-            // "初始表底":{"index":5,"type":"number","isshow":false,"readonly":true},
-            "上期表读数": {"index": 5, "type": "number", "readonly": true, isshow: false},
-            "累购气量": {"index": 6, "type": "number", "readonly": true},
-            "已用气量": {"index": 7, "type": "number", "checkmust": true},//基表数
-            "剩余气量": {"index": 8, "type": "number", "checkmust": true},//累购-已用
+            "初始表底": {"index": 5, "type": "number", "isshow": false, "readonly": true},
+            "上期表读数": {"index": 6, "type": "number", "readonly": true, isshow: false},
+            "累购气量": {"index": 7, "type": "number", "readonly": true},
+            "已用气量": {"index": 8, "type": "number", "checkmust": false},//基表数
+            "剩余气量": {"index": 9, "type": "number", "checkmust": false},//累购-已用
             //显示屏数  --实际剩余气量
-            "气量异常差值": {"index": 9, "type": "number", "readonly": true}
+            "气量异常差值": {"index": 10, "type": "number", "readonly": true},
+            "表箱号": {"index": 11, "type": "string", "readonly": true},
+            "燃气表照片": {"index": 12, "type": "picture", "checkmust": false},
           }
           // 注意，配置项的index必须与上面的固定配置保持'顺序'
         }
@@ -512,18 +1043,19 @@ export default {
           "checkmust": true,
           "index": 1,
           "items": {
-            //"燃气表照片":{"index":1,"type":"picture","remark":"(拍摄清晰的表具编号、字轮数、剩余气量等)"},
             "基表编号": {"index": 1, "type": "string", "readonly": true},
             "气表型号": {"index": 2, "type": "string", "readonly": true},
             "气表品牌": {"index": 3, "type": "string", "readonly": true},
             "进气方向": {"index": 4, "type": "string", "readonly": true},
-            // "初始表底":{"index":5,"type":"number","isshow":false,"readonly":true},
-            "上期表读数": {"index": 5, "type": "number", "readonly": true, isshow: false},
-            "累购金额": {"index": 6, "type": "number", "readonly": true},
-            "已用金额": {"index": 7, "type": "number", "checkmust": true},
+            "初始表底": {"index": 5, "type": "number", "isshow": false, "readonly": true},
+            "上期表读数": {"index": 6, "type": "number", "readonly": true, isshow: false},
+            "累购金额": {"index": 7, "type": "number", "readonly": true},
+            "已用金额": {"index": 8, "type": "number", "checkmust": false},
             //显示屏数  --实际剩余气量
-            "剩余金额": {"index": 8, "type": "number", "checkmust": true},
-            "金额异常差值": {"index": 9, "type": "number", "readonly": true}
+            "剩余金额": {"index": 9, "type": "number", "checkmust": false},
+            "金额异常差值": {"index": 10, "type": "number", "readonly": true},
+            "表箱号": {"index": 11, "type": "string", "readonly": true},
+            "燃气表照片": {"index": 12, "type": "picture", "checkmust": false},
           }
         }
       },
@@ -534,12 +1066,12 @@ export default {
     Radio,
   },
   computed: {
-    isRecodrDownloadBtn(){
+    isRecodrDownloadBtn() {
       // 投诉单下派还是处理
       let res = this.$appdata.getSingleValue('无限制录音');
-      if (res == 'true'){
+      if (res == 'true') {
         return true;
-      }else {
+      } else {
         return false;
       }
     },
@@ -549,7 +1081,6 @@ export default {
       },
       set(val) {
         if (this.isStrat) {
-          debugger;
           this.$goto(val, {userinfo: this.data}, 'paper-router')
         } else {
           this.$showMessage('未开始安检！')
@@ -563,17 +1094,80 @@ export default {
     }
   },
   methods: {
-    devicesCollect() {
-      console.log("4444444")
-      console.log(JSON.stringify(this.config))
-      console.log(JSON.stringify(this.deviceconfig2))
-      console.log("4444444")
+    exportToPDF() {
+      const element = document.getElementById('toPdf') // 替换为您要导出的页面元素的ID
+      html2pdf(element)
+    },
+
+    showAudit() {
+      var audit = this.$appdata.getSingleValue('安检审核');
+      if (audit == '是' && (this.item.f_approved == '未审核' || !this.item.f_approved)) {
+        this.showButton = true
+      }
+    },
+    //安检审核成功
+    auditSuccesss() {
+      this.loading = true;
+      var reqdata = {
+        audit_result: '通过',
+        operator: "success",
+        audit_time: Util.getNowDate(),
+        user_name: this.$login.f.name,
+        id: this.item.id,
+        f_check_item_id: this.item.f_check_item_id
+      }
+      new HttpResetClass().load('POST', '/rs/logic/updateAafeAudit', {data: reqdata}, {
+        resolveMsg: '安检审核成功！',
+        rejectMsg: '安检审核出错！'
+      }).then((res) => {
+        if (res.data.code == 200) {
+          this.loading = false;
+          this.$back()
+        }
+      })
+    },
+    auditFail() {
+      this.showModel = true;
+    },
+    auditFailOK() {
 
+      this.loading = true;
+      var reqdata = {
+        message: this.message,
+        audit_result: '不通过',
+        operator: "fail",
+        audit_time: Util.getNowDate(),
+        user_name: this.$login.f.name,
+        id: this.item.id,
+        f_check_item_id: this.item.f_check_item_id
+      }
+      new HttpResetClass().load('POST', '/rs/logic/updateAafeAudit', {data: reqdata}, {
+        resolveMsg: '安检审核成功！',
+        rejectMsg: '安检审核出错！'
+      }).then((res) => {
+        if (res.data.code == 200) {
+          this.loading = false;
+          this.message = '';
+          this.showModel = false;
+          this.$back()
+        }
+      })
+    },
+    auditFailCancel() {
+      this.showModel = false;
+      this.message = '';
+    },
+
+    devicesCollect() {
+      //tag
+      //tag)
+      //tag)
+      //tag
       this.deviceCollects = []
       let checkResult = '正常'
       this.result = '正常'
       let codata = JSON.parse(JSON.stringify(this.data))
-      console.log("111111111111" + JSON.stringify(codata))
+      //tag)
       for (let device in this.data) {
         let f_device_type
         if (device.startsWith("device")) {
@@ -584,23 +1178,36 @@ export default {
             } else {
               f_device_type = this.data[device][item].f_device_type
             }
-            // console.log('codata[device][item]=>',codata[device][item])
+            // //tag
+            let deviceelse = []
             let deviceInfos = []
             for (let i in this.data[device][item].f_items) {
               let defects = ''
+
               let items = this.data[device][item].f_items[i]
-              if ((items.type === 'selector' || items.type === 'radio' || items.type === 'checkbox') && items.f_item_value != null && items.f_item_value instanceof Array) {
+
+
+              if ((items.type === 'selector' || items.type === 'radio' || items.type === 'checkbox' || items.type === 'picture') && items.f_item_value != null && items.f_item_value instanceof Array) {
                 for (let i in items.f_item_value) {
                   let f_item_value = items.f_item_value[i]
 
-                  console.log('f_item_value => ' + JSON.stringify(f_item_value))
-                  console.log('f_device_type => ' + JSON.stringify(f_device_type))
-                  console.log('this.paper[device][item] => ' + JSON.stringify(this.data[device][item]))
-                  console.log('this.config[this.paper[device][item].f_device_type] => ' + JSON.stringify(this.config[this.data[device][item].f_device_type]))
-                  if (!this.config[this.data[device][item].f_device_type].items[items.f_item_name]) {
+                  //tag)
+                  //tag)
+                  //tag)
+                  //tag)
+
+                  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
+                  }*/
+                  if (items.f_is_defect == 'true' || items.f_is_defect == true) {
+                    checkResult = '有隐患'
+                    this.result = '有隐患'
+                    defects = `${defects}:${items.f_item_value}/`
                   }
-                  let options = this.config[this.data[device][item].f_device_type].items[items.f_item_name].options
+                  /*let options = this.config[this.data[device][item].f_device_type].items[items.f_item_name].options
                   for (let option in options) {
                     if (options[option].data == f_item_value) {
                       if (options[option].isdefect == 'true' || options[option].isdefect == true) {
@@ -610,19 +1217,21 @@ export default {
                         // let level = options[option].level
                       }
                     }
-                  }
-                  console.log('defects=====>' + JSON.stringify(defects))
+                  }*/
+                  //tag)
                 }
                 if (defects != '') {
-                  deviceInfos.push(`${items.f_item_name}${defects.substring(0, defects.length - 1)}`)
+                  console.log('有隐患items', items)
+                  deviceInfos.push(`${items.f_item_name}${defects.substring(0, defects.length - 1)}${items.f_else ? items.f_else : ''}`)
                 }
-              } else if (items.type === 'stringp') {
+              } else if ((items.type === 'string' || items.type === 'number') && items.f_is_defect && items.f_item_value[0]) {
                 checkResult = '有隐患'
                 this.result = '有隐患'
                 deviceInfos.push(`${items.f_item_name}:${items.f_item_value[0]}`)
+
               } else if (items.f_item_name == '金额异常差值') {
                 var deviation = this.$appdata.getSingleValue('金额异常差值允许误差')
-                console.log(items.f_item_value[0] + '金额异常差值允许误差' + deviation)
+                //tag
                 if (parseFloat(items.f_item_value[0]).toString() != "NaN" && parseFloat(deviation).toString() != "NaN") {
                   if (parseFloat(items.f_item_value[0]) > parseFloat(deviation) || parseFloat(items.f_item_value[0]) < parseFloat(deviation) * -1) {
                     checkResult = '有隐患'
@@ -632,7 +1241,7 @@ export default {
                 }
               } else if (items.f_item_name == '气量异常差值') {
                 var deviation = this.$appdata.getSingleValue('气量异常差值允许误差')
-                console.log(items.f_item_value[0] + '气量异常差值允许误差' + deviation)
+                //tag
                 if (parseFloat(items.f_item_value[0]).toString() != "NaN" && parseFloat(deviation).toString() != "NaN") {
                   if (parseFloat(items.f_item_value[0]) > parseFloat(deviation) || parseFloat(items.f_item_value[0]) < parseFloat(deviation) * -1) {
                     checkResult = '有隐患'
@@ -641,9 +1250,20 @@ export default {
                   }
                 }
               }
-              console.log('deviceInfos========>' + JSON.stringify(deviceInfos))
-              console.log('items.f_is_defect')
-              console.log(items.f_is_defect)
+              if (!this.config[this.data[device][item].f_device_type].items[items.f_item_name]) {
+                // console.log('this.config[this.data[device][item].f_device_type]', this.config[this.data[device][item].f_device_type])
+                // console.log('this.deviceconfig2', this.deviceconfig2)
+                for (let dev in this.deviceconfig2) {
+                  if (this.deviceconfig2[dev].checkname == this.data[device][item].f_device_type) {
+                    this.deviceconfig2[dev].items.push({
+                      lname: items.f_item_name
+                    })
+                  }
+                }
+              }
+              //tag)
+              //tag
+              //tag
               if (items.type === 'selector') {
                 items.selected = []
               } else if (items.type === 'inputSelector') {
@@ -652,13 +1272,16 @@ export default {
             }
 
 
-            console.log('deviceCollect', this.deviceCollect)
+            //tag
             this.$set('deviceCollect.name', f_device_type)
             this.$set('deviceCollect.value', checkResult)
             this.$set('deviceCollect.devices', deviceInfos)
-            console.log("5555555555" + JSON.stringify(this.deviceCollect))
+            this.$set('deviceCollect.else', deviceelse)
+            console.log('deviceCollect.devices', this.deviceCollect.devices)
+            console.log('deviceCollect.else', this.deviceCollect.else)
+            //tag)
             if (this.deviceCollect.name) {
-              console.log("999999998888888" + this.deviceCollect.name)
+              //tag
               this.deviceCollects.push(JSON.parse(JSON.stringify(this.deviceCollect)))
             }
 
@@ -672,17 +1295,20 @@ export default {
       }
       this.ajresult = JSON.parse(this.data.f_defect_content).result
       this.showimg3 = this.data.f_noanswer_path
-      this.showimg4 = this.data.f_rejectcheck_path
       this.showimg5 = this.data.f_noanswer1_path
-      this.showimg6 = this.data.f_rejectcheck1_path
+      this.showimg6 = this.data.f_noanswer2_path
+      this.showimg4 = this.data.f_rejectcheck_path
+      this.showimg7 = this.data.f_rejectcheck1_path
+      this.showimg8 = this.data.f_rejectcheck2_path
       this.paperdata = this.data
+      this.f_user_path = this.paperdata.f_user_pictures ? JSON.parse(this.paperdata.f_user_pictures)[0].f_user_path : ''
       this.loading = false
     },
     imgclose() {
       this.imgshow = false
     },
     putDevices() {
-      //console.log('Vue.config.safecheck', Vue.config.safecheck.safetype)
+      ////tag
       this.$set('data.approve', "true")
       this.$set('data.writeback', "false")
       if (Vue.config.safecheck.ApproveConfig != undefined) {
@@ -695,22 +1321,26 @@ export default {
         if (Vue.config.safecheck.ApproveConfig.livedispose != undefined) {
           this.livedispose = Vue.config.safecheck.ApproveConfig.livedispose
         }
-        if(Vue.config.safecheck.ApproveConfig.hiddendanger != undefined) {
+        if (Vue.config.safecheck.ApproveConfig.hiddendanger != undefined) {
           if (parseInt(Vue.config.safecheck.ApproveConfig.hiddendanger) >= 3) {
             this.hiddenDangerImgNumber = 3
-          }else {
+          } else {
             this.hiddenDangerImgNumber = parseInt(Vue.config.safecheck.ApproveConfig.hiddendanger)
           }
         }
       }
-      console.log('当前安检类型----' + this.item.f_safecheck_type)
-
-      console.log(JSON.stringify(this.data))
-      if (!this.item.f_safecheck_type) {
+      //tag
+      //tag)
+      if (!this.item.f_safecheck_type && Vue.config.safecheck.SafecheckType) {
         this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType['年度普检'][this.item.f_check_type]])
-      } else {
-        if (Vue.config.safecheck.DevicesConfig != undefined)
-          this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_check_type]])
+      } else if (Vue.config.safecheck.SafecheckType){
+        this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_check_type]])
+      }else {
+        if(this.item.f_check_type == '民用'){
+          this.config = this.extend(this.config, Vue.config.safecheck.DevicesConfig)
+        }else {
+          this.config = this.extend(this.config, Vue.config.safecheck.DevicesSetConfig)
+        }
       }
       //遍历安检项配置
       for (let i in this.config) {
@@ -740,8 +1370,8 @@ export default {
 
     },
     showpath(val1, val2) {
-      console.log("555555555555555555")
-      console.log(val1)
+      //tag
+      //tag
       if (val1) {
         this.showimg1 = val1
         this.picturename = val2
@@ -749,7 +1379,7 @@ export default {
       }
     },
     showpicture(val1, val2) {
-      console.log("77777777777777")
+      //tag
       if (val2 == '气量异常差值' || val2 == '金额异常差值') {
         return
       }
@@ -765,9 +1395,9 @@ export default {
                   this.showimg2 = this.devicesAll[i][j].f_items[k].f_second_path
                   this.otherDarginShowImgs = []
                   for (let l = 0; l < this.hiddenDangerImgNumber; l++) {
-                    let img = {path:''}
-                    if (this.devicesAll[i][j].f_items[k]['f_p' + (l+1)+'_path']) {
-                      img.path =  this.devicesAll[i][j].f_items[k]['f_p' + (l+1)+'_path'] + '?' + Math.random()
+                    let img = {path: ''}
+                    if (this.devicesAll[i][j].f_items[k]['f_p' + (l + 1) + '_path']) {
+                      img.path = this.devicesAll[i][j].f_items[k]['f_p' + (l + 1) + '_path'] + '?' + Math.random()
                       this.otherDarginShowImgs.push(img)
                     }
                   }
@@ -783,7 +1413,7 @@ export default {
       }
     },
     isred(val1, val2) {
-      console.log("77777777777777")
+      //tag
       if (val2 == '气量异常差值' || val2 == '金额异常差值') {
         return
       }
@@ -816,7 +1446,8 @@ export default {
               if (this.devicesAll[i][j].f_items[k].f_item_name == val2) {
                 if (this.devicesAll[i][j].f_items[k].f_item_lists[0]) {
                   for (let l = 0; l < this.devicesAll[i][j].f_items[k].f_item_lists.length; l++) {
-                    aa += this.devicesAll[i][j].f_items[k].f_item_lists[l].f_item_value + ' '
+                    let val = this.devicesAll[i][j].f_items[k].f_item_lists[l].f_item_value
+                    aa += (val === null ? '空' : val) + ' '
                   }
                   return aa
                 }
@@ -846,14 +1477,14 @@ export default {
     getDeviceAll() {
       let keyall = Object.keys(this.data)
       for (let i = 0; i < keyall.length; i++) {
-        console.log(JSON.stringify(keyall))
-        if (keyall[i].startsWith('device') && keyall[i] != 'deviceundefined') {
+        //tag)
+        if ((keyall[i].startsWith('f_devices') || keyall[i].startsWith('devices')) && keyall[i] != 'deviceundefined') {
           this.devicesAll.push(this.data[keyall[i]])
-          console.log(keyall[i])
+          //tag
         }
       }
-      console.log("666666666666666666")
-      console.log(JSON.stringify(this.devicesAll))
+      //tag
+      //tag)
       this.devicesCollect()
 
     },
@@ -879,7 +1510,7 @@ export default {
     },
 
     viewPic(fileName) {
-      console.log('view pic: ' + fileName)
+      //tag
       if (this.role == 'view') {
         if (!fileName.endsWith('nopic.png')) {
           this.pic_to_be_viewed = fileName
@@ -937,11 +1568,11 @@ export default {
         HostApp.__this__.$set('data', paper)
         HostApp.__this__.$goto('paper-state', {}, 'paper-router')
         // 如果打回重检则重新计时
-        console.log('HostApp.__this__.role' + HostApp.__this__.role + ' HostApp.__this__.f_approved:' + HostApp.__this__.data.f_approved)
+        //tag
         if (HostApp.__this__.role == 'inspect'
           && HostApp.__this__.data.f_approved
           && HostApp.__this__.data.f_approved == '打回') {
-          console.log('打回')
+          //tag
           HostApp.__this__.data.f_onsite_time = Util.toStandardTimeString()
           HostApp.__this__.tick()
         }
@@ -1178,8 +1809,13 @@ export default {
     }
   },
   ready() {
+    setTimeout(() => {
+      this.loading = false;
+    }, 10000)
     this.putDevices()
-    if (this.item.f_state != '未检' || this.item.f_no_checkplan == '无计划安检') {
+    this.showAudit()
+    this.newConfig = this.$appdata.getSingleValue('配置中心获取文件') ? this.$appdata.getSingleValue('配置中心获取文件') : '否';
+    if (this.item.f_state != '未检' || this.item.f_no_checkplan == '无计划安检' || this.item.f_no_checkplan == '复检') {
       if (this.role != 'inspect') {
         let that = this
         let id
@@ -1189,13 +1825,10 @@ export default {
           id = this.item.f_paper_id
         }
         this.$resetpost(`rs/path/getUserinfomation`, {data: {condition: `id = '${id}'`}}).then((respanse) => {
-            console.log('result....', respanse)
+            //tag
             if (respanse.data.length != 0) {
               // 包含 其它 特殊处理的数组
               // 对应位置
-
-              console.log('devices => ', respanse.data[0])
-
               that.data = Object.assign(that.data, respanse.data[0])
               if (respanse.data[0].f_devices) {
                 for (let da in that.devices) {
@@ -1205,11 +1838,11 @@ export default {
                   for (let de in that.devices) {
                     if (that.devices[de].device == item.f_device_type) {
                       item.f_items.forEach((f_item) => {
-                        console.log('f_item====>', f_item)
-                        console.log('f_item.f_path====>', f_item.f_path)
+                        //tag
+                        //tag
                         let itemValues = []
                         f_item.f_item_lists.forEach((tempItem) => {
-                          console.log('emm => ', f_item.f_item_name, '   ', tempItem.f_item_value)
+                          //tag
                           if (tempItem.f_item_value !== 'null') {
                             itemValues.push(tempItem.f_item_value)
                           }
@@ -1232,49 +1865,50 @@ export default {
               } else {
                 Util.androidRatifyPics(that.data, this.$androidUtil.getProxyUrl())
               }
-              console.log("that.data:", that.data)
+              //tag
             }
             // this.$goto('paper-message-blank', {userinfo:this.data,devices:this.devices,config:this.config,role:this.role}, 'self')
             this.isshow = true
             asyncReady(this).then(() => {
-              console.log("66666666666")
-              console.log(JSON.stringify(this.data))
+              //tag
+              //tag)
+              console.log('Vue.config.safecheck.DevicesConfig', Vue.config.safecheck.DevicesConfig)
               if (this.data.f_check_type == '民用') {
                 this.deviceconfig = Vue.config.safecheck.DevicesConfig
-                if (typeof this.deviceconfig==='string'){
-                  this.deviceconfig=JSON.parse(this.deviceconfig)
+                if (typeof this.deviceconfig === 'string') {
+                  this.deviceconfig = JSON.parse(this.deviceconfig)
                 }
-                console.log("deviceconfig1==>" + JSON.stringify(this.deviceconfig))
+                //tag)
               } else if (this.data.f_check_type == '非民用') {
                 this.deviceconfig = Vue.config.safecheck.DevicesSetConfig
-                if (typeof this.deviceconfig==='string'){
-                  this.deviceconfig=JSON.parse(this.deviceconfig)
+                if (typeof this.deviceconfig === 'string') {
+                  this.deviceconfig = JSON.parse(this.deviceconfig)
                 }
-                console.log("deviceconfig2==>" + JSON.stringify(this.deviceconfig))
+                //tag)
               }
               if (this.data.f_collection_type == '按金额') {
-                let aaa = Object.assign({}, this.config2["燃气表"].items, this.deviceconfig["燃气表"].items)
-                this.deviceconfig["燃气表"].items = aaa
-                //this.deviceconfig["燃气表"]=this.config2["燃气表"]
-                console.log("deviceconfig3==>" + JSON.stringify(this.deviceconfig))
+                if (this.deviceconfig["燃气表"]){
+                  let aaa = Object.assign({}, this.config2["燃气表"].items, this.deviceconfig["燃气表"].items)
+                  this.deviceconfig["燃气表"].items = aaa
+                }
               } else {
-                let aaa = Object.assign({}, this.config["燃气表"].items, this.deviceconfig["燃气表"].items)
-                this.deviceconfig["燃气表"].items = aaa
-                console.log("deviceconfig4==>" + JSON.stringify(this.deviceconfig))
+                if (this.deviceconfig["燃气表"]){
+                  let aaa = Object.assign({}, this.config["燃气表"].items, this.deviceconfig["燃气表"].items)
+                  this.deviceconfig["燃气表"].items = aaa
+                }
               }
               this.deviceconfig2 = ObjConfig.getObjConfig(this.deviceconfig)
               this.deviceconfig2[0].items = jsonSort(this.deviceconfig2[0].items, "index")
               this.deviceconfig2[1].items = jsonSort(this.deviceconfig2[1].items, "index")
               this.deviceconfig2 = jsonSort(this.deviceconfig2, "index")
               this.getDeviceAll()
-
-
             })
           }
         ).catch(
           (respanse) => {
-            console.log('respanse', respanse)
+            //tag
             alert('查找安检单失败')
+            this.loading = false
           })
       }
     }
@@ -1282,11 +1916,11 @@ export default {
   },
   watch: {
     //   'isUpload'(val){
-    //     console.log('isUpload发生变化===>'+val)
+    //     //tag
     //   }
   },
   destroyed() {
-    console.log('退出当前页Set')
+    //tag
     this.disableTimer()
   }
 }