manage-client 3.3.188 → 3.3.190

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,190 +1,190 @@
1
- var express = require('express')
2
- var webpack = require('webpack')
3
- var config = require('./webpack.dev.conf')
4
- var proxyMiddleware = require('http-proxy-middleware')
5
- // var httpProxy = require('http-proxy')
6
-
7
- var app = express()
8
- var compiler = webpack(config)
9
- // var proxy = httpProxy.createProxyServer()
10
-
11
- // Define HTTP proxies to your custom API backend
12
- // https://github.com/chimurai/http-proxy-middleware
13
- // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
14
- var shaoguan = 'http://119.146.1.106:8300/'
15
- var qtx= 'http://36.103.222.144:6300/'
16
- // var bendi = 'http://220.194.141.253:8600/'
17
- // var bendi = 'http://203.57.101.233:9001'
18
- // var bendi = 'http://172.168.1.11:9001/'
19
- // var bendi = 'http://203.57.101.233:8400/'
20
- // var bendi = 'http://121.36.106.17:8400/'
21
- // var fuwu = 'http://203.57.101.233:9001'
22
- var bendi = 'http://192.168.50.4:8400/'
23
- // var bendi = 'http://119.187.112.234:8400/'
24
- var wode = 'http://192.168.50.4:8400/'
25
- // 192.168.
26
- // var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
27
- // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
28
- var proxyTable = {
29
- '/rs/logic/exportfile': {
30
- target: bendi
31
- },
32
- '/api': {
33
- target: 'http://192.168.50.4:8400'
34
-
35
- },
36
- '/rs/sql/chargeQuery_by_gasproperties': {
37
- target: 'http://localhost:8084/'
38
- },
39
- '/rs/logic/chargeQuery_by_gasproperties_line': {
40
- target: 'http://localhost:8084/'
41
- },
42
- '/files': {
43
- target: bendi
44
- },
45
- // 查找资源服务数据
46
- '/rs/search': {
47
- target: bendi
48
- },
49
- // 查找资源服务数据
50
- '/rs/logic/getLogin': {
51
- target: bendi
52
- },
53
- // 查找资源服务数据
54
- '/rs/logic/getInitData': {
55
- target: bendi
56
- },
57
- '/rs/logic/getSaleInitData': {
58
- target: bendi
59
- },
60
- // 用户登录服务地址
61
- '/rs/user': {
62
- target: bendi
63
- },
64
- '/rs/path/getParams': {
65
- target: bendi
66
- },
67
- '/rs/data': {
68
- target: bendi
69
- },
70
- '/rs/license': {
71
- target: bendi
72
- },
73
- '/rs/db': {
74
- target: bendi
75
- },
76
- '/excel': {
77
- target: bendi
78
- },
79
- '/rs/config': {
80
- target: bendi
81
- },
82
- '/rs/sql/getLicenseById': {
83
- target: bendi
84
- },
85
- '/rs/report': {
86
- target: bendi
87
- },
88
- '/rs/vue': {
89
- target: bendi
90
- },
91
- '/rs/file': {
92
- target: bendi
93
- },
94
- '/rs/sql/singleTable': {
95
- target: bendi
96
- },
97
- '/rs': {
98
- target: wode
99
- }
100
- }
101
-
102
- var devMiddleware = require('webpack-dev-middleware')(compiler, {
103
- publicPath: config.output.publicPath,
104
- stats: {
105
- colors: true,
106
- chunks: false
107
- }
108
- })
109
-
110
- var hotMiddleware = require('webpack-hot-middleware')(compiler)
111
- // force page reload when html-webpack-plugin template changes
112
- compiler.plugin('compilation', function (compilation) {
113
- compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
114
- hotMiddleware.publish({action: 'reload'})
115
- cb()
116
- })
117
- })
118
-
119
- // proxy api requests
120
- Object.keys(proxyTable).forEach(function (context) {
121
- var options = proxyTable[context]
122
- if (typeof options === 'string') {
123
- options = {target: options}
124
- }
125
- app.use(proxyMiddleware(context, options))
126
- })
127
-
128
- // handle fallback for HTML5 history API
129
- app.use(require('connect-history-api-fallback')())
130
- // app.use(function (req, res, next) {
131
- // res.header('Access-Control-Allow-Origin', '*')
132
- // res.header('Access-Control-Allow-Headers', 'X-Requested-With')
133
- // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
134
- // res.header('X-Powered-By', '3,2,1')
135
- // res.header('Access-Control-Allow-Credentials', 'true')
136
- // res.header('Content-Type', 'application/json;charset=utf-8')
137
- // next()
138
- // })
139
-
140
- // serve webpack bundle output
141
- app.use(devMiddleware)
142
-
143
- // enable hot-reload and state-preserving
144
- // compilation error display
145
- app.use(hotMiddleware)
146
-
147
- // serve pure static assets
148
- app.use('/static', express.static('./static'))
149
-
150
- // app.all('/rs/*', function (req, res) {
151
- // proxy.web(req, res, {
152
- // target: 'http://127.0.0.1:8081/reports'
153
- // })
154
- // })
155
-
156
- // app.all('/rs/*', function (req, res) {
157
- // proxy.web(req, res, {
158
- // target: 'http://127.0.0.1:8081/ldap'
159
- // })
160
- // })
161
- // app.all('/excel/*', function (req, res) {
162
- // proxy.web(req, res, {
163
- // target: 'http://127.0.0.1:8081/charge'
164
- // })
165
- // })
166
-
167
- // app.all('/rs/*', function (req, res) {
168
- // proxy.web(req, res, {
169
- // target: 'http://127.0.0.1:82/charge'
170
- // })
171
- // })
172
-
173
- // app.all('/*', function (req, res) {
174
- // proxy.web(req, res, {
175
- // target: 'http://127.0.0.1:82'
176
- // })
177
- // })
178
- // app.all('/rs/user', function (req, res) {
179
- // proxy.web(req, res, {
180
- // target: 'http://127.0.0.1:82'
181
- // })
182
- // })
183
-
184
- module.exports = app.listen(8015, function (err) {
185
- if (err) {
186
- console.log(err)
187
- return
188
- }
189
- console.log('Listening at http://localhost:8015')
190
- })
1
+ var express = require('express')
2
+ var webpack = require('webpack')
3
+ var config = require('./webpack.dev.conf')
4
+ var proxyMiddleware = require('http-proxy-middleware')
5
+ // var httpProxy = require('http-proxy')
6
+
7
+ var app = express()
8
+ var compiler = webpack(config)
9
+ // var proxy = httpProxy.createProxyServer()
10
+
11
+ // Define HTTP proxies to your custom API backend
12
+ // https://github.com/chimurai/http-proxy-middleware
13
+ // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
14
+ var shaoguan = 'http://119.146.1.106:8300/'
15
+ var qtx= 'http://36.103.222.144:6300/'
16
+ // var bendi = 'http://220.194.141.253:8600/'
17
+ // var bendi = 'http://203.57.101.233:9001'
18
+ // var bendi = 'http://172.168.1.11:9001/'
19
+ // var bendi = 'http://203.57.101.233:8400/'
20
+ // var bendi = 'http://121.36.106.17:8400/'
21
+ // var fuwu = 'http://203.57.101.233:9001'
22
+ var bendi = 'http://192.168.50.4:8400/'
23
+ // var bendi = 'http://119.187.112.234:8400/'
24
+ var wode = 'http://192.168.50.4:8400/'
25
+ // 192.168.
26
+ // var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
27
+ // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
28
+ var proxyTable = {
29
+ '/rs/logic/exportfile': {
30
+ target: bendi
31
+ },
32
+ '/api': {
33
+ target: 'http://192.168.50.4:8400'
34
+
35
+ },
36
+ '/rs/sql/chargeQuery_by_gasproperties': {
37
+ target: 'http://localhost:8084/'
38
+ },
39
+ '/rs/logic/chargeQuery_by_gasproperties_line': {
40
+ target: 'http://localhost:8084/'
41
+ },
42
+ '/files': {
43
+ target: bendi
44
+ },
45
+ // 查找资源服务数据
46
+ '/rs/search': {
47
+ target: bendi
48
+ },
49
+ // 查找资源服务数据
50
+ '/rs/logic/getLogin': {
51
+ target: bendi
52
+ },
53
+ // 查找资源服务数据
54
+ '/rs/logic/getInitData': {
55
+ target: bendi
56
+ },
57
+ '/rs/logic/getSaleInitData': {
58
+ target: bendi
59
+ },
60
+ // 用户登录服务地址
61
+ '/rs/user': {
62
+ target: bendi
63
+ },
64
+ '/rs/path/getParams': {
65
+ target: bendi
66
+ },
67
+ '/rs/data': {
68
+ target: bendi
69
+ },
70
+ '/rs/license': {
71
+ target: bendi
72
+ },
73
+ '/rs/db': {
74
+ target: bendi
75
+ },
76
+ '/excel': {
77
+ target: bendi
78
+ },
79
+ '/rs/config': {
80
+ target: bendi
81
+ },
82
+ '/rs/sql/getLicenseById': {
83
+ target: bendi
84
+ },
85
+ '/rs/report': {
86
+ target: bendi
87
+ },
88
+ '/rs/vue': {
89
+ target: bendi
90
+ },
91
+ '/rs/file': {
92
+ target: bendi
93
+ },
94
+ '/rs/sql/singleTable': {
95
+ target: bendi
96
+ },
97
+ '/rs': {
98
+ target: wode
99
+ }
100
+ }
101
+
102
+ var devMiddleware = require('webpack-dev-middleware')(compiler, {
103
+ publicPath: config.output.publicPath,
104
+ stats: {
105
+ colors: true,
106
+ chunks: false
107
+ }
108
+ })
109
+
110
+ var hotMiddleware = require('webpack-hot-middleware')(compiler)
111
+ // force page reload when html-webpack-plugin template changes
112
+ compiler.plugin('compilation', function (compilation) {
113
+ compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
114
+ hotMiddleware.publish({action: 'reload'})
115
+ cb()
116
+ })
117
+ })
118
+
119
+ // proxy api requests
120
+ Object.keys(proxyTable).forEach(function (context) {
121
+ var options = proxyTable[context]
122
+ if (typeof options === 'string') {
123
+ options = {target: options}
124
+ }
125
+ app.use(proxyMiddleware(context, options))
126
+ })
127
+
128
+ // handle fallback for HTML5 history API
129
+ app.use(require('connect-history-api-fallback')())
130
+ // app.use(function (req, res, next) {
131
+ // res.header('Access-Control-Allow-Origin', '*')
132
+ // res.header('Access-Control-Allow-Headers', 'X-Requested-With')
133
+ // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
134
+ // res.header('X-Powered-By', '3,2,1')
135
+ // res.header('Access-Control-Allow-Credentials', 'true')
136
+ // res.header('Content-Type', 'application/json;charset=utf-8')
137
+ // next()
138
+ // })
139
+
140
+ // serve webpack bundle output
141
+ app.use(devMiddleware)
142
+
143
+ // enable hot-reload and state-preserving
144
+ // compilation error display
145
+ app.use(hotMiddleware)
146
+
147
+ // serve pure static assets
148
+ app.use('/static', express.static('./static'))
149
+
150
+ // app.all('/rs/*', function (req, res) {
151
+ // proxy.web(req, res, {
152
+ // target: 'http://127.0.0.1:8081/reports'
153
+ // })
154
+ // })
155
+
156
+ // app.all('/rs/*', function (req, res) {
157
+ // proxy.web(req, res, {
158
+ // target: 'http://127.0.0.1:8081/ldap'
159
+ // })
160
+ // })
161
+ // app.all('/excel/*', function (req, res) {
162
+ // proxy.web(req, res, {
163
+ // target: 'http://127.0.0.1:8081/charge'
164
+ // })
165
+ // })
166
+
167
+ // app.all('/rs/*', function (req, res) {
168
+ // proxy.web(req, res, {
169
+ // target: 'http://127.0.0.1:82/charge'
170
+ // })
171
+ // })
172
+
173
+ // app.all('/*', function (req, res) {
174
+ // proxy.web(req, res, {
175
+ // target: 'http://127.0.0.1:82'
176
+ // })
177
+ // })
178
+ // app.all('/rs/user', function (req, res) {
179
+ // proxy.web(req, res, {
180
+ // target: 'http://127.0.0.1:82'
181
+ // })
182
+ // })
183
+
184
+ module.exports = app.listen(8015, function (err) {
185
+ if (err) {
186
+ console.log(err)
187
+ return
188
+ }
189
+ console.log('Listening at http://localhost:8015')
190
+ })
package/package.json CHANGED
@@ -1,111 +1,111 @@
1
- {
2
- "name": "manage-client",
3
- "version": "3.3.188",
4
- "description": "经营管控模块前台组件",
5
- "main": "src/index.js",
6
- "directories": {
7
- "test": "test"
8
- },
9
- "dependencies": {
10
- "crypto-js": "^4.1.1",
11
- "swiper": "^5.4.5"
12
- },
13
- "devDependencies": {
14
- "axios": "0.15.3",
15
- "babel-core": "^6.0.0",
16
- "babel-loader": "^6.0.0",
17
- "babel-plugin-transform-runtime": "^6.0.0",
18
- "babel-preset-es2015": "^6.0.0",
19
- "babel-preset-stage-2": "^6.0.0",
20
- "chai": "^3.5.0",
21
- "co": "^4.6.0",
22
- "connect-history-api-fallback": "^1.1.0",
23
- "cross-env": "^1.0.7",
24
- "cross-spawn": "^2.1.5",
25
- "css-loader": "^0.23.0",
26
- "echarts": "^4.1.0",
27
- "eslint": "^2.0.0",
28
- "eslint-config-standard": "^5.1.0",
29
- "eslint-friendly-formatter": "^1.2.2",
30
- "eslint-loader": "^1.3.0",
31
- "eslint-plugin-html": "^1.3.0",
32
- "eslint-plugin-promise": "^1.0.8",
33
- "eslint-plugin-standard": "^1.3.2",
34
- "eslint-plugin-vue": "^0.1.1",
35
- "eventsource-polyfill": "^0.9.6",
36
- "express": "^4.13.3",
37
- "extract-text-webpack-plugin": "^1.0.1",
38
- "filemanager-webpack-plugin": "^2.0.5",
39
- "file-loader": "^0.8.4",
40
- "function-bind": "^1.0.2",
41
- "html-webpack-plugin": "^2.8.1",
42
- "http-proxy-middleware": "^0.11.0",
43
- "inject-loader": "^2.0.1",
44
- "isparta-loader": "^2.0.0",
45
- "jasmine-core": "^2.4.1",
46
- "jquery": "^3.3.1",
47
- "jsencrypt": "3.0.0-rc.1",
48
- "json-loader": "^0.5.4",
49
- "karma": "^1.4.1",
50
- "karma-chrome-launcher": "^2.2.0",
51
- "karma-coverage": "^1.1.1",
52
- "karma-mocha": "^1.3.0",
53
- "karma-sinon-chai": "^1.3.1",
54
- "karma-sourcemap-loader": "^0.3.7",
55
- "karma-spec-reporter": "0.0.31",
56
- "karma-webpack": "^2.0.2",
57
- "ldap-clients": "3.0.7",
58
- "less": "^2.7.3",
59
- "mkdirp": "^0.5.1",
60
- "mocha": "^3.2.0",
61
- "moment": "2.24.0",
62
- "ncp": "^2.0.0",
63
- "rimraf": "^2.5.0",
64
- "sale-client": "3.4.14",
65
- "selenium-server": "2.52.0",
66
- "sinon": "^2.1.0",
67
- "sinon-chai": "^2.8.0",
68
- "style": "0.0.3",
69
- "style-loader": "^0.20.3",
70
- "swiper": "^5.4.5",
71
- "system-clients": "3.2.61",
72
- "url-loader": "^0.5.7",
73
- "vue-amap": "0.5.10",
74
- "vue-client": "1.24.141",
75
- "vue-hot-reload-api": "^1.2.0",
76
- "vue-html-loader": "^1.0.0",
77
- "vue-loader": "8.2.1",
78
- "vue-resource": "^1.5.0",
79
- "vue-router": "^0.7.13",
80
- "vue-strap": "^1.0.9",
81
- "vue-style-loader": "^1.0.0",
82
- "vue-validator": "2.1.7",
83
- "webpack": "1.12.2",
84
- "webpack-dev-middleware": "^1.4.0",
85
- "webpack-hot-middleware": "^2.6.0",
86
- "webpack-merge": "^0.8.3",
87
- "webpack-parallel-uglify-plugin": "^1.0.0"
88
- },
89
- "scripts": {
90
- "unit": "karma start test/unit/karma.conf.js --single-run",
91
- "example": "node build/example-server.js",
92
- "dev": "node build/dev-server.js",
93
- "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
94
- "oldbuild": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.oldprod.conf.js",
95
- "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",
96
- "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",
97
- "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",
98
- "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",
99
- "e2e": "node test/e2e/runner.js",
100
- "release": "bash build/release.sh"
101
- },
102
- "repository": {
103
- "type": "git",
104
- "url": "https://gitee.com/aote/management_modules.git"
105
- },
106
- "keywords": [
107
- "manage"
108
- ],
109
- "author": "liuxudong",
110
- "license": "ISC"
111
- }
1
+ {
2
+ "name": "manage-client",
3
+ "version": "3.3.190",
4
+ "description": "经营管控模块前台组件",
5
+ "main": "src/index.js",
6
+ "directories": {
7
+ "test": "test"
8
+ },
9
+ "dependencies": {
10
+ "crypto-js": "^4.1.1",
11
+ "swiper": "^5.4.5"
12
+ },
13
+ "devDependencies": {
14
+ "axios": "0.15.3",
15
+ "babel-core": "^6.0.0",
16
+ "babel-loader": "^6.0.0",
17
+ "babel-plugin-transform-runtime": "^6.0.0",
18
+ "babel-preset-es2015": "^6.0.0",
19
+ "babel-preset-stage-2": "^6.0.0",
20
+ "chai": "^3.5.0",
21
+ "co": "^4.6.0",
22
+ "connect-history-api-fallback": "^1.1.0",
23
+ "cross-env": "^1.0.7",
24
+ "cross-spawn": "^2.1.5",
25
+ "css-loader": "^0.23.0",
26
+ "echarts": "^4.1.0",
27
+ "eslint": "^2.0.0",
28
+ "eslint-config-standard": "^5.1.0",
29
+ "eslint-friendly-formatter": "^1.2.2",
30
+ "eslint-loader": "^1.3.0",
31
+ "eslint-plugin-html": "^1.3.0",
32
+ "eslint-plugin-promise": "^1.0.8",
33
+ "eslint-plugin-standard": "^1.3.2",
34
+ "eslint-plugin-vue": "^0.1.1",
35
+ "eventsource-polyfill": "^0.9.6",
36
+ "express": "^4.13.3",
37
+ "extract-text-webpack-plugin": "^1.0.1",
38
+ "filemanager-webpack-plugin": "^2.0.5",
39
+ "file-loader": "^0.8.4",
40
+ "function-bind": "^1.0.2",
41
+ "html-webpack-plugin": "^2.8.1",
42
+ "http-proxy-middleware": "^0.11.0",
43
+ "inject-loader": "^2.0.1",
44
+ "isparta-loader": "^2.0.0",
45
+ "jasmine-core": "^2.4.1",
46
+ "jquery": "^3.3.1",
47
+ "jsencrypt": "3.0.0-rc.1",
48
+ "json-loader": "^0.5.4",
49
+ "karma": "^1.4.1",
50
+ "karma-chrome-launcher": "^2.2.0",
51
+ "karma-coverage": "^1.1.1",
52
+ "karma-mocha": "^1.3.0",
53
+ "karma-sinon-chai": "^1.3.1",
54
+ "karma-sourcemap-loader": "^0.3.7",
55
+ "karma-spec-reporter": "0.0.31",
56
+ "karma-webpack": "^2.0.2",
57
+ "ldap-clients": "3.0.7",
58
+ "less": "^2.7.3",
59
+ "mkdirp": "^0.5.1",
60
+ "mocha": "^3.2.0",
61
+ "moment": "2.24.0",
62
+ "ncp": "^2.0.0",
63
+ "rimraf": "^2.5.0",
64
+ "sale-client": "3.4.14",
65
+ "selenium-server": "2.52.0",
66
+ "sinon": "^2.1.0",
67
+ "sinon-chai": "^2.8.0",
68
+ "style": "0.0.3",
69
+ "style-loader": "^0.20.3",
70
+ "swiper": "^5.4.5",
71
+ "system-clients": "3.2.61",
72
+ "url-loader": "^0.5.7",
73
+ "vue-amap": "0.5.10",
74
+ "vue-client": "1.24.141",
75
+ "vue-hot-reload-api": "^1.2.0",
76
+ "vue-html-loader": "^1.0.0",
77
+ "vue-loader": "8.2.1",
78
+ "vue-resource": "^1.5.0",
79
+ "vue-router": "^0.7.13",
80
+ "vue-strap": "^1.0.9",
81
+ "vue-style-loader": "^1.0.0",
82
+ "vue-validator": "2.1.7",
83
+ "webpack": "1.12.2",
84
+ "webpack-dev-middleware": "^1.4.0",
85
+ "webpack-hot-middleware": "^2.6.0",
86
+ "webpack-merge": "^0.8.3",
87
+ "webpack-parallel-uglify-plugin": "^1.0.0"
88
+ },
89
+ "scripts": {
90
+ "unit": "karma start test/unit/karma.conf.js --single-run",
91
+ "example": "node build/example-server.js",
92
+ "dev": "node build/dev-server.js",
93
+ "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
94
+ "oldbuild": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.oldprod.conf.js",
95
+ "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",
96
+ "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",
97
+ "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",
98
+ "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",
99
+ "e2e": "node test/e2e/runner.js",
100
+ "release": "bash build/release.sh"
101
+ },
102
+ "repository": {
103
+ "type": "git",
104
+ "url": "https://gitee.com/aote/management_modules.git"
105
+ },
106
+ "keywords": [
107
+ "manage"
108
+ ],
109
+ "author": "liuxudong",
110
+ "license": "ISC"
111
+ }
@@ -394,9 +394,6 @@
394
394
  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
