safecheck-client 3.0.30-72 → 3.0.30-74

package/src/components/rongcheng/report/CheckPlanAreaList.vue

@@ -122,6 +122,15 @@
             <th>
               <nobr>到访不遇</nobr>
             </th>
+            <th>
+              <nobr>激光检漏</nobr>
+            </th>
+            <th>
+              <nobr>立杠保压</nobr>
+            </th>
+            <th>
+              <nobr>室外关阀</nobr>
+            </th>
             <th>
               <nobr>拒检</nobr>
             </th>
@@ -143,10 +152,13 @@
             <td style="text-align:center" :class="{'defectfront':row.f_plan_total==row.f_user_number,'td-0':row.f_checker_name==undefined,'td-1':model.rows.length!=($index+1)&&row.f_checker_name.indexOf('*&')==-1,'td-2':model.rows.length!=($index+1)&&row.f_checker_name.indexOf('*&')!=-1,'td-3':model.rows.length==($index+1)&&row.f_checker_name.indexOf('*&')!=-1,'td-4':model.rows.length==($index+1)&&row.f_checker_name.indexOf('*&')==-1}" v-if="$parent.$parent.$parent.nameForSql.includes('f_checker_name')">{{row.f_checker_name.indexOf('*&')!=-1?'':row.f_checker_name}}</td>
             <td style="text-align:center" :class="{'defectfront':row.f_plan_total==row.f_user_number}" v-if="$parent.$parent.$parent.nameForSql.includes('f_user_number')">{{row.f_user_number}}</td>
             <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center">{{row.f_plan_total}}</td>
-            <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center">{{row.f_weijian+row.f_buyu+row.f_jujian}}</td>
+            <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center">{{row.f_weijian+row.f_buyu+row.f_jujian+row.f_jiguangjianlou+row.f_liganbaoya+row.f_shiwaiguanfa}}</td>
             <!--<td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center">{{row.f_yijian}}</td>-->
             <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center"><nobr>{{row.f_ruhu}}</nobr></td>
             <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center"><nobr>{{row.f_buyu}}</nobr></td>
+            <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center"><nobr>{{row.f_jiguangjianlou}}</nobr></td>
+            <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center"><nobr>{{row.f_liganbaoya}}</nobr></td>
+            <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center"><nobr>{{row.f_shiwaiguanfa}}</nobr></td>
             <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center">{{row.f_jujian}}</td>
             <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center"><nobr>{{row.f_check_bv}}</nobr></td>
             <!--<td style="text-align: center;">-->
@@ -159,10 +171,13 @@
           <td  style="text-align:center"><strong>合计：</strong></td>
           <td  style="text-align:center" :colspan="$parent.$parent.$parent.nameForSql.length"></td>
           <td  style="text-align:center"><strong>{{model.sums.f_plan_total}}</strong></td>
-          <td  style="text-align:center"><strong>{{model.sums.f_weijian+model.sums.f_buyu+model.sums.f_jujian}}</strong></td>
+          <td  style="text-align:center"><strong>{{model.sums.f_weijian+model.sums.f_buyu+model.sums.f_jujian+model.sums.f_jiguangjianlou+model.sums.f_liganbaoya+model.sums.f_shiwaiguanfa}}</strong></td>
           <!--<td  style="text-align:center"><strong>{{model.sums.f_yijian}}</strong></td>-->
           <td  style="text-align:center"><nobr><strong>{{model.sums.f_ruhu}}</strong></nobr></td>
           <td  style="text-align:center"><nobr><strong>{{model.sums.f_buyu}}</strong></nobr></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_jiguangjianlou}}</strong></nobr></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_liganbaoya}}</strong></nobr></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_shiwaiguanfa}}</strong></nobr></td>
           <td  style="text-align:center"><strong>{{model.sums.f_jujian}}</strong></td>
           <td  style="text-align:center"><strong>{{model.sums.f_plan_total>0?(model.sums.f_ruhu/model.sums.f_plan_total*100).toFixed(2)+'%':0}}</strong></td>
           </tr >
