manage-client 4.0.28 → 4.0.29-yc

package/build/dev-server.js

@@ -1,190 +1,206 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-// var httpProxy = require('http-proxy')
-
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
-
-// Define HTTP proxies to your custom API backend
-// https://github.com/chimurai/http-proxy-middleware
-// var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
-var shaoguan = 'http://119.146.1.106:8300/'
-var qtx= 'http://36.103.222.144:6300/'
-// var bendi = 'http://220.194.141.253:8600/'
-// var bendi = 'http://203.57.101.233:9001'
-// var bendi = 'http://172.168.1.11:9001/'
-// var bendi = 'http://192.168.50.4:8400/'
-// var bendi = 'http://121.36.106.17:8400/'
-// var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://192.168.50.4:8400/'
-// var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://192.168.50.4:8400/'
-// 192.168.
-//  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
-// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
-var proxyTable = {
-  '/rs/logic/exportfile': {
-    target: bendi
-  },
-  '/api': {
-    target: 'http://192.168.50.4:8400'
-
-  },
-  '/rs/sql/chargeQuery_by_gasproperties': {
-    target: 'http://localhost:8084/'
-  },
-  '/rs/logic/chargeQuery_by_gasproperties_line': {
-    target: 'http://localhost:8084/'
-  },
-  '/files': {
-    target: bendi
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: bendi
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: bendi
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: bendi
-  },
-  '/rs/logic/getSaleInitData': {
-    target: bendi
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: bendi
-  },
-  '/rs/path/getParams': {
-    target: bendi
-  },
-  '/rs/data': {
-    target: bendi
-  },
-  '/rs/license': {
-    target: bendi
-  },
-  '/rs/db': {
-    target: bendi
-  },
-  '/excel': {
-    target: bendi
-  },
-  '/rs/config': {
-    target: bendi
-  },
-  '/rs/sql/getLicenseById': {
-    target: bendi
-  },
-  '/rs/report': {
-    target: bendi
-  },
-  '/rs/vue': {
-    target: bendi
-  },
-  '/rs/file': {
-    target: bendi
-  },
-  '/rs/sql/singleTable': {
-    target: bendi
-  },
-  '/rs': {
-    target: wode
-  }
-}
-
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({action: 'reload'})
-    cb()
-  })
-})
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
-
-// serve webpack bundle output
-app.use(devMiddleware)
-
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-
-// serve pure static assets
-app.use('/static', express.static('./static'))
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/reports'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/ldap'
-//   })
-// })
-// app.all('/excel/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/charge'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82/charge'
-//   })
-// })
-
-// app.all('/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-// app.all('/rs/user', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-
-module.exports = app.listen(8015, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8015')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var proxyMiddleware = require('http-proxy-middleware')
+// var httpProxy = require('http-proxy')
+
+var app = express()
+var compiler = webpack(config)
+// var proxy = httpProxy.createProxyServer()
+
+// Define HTTP proxies to your custom API backend
+// https://github.com/chimurai/http-proxy-middleware
+// var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
+// var shaoguan = 'http://119.146.1.106:8300/'
+// var qtx= 'http://36.103.222.144:6300/'
+// var bendi = 'http://220.194.141.253:8600/'
+// var bendi = 'http://203.57.101.233:9001'
+// var bendi = 'http://172.168.1.11:9001/'
+var bendi = 'http://124.71.151.143:8300/'
+// var bendi = 'http://121.36.106.17:8400/'
+// var fuwu = 'http://203.57.101.233:9001'
+// var bendi = 'http://192.168.50.4:8400/'
+// var bendi = 'http://119.187.112.234:8400/'
+var wode = 'http://127.0.0.1:8488/'
+// 192.168.
+//  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
+// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
+var proxyTable = {
+  '/rs/logic/exportfile': {
+    target: bendi
+  },
+  '/files': {
+    target: bendi
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: bendi
+  },
+  // 查找资源服务数据
+  '/webapps': {
+    target: bendi
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: bendi
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: bendi
+  },
+  '/rs/logic/getSaleInitData': {
+    target: bendi
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: bendi
+  },
+  '/rs/path/getParams': {
+    target: bendi
+  },
+  '/rs/data': {
+    target: bendi
+  },
+  '/rs/license': {
+    target: bendi
+  },
+  '/rs/db': {
+    target: bendi
+  },
+  '/excel': {
+    target: bendi
+  },
+  '/rs/config': {
+    target: bendi
+  },
+  '/rs/sql/getLicenseById': {
+    target: bendi
+  },
+  '/rs/vue': {
+    target: bendi
+  },
+  '/rs/file': {
+    target: bendi
+  },
+  '/rs/sql/singleTable': {
+    target: bendi
+  },
+  // '/api/af-revenue/logic/openapi/exportfile': {
+  //   pathRewrite: {'^/api/af-revenue/logic/openapi/exportfile': '/rs/logic/exportfile'},
+  //   changeOrigin: true,
+  //   target: bendi
+  // },
+  // '/api/af-revenue/sql/': {
+  //   pathRewrite: {'^/api/af-revenue/sql': '/rs/sql'},
+  //   changeOrigin: true,
+  //   target: bendi
+  // },
+  // '/api/af-revenue/logic/': {
+  //   pathRewrite: {'^/api/af-revenue/logic': '/rs/logic'},
+  //   changeOrigin: true,
+  //   target: bendi
+  // },
+  // '/api/af-revenue/report/': {
+  //   pathRewrite: {'^/api/af-revenue/report': '/rs/report'},
+  //   changeOrigin: true,
+  //   target: bendi
+  // },
+  '/api': {
+    changeOrigin: true,
+    target: bendi
+  },
+  '/rs': {
+    changeOrigin: true,
+    target: bendi
+  }
+}
+
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+var hotMiddleware = require('webpack-hot-middleware')(compiler)
+// force page reload when html-webpack-plugin template changes
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({action: 'reload'})
+    cb()
+  })
+})
+
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+  var options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+// app.use(function (req, res, next) {
+//   res.header('Access-Control-Allow-Origin', '*')
+//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
+//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
+//   res.header('X-Powered-By', '3,2,1')
+//   res.header('Access-Control-Allow-Credentials', 'true')
+//   res.header('Content-Type', 'application/json;charset=utf-8')
+//   next()
+// })
+
+// serve webpack bundle output
+app.use(devMiddleware)
+
+// enable hot-reload and state-preserving
+// compilation error display
+app.use(hotMiddleware)
+
+// serve pure static assets
+app.use('/static', express.static('./static'))
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/reports'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/ldap'
+//   })
+// })
+// app.all('/excel/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/charge'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82/charge'
+//   })
+// })
+
+// app.all('/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+// app.all('/rs/user', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+
+module.exports = app.listen(8015, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8015')
+})

