safecheck-client 3.0.33-15 → 3.0.33-150

package/src/components/android/ImgSelfAndroid.vue

@@ -1,181 +1,181 @@
-<template>
-  <div>
-    <img :src="src" :alt="alt" @click="open()" style="width: 100%;height: 100%" title="点击查看图片" :id="'vc-imgself-img-'+attach">
-    <div class="full-img" v-if="show">
-      <div @click="on"  draggable="false" >
-        <img :src="src" id="image" alt="" style="width: 100%" class="img-state" :alt="alt || ''">
-      </div>
-      <div class="btns">
-        <button type="button" name="button" class="btn btn-primary" @click="close()" :id="'vc-imgself-close-'+attach">关闭</button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-  import $ from 'jquery'
-
-
-  export default {
-    props: {
-      src: {
-        type: String
-      },
-      width: {
-        default: 60
-      },
-      height: {
-        default: 60
-      },
-      alt: {
-        default: '图片加载失败'
-      },
-      attach: {
-        type: String,
-        default: 'name'
-      }
-    },
-    data () {
-      return {
-        show: false,
-        deg: 0,
-        power: 1
-      }
-    },
-    methods: {
-      open () {
-        this.deg = 0
-        this.power = 0.5
-        this.show = true
-      },
-      close () {
-        this.show = false
-      },
-      on(){
-        $(function (){
-          let result = {}
-          var eleImg = document.querySelector('#image');
-          var store = {
-            scale: 1
-          };
-          // 缩放处理
-          eleImg.addEventListener('touchstart', function (event) {
-            var touches = event.touches;
-            var events = touches[0];
-            var events2 = touches[1];
-
-            var x = eleImg.offsetLeft;
-            var y = eleImg.offsetTop;
-
-            if (!events) {
-              return;
-            }
-            event.preventDefault();
-            // 第一个触摸点的坐标
-            store.pageX = events.pageX;
-            store.pageY = events.pageY;
-            store.x = x;
-            store.y = y;
-            store.moveable = true;
-            if (events2) {
-              store.pageX2 = events2.pageX;
-              store.pageY2 = events2.pageY;
-            }
-            store.originScale = store.scale || 1;
-          },{ passive: false });
-          document.addEventListener('touchmove', function (event) {
-            if (!store.moveable) {
-              return;
-            }
-            event.preventDefault();
-            var touches = event.touches;
-            var events = touches[0];
-            var events2 = touches[1];
-            result.textContent = '触摸点数量：' + touches.length;
-            if (events2) {
-              if (!store.pageX2) {
-                store.pageX2 = events2.pageX;
-              }
-              if (!store.pageY2) {
-                store.pageY2 = events2.pageY;
-              }
-              var getDistance = function (start, stop) {
-                return Math.hypot(stop.x - start.x, stop.y - start.y);
-              };
-              var zoom = getDistance({
-                  x: events.pageX,
-                  y: events.pageY
-                }, {
-                  x: events2.pageX,
-                  y: events2.pageY
-                }) /
-                getDistance({
-                  x: store.pageX,
-                  y: store.pageY
-                }, {
-                  x: store.pageX2,
-                  y: store.pageY2
-                });
-              var newScale = store.originScale * zoom;
-              if (newScale > 4) {
-                newScale = 4;
-              }
-              store.scale = newScale;
-              eleImg.style.transform = 'scale('+ newScale +')';
-              result.textContent = 'zoom: '+ zoom + ', apply scale: ' + newScale;
-            }else{
-              var moveX = events.pageX - store.pageX;
-              var moveY = events.pageY - store.pageY;
-              var imagetop = store.x + moveX;
-              var imageleft = store.y + moveY;
-              eleImg.style.transform = `translate(${imagetop}px, ${imageleft}px) scale(${store.scale})`;
-            }
-          },{ passive: false });
-
-          document.addEventListener('touchend', function () {
-            store.moveable = false;
-
-            delete store.pageX2;
-            delete store.pageY2;
-          },{ passive: false });
-          document.addEventListener('touchcancel', function () {
-            store.moveable = false;
-            delete store.pageX2;
-            delete store.pageY2;
-          },{ passive: false });
-        });
-      }
-
-    },
-    ready(){
-    }
-  }
-</script>
-<style media="screen">
-  .full-img {
-    position: fixed;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    z-index: 20;
-    background: rgba(0,0,0,0.8);
-    display: flex;
-    overflow: auto;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    color: #fff;
-  }
-  .btns {
-    position: fixed;
-    bottom: 100px;
-    height: auto;
-  }
-  .btns button {
-    margin-right: 20px;
-  }
-  .img-state {
-
-  }
-</style>
+<template>
+  <div>
+    <img :src="src" :alt="alt" @click="open()"   :width="width" :height="height"title="点击查看图片" :id="'vc-imgself-img-'+attach">
+    <div class="full-img" v-if="show">
+      <div @click="on"  draggable="false" >
+        <img :src="src" id="image" alt="" style="width: 100%" class="img-state" :alt="alt || ''">
+      </div>
+      <div class="btns">
+        <button type="button" name="button" class="btn btn-primary" @click="close()" :id="'vc-imgself-close-'+attach">关闭</button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import $ from 'jquery'
+
+
+  export default {
+    props: {
+      src: {
+        type: String
+      },
+      width: {
+        default: 60
+      },
+      height: {
+        default: 60
+      },
+      alt: {
+        default: '图片加载失败'
+      },
+      attach: {
+        type: String,
+        default: 'name'
+      }
+    },
+    data () {
+      return {
+        show: false,
+        deg: 0,
+        power: 1
+      }
+    },
+    methods: {
+      open () {
+        this.deg = 0
+        this.power = 0.5
+        this.show = true
+      },
+      close () {
+        this.show = false
+      },
+      on(){
+        $(function (){
+          let result = {}
+          var eleImg = document.querySelector('#image');
+          var store = {
+            scale: 1
+          };
+          // 缩放处理
+          eleImg.addEventListener('touchstart', function (event) {
+            var touches = event.touches;
+            var events = touches[0];
+            var events2 = touches[1];
+
+            var x = eleImg.offsetLeft;
+            var y = eleImg.offsetTop;
+
+            if (!events) {
+              return;
+            }
+            event.preventDefault();
+            // 第一个触摸点的坐标
+            store.pageX = events.pageX;
+            store.pageY = events.pageY;
+            store.x = x;
+            store.y = y;
+            store.moveable = true;
+            if (events2) {
+              store.pageX2 = events2.pageX;
+              store.pageY2 = events2.pageY;
+            }
+            store.originScale = store.scale || 1;
+          },{ passive: false });
+          document.addEventListener('touchmove', function (event) {
+            if (!store.moveable) {
+              return;
+            }
+            event.preventDefault();
+            var touches = event.touches;
+            var events = touches[0];
+            var events2 = touches[1];
+            result.textContent = '触摸点数量：' + touches.length;
+            if (events2) {
+              if (!store.pageX2) {
+                store.pageX2 = events2.pageX;
+              }
+              if (!store.pageY2) {
+                store.pageY2 = events2.pageY;
+              }
+              var getDistance = function (start, stop) {
+                return Math.hypot(stop.x - start.x, stop.y - start.y);
+              };
+              var zoom = getDistance({
+                  x: events.pageX,
+                  y: events.pageY
+                }, {
+                  x: events2.pageX,
+                  y: events2.pageY
+                }) /
+                getDistance({
+                  x: store.pageX,
+                  y: store.pageY
+                }, {
+                  x: store.pageX2,
+                  y: store.pageY2
+                });
+              var newScale = store.originScale * zoom;
+              if (newScale > 4) {
+                newScale = 4;
+              }
+              store.scale = newScale;
+              eleImg.style.transform = 'scale('+ newScale +')';
+              result.textContent = 'zoom: '+ zoom + ', apply scale: ' + newScale;
+            }else{
+              var moveX = events.pageX - store.pageX;
+              var moveY = events.pageY - store.pageY;
+              var imagetop = store.x + moveX;
+              var imageleft = store.y + moveY;
+              eleImg.style.transform = `translate(${imagetop}px, ${imageleft}px) scale(${store.scale})`;
+            }
+          },{ passive: false });
+
+          document.addEventListener('touchend', function () {
+            store.moveable = false;
+
+            delete store.pageX2;
+            delete store.pageY2;
+          },{ passive: false });
+          document.addEventListener('touchcancel', function () {
+            store.moveable = false;
+            delete store.pageX2;
+            delete store.pageY2;
+          },{ passive: false });
+        });
+      }
+
+    },
+    ready(){
+    }
+  }
+</script>
+<style media="screen">
+  .full-img {
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    z-index: 20;
+    background: rgba(0,0,0,0.8);
+    display: flex;
+    overflow: auto;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    color: #fff;
+  }
+  .btns {
+    position: fixed;
+    bottom: 100px;
+    height: auto;
+  }
+  .btns button {
+    margin-right: 20px;
+  }
+  .img-state {
+
+  }
+</style>