@@ -183,7 +198,7 @@
   export default {
     data () {
       return {
-        model: new PagedList('rs/sql/getCheckPlanAreaList', 99999,{},{f_plan_total:'',f_weijian:'',f_yijian:'',f_ruhu:'',f_buyu:'',f_jujian:''}),
+        model: new PagedList('rs/sql/getCheckPlanAreaList', 99999,{},{f_plan_total:'',f_weijian:'',f_yijian:'',f_ruhu:'',f_buyu:'',f_jiguangjianlou:'',f_liganbaoya:'',f_shiwaiguanfa:'',f_jujian:''}),
         // 公司下拉
         curorgid: [this.$login.f.orgid],
         row: {},
@@ -375,6 +390,9 @@
           this.model.sums.f_yijian = 0
           this.model.sums.f_ruhu = 0
           this.model.sums.f_buyu = 0
+          this.model.sums.f_jiguangjianlou= 0
+          this.model.sums.f_liganbaoya = 0
+          this.model.sums.f_shiwaiguanfa = 0
           this.model.sums.f_jujian = 0
         }
       }

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

@@ -820,7 +820,7 @@
                 }
                 _this.$dispatch('gotoson',pardate)
                 //tag
-                _this.$goto('safecheck-order-v', {f_plan_id: row.f_plan_id, item: row, role: 'inspect',parentPage:'CurrentCreate'}, 'self', _this.reload)
+                _this.$goto('safecheck-order-v', {f_plan_id: row.f_plan_id, item: row, role: 'inspect',parentPage:'CurrentCreate',openpaper:true}, 'self', _this.reload)
               }).catch ((msg)=>{
                 this.$showMessage("网络异常,请检查网络后再试！")
               })

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

@@ -0,0 +1,132 @@
+<template>
+  <div>
+    <button @click="handleClick">渲染</button>
+    <button @click="savePaper">保存</button>
+    <iframe v-if="showSketchPage" :src="sketchPageSrc" id="aaaa2" style="width: 100%; height: 500px;"></iframe>
+  </div>
+</template>
+
+<script>
+import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
+
+export default {
+  title: 'App',
+  data() {
+    return {
+      inputText: '',
+      showSketchPage: false,
+      sketchPageSrc: '/sketch',
+      sketchId: '',
+      title: '',
+      paperMessage: ''
+    };
+  },
+  props: {
+    row: ''
+  },
+  async ready() {
+    if (this.row) {
+      await new HttpResetClass().load('POST', 'rs/sql/tel_singleTable_OrderBy', {
+        data: {
+          items: 'blob', tablename: 't_blob_sketch', condition: `id  = '${this.row}'`, orderitem: 'id'
+        }
+      }).then(res => {
+        if (res.data.length === 0) {
+          this.handleClick()
+          return
+        }
+        try {
+          let hex = Buffer.from(res.data[0].blob, 'hex').toString('utf8');
+          if (!hex.includes('{')) {
+            this.inputText = Buffer.from(hex, 'hex').toString('utf8');
+          } else {
+            this.inputText = hex;
+          }
+        } catch (e) {
+          this.$showMessage('网络异常请联系管理员')
+        }
+        this.handleClick()
+      })
+    }
+  },
+  methods: {
+    handleClick() {
+      this.showSketchPage = true;
+      this.$nextTick(() => {
+        const sketchIframe = document.getElementById('aaaa2');
+
+        window.addEventListener('message', (event) => {
+          if (JSON.parse(event.data.param).gadgets.length > 0) {
+            this.paperMessage = event.data.param;
+          }
+        });
+
+        sketchIframe.contentWindow.postMessage(this.inputText, '*');
+      })
+    },
+    savePaper() {
+      if (!this.paperMessage) {
+        this.$showMessage('请先点击左上角保存图标')
+        return
+      }
+      let param = JSON.parse(this.paperMessage)
+      if (!param.title) {
+        this.$showMessage('请填写示意图标题')
+        return
+      }
+      let gadgets = param.gadgets
+      if (gadgets.length > 0) {
+        var jsonString = JSON.stringify(param);
+        var reqdata = {
+          blob: Buffer.from(jsonString, 'utf8').toString('hex'),
+          orgid: this.$login.f.orgid,
+          orgname: this.$login.f.orgs,
+          title: param.title,
+          f_userinfo_id: this.row
+        }
+        new HttpResetClass().load('POST', 'rs/logic/savePaperEdit', {data: reqdata}).then(res => {
+          if (res.data.code === 200) {
+            this.$showMessage('保存成功')
+          } else {
+            this.$showMessage('保存失败')
+          }
+        })
+      }
+    },
+    hexToBytes(hex) {
+      for (var bytes = [], c = 0; c < hex.length; c += 2)
+        bytes.push(parseInt(hex.substring(c, 2), 16));
+      return new Uint8Array(bytes);
+    },
+    decodeHexStringToJSON(hexString) {
+      // 去除前缀 "0x"
+      var cleanHexString = hexString.slice(2);
+
+      // 将十六进制字符串转换为字节数组
+      var byteArray = this.hexToBytes(cleanHexString);
+
+      // 创建 Blob 对象
+      var blob = new Blob([byteArray], {type: 'application/json'});
+
+      // 读取 Blob 为文本
+      return new Promise(function (resolve, reject) {
+        var reader = new FileReader();
+        reader.onloadend = function () {
+          resolve(reader.result);
+        };
+        reader.onerror = function () {
+          reject(reader.error);
+        };
+        reader.readAsText(blob, 'UTF-8');
+      });
+    }
+  },
+  // beforeDestroy() {
+  //   this.savePaper()
+  // }
+}
+</script>
+
+<style>
+/* 这里可以添加样式 */
+</style>

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

