safecheck-client 4.0.0-65 → 4.0.0-66

package/package.json

@@ -1,132 +1,132 @@
-{
-  "name": "safecheck-client",
-  "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "4.0.0-65",
-  "description": "安检模块 前端组件",
-  "author": "丁新 <417755458@qq.com>",
-  "license": "ISC",
-  "main": "src/index.js",
-  "keywords": [
-    "safecheck"
-  ],
-  "scripts": {
-    "example": "node build/example-server.js",
-    "dev": "webpack-dev-server --config ./build/dev-server.js",
-    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "build": "rimraf dist && mkdirp dist && ncp static dist/safecheck && cross-env webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "hanwei": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.hanwei.conf.js",
-    "android": "node build/dev-android.js",
-    "unit": "karma start test/unit/karma.conf.js --single-run",
-    "make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js && publish",
-    "e2e": "node test/e2e/runner.js",
-    "release": "bash build/release.sh",
-    "fix-memory-limit": "cross-env LIMIT=4096 increase-memory-limit"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/aote/product-hujiao"
-  },
-  "dependencies": {
-    "axios": "^0.27.2",
-    "benz-amr-recorder": "^1.1.3",
-    "browserslist": "^4.21.4",
-    "crypto-js": "^4.2.0",
-    "html2canvas": "^1.1.4",
-    "html2pdf.js": "^0.10.1",
-    "jspdf": "^2.3.1",
-    "less": "^4.2.0",
-    "mint-ui": "^1.0.2",
-    "node-libs-browser": "^2.2.1",
-    "pretty-error": "^4.0.0",
-    "vue": "^1.0.17",
-    "wavesurfer.js": "^3.3.3",
-    "xlsx": "^0.17.3"
-  },
-  "devDependencies": {
-    "babel-core": "^6.26.0",
-    "babel-loader": "^7.0.0",
-    "babel-plugin-transform-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-stage-2": "^6.0.0",
-    "chai": "^3.5.0",
-    "compression-webpack-plugin": "^1.1.2",
-    "connect-history-api-fallback": "^1.1.0",
-    "cross-env": "^1.0.7",
-    "cross-spawn": "^2.1.5",
-    "css-loader": "^0.23.0",
-    "echarts": "^4.1.0",
-    "eslint": "^2.0.0",
-    "eslint-config-standard": "^5.1.0",
-    "eslint-friendly-formatter": "^1.2.2",
-    "eslint-loader": "^1.3.0",
-    "eslint-plugin-html": "^1.3.0",
-    "eslint-plugin-promise": "^1.0.8",
-    "eslint-plugin-standard": "^1.3.2",
-    "eslint-plugin-vue": "^0.1.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^3.0.2",
-    "file-loader": "^0.8.4",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.30.1",
-    "http-proxy-middleware": "^0.11.0",
-    "increase-memory-limit": "^1.0.7",
-    "inject-loader": "^2.0.1",
-    "isparta-loader": "^2.0.0",
-    "jasmine-core": "^2.4.1",
-    "jquery": "^3.3.1",
-    "jsencrypt": "3.0.0-rc.1",
-    "json-loader": "^0.5.4",
-    "karma": "^1.4.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-phantomjs-launcher": "^1.0.2",
-    "karma-phantomjs-shim": "^1.4.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "less-loader": "^2.2.3",
-    "lolex": "^1.5.2",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "ncp": "^2.0.0",
-    "nightwatch": "^0.8.18",
-    "ol": "^4.6.4",
-    "phantomjs-prebuilt": "^2.1.3",
-    "proj4": "^2.2.1",
-    "rimraf": "^2.5.0",
-    "selenium-server": "2.52.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "style": "0.0.3",
-    "style-loader": "^0.20.3",
-    "system-clients": "3.3.2",
-    "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.25.26",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "^8.2.1",
-    "vue-resource": "^1.5.0",
-    "vue-router": "^0.7.13",
-    "vue-strap": "^1.0.9",
-    "vue-style-loader": "^1.0.0",
-    "vue-validator": "2.1.7",
-    "webpack": "^3.12.0",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-dev-server": "^2.9.7",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3",
-    "weixin-js-sdk": "^1.2.0"
-  },
-  "directories": {
-    "doc": "docs",
-    "example": "examples",
-    "test": "test"
-  }
-}
+{
+  "name": "safecheck-client",
+  "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
+  "version": "4.0.0-66",
+  "description": "安检模块 前端组件",
+  "author": "丁新 <417755458@qq.com>",
+  "license": "ISC",
+  "main": "src/index.js",
+  "keywords": [
+    "safecheck"
+  ],
+  "scripts": {
+    "example": "node build/example-server.js",
+    "dev": "webpack-dev-server --config ./build/dev-server.js",
+    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+    "build": "rimraf dist && mkdirp dist && ncp static dist/safecheck && cross-env webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "hanwei": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.hanwei.conf.js",
+    "android": "node build/dev-android.js",
+    "unit": "karma start test/unit/karma.conf.js --single-run",
+    "make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js && publish",
+    "e2e": "node test/e2e/runner.js",
+    "release": "bash build/release.sh",
+    "fix-memory-limit": "cross-env LIMIT=4096 increase-memory-limit"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/aote/product-hujiao"
+  },
+  "dependencies": {
+    "axios": "^0.27.2",
+    "benz-amr-recorder": "^1.1.3",
+    "browserslist": "^4.21.4",
+    "crypto-js": "^4.2.0",
+    "html2canvas": "^1.1.4",
+    "html2pdf.js": "^0.10.1",
+    "jspdf": "^2.3.1",
+    "less": "^4.2.0",
+    "mint-ui": "^1.0.2",
+    "node-libs-browser": "^2.2.1",
+    "pretty-error": "^4.0.0",
+    "vue": "^1.0.17",
+    "wavesurfer.js": "^3.3.3",
+    "xlsx": "^0.17.3"
+  },
+  "devDependencies": {
+    "babel-core": "^6.26.0",
+    "babel-loader": "^7.0.0",
+    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "compression-webpack-plugin": "^1.1.2",
+    "connect-history-api-fallback": "^1.1.0",
+    "cross-env": "^1.0.7",
+    "cross-spawn": "^2.1.5",
+    "css-loader": "^0.23.0",
+    "echarts": "^4.1.0",
+    "eslint": "^2.0.0",
+    "eslint-config-standard": "^5.1.0",
+    "eslint-friendly-formatter": "^1.2.2",
+    "eslint-loader": "^1.3.0",
+    "eslint-plugin-html": "^1.3.0",
+    "eslint-plugin-promise": "^1.0.8",
+    "eslint-plugin-standard": "^1.3.2",
+    "eslint-plugin-vue": "^0.1.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^3.0.2",
+    "file-loader": "^0.8.4",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.30.1",
+    "http-proxy-middleware": "^0.11.0",
+    "increase-memory-limit": "^1.0.7",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
+    "jasmine-core": "^2.4.1",
+    "jquery": "^3.3.1",
+    "jsencrypt": "3.0.0-rc.1",
+    "json-loader": "^0.5.4",
+    "karma": "^1.4.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.3.0",
+    "karma-phantomjs-launcher": "^1.0.2",
+    "karma-phantomjs-shim": "^1.4.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "less-loader": "^2.2.3",
+    "lolex": "^1.5.2",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "ncp": "^2.0.0",
+    "nightwatch": "^0.8.18",
+    "ol": "^4.6.4",
+    "phantomjs-prebuilt": "^2.1.3",
+    "proj4": "^2.2.1",
+    "rimraf": "^2.5.0",
+    "selenium-server": "2.52.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.8.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "system-clients": "^4.0.5",
+    "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.25.31",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "^8.2.1",
+    "vue-resource": "^1.5.0",
+    "vue-router": "^0.7.13",
+    "vue-strap": "^1.0.9",
+    "vue-style-loader": "^1.0.0",
+    "vue-validator": "2.1.7",
+    "webpack": "^3.12.0",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-dev-server": "^2.9.7",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3",
+    "weixin-js-sdk": "^1.2.0"
+  },
+  "directories": {
+    "doc": "docs",
+    "example": "examples",
+    "test": "test"
+  }
+}

