safecheck-client 3.0.30-7 → 3.0.30-71

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-7",
+  "version": "3.0.30-71",
   "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/Util.js

@@ -394,3 +394,18 @@ export function convertToIn (val) {
   }
   return temp
 }
+
+//获取随机uuid
+export function generateUUID() {
+  // 'x' 代表数字与大小写字母中的任意一个
+  const chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+  let uuid = '';
+  // 第一个字符是 '0'-'7' 之间的随机数字，用于版本标识
+  uuid += chars.charAt(Math.floor(Math.random() * 8) + Math.floor(Math.random() * 8) % 8);
+  for (let i = 0; i < 31; i++) {
+    // 随机选择字符
+    uuid += chars.charAt(Math.random() * chars.length | 0);
+  }
+  // 修正长度和格式，以确保它看起来像是一个标准的UUID
+  return uuid.substr(0, 8)  + uuid.substr(8, 4)  + uuid.substr(12, 4)  + uuid.substr(16, 4)  + uuid.substr(20, 12);
+}

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/AreaPlan.vue

@@ -415,8 +415,8 @@
         ],
         isends: [
           {label: '请选择完成状态', value: ''},
-          {label: '未完成', value: 'f_check_version=1 or f_check_version=2'},
-          {label: '已完成', value: 'f_check_version is null'},
+          {label: '未完成', value: '( tcp.f_check_version = 1 or tcp.f_check_version = 2 )'},
+          {label: '已完成', value: 'tcp.f_check_version is null'},
         ],
         check_states: [
           {label: '请选择安检状态', value: ''},

package/src/components/android/CurrentCreate.vue

@@ -774,10 +774,11 @@
       inspect(row) {
         var _this = this
         let http = new HttpResetClass()
-        http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: {
+        http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: {
             items: 'id',
             tablename: 't_check_plan_item',
-            condition:  `id  = '${row.id}'`
+            condition:  `id  = '${row.id}'`,
+            orderitem: ' id '
           }}, {resolveMsg: null, rejectMsg: null}).then((getcheckplan) => {
           console.log('getcheckplan=', JSON.stringify(getcheckplan))
           this.getcheckplandata = getcheckplan.data[0]