@@ -144,7 +144,7 @@
 
   export default {
     title: '安检单',
-    props: ['f_plan_id', 'item', 'role','parentPage','source'],
+    props: ['f_plan_id', 'item', 'role','parentPage','source','openpaper'],
     // props: ['f_plan_id', 'role'],
     data() {
       return {
@@ -2480,7 +2480,7 @@
           tittle:'安检详情',
           safe:true
         }
-        this.$goto('safecheck-userinfo', {userinfo:this.data}, 'repair')
+        this.$goto('safecheck-userinfo', {userinfo:this.data,openpaper:this.openpaper}, 'repair')
       }
     },
     watch: {

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

@@ -14,6 +14,8 @@
                     @click="history('维修记录')">维修记录</label>
             <label  style="color: #00b3ee;text-decoration:none;"
                     @click="history('其他收费')">其他收费</label>
+            <label  style="color: #00b3ee;text-decoration:none;" v-if="openpaper"
+                    @click="openPaper(userinfo.f_userinfoid)">其他收费</label>
           </p>
         </div>
         <div class="col-xs-12" style="padding: 2px 0">
@@ -271,7 +273,7 @@
 
   export default {
     title: 'SafecheckUserInfo',
-    props: ['userinfo'],
+    props: ['userinfo','openpaper'],
     data () {
       return this.$parent.$parent.data
     },
@@ -308,6 +310,9 @@
       this.safecheckStateReady()
     },
     methods: {
+      openPaper(userinfo_id){
+        this.$parent.$parent.$goto('edit', {row:userinfo_id})
+      },
       history(val) {
         this.$dispatch('gotoson', {
           _this: this.$parent.$parent,

package/src/filiale/bayan/android.js

@@ -9,7 +9,8 @@ let specialComp = {
   'safecheck-devices': (resolve) => { require(['./android/SafecheckDevices'], resolve) },
   'PhoneUpUserinfo': (resolve) => { require(['./android/PhoneUpUserinfo'], resolve) },
   'safecheck-userinfo': (resolve) => { require(['./android/SafecheckUserInfo'], resolve) },
-  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) }
+  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
+  'edit': (resolve) => { require(['./android/Edit'], resolve) }
 }
 
 exports.specialComp = specialComp