sale-client 3.4.96 → 3.4.97

package/package.json

@@ -1,116 +1,116 @@
-{
-  "name": "sale-client",
-  "version": "3.4.96",
-  "description": "收费模块前台组件",
-  "main": "src/index.js",
-  "scripts": {
-    "example": "node build/example-server.js",
-    "dev": "node build/dev-server.js",
-    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "unit": "karma start test/unit/karma.conf.js",
-    "build": "rimraf dist && mkdirp dist && ncp static dist/mergeUser && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "e2e": "node test/e2e/runner.js",
-    "release": "bash build/release.sh",
-    "page": "rimraf dist && mkdirp dist && ncp static dist/singlepage && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.singlepage.conf.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/aote/product.git"
-  },
-  "dependencies": {
-    "examples": "^0.1.0",
-    "js-file-download": "0.4.12",
-    "less-loader": "^2.2.3",
-    "qrcodejs2": "0.0.2",
-    "vue": "^1.0.17",
-    "yarn": "^1.22.10"
-  },
-  "devDependencies": {
-    "address-client": "3.0.24-70",
-    "axios": "0.15.3",
-    "babel-core": "^6.0.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",
-    "co": "^4.6.0",
-    "connect-history-api-fallback": "^1.1.0",
-    "compression-webpack-plugin": "1.1.2",
-    "cross-env": "^1.0.7",
-    "cross-spawn": "^2.1.5",
-    "css-loader": "^0.23.0",
-    "echarts": "^4.1.0",
-    "eslint": "^3.19.0",
-    "eslint-config-standard": "^10.2.1",
-    "eslint-friendly-formatter": "^3.0.0",
-    "eslint-loader": "^1.7.1",
-    "eslint-plugin-html": "^3.0.0",
-    "eslint-plugin-import": "^2.7.0",
-    "eslint-plugin-node": "^5.2.0",
-    "eslint-plugin-promise": "^3.4.0",
-    "eslint-plugin-standard": "^3.0.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.4",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.8.1",
-    "http-proxy-middleware": "^0.11.0",
-    "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-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "ldap-clients": "3.0.7",
-    "less": "^2.7.3",
-    "manage-client": "3.1.8-88",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "moment": "2.24.0",
-    "ncp": "^2.0.0",
-    "nightwatch": "^0.8.18",
-    "qrcodejs2": "0.0.2",
-    "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.1.97",
-    "url-loader": "^0.5.7",
-    "vue-client": "1.24.43",
-    "vue-clipboard2": "0.3.1",
-    "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": "^1.12.2",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3",
-    "weixin-js-sdk": "^1.2.0"
-  },
-  "keywords": [
-    "selling-clients"
-  ],
-  "author": "张桥",
-  "license": "ISC",
-  "directories": {
-    "example": "examples",
-    "test": "test"
-  }
-}
+{
+  "name": "sale-client",
+  "version": "3.4.97",
+  "description": "收费模块前台组件",
+  "main": "src/index.js",
+  "scripts": {
+    "example": "node build/example-server.js",
+    "dev": "node build/dev-server.js",
+    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+    "unit": "karma start test/unit/karma.conf.js",
+    "build": "rimraf dist && mkdirp dist && ncp static dist/mergeUser && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "e2e": "node test/e2e/runner.js",
+    "release": "bash build/release.sh",
+    "page": "rimraf dist && mkdirp dist && ncp static dist/singlepage && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.singlepage.conf.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/aote/product.git"
+  },
+  "dependencies": {
+    "examples": "^0.1.0",
+    "js-file-download": "0.4.12",
+    "less-loader": "^2.2.3",
+    "qrcodejs2": "0.0.2",
+    "vue": "^1.0.17",
+    "yarn": "^1.22.10"
+  },
+  "devDependencies": {
+    "address-client": "3.0.24-70",
+    "axios": "0.15.3",
+    "babel-core": "^6.0.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",
+    "co": "^4.6.0",
+    "connect-history-api-fallback": "^1.1.0",
+    "compression-webpack-plugin": "1.1.2",
+    "cross-env": "^1.0.7",
+    "cross-spawn": "^2.1.5",
+    "css-loader": "^0.23.0",
+    "echarts": "^4.1.0",
+    "eslint": "^3.19.0",
+    "eslint-config-standard": "^10.2.1",
+    "eslint-friendly-formatter": "^3.0.0",
+    "eslint-loader": "^1.7.1",
+    "eslint-plugin-html": "^3.0.0",
+    "eslint-plugin-import": "^2.7.0",
+    "eslint-plugin-node": "^5.2.0",
+    "eslint-plugin-promise": "^3.4.0",
+    "eslint-plugin-standard": "^3.0.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "file-loader": "^0.8.4",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.8.1",
+    "http-proxy-middleware": "^0.11.0",
+    "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-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "ldap-clients": "3.0.7",
+    "less": "^2.7.3",
+    "manage-client": "3.1.8-88",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "moment": "2.24.0",
+    "ncp": "^2.0.0",
+    "nightwatch": "^0.8.18",
+    "qrcodejs2": "0.0.2",
+    "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.2.0",
+    "url-loader": "^0.5.7",
+    "vue-client": "1.24.48",
+    "vue-clipboard2": "0.3.1",
+    "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": "^1.12.2",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3",
+    "weixin-js-sdk": "^1.2.0"
+  },
+  "keywords": [
+    "selling-clients"
+  ],
+  "author": "张桥",
+  "license": "ISC",
+  "directories": {
+    "example": "examples",
+    "test": "test"
+  }
+}