package/src/components/android/SafecheckDevices.vue

@@ -457,6 +457,8 @@ export default {
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
+      this.f_items[prop].f_longitude = obj.longitude
+      this.f_items[prop].f_latitude = obj.latitude
       //tag
       //tag
       HostApp._open_a_page({type: 'boomerang',
@@ -1011,7 +1013,9 @@ export default {
         f_else: '',
         f_p1_path: '',
         f_p2_path: '',
-        f_p3_path: ''
+        f_p3_path: '',
+        f_longitude:'',
+        f_latitude:''
       }
       //tag)
       //tag)

package/src/components/android/SafecheckOrderV.vue

@@ -269,7 +269,7 @@
               "气量异常差值":{"index":10,"type":"number","readonly": true},
               "金额异常差值":{"index":10,"type":"number","readonly": true},
               "系统余额":{"index":10,"type":"number","readonly": true},
-              "表箱号":{"index":11,"type":"string","readonly": true},
+              "表封号":{"index":11,"type":"string","readonly": true},
               "燃气表照片":{"index":12,"type":"picture","checkmust": false}
             }
             // 注意，配置项的index必须与上面的固定配置保持'顺序'
@@ -686,8 +686,10 @@
         let prefix = '用户基本信息：'
         if(Util.required(this.data.f_user_name))
           return prefix + '用户名必须输入'
+        if (!this.data.f_user_phone){
+          return '请输入正确的电话号码'
+        }
         if(!(/^\d{11}$/.test(this.data.f_user_phone.trim()))) {
-
           return '请输入正确的电话号码'
         }
         // if(Util.required(this.data.f_residential_area))
@@ -2072,7 +2074,7 @@
                         f_defect_level: null,
                         f_device_id: "",
                         f_is_defect: "",
-                        f_item_name: "表箱号",
+                        f_item_name: "表封号",
                         f_item_value: this.item.f_plan_meters[i].f_metertitles,
                         f_path: "",
                         type: "string"
@@ -2134,7 +2136,7 @@
                         f_defect_level: null,
                         f_device_id: "",
                         f_is_defect: "",
-                        f_item_name: "表箱号",
+                        f_item_name: "表封号",
                         f_item_value: this.item.f_plan_meters[i].f_metertitles,
                         f_path: "",
                         type: "string"
@@ -2435,13 +2437,17 @@
           //tag
           if (this.role == 'inspect') {
             //tag
-            if (this.item.f_no_checkplan == '无计划安检' || this.item.f_no_checkplan == '复检') {
-              value = this.$androidUtil.path({
-                alias: 'getUserinfomation',
-                data: {condition: "f_check_item_id = '" + this.item.id + "' and f_no_checkplan in ('无计划安检','复检')"}
-              })
-            } else {
-              value = this.$androidUtil.bzLogic('FetchCheckPaper', {id: this.item.id})
+            if(this.item.f_no_checkplan != '无计划安检' ){
+              if (this.item.f_no_checkplan == '复检') {
+                value = this.$androidUtil.path({
+                  alias: 'getUserinfomation',
+                  data: {condition: "f_check_item_id = '" + this.item.id + "' and f_no_checkplan in ('无计划安检','复检')"}
+                })
+              } else {
+                value = this.$androidUtil.bzLogic('FetchCheckPaper', {id: this.item.id})
+              }
+            }else {
+              value.data =[]
             }
           } else {
             value = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/path/getUserinfomation`, {data: {condition: `id = '${this.item.f_paper_id}'`}})
@@ -2618,7 +2624,7 @@
             })
         }
       }else{
-        if(this.parentPage && this.parentPage=='CurrentCreate'){
+        if(this.parentPage && this.parentPage=='AddPlanItem'){
           //tag
           let isRecodr = this.$appdata.getSingleValue('无限制录音'); //单值参数，为true则是开启全程录音
           if (isRecodr) {

package/src/components/map/checkScreen.vue

@@ -445,13 +445,15 @@ export default {
 
 
       let a3=[]
-      for(let i=0;i<this.level2.length;i++){
-        a3.push({
-          lnglat: [this.level2[i].f_longitude,this.level2[i].f_latitude], //点标记位置
-          name: '二级隐患',
-          id:i,
-          rowstr:this.level2[i]
-        })
+      for(let o=0;o<this.level2.length;o++){
+        if (this.level2[o].f_longitude && this.level2[o].f_latitude){
+          a3.push({
+            lnglat: [this.level2[o].f_longitude,this.level2[o].f_latitude], //点标记位置
+            name: '二级隐患',
+            id:o,
+            rowstr:this.level2[o]
+          })
+        }
       }
       // 将数组设置到 massMarks 图层
       this.level2Mulchs.setData(a3);
@@ -459,13 +461,15 @@ export default {
       this.level2Mulchs.setMap(this.map);
 
       let a4=[]
-      for(let i=0;i<this.level3.length;i++){
-        a4.push({
-          lnglat: [this.level3[i].f_longitude, this.level3[i].f_latitude], //点标记位置
-          name: '三级隐患',
-          id:i,
-          rowstr:this.level3[i]
-        })
+      for(let p=0;p<this.level3.length;p++){
+        if (this.level3[p].f_longitude&&this.level3[p].f_latitude){
+          a4.push({
+            lnglat: [this.level3[p].f_longitude, this.level3[p].f_latitude], //点标记位置
+            name: '三级隐患',
+            id:p,
+            rowstr:this.level3[p]
+          })
+        }
       }
       // 将数组设置到 massMarks 图层
       this.level3Mulchs.setData(a4);
@@ -474,13 +478,15 @@ export default {
 
 
       let a5=[]
-      for(let i=0;i<this.problems.length;i++){
-        a5.push({
-          lnglat: [this.problems[i].f_longitude, this.problems[i].f_latitude], //点标记位置
-          name: '普通问题',
-          id:i,
-          rowstr:this.problems[i]
-        })
+      for(let l=0;l<this.problems.length;l++){
+        if (this.problems[l].f_longitude&&this.problems[l].f_latitude){
+          a5.push({
+            lnglat: [this.problems[l].f_longitude, this.problems[l].f_latitude], //点标记位置
+            name: '普通问题',
+            id:l,
+            rowstr:this.problems[l]
+          })
+        }
       }
       // 将数组设置到 massMarks 图层
       this.problemsMulchs.setData(a5);

package/src/components/paper/PlanChooser.vue

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

package/src/components/pc/NewCheckpaper.vue

@@ -894,6 +894,7 @@ import Vue from 'vue'
 import * as Util from '../Util'
 import {jsonSort} from '../../utils/LdapHelper'
 import {HttpResetClass} from "vue-client";
+import {forEach} from "mocha/lib/utils";
 
 let asyncReady = async function (self) {
   // 获取配置信息
@@ -1293,6 +1294,9 @@ export default {
       if (this.deviceCollects.length > 0) {
         this.hasDevice = true
       }
+      this.deviceconfig2 = this.deviceconfig2.filter(row => {
+        return !(row.checkname == '$configProp' || row.checkname == '$globalProp');
+      })
       this.ajresult = JSON.parse(this.data.f_defect_content).result
       this.showimg3 = this.data.f_noanswer_path
       this.showimg5 = this.data.f_noanswer1_path
@@ -1873,18 +1877,17 @@ export default {
               //tag
               //tag)
               console.log('Vue.config.safecheck.DevicesConfig', Vue.config.safecheck.DevicesConfig)
-              if (this.data.f_check_type == '民用') {
-                this.deviceconfig = Vue.config.safecheck.DevicesConfig
-                if (typeof this.deviceconfig === 'string') {
-                  this.deviceconfig = JSON.parse(this.deviceconfig)
-                }
-                //tag)
-              } else if (this.data.f_check_type == '非民用') {
+              // 如果没有用户类型 默认按民用配置走
+              if (this.data.f_check_type == '非民用') {
                 this.deviceconfig = Vue.config.safecheck.DevicesSetConfig
                 if (typeof this.deviceconfig === 'string') {
                   this.deviceconfig = JSON.parse(this.deviceconfig)
                 }
-                //tag)
+              }else{
+                  this.deviceconfig = Vue.config.safecheck.DevicesConfig
+                  if (typeof this.deviceconfig === 'string') {
+                    this.deviceconfig = JSON.parse(this.deviceconfig)
+                  }
               }
               if (this.data.f_collection_type == '按金额') {
                 if (this.deviceconfig["燃气表"]){

package/src/components/planmanage/PlanManage.vue

@@ -16,7 +16,7 @@
                       close-on-select value-single >
             </v-select>
           </div>
-          <div class="row auto safe-div-p"><!--<span style="margin-right: 5px" @click="refresh()" style="cursor:default">测试</span>--><span style="margin-right: 5px" @click="delCheckPlan()" style="cursor:default">删除</span> <span @click="sendCheckPlan()" style="cursor:default">下发</span></div>
+          <div class="row auto safe-div-p"><!--<span style="margin-right: 5px" @click="refresh()" style="cursor:default">测试</span>--><span style="margin-right: 5px" @click="delCheckPlan()" style="cursor:default" v-if="isdelete">删除</span> <span @click="sendCheckPlan()" style="cursor:default">下发</span></div>
         </div>
         <div class="leftplan-center safe_plan_list">
           <div class="row safe-leftplan safe_list_li" :class="{'safe-selectplan':selectPlan.id==row.id}" v-for="row in checkplan.list.data" @click="selectPlanChange(row)">
@@ -399,6 +399,7 @@
             a:'1',
             opt:[{label:"按时间降序",value:"按时间降序"},{label:"按时间升序",value:"按时间升序"}],
             currentorder:'按时间降序',
+            isdelete:this.$login.r ? this.$login.r.includes("安检计划删除"):false,
             checkplan : new SearchList(true),
             selectPlan:{id:''},
             upCheckPlan:{
@@ -451,6 +452,13 @@
         },
       async ready(){
         await this.loadpage()
+        if (!this.userlogin.orgid){
+          if (this.$login.f.f_orgids){
+            this.userlogin.orgid = this.$login.f.f_orgids.endsWith('.')?this.$login.f.f_orgids.substring(0,this.$login.f.f_orgids.length-1):this.$login.f.f_orgids
+          }else {
+            this.userlogin.orgid = ''
+          }
+        }
       },
    computed: {
         ntoway() {
@@ -575,8 +583,10 @@
         //查询安检员selectChanged
         async searchChecker(id){
           let res=await new HttpResetClass().load('POST', '/rs/search', {
-            source: `root.getResourceById($${this.userlogin.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,
-            userid: this.$login.f.id
+            data:{
+              source: `this.getSpecialResByType($user$).where(row.getAttributes().get($rolestr$)!=null ).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,
+              userid: this.userlogin.orgid
+            }
           }, {resolveMsg: null, rejectMsg: null})
           let arr = []
           res.data.forEach((resRow) => {
@@ -727,7 +737,7 @@
           this.isSend=true
           let res=await new HttpResetClass().load("POST", "/rs/logic/deleteCheckPlan", {
             data:{
-              f_operator:this.userlogin.orgstr,//global.login.name,
+              f_operator:this.userlogin.name,//global.login.name,
               condition:"",
               switchCheckAll:true,
               checkAll:false,

package/src/components/planmanage/checkPlanList.vue

@@ -50,7 +50,7 @@
             </div>
             <div class="form-group col-sm-2" style="float: right">
               <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.showplanModal()">计划调整</button>
-              <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.delPlanItem()">移出计划</button>
+              <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.delPlanItem()" v-show="$parent.$parent.isdelete">移出计划</button>
             </div>
             <modal :show.sync="$parent.$parent.showCondtion" v-ref:modal :width="'50%'" :backdrop="false">
               <div slot="modal-header" class="modal-header">
@@ -178,6 +178,7 @@
     data() {
       return {
         model:new PagedList('/rs/sql/planItem', 100, {}),
+        isdelete:this.$login.r ? this.$login.r.includes("安检计划删除"):false,
         a:'1',
         opt:[{label:"测试",value:"测试"}],
         showCondtion:false,