safecheck-client 3.1.1-gaomi-7 → 4.0.1

package/src/components/pc/NewCheckpaper.vue

@@ -1,6 +1,5 @@
 <style scoped>
 .img {
-  border: 1px solid #9773ed;
   width: auto;
   height: auto;
   float: left;
@@ -13,23 +12,26 @@ img {
 }
 
 
-.container{
+.container {
   margin: 10px auto;
   width: 80%;
   height: auto;
 }
+
 div::-webkit-scrollbar {
-width: 0 !important;
+  width: 0 !important;
   height: 0 !important;
 }
 
-div{
+div {
   -ms-overflow-style: none;
-overflow: -moz-scrollbars-none;
+  overflow: -moz-scrollbars-none;
 }
+
 .divmask {
   pointer-events: none;
 }
+
 .app-header {
   border-radius: 50%;
   background: rgba(73, 158, 223, 0.4);
@@ -38,7 +40,7 @@ overflow: -moz-scrollbars-none;
   text-align: center;
   font-size: 1.2em;
   z-index: 10;
-  opacity:0.5;
+  opacity: 0.5;
   bottom: 50px;
   margin-top: -20px;
   position: absolute;
@@ -52,228 +54,325 @@ overflow: -moz-scrollbars-none;
   <div class="basic-main" style="height: 100%">
     <div class="page-header app-header auto" style="padding: 15px;margin-right: 10px;right: 0%;height: 7%">
       <div @click="back()">
-        <img src="../../assets/back.png" style="margin: 0px"/>
+        <img src="../../assets/back.png" style="margin: 0px" />
       </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">
-            <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_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" 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;">{{ 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">
+      <div class="row">
+        <div class="col-md-6" style="margin-right: 2%;height: 100%;overflow: scroll">
+          <div style="width: 95%;margin-left: 5%">
+            <table class="table table-striped table-bordered" v-for="config in deviceconfig2">
+              <thead v-show="!(config.checkname != '燃气表' && data.f_entry_status != '入户')">
+              <tr>
+                <th style="text-align: center">{{ config.checkname }}</th>
+              </tr>
+              </thead>
+              <tbody v-show="!(config.checkname != '燃气表' && data.f_entry_status != '入户')">
+              <tr v-for="dev in config.items">
+                <td v-if="dev.type != 'text'">
+                  <div class="row">
+                    <div class="col-md-8" style="text-align: center;">
+                      <label><button-link :style="{ color: defectNames.includes(dev.lname) ? 'red' : 'black' }"
+                                          type="button" class="btn btn-link" @click="showpicture(config.checkname, dev.lname)">{{
+                          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) }}</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>
+                      </label>
+                    </div>
+                  </div>
+                </td>
+                <td v-if="dev.type === 'text'">
+                  <label style="width: 100%;text-align: center">{{ dev.lname }}</label>
+                </td>
+              </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+        <div class style="width: 1%;height: 100%;background-color: #F1F8FF;float: left;"></div>
+        <div class="col-md-5" style="margin-left: 2%;height: 100%;overflow: scroll">
+          <div style="width: 100%;margin: auto">
+            <table class="table table-striped table-bordered" style="margin-bottom: 6px">
+              <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%">{{ data.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%">{{ data.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">{{ data.f_idnumber }}</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px">用户类型:</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ data.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">{{ data.f_user_phone }}</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px">区 / 县:</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ data.f_area }}</td>
+              </tr>
+              <tr>
+                <td style="text-align: center;border: #E9E9E9 solid 1px">街 道:</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ data.f_street }}</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px">楼 号:</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ data.f_building }}</td>
+              </tr>
+              <tr>
+                <td style="text-align: center;border: #E9E9E9 solid 1px">单 元:</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ data.f_unit }}</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px">楼 层:</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ data.f_floor }}</td>
+              </tr>
+              <tr>
+                <td style="text-align: center;border: #E9E9E9 solid 1px">门 牌 号 :</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ data.f_room }}</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px">用户性质:</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ data.f_userproperties }}</td>
+              </tr>
+              <tr>
+                <td style="text-align: center;border: #E9E9E9 solid 1px">进气口铅封号:</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ item.f_airintake_seal_no }}</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px">出气口铅封号:</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ item.f_airouttake_seal_no }}</td>
+              </tr>
+              <tr>
+                <td style="text-align: center;border: #E9E9E9 solid 1px">备注信息:</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ data.f_comments }}</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px">小区名称:</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ data.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">{{ data.f_address }}</td>
+              </tr>
+              </tbody>
+            </table>
+            <table class="table table-striped table-bordered" v-show="data.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%">{{ data.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%">{{ data.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%">{{ data.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%">{{ data.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;">{{ data.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;">{{ 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%">
+                  {{ data.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;
+                        {{ deviceCollect.name }}:{{ deviceCollect.value }}&nbsp;&nbsp;&nbsp;
+                      </span>
+                      <br>
+                      <span v-if="deviceCollect.value == '有隐患'">
+                        <lable>
+                          隐患:
+                        </lable>
+                        <span class="li-font" v-for="val in deviceCollect.devices">
+                          {{ val }}&nbsp;&nbsp;&nbsp;
+                        </span><br>
                       </span>
-                <br>
-             <span v-if="deviceCollect.value == '有隐患'">
-               <lable>
-                 隐患:
-               </lable>
-               <span class="li-font" v-for="val in deviceCollect.devices">
-                        {{val}}&nbsp;&nbsp;&nbsp;
-                      </span><br>
-             </span>
 
-           </span>
-              </td>
-            </tr>
+                    </span>
+                </td>
+              </tr>
 
-            </tbody>
-          </table>
-          <table class="table table-striped table-bordered" 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" v-show="data.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%">{{ data.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%">{{ data.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%">{{ data.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>-->
+                  <img-self-safe v-if="this.data.f_entry_status == '到访不遇'"
+                                 :src="data.f_noanswer_path" :alt="`查看${data.f_entry_status}}照片`" width="80"
+                                 height="30"></img-self-safe>
+                  <img-self-safe v-if="this.data.f_entry_status == '拒检'"
+                                 :src="data.f_rejectcheck_path" :alt="`查看${data.f_entry_status}}照片`" width="80"
+                                 height="30"></img-self-safe>
+                </td>
+              </tr>
+              <tr v-if="data.f_entry_status == '到访不遇'">
+                <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%">
+                  {{ data.f_novisit_reason }}
+                </td>
+              </tr>
 
-            </tbody>
-          </table>
-          <table class="table table-striped table-bordered" 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-safe  :src="img.f_overall_path" style="float: left" width="150" height="200"></img-self-safe>
+              </tbody>
+            </table>
+            <table class="table table-striped table-bordered" v-show="data.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: 610px;background: #FFFFFF">
+<!--                    <button @click="open_f">查看安检总体照片</button>-->
+                    <div class="img" v-for="(index, img) in overallImagePaths">
+                      <img-self-safe
+                        :src="img"
+                        :images="overallImagePaths"
+                        :current-index="index"
+                        width="150"
+                        height="200"
+                        style="margin-right: 10px;margin-bottom: 10px;"
+                      ></img-self-safe>
+                    </div>
+<!--                    <div class="img" v-for="img in data.f_overall_imgs" @click="open_f">
+                      <img-self-safe  :src="img.f_overall_path" style="float: left" width="150" height="200"></img-self-safe>
+&lt;!&ndash;                      <img :src="'/rs/image/file/' + img.f_overall_path"
+                           style=" height: 200px;margin-right: 10px;margin-bottom: 10px;">&ndash;&gt;
+                    </div>-->
                   </div>
-                </div>
-
-
-              </td>
-
-            </tr></tbody>
-          </table>
-          <table class="table table-striped table-bordered" 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-safe  :src="paperdata.f_sign_path"  width="486" height="300"></img-self-safe>
+                </td>
+              </tr>
+              </tbody>
+            </table>
+            <table class="table table-striped table-bordered" v-show="data.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-safe :src="data.f_sign_path" width="486"
+                                     height="300"></img-self-safe>
+                    </div>
                   </div>
-
-                </div>
-
-
-              </td>
-
-            </tr></tbody>
-          </table>
-        </div>
-      </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">
-            <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'">
-                <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>
+                </td>
+              </tr>
+              </tbody>
+            </table>
+            <table class="table table-striped table-bordered" v-show="data.f_notified_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">
+                    <div class="img" style="float: none">
+                      <img-self-safe v-if="data.f_notified_path" :src="data.f_notified_path" width="486"
+                                     height="300"></img-self-safe>
+                    </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>
-                    <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>
+                </td>
+              </tr>
+              </tbody>
+            </table>
+            <table class="table table-striped table-bordered" v-show="data.f_table_anomaly_path">
+              <thead>
+              <tr>
+                <th colspan="2" style="text-align: center">表具异常记录</th>
+              </tr>
+              </thead>
+              <tbody>
+              <tr>
+                <td style="margin: auto;text-align: center">
+                  备注:
+                </td>
+                <td style="margin: auto;text-align: center">
+                  {{ data.f_table_anomaly_remark }}
+                </td>
+              </tr>
+              <tr>
+                <td colspan="2" style="margin: auto;text-align: center">
+                  <div class="container" style="max-width: 500px;background: #FFFFFF">
+                    <div class="img" style="float: none">
+                      <img-self-safe v-if="data.f_table_anomaly_path" :src="data.f_table_anomaly_path" width="486" height="300"></img-self-safe>
+                    </div>
                   </div>
-                </div>
-              </td>
-              <td v-if="dev.type==='text'">
-                <label style="width: 100%;text-align: center">{{dev.lname}}</label>
-              </td>
-            </tr>
-            </tbody>
-          </table>
+                </td>
+              </tr>
+              </tbody>
+            </table>
+          </div>
         </div>
       </div>
-
-  </div>
-  </div>
+    </div>
   </div>
+  <image-viewer :src="paperImgs" :show="showpaperImg" :linenumber="linenumber" @clone_f="clone_p"
+                alt="安检总体图片"></image-viewer>
   <modal :show.sync="imgshow" v-ref:modal backdrop="true">
     <header slot="modal-header" class="modal-header">
-      {{picturename}}
+      {{ picturename }}
     </header>
     <article slot="modal-body" class="modal-body">
       <div class="from-group">
         <div class="row">
           <div class="col-md-6">
-        <img-self-safe v-if="showimg1" :src="showimg1"   width="300" height="400"></img-self-safe>
-          </div><div class="col-md-6">
-        <img-self-safe v-if="showimg2" :src="showimg2"   width="300" height="400"></img-self-safe>
-        </div>
+            <img-self-safe v-if="showimg1" :src="showimg1" width="300" height="400"></img-self-safe>
+          </div>
+          <div class="col-md-6">
+            <img-self-safe v-if="showimg2" :src="showimg2" width="300" height="400"></img-self-safe>
+          </div>
         </div>
       </div>
     </article>
@@ -283,16 +382,19 @@ overflow: -moz-scrollbars-none;
   </modal>
   <modal :show.sync="imgshow2" v-ref:modal backdrop="true">
     <header slot="modal-header" class="modal-header">
-      {{paperdata.f_entry_status}}照片
+      {{ data.f_entry_status }}照片
     </header>
     <article slot="modal-body" class="modal-body">
       <div class="from-group">
         <div class="row">
+          <!--<div class="col-md-6">
+            <img-self-safe v-if="this.data.f_entry_status=='到访不遇'" :src="showimg3"   width="300" height="400"></img-self-safe>
+          </div>
           <div class="col-md-6">
-            <img-self-safe v-if="this.paperdata.f_entry_status=='到访不遇'" :src="showimg3"   width="300" height="400"></img-self-safe>
-          </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>
-        </div>
+            <img-self-safe v-if="this.data.f_entry_status=='拒检'" :src="showimg4"   width="300" height="400"></img-self-safe>
+          </div>-->
+          <img v-if="this.data.f_entry_status == '到访不遇'" :src="'/rs/image/file/' + showimg3" width="300" height="400">
+          <img v-if="this.data.f_entry_status == '拒检'" :src="'/rs/image/file/' + showimg4" width="300" height="400">
         </div>
       </div>
     </article>
@@ -312,40 +414,15 @@ import RadioGroup from 'vue-client/src/vue-strap/src/radioGroup'
 import Radio from 'vue-client/src/vue-strap/src/radioBtn'
 import Vue from 'vue'
 import * as Util from '../Util'
-import {jsonSort} from '../../utils/LdapHelper'
-import {HttpResetClass} from "vue-client";
+import { jsonSort } from '../../utils/LdapHelper'
+import { HttpResetClass } from 'vue-client'
 let asyncReady = async function (self) {
   // 获取配置信息
   try {
-    let res= await new HttpResetClass().load('post','rs/sql/tel_singleTable_OrderBy',{data: {
-        items: 'f_dir',
-        tablename: 't_organization',
-        condition: `id  = '${self.item.f_filialeid}'`,
-        orderitem: 'id'
-      }})/*.then(res=>{*/
-    console.log("aaaaaaaaaaaaaaaa")
-    console.log(JSON.stringify(res.data[0].f_dir))
-    if (!res.data[0].f_dir){
-      self.$showMessage("该公司无组织目录，无法获取配置文件，请联系管理员确认")
-    }else{
-      //this.f_dir=res.data[0].f_dir
-      try {
-        let res1=await new HttpResetClass().load('GET',`/safecheck/rs/vue/DevicesConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {},{resolveMsg: '获取居民配置项成功！', rejectMsg: '获取居民配置项出错！'})/*.then(res=>{*/
-        console.log('111111111111居民===>', res1.data)
-        //this.safeConfig["民用配置项"]=Object.assign({},res.data)
-        Vue.config.safecheck.DevicesConfig=res1.data
-        /*})*/
-        let res2=await new HttpResetClass().load('GET',`/safecheck/rs/vue/DevicesSetConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {},{resolveMsg: '获取非居民配置项成功！', rejectMsg: '获取非居民配置项出错！'})/*.then(res=>{*/
-        console.log('22222222222222非居民===>', res2.data)
-        //this.safeConfig["非民用配置项"]=Object.assign({},res.data)
-        Vue.config.safecheck.DevicesSetConfig=res2.data
-        /*}).then(res=> {
-        })*/
-
-      }catch (e) {
-        self.$showMessage("获取配置文件失败"+e)
-      }
-    }
+    let res = await new HttpResetClass().load('get', '/api/af-safecheck/vue', null, { resolveMsg: null, rejectMsg: null })
+    self.delConfigKey(res.data)
+    Vue.config.safecheck = res.data
+    console.log('获取配置结果===', res.data)
   } catch (error) {
     // 忽略704,文件找不到异常R
     if (error.status !== 704) {
@@ -360,79 +437,114 @@ export default {
     return {
       data: {
         f_devices: [],
-        f_defect_content:''
+        f_defect_content: '',
+        f_overall_imgs: []
       },
-      paperdata:{},
-      picturename:'隐患照片',
-      defectDevice:{},
-      hasDevice:false,
-      deviceCollect:{},
-      deviceCollects:[],
-      isshow:false,
-      ajresult:'',
-      loading:true,
-      imgshow:false,
-      imgshow2:false,
-      isUpload:false,
-      livedispose:'',
-      showimg1:'',
-      showimg2:'',
-      showimg3:'',
-      showimg4:'',
-      startClick:false, //开始安检按钮是否可点击
+      // 图片URL
+      paperImgs: [],
+      // 缩略图显示的行数
+      linenumber: 1,
+      iswlw: false,
+      // 是否显示
+      showpaperImg: false,
+      picturename: '隐患照片',
+      defectDevice: {},
+      hasDevice: false,
+      deviceCollect: {},
+      deviceCollects: [],
+      isshow: false,
+      ajresult: '',
+      loading: true,
+      imgshow: false,
+      imgshow2: false,
+      isUpload: false,
+      livedispose: '',
+      defectNames: [],
+      showimg1: '',
+      showimg2: '',
+      showimg3: '',
+      showimg4: '',
+      startClick: false, //开始安检按钮是否可点击
       isStrat: false, //是否开始安检
-      checkResult:{},//查询结果
-      newcheckResult:{},
+      checkResult: {},//查询结果
+      newcheckResult: {},
       timer: null,
       showModal: false,
       pic_to_be_viewed: '',
-      showBack:true,
+      showBack: true,
       devices: [],
-      devicesAll:[],
-      configAJ:[],
-      configRQ:[],
-      deviceconfig:{},
-      deviceconfig2:[],
-      f_devices : [],
+      devicesAll: [],
+      configAJ: [],
+      configRQ: [],
+      deviceconfig: {},
+      deviceconfig2: [],
+      f_devices: [],
       config: {
-        "燃气表":{
-          "checkmust":true,
-          "index":1,
-          "items":{
+        "燃气表": {
+          "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": 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", "readonly": true, isshow: false },
+            "户累购气量": { "index": 6, "type": "number", "readonly": true },
+            "累购气量": { "index": 7, "type": "number", "readonly": true },
+            "已用气量": { "index": 8, "type": "number", "checkmust": true },//基表数
+            "剩余气量": { "index": 9, "type": "number", "checkmust": true },//累购-已用
             //显示屏数  --实际剩余气量
-            "气量异常差值":{"index":9,"type":"number","readonly": true}
+            "气量异常差值": { "index": 10, "type": "number", "readonly": true },
+            "差值备注": { "index": 12, "type": "string", "readonly": false }
           }
           // 注意，配置项的index必须与上面的固定配置保持'顺序'
         }
       },
       //金额
       config2: {
-        "燃气表":{
-          "checkmust":true,
-          "index":1,
-          "items":{
+        "燃气表": {
+          "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", "readonly": true },
+            "已用金额": { "index": 8, "type": "number", "checkmust": true },
+            //显示屏数  --实际剩余气量
+            "剩余金额": { "index": 9, "type": "number", "checkmust": true },
+            "金额异常差值": { "index": 10, "type": "number", "readonly": true },
+            "差值备注": { "index": 12, "type": "string", "readonly": false }
+          }
+        }
+      },
+      config3: {
+        "燃气表": {
+          "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": 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", "readonly": true, isshow: false },
+            "表读数": { "index": 6, "type": "number", "readonly": true },
+            "表剩余金额": { "index": 7, "type": "number", "readonly": true },
+            "字轮数": { "index": 8, "type": "number", "checkmust": true },//基表数
+            "表余额": { "index": 9, "type": "number", "checkmust": true },
             //显示屏数  --实际剩余气量
-            "剩余金额":{"index":8,"type":"number","checkmust": true},
-            "金额异常差值":{"index":9,"type":"number","readonly": true}
+            "表数异常差值": { "index": 10, "type": "number", "readonly": true },
+            "表金额异常差值": { "index": 11, "type": "number", "readonly": true },
+            "差值备注": { "index": 12, "type": "string", "readonly": false }
           }
         }
       },
@@ -443,16 +555,15 @@ export default {
     Radio,
   },
   computed: {
-
     selector: {
       get() {
         return 'paper-state'
       },
       set(val) {
-        if(this.isStrat){
+        if (this.isStrat) {
           debugger;
-          this.$goto(val, {userinfo:this.data}, 'paper-router')
-        }else{
+          this.$goto(val, { userinfo: this.data }, 'paper-router')
+        } else {
           this.$showMessage('未开始安检！')
         }
       }
@@ -461,131 +572,120 @@ export default {
       get() {
         return this.role == 'inspect'
       }
+    },
+    // 添加新的计算属性
+    overallImagePaths() {
+      return this.data.f_overall_imgs ? this.data.f_overall_imgs.map(img => img.f_overall_path) : []
     }
   },
   methods: {
-    devicesCollect(){
-      // console.log("111111111111111"+this.paper[device])
-      console.log("4444444")
-      console.log(JSON.stringify(this.config))
-      console.log(JSON.stringify(this.deviceconfig2))
-      console.log("4444444")
-
+    delConfigKey(obj) {
+      // 从琉璃中获取的配置中会包含 $开头的一些额外描述新的key。为了兼容v3的代码逻辑在此函数中去掉
+      Object.keys(obj).forEach(key => {
+        Object.keys(obj[key]).forEach(col => {
+          // 检查键是否以$开头
+          if (col.startsWith('$')) {
+            // 使用delete操作符删除键
+            delete obj[key][col];
+          }
+        })
+      })
+    },
+    open_f() {
+      // 打开组件
+      this.showpaperImg = true
+      console.log('打开图片查看器')
+    },
+    clone_p() {
+      // 关闭组件
+      this.showpaperImg = false
+      console.log('关闭图片查看器')
+    },
+    devicesCollect() {
       this.deviceCollects = []
       let checkResult = '正常'
       this.result = '正常'
-      let codata = JSON.parse(JSON.stringify(this.data))
-      console.log("111111111111"+JSON.stringify(codata))
-      for(let device in this.data){
-        let f_device_type
-        if(device.startsWith("device")){
-          for(let item in this.data[device]) {
-            if(this.data[device].length > 1 ){
-              let j = Number.parseInt(item)+1
-              f_device_type = `${this.data[device][item].f_device_type}${j}`
-            }else{
-              f_device_type = this.data[device][item].f_device_type
-            }
-            // console.log('codata[device][item]=>',codata[device][item])
+
+      // 遍历所有设备数据
+      for (const deviceKey in this.data) {
+        if (deviceKey.startsWith('device')) {
+          this.data[deviceKey].forEach(device => {
             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){
-                for (let i in items.f_item_value) {
-                  let f_item_value = items.f_item_value[i]
+            let hasDefect = false
 
-                  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]){
-                    continue
-                  }
-                  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) {
-                        checkResult = '有隐患'
-                        this.result = '有隐患'
-                        defects=`${defects}:${options[option].data}/`
-                        // let level = options[option].level
-                      }
-                    }
+            device.f_items.forEach(item => {
+              // 检查是否有隐患标记
+              if (item.f_is_defect && item.f_is_defect === 'true') {
+                hasDefect = true
+                const defectValue = Array.isArray(item.f_item_value) ?
+                  item.f_item_value.join(',') :
+                  item.f_item_value
+                deviceInfos.push(`${item.f_item_name}:${defectValue}`)
+              }
+
+              // 检查选择型隐患
+              if ((item.type === 'selector' || item.type === 'radio' || item.type === 'checkbox')
+                && Array.isArray(item.f_item_value)) {
+                item.f_item_value.forEach(value => {
+                  // 检查值是否包含隐患关键词
+                  if (value.includes('隐患') || value.includes('不合格')) {
+                    hasDefect = true
+                    deviceInfos.push(`${item.f_item_name}:${value}`)
                   }
-                  console.log('defects=====>'+JSON.stringify(defects))
-                }
-                if(defects != ''){
-                  deviceInfos.push(`${items.f_item_name}${defects.substring(0, defects.length - 1)}`)
-                }
-              }else if(items.type === 'stringp'){
-                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)
-                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 = '有隐患'
-                    this.result = '有隐患'
-                    deviceInfos.push(`${items.f_item_name}:${items.f_item_value[0]}`)
+                })
+              }
+
+              // 检查特殊隐患项
+              if (item.f_item_name === '金额异常差值' || item.f_item_name === '表金额异常差值') {
+                const deviation = this.$appdata.getSingleValue('金额异常差值允许误差')
+                const value = parseFloat(item.f_item_value[0])
+                if (!isNaN(value) && !isNaN(parseFloat(deviation))) {
+                  if (value > parseFloat(deviation) || value < parseFloat(deviation) * -1 || value < 0) {
+                    hasDefect = true
+                    deviceInfos.push(`${item.f_item_name}:${value}`)
                   }
                 }
-              }else if(items.f_item_name == '气量异常差值'){
-                var deviation = this.$appdata.getSingleValue('气量异常差值允许误差')
-                console.log(items.f_item_value[0]+'气量异常差值允许误差'+deviation)
-                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 = '有隐患'
-                    this.result = '有隐患'
-                    deviceInfos.push(`${items.f_item_name}:${items.f_item_value[0]}`)
+              }
+
+              if (item.f_item_name === '气量异常差值' || item.f_item_name === '表气量异常差值') {
+                const deviation = this.$appdata.getSingleValue('气量异常差值允许误差')
+                const value = parseFloat(item.f_item_value[0])
+                if (!isNaN(value) && !isNaN(parseFloat(deviation))) {
+                  if (value > parseFloat(deviation) || value < parseFloat(deviation) * -1) {
+                    hasDefect = true
+                    deviceInfos.push(`${item.f_item_name}:${value}`)
                   }
                 }
               }
-              console.log('deviceInfos========>'+JSON.stringify(deviceInfos))
-              console.log('items.f_is_defect')
-              console.log(items.f_is_defect)
-              if (items.type === 'selector') {
-                items.selected = []
-              } else if (items.type === 'inputSelector') {
-                items.selected = ''
-              }
-            }
+            })
 
-
-            console.log('deviceCollect',this.deviceCollect)
-            this.$set('deviceCollect.name',f_device_type)
-            this.$set('deviceCollect.value',checkResult)
-            this.$set('deviceCollect.devices',deviceInfos)
-            console.log("5555555555"+JSON.stringify(this.deviceCollect))
-            if (this.deviceCollect.name){
-              console.log("999999998888888"+this.deviceCollect.name)
-              this.deviceCollects.push(JSON.parse(JSON.stringify(this.deviceCollect)))
+            // 如果有隐患，添加到 deviceCollects
+            if (hasDefect) {
+              checkResult = '有隐患'
+              this.result = '有隐患'
+              this.deviceCollects.push({
+                name: device.f_device_type,
+                value: '有隐患',
+                devices: deviceInfos
+              })
             }
-
-            checkResult = '正常'
-            this.deviceCollect = {}
-          }
+          })
         }
       }
-      if(this.deviceCollects.length>0){
-        this.hasDevice = true
-      }
-      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.paperdata=this.data
-      this.loading=false
+
+      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.loading = false
     },
-    imgclose(){
-      this.imgshow=false
+    imgclose() {
+      this.imgshow2 = false
     },
     putDevices() {
       //console.log('Vue.config.safecheck', Vue.config.safecheck.safetype)
       this.$set('data.approve', "true")
       this.$set('data.writeback', "false")
-      if (Vue.config.safecheck.ApproveConfig != undefined) {
+      if (Vue.config.safecheck && Vue.config.safecheck.ApproveConfig != undefined) {
         if (Vue.config.safecheck.ApproveConfig.approve != undefined) {
           this.$set('data.approve', Vue.config.safecheck.ApproveConfig.approve)
         }
@@ -596,20 +696,35 @@ export default {
           this.livedispose = Vue.config.safecheck.ApproveConfig.livedispose
         }
       }
-      console.log('当前安检类型----'+this.item.f_safecheck_type)
+      console.log('当前安检类型----' + this.item.f_safecheck_type)
 
       console.log(JSON.stringify(this.data))
-      if(!this.item.f_safecheck_type){
+      if (!this.item.f_safecheck_type) {
         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 (this.item.f_offsite_time < '2021-07-20 20:54:02') {
+          if (this.item.f_safecheck_type = '民用') {
+            this.config = this.extend(this.config, Vue.config.safecheck.SafeDevicesVersion.v1.DevicesConfig)
+          } else {
+            this.config = this.extend(this.config, Vue.config.safecheck.DevicesSetConfig)
+          }
+        } else if (this.item.f_offsite_time < '2025-02-26 22:00:00') {
+          if (this.item.f_safecheck_type = '民用') {
+            this.config = this.extend(this.config, Vue.config.safecheck.SafeDevicesVersion.v2.DevicesConfig)
+          } else {
+            this.config = this.extend(this.config, Vue.config.safecheck.DevicesSetConfig)
+          }
+        } 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]])
+
+        }
       }
       //遍历安检项配置
       for (let i in this.config) {
         //取得安检项索引值
         let n = this.config[i].index
-        this.devices[n - 1] = {device: i, n: n, checkmust: this.config[i].checkmust}
+        this.devices[n - 1] = { device: i, n: n, checkmust: this.config[i].checkmust }
         this.$set('data.' + 'device' + n, [])
         let items = []
         for (let it in this.config[i].items) {
@@ -632,55 +747,31 @@ export default {
       }
 
     },
-    showpath(val1,val2){
+    showpath(val1, val2) {
       console.log("555555555555555555")
       console.log(val1)
-      if (val1){
-        this.showimg1=val1
-        this.picturename=val2
-        this.imgshow=true
-      }
-    },
-    showpicture(val1,val2){
-      console.log("77777777777777")
-      if (val2=='气量异常差值'||val2=='金额异常差值'){
-        return
-      }
-      for (let i = 0; i <this.devicesAll.length; i++) {
-        for (let j = 0; j < this.devicesAll[i].length; j++) {
-          if (this.devicesAll[i][j].f_device_type==val1){
-            for (let k = 0; k < this.devicesAll[i][j].f_items.length; k++) {
-              if (this.devicesAll[i][j].f_items[k].f_item_name==val2){
-                if (!this.devicesAll[i][j].f_items[k].f_is_defect){
-                  return false
-                }else{
-                  this.showimg1=this.devicesAll[i][j].f_items[k].f_path
-                  this.showimg2=this.devicesAll[i][j].f_items[k].f_second_path
-                  this.picturename='隐患照片'
-                  this.imgshow=true
-                  return true
-                }
-              }
-            }
-
-          }
-        }
+      if (val1) {
+        this.showimg1 = val1
+        this.picturename = val2
+        this.imgshow = true
       }
     },
-    isred(val1,val2){
-      console.log("77777777777777")
-      if (val2=='气量异常差值'||val2=='金额异常差值'){
+    showpicture(val1, val2) {
+      if (val2 == '气量异常差值' || val2 == '金额异常差值') {
         return
       }
-      for (let i = 0; i <this.devicesAll.length; i++) {
+      for (let i = 0; i < this.devicesAll.length; i++) {
         for (let j = 0; j < this.devicesAll[i].length; j++) {
-          if (this.devicesAll[i][j].f_device_type==val1){
+          if (this.devicesAll[i][j].f_device_type == val1) {
             for (let k = 0; k < this.devicesAll[i][j].f_items.length; k++) {
-              if (this.devicesAll[i][j].f_items[k].f_item_name==val2){
-                if (!this.devicesAll[i][j].f_items[k].f_is_defect){
-                  return false
-                }else{
-                  return true
+              if (this.devicesAll[i][j].f_items[k].f_item_name == val2) {
+                if (!this.devicesAll[i][j].f_items[k].f_is_defect) {
+                  return
+                } else {
+                  this.showimg1 = this.devicesAll[i][j].f_items[k].f_path
+                  this.showimg2 = this.devicesAll[i][j].f_items[k].f_second_path
+                  this.picturename = '隐患照片'
+                  this.imgshow = true
                 }
               }
             }
@@ -689,33 +780,38 @@ export default {
         }
       }
     },
-    showpicture2(){
-      this.imgshow2=true
+    showpicture2() {
+      this.imgshow2 = true
     },
-    getDeviceValue(val1,val2){
-      for (let i = 0; i <this.devicesAll.length; i++) {
-        for (let j = 0; j < this.devicesAll[i].length; j++) {
-          if (this.devicesAll[i][j].f_device_type==val1){
-            for (let k = 0; k < this.devicesAll[i][j].f_items.length; k++) {
-              if (this.devicesAll[i][j].f_items[k].f_item_name==val2){
-                if(this.devicesAll[i][j].f_items[k].f_item_lists[0]){
-                return this.devicesAll[i][j].f_items[k].f_item_lists[0].f_item_value
-                }
+    getDeviceValue(deviceType, itemName) {
+      console.log('deviceType==', deviceType)
+      console.log('itemName==', itemName)
+      console.log('this==', this)
+      // 先从当前配置中查找
+      for (const deviceKey in this.data) {
+        if (deviceKey.startsWith('device')) {
+          for (const device of this.data[deviceKey]) {
+            if (device.f_device_type === deviceType) {
+              const item = device.f_items.find(item => item.f_item_name === itemName)
+              if (item) {
+                // 如果是数组，用逗号连接
+                return Array.isArray(item.f_item_value) ?
+                  item.f_item_value.join(',') :
+                  item.f_item_value
               }
             }
-
           }
         }
       }
-
+      return ''
     },
-    getDevicePath(val1,val2){
-      for (let i = 0; i <this.devicesAll.length; i++) {
+    getDevicePath(val1, val2) {
+      for (let i = 0; i < this.devicesAll.length; i++) {
         for (let j = 0; j < this.devicesAll[i].length; j++) {
-          if (this.devicesAll[i][j].f_device_type==val1){
+          if (this.devicesAll[i][j].f_device_type == val1) {
             for (let k = 0; k < this.devicesAll[i][j].f_items.length; k++) {
-              if (this.devicesAll[i][j].f_items[k].f_item_name==val2){
-                  return this.devicesAll[i][j].f_items[k].f_path
+              if (this.devicesAll[i][j].f_items[k].f_item_name == val2) {
+                return this.devicesAll[i][j].f_items[k].f_path
               }
             }
 
@@ -724,11 +820,11 @@ export default {
       }
 
     },
-    getDeviceAll(){
-      let keyall=  Object.keys(this.data)
+    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'){
+        if (keyall[i].startsWith('device') && keyall[i] != 'deviceundefined') {
           this.devicesAll.push(this.data[keyall[i]])
           console.log(keyall[i])
         }
@@ -739,30 +835,30 @@ export default {
 
     },
 
-    back(){
+    back() {
       if (this.role == 'inspect') {
-        if(!this.isStrat){
+        if (!this.isStrat) {
           this.$back()
           return
-        }else{
-          this.savePaper(true).then(()=>{
+        } else {
+          this.savePaper(true).then(() => {
             this.$back()
             this.isStrat = false
           })
         }
-      }else{
+      } else {
         this.$back()
       }
     },
-    checkIsStart(){
+    checkIsStart() {
       alert('asdad')
       return
     },
 
     viewPic(fileName) {
       console.log('view pic: ' + fileName)
-      if(this.role == 'view') {
-        if(!fileName.endsWith('nopic.png')) {
+      if (this.role == 'view') {
+        if (!fileName.endsWith('nopic.png')) {
           this.pic_to_be_viewed = fileName
           this.showModal = true
         }
@@ -788,7 +884,7 @@ export default {
     },
     genuineSave(saveOnly) {
       HostApp.__this__.save(saveOnly)
-      if(!saveOnly)
+      if (!saveOnly)
         HostApp.__this__.disableTimer()
       HostApp.__callback__ = null
       HostApp.__this__ = null
@@ -796,21 +892,21 @@ export default {
     setUrgency() {
       this.data.f_defect_urgency = 'Z'
       let that = this
-      this.data.f_defects.forEach(function(defect) {
-        if(that.data.f_defect_urgency > defect.f_defect_level.charAt(0))
+      this.data.f_defects.forEach(function (defect) {
+        if (that.data.f_defect_urgency > defect.f_defect_level.charAt(0))
           that.data.f_defect_urgency = defect.f_defect_level.charAt(0)
       })
-      if(this.data.f_defect_urgency == 'Z')
+      if (this.data.f_defect_urgency == 'Z')
         this.data.f_defect_urgency = null
     },
     disableTimer() {
-      if(this.timer) {
+      if (this.timer) {
         window.clearTimeout(this.timer)
         this.timer = null
       }
     },
     loaded(paper) {
-      if(!paper.hasOwnProperty('id')) {
+      if (!paper.hasOwnProperty('id')) {
         this.$showMessage("该安检单在手机上已经不存在，可能是卸载过程序。可以进入重新安检，或返回安检计划。")
         this.init()
       } else {
@@ -819,7 +915,7 @@ export default {
         HostApp.__this__.$goto('paper-state', {}, 'paper-router')
         // 如果打回重检则重新计时
         console.log('HostApp.__this__.role' + HostApp.__this__.role + ' HostApp.__this__.f_approved:' + HostApp.__this__.data.f_approved)
-        if(HostApp.__this__.role == 'inspect'
+        if (HostApp.__this__.role == 'inspect'
           && HostApp.__this__.data.f_approved
           && HostApp.__this__.data.f_approved == '打回') {
           console.log('打回')
@@ -831,10 +927,10 @@ export default {
       HostApp.__this__ = null
     },
     S4() {
-      return (((1+Math.random())*0x10000)|0).toString(16).substring(1);
+      return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
     },
-    init () {
-      this.data.f_noplan_item_id =  this.S4()+""+this.S4()+""+this.S4()+""+this.S4()+""+this.S4()+""+this.S4()+""+this.S4()+""+this.S4()
+    init() {
+      this.data.f_noplan_item_id = this.S4() + "" + this.S4() + "" + this.S4() + "" + this.S4() + "" + this.S4() + "" + this.S4() + "" + this.S4()
       this.data.ename = Vue.user.ename
       this.data.f_outlets = Vue.user.f_parentname
       this.data.f_meetunit = Vue.user.orgpathnames
@@ -857,7 +953,7 @@ export default {
       // 安检状态
       this.$set('data.f_entry_status', '入户')
       this.$set('data.f_usegas', '已使用')
-      this.$set('data.f_state',this.item.f_state)
+      this.$set('data.f_state', this.item.f_state)
       // 用户信息
       this.$set('data.f_user_name', this.item.f_user_name)
       this.$set('data.f_user_phone', this.item.f_user_phone)
@@ -866,11 +962,11 @@ export default {
       this.$set('data.f_card_id', this.item.f_card_id)
       this.$set('data.f_area', this.item.f_area)
       this.$set('data.f_street', this.item.f_street)
-      this.$set('data.f_room',this.item.f_room)
+      this.$set('data.f_room', this.item.f_room)
       this.$set('data.f_building', this.item.f_building)
-      this.$set('data.f_unit',this.item.f_unit)
+      this.$set('data.f_unit', this.item.f_unit)
       this.$set('data.f_floor', this.item.f_floor)
-      this.$set('data.f_residential_area' , this.item.f_residential_area)
+      this.$set('data.f_residential_area', this.item.f_residential_area)
       this.$set('data.f_idnumber', this.item.f_idnumber)
       this.$set('data.f_comments', this.item.f_comments)
       this.$set('data.f_userproperties', this.item.f_userproperties)
@@ -886,11 +982,11 @@ export default {
       // this.$set('data.f_room_style', '多层')
       //供暖方式
       //  this.$set('data.f_heating_style', '热力公司集中供暖')
-      if(this.item.f_plan_meters) {
+      if (this.item.f_plan_meters) {
         for (let de in this.devices) {
           this.$set('data.device' + this.devices[de].n, [])
           for (let i = 0; i < this.item.f_plan_meters.length; i++) {
-            if(this.item.f_plan_meters[i].f_meter_type) {
+            if (this.item.f_plan_meters[i].f_meter_type) {
               if (this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_meter_type.indexOf('机表') > 0) {
                 delete this.config['燃气表']['items']['累计购气量']
                 this.data['device' + this.devices[de].n].push({
@@ -1040,7 +1136,7 @@ export default {
       return obj;
     },
     //获取当前时间
-    getNowFormatDate(){
+    getNowFormatDate() {
       var date = new Date();
       var seperator1 = "-";
       var seperator2 = ":";
@@ -1059,38 +1155,69 @@ export default {
     }
   },
   ready() {
+    asyncReady(this).then(() => {
       this.putDevices()
-    if (this.item.f_state != '未检' || this.item.f_no_checkplan == '无计划安检') {
-      if (this.role != 'inspect') {
-        let that = this
-        let id
-        if (this.role == 'view') {
-          id = this.item.id
-        } else if (this.role == 'androidview') {
-          id = this.item.f_paper_id
-        }
-        this.$resetpost(`rs/path/getUserinfomation`, {data: {condition: `id = '${id}'`}}).then((respanse) => {
-            console.log('result....', respanse)
+      console.log('CONFIG==', JSON.stringify(this.config))
+      if (this.item.f_state != '未检' || this.item.f_no_checkplan == '无计划安检') {
+        if (this.role != 'inspect') {
+          let that = this
+          let id = this.role == 'view' ? this.item.id : this.item.f_paper_id
+
+          new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/path_getCheckPaper`, { id: id }).then((respanse) => {
             if (respanse.data.length != 0) {
-              // 包含 其它 特殊处理的数组
-              // 对应位置
+              // 先合并历史配置到当前配置
+              if (respanse.data[0].f_devices) {
+                respanse.data[0].f_devices.forEach((savedDevice) => {
+                  const deviceType = savedDevice.f_device_type
 
-              console.log('devices => ', respanse.data[0])
+                  // 如果设备类型不存在于当前配置，则添加
+                  if (!this.config[deviceType]) {
+                    this.config[deviceType] = {
+                      checkmust: true,
+                      index: Object.keys(this.config).length + 1,
+                      items: {}
+                    }
+                  }
+
+                  // 合并检查项
+                  savedDevice.f_items.forEach((savedItem) => {
+                    const itemName = savedItem.f_item_name
+                    if (!this.config[deviceType].items[itemName]) {
+                      this.config[deviceType].items[itemName] = {
+                        index: Object.keys(this.config[deviceType].items).length + 1,
+                        type: savedItem.type || 'string',
+                        readonly: true
+                      }
+                    }
+                  })
+                })
+              }
 
+              // 处理数据
               that.data = Object.assign(that.data, respanse.data[0])
+              console.log('respanse.data[0].f_devices', respanse.data[0].f_devices)
               if (respanse.data[0].f_devices) {
                 for (let da in that.devices) {
                   that.$set('data.device' + that.devices[da].n, [])
                 }
+                console.log('that.devices==', that.devices)
                 respanse.data[0].f_devices.forEach((item) => {
                   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)
+                        console.log("9527")
+                        console.log('f_item====>', JSON.stringify(f_item))
+                        if (f_item.f_is_defect == 'true') {
+                          this.defectNames.push(f_item.f_item_name)
+                        }
+                        if (f_item.f_item_name == '字轮数') {
+                          console.log("9529")
+                          this.iswlw = true
+                        }
+                        /*console.log('f_item.f_path====>', f_item.f_path)*/
                         let itemValues = []
                         f_item.f_item_lists.forEach((tempItem) => {
-                          console.log('emm => ', f_item.f_item_name, '   ', tempItem.f_item_value)
+                          // console.log('emm => ', f_item.f_item_name, '   ', tempItem.f_item_value)
                           if (tempItem.f_item_value !== 'null') {
                             itemValues.push(tempItem.f_item_value)
                           }
@@ -1105,60 +1232,80 @@ export default {
                   }
                 })
               }
-              Util.replaceFalse(that.data)
-              Util.booleanFilter(that.data)
-              if (this.role == 'view') {
-                Util.ratifyPics(that.data)
-                Util.ratifyPics(that.picture)
-              } else {
-                Util.androidRatifyPics(that.data, this.$androidUtil.getProxyUrl())
+
+              // 根据时间和类型选择配置
+              this.deviceconfig = JSON.parse(JSON.stringify(this.config))
+              // 处理特殊配置
+              if (this.iswlw) {
+                this.deviceconfig["燃气表"] = this.config3["燃气表"]
+              } else if (this.data.f_collection_type == '按金额') {
+                /*if (this.data.f_collection_type == '按气量') {
+                  this.deviceconfig["燃气表"] = this.config["燃气表"]
+                } else */
+                this.deviceconfig["燃气表"] = this.config2["燃气表"]
               }
-              console.log("that.data:", that.data)
-            }
-            // 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))
-            if (this.data.f_check_type=='民用'){
-              this.deviceconfig=Vue.config.safecheck.DevicesConfig
-              console.log("deviceconfig1==>"+JSON.stringify(this.deviceconfig))
-            }else if (this.data.f_check_type=='非民用'){
-              this.deviceconfig=Vue.config.safecheck.DevicesSetConfig
-              console.log("deviceconfig2==>"+JSON.stringify(this.deviceconfig))
-            }
-            if (this.data.f_collection_type=='按气量'){
-              let aaa=Object.assign({},this.config["燃气表"].items,this.deviceconfig["燃气表"].items)
-              this.deviceconfig["燃气表"].items=aaa
-              console.log("deviceconfig3==>"+JSON.stringify(this.deviceconfig))
-            }else{
-              let aaa=Object.assign({},this.config2["燃气表"].items,this.deviceconfig["燃气表"].items)
-              this.deviceconfig["燃气表"].items=aaa
-              //this.deviceconfig["燃气表"]=this.config2["燃气表"]
-              console.log("deviceconfig4==>"+JSON.stringify(this.deviceconfig))
-            }
-            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()
 
+              // 更新排序后的配置
+              this.deviceconfig2 = ObjConfig.getObjConfig(JSON.parse(JSON.stringify(this.deviceconfig)))
+              this.deviceconfig2.forEach(config => {
+                config.items = jsonSort(config.items, "index")
+              })
+              this.deviceconfig2 = jsonSort(this.deviceconfig2, "index")
 
-          })
-          }
-        ).catch(
-          (respanse) => {
+              this.getDeviceAll()
+            }
+          }).catch((respanse) => {
             console.log('respanse', respanse)
-            alert('查找安检单失败')
+            alert('查找安检单失败!')
           })
+        }
       }
-    }
-
+    })
   },
-  watch:{
-    //   'isUpload'(val){
-    //     console.log('isUpload发生变化===>'+val)
-    //   }
+  watch: {
+    'data.f_overall_imgs'(val) {
+      console.log('安检总体照片55555555发生变化===>', val)
+      this.paperImgs = []
+      if (val) {
+        for (var i in val) {
+          console.log(i)
+          console.log(val[i])
+          console.log(val[i].f_overall_path)
+          if (val[i].f_overall_path)
+            this.paperImgs.push({ url: '/rs/image/file/' + val[i].f_overall_path })
+        }
+      }
+      console.log('照片URL+++++》》》', this.paperImgs)
+      if (this.paperImgs.length > 0) {
+        this.linenumber = Math.ceil(this.paperImgs.length / 3)
+        console.log('行数--linenumber', this.linenumber)
+      }
+    }
+    /*,
+    'data.f_noanswer_path'(val){
+      console.log('不遇照片55555555发生变化===>',val)
+      this.paperImgs = []
+      if(val) {
+            this.paperImgs.push({url: val})
+      }
+      console.log('照片URL+++++》》》',this.paperImgs)
+      if(this.paperImgs.length>0) {
+        this.linenumber = Math.ceil(this.paperImgs.length / 3)
+        console.log('行数--linenumber',this.linenumber)
+      }
+    },
+    'data.f_rejectcheck_path'(val){
+      console.log('拒检照片55555555发生变化===>',val)
+      this.paperImgs = []
+      if(val) {
+        this.paperImgs.push({url: val})
+      }
+      console.log('照片URL+++++》》》',this.paperImgs)
+      if(this.paperImgs.length>0) {
+        this.linenumber = Math.ceil(this.paperImgs.length / 3)
+        console.log('行数--linenumber',this.linenumber)
+      }
+    }*/
   },
   destroyed() {
     console.log('退出当前页Set')
@@ -1167,15 +1314,3 @@ export default {
 }
 
 </script>
-<style scoped>
-.table-striped thead tr th {
-  background-color: rgb(223,237,251);
-  padding: 10px;
-  border-left: solid 0px #dae4f2;
-  border-top: solid 1px #dae4f2;
-  border-right: none;
-  border-bottom: none;
-  text-align: center;
-  color: black;
-}
-</style>