package/singlepage/{FileUserFiles → page}/App.vue

@@ -2,7 +2,7 @@
   <app-base class="bg">
     <div class='flex'>
       <article>
-        <route :comp="{name: 'file-user-files'}"></route>
+        <route :comp="{name: 'load-data'}"></route>
       </article>
     </div>
   </app-base>

package/singlepage/{FileUserFiles → page}/index.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>档案管理</title>
+    <title>智慧燃气</title>
   </head>
   <style>
     body {
@@ -10,7 +10,7 @@
     }
   </style>
   <body id="bodymain" class="themeOne" >
-    <app ></app>
-    <script src="./FileUserFiles.js"></script>
+    <app></app>
+    <script src="./page.js"></script>
   </body>
 </html>

package/singlepage/{FileUserFiles → page}/main.js

@@ -4,7 +4,9 @@ import App from './App'
 import { system } from 'system-clients'
 import sale from '../../src/sale'
 import { address } from 'address-client'
+import { ldap } from 'ldap-clients'
 import VueClipboard from 'vue-clipboard2'
+import moment from 'moment'
 Vue.use(VueClipboard)
 Vue.config.silent = true
 
@@ -12,6 +14,7 @@ all()
 system(false)
 sale()
 address()
+ldap()
 require('system-clients/src/styles/less/bootstrap.less')
 
 new Vue({

package/src/components/common/userinfo_detail/UserBaseInfoNew.vue

@@ -267,10 +267,12 @@
         let data = {
           f_userfiles_id: this.row.f_userfiles_id
         }
-        if (this.row.f_network_valve == null) {
-         this.$resetpost('rs/logic/openzdfk', data, {resolveMsg: '关闭自动阀控成功。', rejectMsg: '关闭自动阀控失败!!!'})
+        if (this.row.f_network_valve !== '1') {
+           this.$resetpost('rs/logic/openzdfk', data, {resolveMsg: '关闭自动阀控成功。', rejectMsg: '关闭自动阀控失败!!!'})
+           this.row.f_network_valve = '1'
         } else {
-          this.$resetpost('rs/logic/closezdfk', data, {resolveMsg: '开启自动阀控成功。', rejectMsg: '开启自动阀控失败!!!'})
+            this.$resetpost('rs/logic/closezdfk', data, {resolveMsg: '开启自动阀控成功。', rejectMsg: '开启自动阀控失败!!!'})
+            this.row.f_network_valve = null
         }
       },
       // 阀控管理

package/src/filiale/macheng/UserBaseInfoNew.vue

@@ -120,7 +120,7 @@
         <div  class="col-sm-4">
           <label class="font_normal_body_new">是否自动阀控</label>
 
-          <input class="input-underline" style="width:45%" :value="row.f_network_valve == null ? '是' : '否'" readonly>
+          <input class="input-underline" style="width:45%" :value="row.f_network_valve == '1' ? '否' : '是'" readonly>
         </div>
       </div>
       <div v-if="row.f_collection_type == '按气量'" >
@@ -268,10 +268,13 @@
         let data = {
           f_userfiles_id: this.row.f_userfiles_id
         }
-        if (this.row.f_network_valve == null) {
+        console.log('55555',this.row.f_network_valve)
+        if (this.row.f_network_valve !== '1') {
           this.$resetpost('rs/logic/openzdfk', data, {resolveMsg: '关闭自动阀控成功。', rejectMsg: '关闭自动阀控失败!!!'})
+          this.row.f_network_valve = '1'
         } else {
           this.$resetpost('rs/logic/closezdfk', data, {resolveMsg: '开启自动阀控成功。', rejectMsg: '开启自动阀控失败!!!'})
+          this.row.f_network_valve = null
         }
       },
       // 阀控管理

package/src/filiale/qianneng/HighMeter.vue

@@ -50,10 +50,14 @@
         <!--</div>-->
         <div class="operation-group">
           <strong class="operation" style="margin-top: 2px">视频操作:</strong>
+          <select id="DeviceName" name="D1" @change= "ChangeDevice()">
+          </select>
+            <select id="Resolution" name="D2" @change= "ChangeResolution()">
+            </select>
           <button class="btn btn-info photo" @click="bb()">拍照</button>
-          <button class="btn btn-info" @click="cam_switch(1)">打开视频1</button>
-          <button class="btn btn-info" @click="cam_switch(2)">打开视频2</button>
+          <button class="btn btn-info" @click="cam_switch(1)">打开视频</button>
           <button class="btn btn-info" @click="CloseVideo()">关闭视频</button>
+          <textarea id="base64" v-show="false" @change="base64change()"></textarea>
           <!--<button class="btn btn-info" @click="GetInitRet()">初始化结果</button>-->
           <!--<button class="btn btn-info" @click="GetPid()">取PID</button>-->
           <!--          <div style="display: inline-block;margin-left: 570px">-->
@@ -72,8 +76,8 @@
             <button style="position: absolute;buttom:-10px;left:0px;" @click="splitsimg">旋转</button>
           </div>
           <textarea id="Console" disabled="disabled"></textarea>
-          <IMG id="cam"  :src="cameraurl" width="640" height="640">
-          </IMG>
+          <div  style="width: 640px;height: 400px;" id='ActiveXDivOne'>
+          </div>
         </div>
         <!--        <div class="IdCard">-->
         <!--          <div class="auto IdInputDiv" style="margin-top: 20px"><strong class="IdHint">姓&emsp;&emsp;名</strong><input size=49 id="Name" class="IdInput"></div>-->
@@ -109,6 +113,7 @@
 </template>
 <script>
 
+  import * as hignmeter from './js/hignmeter'
   let ws
   let server_addr = 'ws://127.0.0.1:18888'// 本机端口地址
 export default {
@@ -226,17 +231,24 @@ export default {
         })
       },
       // 打开视频
-      cam_switch (capID) {
-        if (capID == 1) {
-          this.cameraurl = 'http://127.0.0.1:38088/video=stream&camidx=0'
-        }
-        if (capID == 2) {
-          this.cameraurl = 'http://127.0.0.1:38088/video=stream&camidx=1'
-        }
+      cam_switch () {
+        hignmeter.StartVideo()
+      },
+      base64change () {
+        setTimeout(() => {
+          let str = document.getElementById('base64').value
+          this.$dispatch('photo-finish', str)
+        }, 1000)
       },
       // 关闭视频
       CloseVideo () {
-        this.cameraurl = ''
+        hignmeter.CloseVideo()
+      },
+      ChangeDevice() {
+        hignmeter.ChangeDevice()
+      },
+      ChangeResolution() {
+        hignmeter.ChangeResolution()
       },
 
       SetQuality () {
@@ -351,19 +363,8 @@ export default {
       // },
       // //设置颜色模式 只针对截图
       bb () {
-        let camidx = 0
-        if (this.cameraurl === 'http://127.0.0.1:38088/video=stream&camidx=0') {
-          camidx = 0
-        } else if (this.cameraurl === 'http://127.0.0.1:38088/video=stream&camidx=1') {
-          camidx = 1
-        } else {
-          this.showAlert('请先打开视频', 'warning', 2000)
-          return
-        }
-        let param = {
-          camidx: camidx
-        }
-        this.$resetpost('http://127.0.0.1:38088/video=grabimage', param).then((msg) => {   // 截图
+        hignmeter.Capture()
+/*        this.$resetpost('http://127.0.0.1:38088/video=grabimage', param).then((msg) => {   // 截图
           console.log(msg)
 
           if (msg.data.code != '0') {
@@ -377,7 +378,7 @@ export default {
 
           this.$dispatch('photo-finish', msg.data.photoBase64)
           // document.getElementById("Base64IMG").src= "D:\\1234.jpg?" + Math.random();//网页预览图片
-        })
+        })*/
       },
       // 内存截图
       bbase64 () {
@@ -793,11 +794,7 @@ export default {
       }
     },
     ready () {
-      this.onLoad().then(() => {
-        this.$emit('ready')
-      }).catch((error) => {
-        this.$emit('error', error)
-      })
+      hignmeter.loadActiveX()
     }
   }
 </script>