package/src/components/NewDefectList/DefectListNew.vue

@@ -147,19 +147,19 @@
         </div>
         <div class="col-sm-12" style="margin-bottom: 10px" v-if="solveModal.preData.defectImg">
           <label class="font_normal_body">隐患图片</label>
-          <img-self :width="200" :height="200" :src="solveModal.preData.defectImg"></img-self>
+          <img-self-plus :width="200" :height="200" :src="solveModal.preData.defectImg"></img-self-plus>
         </div>
         <div class="col-sm-12" style="margin-bottom: 10px"  v-show="solveModal.preData.defectImg1">
           <label class="font_normal_body">隐患图片</label>
-          <img-self :width="200" :height="200" :src="solveModal.preData.defectImg1"></img-self>
+          <img-self-plus :width="200" :height="200" :src="solveModal.preData.defectImg1"></img-self-plus>
         </div>
         <div class="col-sm-12" style="margin-bottom: 10px"  v-show="solveModal.preData.defectImg2">
           <label class="font_normal_body">隐患图片</label>
-          <img-self :width="200" :height="200" :src="solveModal.preData.defectImg2"></img-self>
+          <img-self-plus :width="200" :height="200" :src="solveModal.preData.defectImg2"></img-self-plus>
         </div>
         <div class="col-sm-12" style="margin-bottom: 10px"  v-show="solveModal.preData.defectImg3">
           <label class="font_normal_body">隐患图片</label>
-          <img-self :width="200" :height="200" :src="solveModal.preData.defectImg3"></img-self>
+          <img-self-plus :width="200" :height="200" :src="solveModal.preData.defectImg3"></img-self-plus>
         </div>
 
         <div style="width: 100%;height: 36px;background-color: #f1f8ff;float: left" v-show="solveModal.preData.state == '已处理' || solveModal.preData.type != 'solve'">
@@ -205,28 +205,28 @@
           <div class="col-sm-12">
             <div class="col-sm-6"  v-for="item in fileInfoData">
 <!--            <img :src="item.f_downloadURL">-->