package/package.json

@@ -1,111 +1,111 @@
-{
-    "name": "manage-client",
-    "version": "4.0.28",
-    "description": "经营管控模块前台组件",
-    "main": "src/index.js",
-    "directories": {
-        "test": "test"
-    },
-    "dependencies": {
-        "crypto-js": "^4.1.1",
-        "swiper": "^5.4.5"
-    },
-    "devDependencies": {
-        "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",
-        "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": "^1.0.1",
-        "filemanager-webpack-plugin": "^2.0.5",
-        "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",
-        "less": "^2.7.3",
-        "mkdirp": "^0.5.1",
-        "mocha": "^3.2.0",
-        "moment": "2.24.0",
-        "ncp": "^2.0.0",
-        "rimraf": "^2.5.0",
-        "sale-client": "3.4.14",
-        "selenium-server": "2.52.0",
-        "sinon": "^2.1.0",
-        "sinon-chai": "^2.8.0",
-        "style": "0.0.3",
-        "style-loader": "^0.20.3",
-        "swiper": "^5.4.5",
-        "system-clients": "3.3.2",
-        "ldap-clients": "3.0.96",
-        "url-loader": "^0.5.7",
-        "vue-amap": "0.5.10",
-        "vue-client": "1.24.162",
-        "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",
-        "webpack-parallel-uglify-plugin": "^1.0.0"
-    },
-    "scripts": {
-        "unit": "karma start test/unit/karma.conf.js --single-run",
-        "example": "node build/example-server.js",
-        "dev": "node build/dev-server.js",
-        "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-        "oldbuild": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.oldprod.conf.js",
-        "build": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_ENTRY=reportManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_BUILDEND=true VUE_APP_ENTRY=webmeterManage webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-        "buildSaleManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-        "buildReportManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=reportManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-        "buildWebmeterManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=webmeterManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-        "e2e": "node test/e2e/runner.js",
-        "release": "bash build/release.sh"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://gitee.com/aote/management_modules.git"
-    },
-    "keywords": [
-        "manage"
-    ],
-    "author": "liuxudong",
-    "license": "ISC"
-}
+{
+    "name": "manage-client",
+    "version": "4.0.29-yc",
+    "description": "经营管控模块前台组件",
+    "main": "src/index.js",
+    "directories": {
+        "test": "test"
+    },
+    "dependencies": {
+        "crypto-js": "^4.1.1",
+        "swiper": "^5.4.5"
+    },
+    "devDependencies": {
+        "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",
+        "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": "^1.0.1",
+        "filemanager-webpack-plugin": "^2.0.5",
+        "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",
+        "less": "^2.7.3",
+        "mkdirp": "^0.5.1",
+        "mocha": "^3.2.0",
+        "moment": "2.24.0",
+        "ncp": "^2.0.0",
+        "rimraf": "^2.5.0",
+        "sale-client": "3.4.14",
+        "selenium-server": "2.52.0",
+        "sinon": "^2.1.0",
+        "sinon-chai": "^2.8.0",
+        "style": "0.0.3",
+        "style-loader": "^0.20.3",
+        "swiper": "^5.4.5",
+        "system-clients": "3.3.2",
+        "ldap-clients": "3.0.96",
+        "url-loader": "^0.5.7",
+        "vue-amap": "0.5.10",
+        "vue-client": "1.24.162",
+        "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",
+        "webpack-parallel-uglify-plugin": "^1.0.0"
+    },
+    "scripts": {
+        "unit": "karma start test/unit/karma.conf.js --single-run",
+        "example": "node build/example-server.js",
+        "dev": "node build/dev-server.js",
+        "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+        "oldbuild": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.oldprod.conf.js",
+        "build": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_ENTRY=reportManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_BUILDEND=true VUE_APP_ENTRY=webmeterManage webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+        "buildSaleManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+        "buildReportManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=reportManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+        "buildWebmeterManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=webmeterManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+        "e2e": "node test/e2e/runner.js",
+        "release": "bash build/release.sh"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://gitee.com/aote/management_modules.git"
+    },
+    "keywords": [
+        "manage"
+    ],
+    "author": "liuxudong",
+    "license": "ISC"
+}

package/src/components/webmeter/gasAnalysis/WebmeterSettlementAnalysis.vue

@@ -9,7 +9,7 @@
                 <label class="font_normal_body">客户编号</label>
                 <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
                        v-model="model.f_userinfo_code" placeholder='客户编号'
-                       condition="f_userinfo_code like '%{}%'" v-el:xq v-next-el='userinfocode' v-el:username
+                       condition="f_userinfo_code = '{}'" v-el:xq v-next-el='userinfocode' v-el:username
                 >
               </div>
               <div class="col-sm-2 form-group">
@@ -30,7 +30,7 @@
                 <label class="font_normal_body">&nbsp;&nbsp;&nbsp;表号&nbsp;&nbsp;&nbsp;</label>
                 <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
                        v-model="model.f_meternumber" placeholder='表号'
-                       condition="f_meternumber like '%{}%'" v-next-el='meternumber' v-el:meternumber
+                       condition="f_meternumber = '{}'" v-next-el='meternumber' v-el:meternumber
                 >
               </div>
               <div style="float:right">