safecheck-client 3.0.30-3 → 3.0.30-33

package/examples/SafePlan-liaoyuan/App.vue

@@ -17,6 +17,7 @@
 import Comp from "./comp"
 import TestData from "./TestData"
 import {HttpResetClass} from "vue-client";
+import Vue from 'vue'
 export default {
 data(){
   return{
@@ -25,7 +26,8 @@ data(){
 },
   ready() {
    try{
-
+     Vue.mmType = 'nginx'
+     Vue.HWQMM = [51, 150, 231, 300, 565, 708, 721, 952, 738, 560, 935, 912, 1274, 1148, 840, 1440]
      if (this.$login) {
        //tag
        global.login=this.$login.f

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "3.0.30-3",
+  "version": "3.0.30-33",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",
@@ -100,18 +100,19 @@
     "selenium-server": "2.52.0",
     "sinon": "^2.1.0",
     "sinon-chai": "^2.8.0",
+    "sketch-vue3": "^1.0.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "system-clients": "3.2.76",
     "system-phone": "1.2.100",
-    "terser-webpack-plugin-legacy": "^1.2.5",
     "telephone-clients": "1.1.27",
+    "terser-webpack-plugin-legacy": "^1.2.5",
     "url-loader": "^0.5.7",
+    "vue-amap": "0.5.10",
     "vue-client": "1.24.129",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",
-    "vue-amap": "0.5.10",
     "vue-resource": "^1.5.0",
     "vue-router": "^0.7.13",
     "vue-strap": "^1.0.9",

package/src/components/android/AddPlanItem.vue

@@ -289,8 +289,11 @@
           HostApp.scanCode({callback:"javascript:HostApp.__this__.getCode();"})
       },
       getCode(){
-        var datapa = HostApp.getCode().data;
-        //tag
+        let datapa = HostApp.getCode().data;
+        let indexnum = datapa.indexOf("]C1")
+        if(indexnum != -1){
+          datapa = datapa.substring(indexnum+3,datapa.length)
+        }
         this.$refs.paged.$refs.cri.model.f_meternumber=datapa
       },
       getCheckTime(){

package/src/components/android/CurrentCreate.vue

@@ -853,7 +853,9 @@
           condition += " and tm.f_meter_no like '%"+this.$refs.paged.$refs.cri.model.f_meter_no+"%'"
         // if(this.$refs.paged.$refs.cri.model.f_flow_direction[0])
         //   condition += " and tm.f_flow_direction = '"+this.$refs.paged.$refs.cri.model.f_flow_direction[0]+"'"
-
+        if(this.$refs.paged.$refs.cri.model.f_user_phone){
+          condition += `and ti.f_user_phone like '%${this.$refs.paged.$refs.cri.model.f_user_phone}%'`
+        }
         if(this.$refs.paged.$refs.cri.model.f_enter_number)
           condition += " and ti.f_enter_number like '%"+this.$refs.paged.$refs.cri.model.f_enter_number+"%'"
         if(this.$refs.paged.$refs.cri.model.f_check_version)

package/src/components/paper/PlanChooser.vue

@@ -79,8 +79,8 @@
   let select = function * (self) {
     let http = new HttpResetClass()
     http.load('POST', '/rs/search', {
-        source: 'tool.getChildrenOfResName($安检员$)',
-        userid: self.$login.f.id
+      source: `root.getResourceById($${self.userlogin.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,
+      userid: self.$login.f.id
       }, {resolveMsg: null, rejectMsg: null}).then((res) => {
       self.checkers = []
       //tag

package/src/components/pc/Edit.vue

@@ -0,0 +1,50 @@
+<template>
+    <div>
+        <input type="text" v-model="inputText" placeholder="Enter text here">
+        <button @click="handleClick">测试</button>
+        <iframe v-if="showSketchPage" :src="sketchPageSrc" ref="sketchIframe" id="sketchIframe"
+            style="width: 100%; height: 500px;"></iframe>
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'App',
+    data() {
+        return {
+            inputText: '',
+            showSketchPage: false,
+            sketchPageSrc: '/sketch'
+        };
+    },
+    methods: {
+        handleClick() {
+            this.showSketchPage = true;
+            //this.sketchPageSrc = `/sketch?data=${encodeURIComponent(this.inputText)}`;
+
+            // 使用 $nextTick 确保 iframe 已经加载到 DOM
+            this.$nextTick(() => {
+                const sketchIframe = document.getElementById('sketchIframe').contentWindow;
+
+                // 监听来自 iframe 的消息
+                window.addEventListener('message', (event) => {
+                    if (event.origin !== window.location.origin) {
+                        return;
+                    }
+                    console.log('Message received from sketch:', event.data);
+                });
+
+                // 发送消息到 iframe
+                sketchIframe.onload = () => {
+                    sketchIframe.postMessage(this.inputText, window.location.origin);
+                };
+            }); // 逻辑空着
+        }
+    },
+
+}
+</script>
+
+<style>
+/* 这里可以添加样式 */
+</style>

package/src/components/pc/NewCheckpaper.vue

@@ -1330,13 +1330,17 @@ export default {
         }
       }
       //tag
-
       //tag)
-      if (!this.item.f_safecheck_type) {
+      if (!this.item.f_safecheck_type && Vue.config.safecheck.SafecheckType) {
         this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType['年度普检'][this.item.f_check_type]])
-      } else {
-        if (Vue.config.safecheck.DevicesConfig != undefined)
-          this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_check_type]])
+      } else if (Vue.config.safecheck.SafecheckType){
+        this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_check_type]])
+      }else {
+        if(this.item.f_check_type == '民用'){
+          this.config = this.extend(this.config, Vue.config.safecheck.DevicesConfig)
+        }else {
+          this.config = this.extend(this.config, Vue.config.safecheck.DevicesSetConfig)
+        }
       }
       //遍历安检项配置
       for (let i in this.config) {

package/src/components/pc/PaperEdit.vue

@@ -0,0 +1,148 @@
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <criteria-paged :model="model" v-ref:paged @sort="sort">
+        <criteria partial='criteria' class="search_area" @condition-changed='$parent.selfSearch' v-ref:criteria>
+          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+            <div class="row">
+              <div class="form-group col-sm-2">
+                <label class="font_normal_body">用户分类</label>
+                <input type="text" class="input_search" v-model="model.f_userinfo_code"
+                       style="width: 60%" placeholder="用户分类" condition="f_userinfo_code='{}'">
+              </div>
+              <div class="form-group col-sm-2">
+                <label class="font_normal_body">用气单位</label>
+                <input type="text" class="input_search" v-model="model.f_user_name"
+                       style="width: 60%" placeholder="客户名称" condition="f_user_name like '%{}%'">
+              </div>
+              <div class="form-group col-sm-2">
+                <label class="font_normal_body">示意图</label>
+                <input type="text" class="input_search" v-model="model.f_user_phone"
+                       style="width: 60%" placeholder="客户电话" condition="f_user_phone like '%{}%'">
+              </div>
+              <div class="form-group col-sm-2">
+                <label class="font_normal_body">单位编号</label>
+                <input type="text" class="input_search" v-model="model.f_meternumber"
+                       style="width: 60%" placeholder="客户表号" condition="f_meternumber like '%{}%'">
+              </div>
+              <div class="form-group col-sm-2" style="width: auto;margin-top:8px;float: right">
+                <export-excel-safe :data="$parent.$parent.searchData"
+                                   :field="$parent.$parent.excelHeaders"
+                                   :choose-col="true"
+                                   sqlurl="rs/logic/SafeExportExcel" sql-name="查找安检单"
+                                   template-name='安检计划明细'></export-excel-safe>
+                <button class="button_spacing button_search" @click="$parent.$parent.change()">查询</button>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid class="list_area table_sy" style="overflow: hidden" :model="model" partial='list' v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th>
+                <nobr>是否有示意图</nobr>
+              </th>
+              <th>
+                <nobr>单位编号</nobr>
+              </th>
+              <th>
+                <nobr>单位地址</nobr>
+              </th>
+              <th>
+                <nobr>单位名称</nobr>
+              </th>
+              <th>
+                <nobr>联系人</nobr>
+              </th>
+              <th>
+                <nobr>分公司</nobr>
+              </th>
+              <th>
+                <nobr>示意图id</nobr>
+              </th>
+              <th>
+                <nobr>操作</nobr>
+              </th>
+            </tr>
+          </template>
+          <template partial='body'>
+
+            <td style="text-align: center">{{ row.uptodate }}</td>
+            <td style="text-align: center">{{ row.gas_point_id }}</td>
+            <td style="text-align: center">{{ row.gas_point_name }}</td>
+            <td style="text-align: center">{{ row.title }}</td>
+            <td style="text-align: center">{{ row.title12 }}</td>
+            <td style="text-align: center">{{ row.title1 }}</td>
+            <td style="text-align: center">{{ row.blod_id }}</td>
+            <td style="text-align: center">
+              <button class="button_spacing button_search-1" @click='change(row)'>查看</button>
+            </td>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+  <modal :show.sync="showModal" v-ref:modal backdrop="false" :width="1200">
+    <div slot="modal-header" class="modal-header">
+      <h4 class="modal-title">
+        打开图纸编辑
+      </h4>
+    </div>
+    <div slot="modal-body" class="modal-body">
+      <edit></edit>
+    </div>
+    <div slot="modal-footer" class="modal-footer" style="text-align: center">
+      <button class="button_search" @click="cancel">取消</button>
+    </div>
+  </modal>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+import Vue from 'vue'
+import co from 'co'
+import * as Util from '../Util'
+import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
+
+export default {
+  title: '图纸编辑页面',
+  data() {
+    return {
+      searchData: {
+        condition: "1=1",
+        f_plan_id: "",
+        f_approved: '',
+        f_entry_status: '',
+        f_no_checkplan: '',
+        f_filialeid: `('${this.$login.f.orgid}')`
+      },
+      model: new PagedList('rs/sql/queryPaperEdit', 20, {}),
+      excelHeaders: {
+        'uptodate': '是否有示意图',
+        'gas_point_id': '单位编号',
+        'gas_point_name': '单位地址',
+        'title': '单位名称',
+        'title12': '联系人',
+        'title1': '分公司',
+        'blod_id': '示意图id',
+      },
+      showModal: false,
+    }
+  },
+  methods: {
+    change() {
+      this.showModal = true
+    },
+    search() {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    cancel() {
+      this.showModal = false
+    }
+  },
+
+  ready() {
+
+  }
+}
+</script>

package/src/components/pc/SelectCheckPlanAndNoPLan.vue

@@ -106,6 +106,7 @@
             <th>入户</th>
             <th>到访不遇</th>
             <th>拒检</th>
+            <th>完成率</th>
           </tr>
         </template>
         <template partial='body'>
@@ -117,6 +118,7 @@
           <td style="text-align: center">{{row.ruhu}}</td>
           <td style="text-align: center">{{row.daofang}}</td>
           <td style="text-align: center">{{row.jujian}}</td>
+          <td style="text-align: center">{{row.wclv}}%</td>
 
         </template>
         <template partial="foot">
@@ -128,6 +130,7 @@
           <td style="text-align: center">{{model.sums.ruhu}}</td>
           <td style="text-align: center">{{model.sums.daofang}}</td>
           <td style="text-align: center">{{model.sums.jujian}}</td>
+          <td style="text-align: center">{{((model.sums.ruhu +model.sums.daofang+model.sums.jujian)/(model.sums.plannum+model.sums.no_plan_num)*100).toFixed(2)}}%</td>
         </template>
       </data-grid>
     </criteria-paged>

package/src/components/querycheckpaper/CheckSearchUser.vue

@@ -184,6 +184,11 @@
               <input type="number" class="input_search" v-model="model.f_check_date"
                      style="width: 60%" placeholder="距上次安检天数" >
             </div>
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">到访不遇次数</label>
+              <input type="number" class="input_search" v-model="model.f_check_version"
+                     style="width: 60%" placeholder="到访不遇次数">
+            </div>
           </div>
 
           <div class="row" v-show="$parent.$parent.$parent.showItem">
@@ -756,7 +761,8 @@ export default {
         }
       }else {
         states = ''
-      }      if(args.model.f_check_date){
+      }
+      if(args.model.f_check_date){
         const daysBefore = Number(args.model.f_check_date);
         if ( daysBefore > 0) {
           // 获取当前日期
@@ -770,6 +776,9 @@ export default {
           console.error('f_check_date不是一个有效的正整数');
         }
       }
+      if (args.model.f_check_version){
+        con+= ` and f_check_version  = '${args.model.f_check_version}'`
+      }
       con += args.model.f_checker_id ? ` and f_checker_name in ${args.model.f_checker_id}` : ' and 1=1'
       let condition = {
         condition1: args.condition,