-              <img-self :width="200" :height="200" :src="item.f_downloadURL" style="margin-left: 10px"></img-self>
+              <img-self-plus :width="200" :height="200" :src="item.f_downloadURL" style="margin-left: 10px"></img-self-plus>
             </div>
             <div class="col-sm-6" v-if="solveModal.preData.repairedImg">
-              <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg" style="margin-left: 10px"></img-self>
+              <img-self-plus :width="200" :height="200" :src="solveModal.preData.repairedImg" style="margin-left: 10px"></img-self-plus>
             </div>
             <div class="col-sm-6" v-if="solveModal.preData.repairedImg1">
-              <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg1"  style="margin-left: 10px"></img-self>
+              <img-self-plus :width="200" :height="200" :src="solveModal.preData.repairedImg1"  style="margin-left: 10px"></img-self-plus>
             </div>
             <div class="col-sm-6" v-if="solveModal.preData.repairedImg2">
-              <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg2"  style="margin-left: 10px"></img-self>
+              <img-self-plus :width="200" :height="200" :src="solveModal.preData.repairedImg2"  style="margin-left: 10px"></img-self-plus>
             </div>
             <div class="col-sm-6" v-if="solveModal.preData.repairedImg2">
-              <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg2"  style="margin-left: 10px"></img-self>
+              <img-self-plus :width="200" :height="200" :src="solveModal.preData.repairedImg2"  style="margin-left: 10px"></img-self-plus>
             </div>
             <div class="col-sm-6" v-if="solveModal.preData.repairedImg3">
-              <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg3"  style="margin-left: 10px"></img-self>
+              <img-self-plus :width="200" :height="200" :src="solveModal.preData.repairedImg3"  style="margin-left: 10px"></img-self-plus>
             </div>
             <div class="col-sm-6" v-if="solveModal.preData.repairedImg4">
-              <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg4"  style="margin-left: 10px"></img-self>
+              <img-self-plus :width="200" :height="200" :src="solveModal.preData.repairedImg4"  style="margin-left: 10px"></img-self-plus>
             </div>
             <div class="col-sm-6" v-if="solveModal.preData.repairedImg5">
-              <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg5"  style="margin-left: 10px"></img-self>
+              <img-self-plus :width="200" :height="200" :src="solveModal.preData.repairedImg5"  style="margin-left: 10px"></img-self-plus>
             </div>
 
           </div>

package/src/components/NewDefectList/DefectPaperNew.vue

@@ -99,14 +99,14 @@
             </div>
 
             <div :class="$parent.$parent.style">
-              <label class="font_normal_body">抄&ensp;表&ensp;册</label>
+              <label class="font_normal_body">安检册</label>
               <v-select class="select_list select"
-                        placeholder='抄表册' style="width: 60%"
+                        placeholder='安检册' style="width: 60%"
                         :value.sync="model.f_meter_book_num" v-model="model.f_meter_book_num"
-                        :options='$parent.$parent.cbc'
+                        :options='$parent.$parent.checkBooks'
                         filer-key="name"
                         close-on-select clear-button
-                        condition="f_meter_book_num={}"
+                        condition="f_check_book_name like '%{}%'"
                         :value-single="true">
               </v-select>
             </div>
@@ -258,14 +258,14 @@
               </v-select>
             </div>
             <div :class="$parent.$parent.style">
-              <label class="font_normal_body">抄&ensp;表&ensp;册</label>
+              <label class="font_normal_body">安检册</label>
               <v-select class="select_list select"
-                        placeholder='抄表册' style="width: 60%"
+                        placeholder='安检册' style="width: 60%"
                         :value.sync="model.f_meter_book_num" v-model="model.f_meter_book_num"
-                        :options='$parent.$parent.cbc'
+                        :options='$parent.$parent.checkBooks'
                         filer-key="name"
                         close-on-select clear-button
-                        condition="f_meter_book_num={}"
+                        condition="f_check_book_name like '%{}%'"
                         :value-single="true">
               </v-select>
             </div>
@@ -521,6 +521,7 @@ export default {
       sliceArea: [],
       callSends:[],
       cbc:[],
+      checkBooks:[],
       repairedOptions:[{label: '全部', value: ''},{label: '已修', value: '已修'}, {label: '未修', value: '未修'}],
       repairers:[],
       cbcs:[],
@@ -542,6 +543,25 @@ export default {
   },
 
   methods: {
+    getCheckBook(){
+      this.checkBooks=[]
+      new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
+        data: {
+          items: 'id,f_check_book_name,f_check_book_type',
+          tablename: 't_check_book',
+          condition: `f_orgid = '${this.$login.f.orgid}'`,
+          orderitem: 'id desc'
+        }
+      }, {resolveMsg: null, rejectMsg: null}).then(res => {
+        this.checkBooks.push({label: '全部', value: ''})
+        res.data.forEach(ress => {
+          this.checkBooks.push({
+            label: ress.f_check_book_name,
+            value: ress.f_check_book_name
+          })
+        })
+      })
+    },
     getSiteRes(obj) {
       console.log('siteRes ---> ')
       console.log(obj)