safecheck-client 3.0.33-1 → 3.0.33-101

package/index.html

@@ -6,10 +6,14 @@
     <title>安检系统</title>
     <link rel="stylesheet" href="http://cache.amap.com/lbs/static/main1119.css"/>
     <!--引入高德地图组件-->
-    <script src="https://webapi.amap.com/maps?v=1.4.2&key=4889f1e58df01cb40415536c8907bf64"></script>
+    <script type="text/javascript">
+      window._AMapSecurityConfig = {
+        securityJsCode: '082dcb22ce9f242500fd6db3a2da5f44'
+      }
+    </script>
+    <script src="https://webapi.amap.com/maps?v=1.4.2&key=a511f5f7695b395a4eebf72b20e0f6e9"></script>
     <!--引入UI组件库（1.1版本） -->
     <script src="https://webapi.amap.com/ui/1.1/main.js?v=1.1.1"></script>
-    <script type="text/javascript" src="http://cache.amap.com/lbs/static/addToolbar.js"></script>
     <style media="screen">
       /*url(./static/newmainbg.jpg)*/
       body{width: 100%;background:#7f8eaf  no-repeat center bottom; background-size: cover;}

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "3.0.33-1",
+  "version": "3.0.33-101",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",
   "main": "src/index.js",
   "keywords": [
     "safecheck"
+
   ],
   "scripts": {
     "example": "node build/example-server.js",
@@ -103,13 +104,13 @@
     "sketch-vue3": "^1.0.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.2.1-10",
+    "system-clients": "3.2.83",
     "system-phone": "1.2.100",
     "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.93",
+    "vue-client": "1.24.76",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/components/Util/ImgSelfSafePlus.vue

@@ -3,7 +3,7 @@
     <img :src="src" :alt="alt" @click.stop="open()" :width="width" :height="height" title="点击查看图片"
          :id="'vc-imgself-img-'+attach">
     <div class="full-img" v-show="show" @contextmenu.prevent.stop="clearStyle">
-      <img :src="src" alt="" class="img-state" :alt="alt || ''" @mousewheel="bigimg(this)" id="image" draggable="false"
+      <img :src="src2" alt="" class="img-state" :alt="alt || ''" @mousewheel="bigimg(this)" id="image" draggable="false"
            @mousedown.prevent="dropImage" style="position:fixed">
       <div class="btns row">
         <button type="button" name="button" class="btn btn-primary" @click.stop="leftRevolve()">向左旋转</button>
@@ -51,7 +51,8 @@
         container:null,
         positionX: null,
         positionY: null,
-        powerh: 1.0
+        powerh: 1.0,
+        src2:""
       }
     },
     ready(){
@@ -64,6 +65,7 @@
       }
       // 将新创建的 div 挂载到 body 上
       document.body.appendChild(this.container);
+      this.src2=this.src
     },
     beforeDestroy(){
       // 销毁挂载的
@@ -75,12 +77,12 @@
       nextPage() {
         console.log(this.list)
         //当前图片，是最后一张图片
-        if (this.src=== this.list[this.list.length - 1].f_overall_path) {
-            this.src= this.list[0].f_overall_path
+        if (this.src2=== this.list[this.list.length - 1].f_overall_path) {
+            this.src2= this.list[0].f_overall_path
           } else {
           for (let i = 0; i < this.list.length; i++) {
-            if (this.src=== this.list[i].f_overall_path) {
-              this.src= this.list[i + 1].f_overall_path
+            if (this.src2=== this.list[i].f_overall_path) {
+              this.src2= this.list[i + 1].f_overall_path
               break
             }
           }
@@ -90,12 +92,12 @@
       previousPage() {
         console.log(this.list)
         //当前图片，是第一张图片
-        if (this.src === this.list[0].f_overall_path) {
-          this.src= this.list[this.list.length - 1].f_overall_path
+        if (this.src2 === this.list[0].f_overall_path) {
+          this.src2= this.list[this.list.length - 1].f_overall_path
         } else {
           for (let i = 0; i < this.list.length; i++) {
-            if (this.src=== this.list[i].f_overall_path) {
-              this.src= this.list[i - 1].f_overall_path
+            if (this.src2=== this.list[i].f_overall_path) {
+              this.src2= this.list[i - 1].f_overall_path
               break
             }
           }

package/src/components/android/CurrentCreate.vue

@@ -985,7 +985,7 @@
         criteria = {
           items: 'count(id) count',
           tablename: 't_check_plan_item',
-          condition: `(f_complete = '' or f_complete = null or f_complete = '未完成') AND f_state = '已检'`,
+          condition: `(f_complete = '' or f_complete is null or f_complete = '未完成') AND f_state = '已检'`,
           groupitem: 'f_state'
         }
         result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_GroupBy', 'criteria': criteria}})

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',

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必须与上面的固定配置保持'顺序'
@@ -2072,7 +2072,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 +2134,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"

package/src/components/android/SwitchValve.vue

@@ -259,7 +259,7 @@ export default {
       // let condition =  ` uf.f_filialeid = '${this.filialeid}'`
       let condition =  ` 1=1 `
       condition += this.condition
-      condition += this.f_meternumber ? ` and f_meternumber = '${this.f_meternumber}'` : ""
+      condition += this.f_meternumber ? ` and uf.f_meternumber = '${this.f_meternumber}'` : ""
       condition += this.f_userinfo_code ? ` and f_userinfo_code = '${this.f_userinfo_code}'` : ""
       condition += this.f_meter_type != '' && this.f_meter_type != [] ? ` and f_meter_type = '${this.f_meter_type}'` : ""
       console.log(condition)