safecheck-client 3.0.34-92 → 3.0.34-93

package/src/components/android/examples/UserExamples.vue

@@ -1,137 +1,137 @@
-<template>
-  <div class="work-badge" style="height: 100%">
-    <div class="badge-top" style="height: 15%">
-      <div class="badge-number">NO.{{ f_head_code }}</div>
-    </div>
-    <div class="badge-middle" style="height: 75%">
-      <img class="badge-image" :src="f_head_pic" alt="Badge Image">
-      <h1 class="name">{{ f_head_name }}</h1>
-      <div class="white-line"></div>
-      <span class="position">{{ f_head_post }}</span>
-    </div>
-    <div class="badge-bottom" style="height: 10%">
-      <div class="contact">
-        <img class="phone-icon" src="../../../assets/123.png" style="height: 30px;width: 30px" alt="Phone Icon">
-        <span style="font-size: 30px;font-style: italic;">{{ f_head_phone }}</span>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import {HttpResetClass} from "vue-client";
-
-export default {
-  name: 'WorkBadge',
-  title:'WorkBadge',
-  data () {
-    return {
-      // 默认值或初始状态
-      f_head_pic: '',
-      f_head_code: '',
-      f_head_name: '',
-      f_head_post: '',
-      f_head_phone: ''
-    };
-  },
-  async ready () {
-    console.log(window.location.href)
-    let id = ''
-    let url = window.location.href
-    if (url.includes('id')){
-      const urlObj = new URL(url);
-      id = urlObj.searchParams.get('id');
-      let QRCode = await new HttpResetClass().load('post',`rs/sql/tel_singleTable_OrderBy`,{data: {
-          items: 'tqr.*,tf.f_downloadpath as url',
-          tablename: 't_qr_code tqr left join t_files tf on tf.f_businessid = tqr.id and f_table_name = \'t_qr_code\'',
-          condition: `f_head_code = '${id}'`,
-          orderitem: '1'
-        }},{resolveMsg: null,rejectMsg: null})
-      if (QRCode && QRCode.data && QRCode.data.length > 0){
-        if (QRCode.data[0].url){
-          this.f_head_pic = QRCode.data[0].url
-        }else {
-          this.f_head_pic = `/rs/image/file/${QRCode.data[0].f_head_pic}`
-        }
-        this.f_head_code = QRCode.data[0].f_head_code
-        this.f_head_name = QRCode.data[0].f_head_name
-        this.f_head_post = QRCode.data[0].f_head_post
-        this.f_head_phone = QRCode.data[0].f_head_phone
-      }else {
-        console.log('获取二维码信息失败')
-        console.log(QRCode)
-      }
-    }
-  }
-};
-</script>
-<style scoped>
-.white-line {
-  width: 65%;
-  height: 5px;
-  background-color: white;
-  margin: 10px 0 10px 17%;
-}
-.work-badge {
-  display: flex;
-  flex-direction: column;
-  background-image: url('../../../assets/f8632d3c8c4c1cb68e99da754cab1a7.png');
-  align-items: center;
-  background-color: #007BFF;
-  color: white;
-  padding: 20px;
-}
-
-.badge-top {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  width: 100%;
-  margin-bottom: 20px;
-}
-
-.badge-image {
-  border: 3px solid #fcfcfc;
-  width: 300px;
-  border-radius: 15px;
-}
-
-.badge-number {
-  font-size: 24px;
-  float: left;
-  text-align: left;
-  font-weight: bold;
-}
-
-.badge-middle {
-  text-align: center;
-  margin-bottom: 20px;
-}
-
-.name {
-  font-size: 65px;
-  font-weight: bold;
-  margin-bottom: 10px;
-  margin-top: 50px;
-}
-
-.position {
-  font-size: 24px;
-}
-
-.badge-bottom {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.contact {
-  display: flex;
-  align-items: center;
-}
-
-.phone-icon {
-  width: 30px;
-  height: 30px;
-  margin-right: 10px;
-}
-</style>
+<template>
+  <div class="work-badge" style="height: 100%">
+    <div class="badge-top" style="height: 15%">
+      <div class="badge-number">NO.{{ f_head_code }}</div>
+    </div>
+    <div class="badge-middle" style="height: 75%">
+      <img class="badge-image" :src="f_head_pic" alt="Badge Image">
+      <h1 class="name">{{ f_head_name }}</h1>
+      <div class="white-line"></div>
+      <span class="position">{{ f_head_post }}</span>
+    </div>
+    <div class="badge-bottom" style="height: 10%">
+      <div class="contact">
+        <img class="phone-icon" src="../../../assets/123.png" style="height: 30px;width: 30px" alt="Phone Icon">
+        <span style="font-size: 30px;font-style: italic;">{{ f_head_phone }}</span>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import {HttpResetClass} from "vue-client";
+
+export default {
+  name: 'WorkBadge',
+  title:'WorkBadge',
+  data () {
+    return {
+      // 默认值或初始状态
+      f_head_pic: '',
+      f_head_code: '',
+      f_head_name: '',
+      f_head_post: '',
+      f_head_phone: ''
+    };
+  },
+  async ready () {
+    console.log(window.location.href)
+    let id = ''
+    let url = window.location.href
+    if (url.includes('id')){
+      const urlObj = new URL(url);
+      id = urlObj.searchParams.get('id');
+      let QRCode = await new HttpResetClass().load('post',`rs/sql/tel_singleTable_OrderBy`,{data: {
+          items: 'tqr.*,tf.f_downloadpath as url',
+          tablename: 't_qr_code tqr left join t_files tf on tf.f_businessid = tqr.id and f_table_name = \'t_qr_code\'',
+          condition: `f_head_code = '${id}'`,
+          orderitem: '1'
+        }},{resolveMsg: null,rejectMsg: null})
+      if (QRCode && QRCode.data && QRCode.data.length > 0){
+        if (QRCode.data[0].url){
+          this.f_head_pic = QRCode.data[0].url
+        }else {
+          this.f_head_pic = `/rs/image/file/${QRCode.data[0].f_head_pic}`
+        }
+        this.f_head_code = QRCode.data[0].f_head_code
+        this.f_head_name = QRCode.data[0].f_head_name
+        this.f_head_post = QRCode.data[0].f_head_post
+        this.f_head_phone = QRCode.data[0].f_head_phone
+      }else {
+        console.log('获取二维码信息失败')
+        console.log(QRCode)
+      }
+    }
+  }
+};
+</script>
+<style scoped>
+.white-line {
+  width: 65%;
+  height: 5px;
+  background-color: white;
+  margin: 10px 0 10px 17%;
+}
+.work-badge {
+  display: flex;
+  flex-direction: column;
+  background-image: url('../../../assets/f8632d3c8c4c1cb68e99da754cab1a7.png');
+  align-items: center;
+  background-color: #007BFF;
+  color: white;
+  padding: 20px;
+}
+
+.badge-top {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  margin-bottom: 20px;
+}
+
+.badge-image {
+  border: 3px solid #fcfcfc;
+  width: 300px;
+  border-radius: 15px;
+}
+
+.badge-number {
+  font-size: 24px;
+  float: left;
+  text-align: left;
+  font-weight: bold;
+}
+
+.badge-middle {
+  text-align: center;
+  margin-bottom: 20px;
+}
+
+.name {
+  font-size: 65px;
+  font-weight: bold;
+  margin-bottom: 10px;
+  margin-top: 50px;
+}
+
+.position {
+  font-size: 24px;
+}
+
+.badge-bottom {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.contact {
+  display: flex;
+  align-items: center;
+}
+
+.phone-icon {
+  width: 30px;
+  height: 30px;
+  margin-right: 10px;
+}
+</style>

package/src/filiale/bayan/android/PaperFeedback.vue

@@ -186,6 +186,10 @@
         </div>
 
       </div>
+      <div class="form-group col-sm-12 col-xs-12 col-md-12 ">
+        <label class="text-left font">隐患整改通知单单号</label>
+        <input v-model="paper.f_repairorder_id" :value="paper.f_repairorder_id"   type="text">
+      </div>
       <div class="form-group col-sm-12 col-xs-12 col-md-12 ">
         <label class="text-left font">副操</label>
         <v-select

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

@@ -97,19 +97,19 @@ div {
               <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>
+                <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">楼 号:</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">{{ 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>
+                <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">单 元:</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">{{ paperdata.f_unit }}</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">楼 层:</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">{{ 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" v-if="paperdata.f_check_type=='民用'">门 牌 号 :</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">{{ 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>
@@ -163,24 +163,26 @@ div {
                 </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;">隐患通知单单号:</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">
+                  {{ paperdata.f_repairorder_id }}
+                </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>
+                      <br>
+                      <span v-if="deviceCollect.value == '有隐患'">
+                        <lable>隐患:</lable>
+                        <span v-for="val in deviceCollect.devices">{{ val }}</span>
+                        <br>
+                      </span>
+                  </span>
                 </td>
               </tr>
 
@@ -485,18 +487,18 @@ div {
                 <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>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">楼 号:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">{{ 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>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">单 元:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">{{ paperdata.f_unit }}</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">楼 层:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">{{ 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" v-if="paperdata.f_check_type=='民用'">门 牌 号 :</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">{{ 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>
@@ -557,27 +559,28 @@ div {
                   </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;">隐患通知单单号:</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">
+                    {{ paperdata.f_repairorder_id }}
+                  </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>
+                      <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"
@@ -1338,7 +1341,8 @@ export default {
       if (this.deviceCollects.length > 0) {
         this.hasDevice = true
       }
-      this.ajresult = JSON.parse(this.data.f_defect_content).result
+      this.data.f_userproperties = this.item.f_gasproperties
+      this.ajresult = JSON.parse(this.item.f_defect_content).result
       this.showimg3 = this.data.f_noanswer_path
       this.showimg5 = this.data.f_noanswer1_path
       this.showimg6 = this.data.f_noanswer2_path
@@ -1860,7 +1864,7 @@ export default {
     setTimeout(() => {
       this.loading = false;
     }, 10000)
-    // this.putDevices()
+    this.putDevices()
     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 == '复检') {