safecheck-client 3.0.30-73 → 3.0.30-74

package/package.json

@@ -1,133 +1,133 @@
-{
-  "name": "safecheck-client",
-  "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "3.0.30-73",
-  "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": "^6.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",
-    "sketch-vue3": "^1.0.0",
-    "style": "0.0.3",
-    "style-loader": "^0.20.3",
-    "system-clients": "3.2.76",
-    "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.129",
-    "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": "3.0.30-74",
+  "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": "^6.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",
+    "sketch-vue3": "^1.0.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "system-clients": "3.2.76",
+    "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.129",
+    "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/rongcheng/PaperStatem.vue

@@ -71,7 +71,7 @@
         <div class="col-sm-8 col-xs-8" :class="style__">
           <label class="text-left font">拒检照片：</label>
           <img-self :src="item.f_rejectcheck_path" alt="拒检照片" style=" display: inline-block" width="150" height="200"> </img-self>
-<!--          <img-self :src="item.f_noanswertwo_path" alt="到访不遇照片" style=" display: inline-block" width="150" height="200"> </img-self>-->
+          <img-self v-if="item.f_rejectcheck2_path" :src="item.f_rejectcheck2_path" alt="拒检照片" style=" display: inline-block" width="150" height="200"> </img-self>
 
         </div>
         <div class="col-sm-4 col-xs-4">
@@ -85,6 +85,47 @@
           </div>
         </div>
       </div>
+
+      <div class="row" v-show="item.f_entry_status=='激光检漏'">
+        <div class="col-sm-8 col-xs-8" :class="style__">
+          <label class="text-left font">激光检漏照片：</label>
+          <img-self :src="item.f_detection_path" alt="激光检漏照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self v-if="item.f_detection2_path" :src="item.f_detection2_path" alt="激光检漏照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self v-if="item.f_detection3_path" :src="item.f_detection3_path" alt="激光检漏照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self v-if="item.f_detection4_path" :src="item.f_detection4_path" alt="激光检漏照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self v-if="item.f_detection5_path" :src="item.f_detection5_path" alt="激光检漏照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self v-if="item.f_detection6_path" :src="item.f_detection6_path" alt="激光检漏照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self v-if="item.f_detection7_path" :src="item.f_detection7_path" alt="激光检漏照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self v-if="item.f_detection8_path" :src="item.f_detection8_path" alt="激光检漏照片" style=" display: inline-block" width="150" height="200"> </img-self>
+        </div>
+      </div>
+      <div class="row" v-show="item.f_entry_status=='立杠保压'">
+        <div class="col-sm-8 col-xs-8" :class="style__">
+          <label class="text-left font">立杠保压照片：</label>
+          <img-self :src="item.f_pressure_path" alt="立杠保压照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self v-if="item.f_pressure2_path" :src="item.f_pressure2_path" alt="立杠保压照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self v-if="item.f_pressure3_path" :src="item.f_pressure3_path" alt="立杠保压照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self v-if="item.f_pressure4_path" :src="item.f_pressure4_path" alt="立杠保压照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self v-if="item.f_pressure5_path" :src="item.f_pressure5_path" alt="立杠保压照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self v-if="item.f_pressure6_path" :src="item.f_pressure6_path" alt="立杠保压照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self v-if="item.f_pressure7_path" :src="item.f_pressure7_path" alt="立杠保压照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self v-if="item.f_pressure8_path" :src="item.f_pressure8_path" alt="立杠保压照片" style=" display: inline-block" width="150" height="200"> </img-self>
+        </div>
+      </div>
+      <div class="row" v-show="item.f_entry_status=='室外关阀'">
+        <div class="col-sm-8 col-xs-8" :class="style__">
+          <label class="text-left font">室外关阀照片：</label>
+          <img-self :src="item.f_outdoor_path" alt="室外关阀照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self v-if="item.f_outdoor2_path" :src="item.f_outdoor2_path" alt="室外关阀照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self v-if="item.f_outdoor3_path" :src="item.f_outdoor3_path" alt="室外关阀照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self v-if="item.f_outdoor4_path" :src="item.f_outdoor4_path" alt="室外关阀照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self v-if="item.f_outdoor5_path" :src="item.f_outdoor5_path" alt="室外关阀照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self v-if="item.f_outdoor6_path" :src="item.f_outdoor6_path" alt="室外关阀照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self v-if="item.f_outdoor7_path" :src="item.f_outdoor7_path" alt="室外关阀照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self v-if="item.f_outdoor8_path" :src="item.f_outdoor8_path" alt="室外关阀照片" style=" display: inline-block" width="150" height="200"> </img-self>
+        </div>
+      </div>
+
 <!--      <div class="row" v-show="item.f_entry_status=='拒检'">
         <div class="col-sm-8 col-xs-8">
           <label class="text-left font">拒检照片：</label>

package/src/components/rongcheng/PhoneUpUserinfo.vue

@@ -381,6 +381,7 @@
   import {HttpResetClass} from 'vue-client'
   import * as Util from "../Util";
   import Vue from 'vue'
+  import {toStandardDateString} from "../Util";
 
   export default {
     title: '设备查看',
@@ -1113,6 +1114,24 @@
         this.userinfo = res.data
         this.userinfo_old = JSON.parse(JSON.stringify(res.data))
         this.model = this.userinfo.meterinfo[0].devicesinfo.concat(this.userinfo.meterinfo[0].devicesinfonew)
+        //已经超期
+        let now = Util.toStandardDateString()
+        let overdue = this.model.filter(item => item.f_expire_date <= now).map(item => item.f_devices_type).join(',')
+        //临近超期
+        let date = new Date()
+        date.setDate(date.getDate() - this.$appdata.getSingleValue('设备超期提醒'))
+        let dt = new Date(date)
+        let month = dt.getMonth()+1
+        let now_advent = dt.getFullYear() + '-' + (month<10? '0'+ month : month) + '-' + (dt.getDate()<10? '0'+ dt.getDate() : dt.getDate())
+        let advent = this.model.filter(item => item.f_expire_date >= now_advent).map(item => item.f_devices_type).join(',')
+
+        if(overdue && advent){
+          this.$showMessage(`${overdue}设备已过期，${advent}设备临近超期`)
+        }else if(advent){
+          this.$showMessage(`${advent}设备临近超期`)
+        }else if(overdue){
+          this.$showMessage(`${overdue}设备已过期`)
+        }
         this.selectArea.id = this.userinfo.addressinfo.f_residential_area_id
         this.selectPcd.id = this.userinfo.addressinfo.f_pcd_id
         this.selectPcd.f_pcd = this.userinfo.addressinfo.f_pcd

package/src/components/rongcheng/SafecheckOrderV.vue

@@ -481,6 +481,14 @@ export default {
         return '未使用天然气则必须拍照'
       if(Vue.android && this.data.f_entry_status == '到访不遇' && this.data.f_noanswer_path == Vue.nopic)
         return  '到访不遇必须拍照'
+
+      if(Vue.android && this.data.f_entry_status == '激光检漏' && this.data.f_detection_path == Vue.nopic)
+        return  '激光检漏必须拍照'
+      if(Vue.android && this.data.f_entry_status == '立杠保压' && this.data.f_pressure_path == Vue.nopic)
+        return  '立杠保压必须拍照'
+      if(Vue.android && this.data.f_entry_status == '室外关阀' && this.data.f_outdoor_path == Vue.nopic)
+        return  '室外关阀必须拍照'
+
     },
     verifyUser() {
       let prefix = '用户基本信息：'