395
395
  补气金额合计:&emsp;{{sumsmodel.f_remanent_money}}
396
396
  </td>
397
- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
398
- 户数合计:&emsp;{{sumsmodel.hushu}}
399
- </td>
400
397
  </tr>
401
398
  </table>
402
399
  <!--<colligate-details :showinfo="showinfo" :businesstype="businesstype" :data="data" @close-info="showinfo=false"></colligate-details>-->
@@ -463,7 +460,7 @@
463
460
  footer:[],
464
461
  meterbrands: [],
465
462
  pricenames: [],
466
- model: new PagedList('api/af-revenue/sql/changeMeterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_balance_amount: 0,f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0,hushu:0}),
463
+ model: new PagedList('api/af-revenue/sql/changeMeterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_balance_amount: 0,f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0}),
467
464
  criteriaShow: false,
468
465
  orgCondtionStr: '',
469
466
  modelval: [],
@@ -294,7 +294,7 @@
294
294
  </div>
295
295
  <modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;" v-ref:modal middle backdrop="false">
296
296
  <article slot="modal-body">
297
- <upload :blodid="selected.f_userinfo_id" v-ref:upload isupload="false" takeimg="false" fusetype="补气" :isremark="false" style="width:auto" ></upload>
297
+ <upload :businessid="selected.id" v-ref:upload isupload="false" takeimg="false" fusetype="补气" :isremark="false" style="width:auto" ></upload>
298
298
  </article>
299
299
  <footer slot="modal-footer" class="modal-footer">
300
300
  </footer>