manage-client 3.2.265 → 3.2.266
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.
- package/build/dev-server.js +180 -180
- package/package.json +1 -1
- package/src/components/webmeter/DrillData/UserGasAll.vue +1 -1
- package/src/components/webmeter/gasStatistics/GasStatistics.vue +1 -1
- package/src/filiale/wenxi/GasDeviceQuery.vue +12 -0
- package/src/filiale/wenxi/GasStatistics.vue +512 -0
- package/src/filiale/wenxi/NewGasStatistics.vue +520 -0
- package/src/filiale/wenxi/webmeterManage.js +4 -0
- package/src/main.js +66 -66
package/build/dev-server.js
CHANGED
|
@@ -1,180 +1,180 @@
|
|
|
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://127.0.0.1:
|
|
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
|
-
'/files': {
|
|
33
|
-
target: bendi
|
|
34
|
-
},
|
|
35
|
-
// 查找资源服务数据
|
|
36
|
-
'/rs/search': {
|
|
37
|
-
target: bendi
|
|
38
|
-
},
|
|
39
|
-
// 查找资源服务数据
|
|
40
|
-
'/rs/logic/getLogin': {
|
|
41
|
-
target: bendi
|
|
42
|
-
},
|
|
43
|
-
// 查找资源服务数据
|
|
44
|
-
'/rs/logic/getInitData': {
|
|
45
|
-
target: bendi
|
|
46
|
-
},
|
|
47
|
-
'/rs/logic/getSaleInitData': {
|
|
48
|
-
target: bendi
|
|
49
|
-
},
|
|
50
|
-
// 用户登录服务地址
|
|
51
|
-
'/rs/user': {
|
|
52
|
-
target: bendi
|
|
53
|
-
},
|
|
54
|
-
'/rs/path/getParams': {
|
|
55
|
-
target: bendi
|
|
56
|
-
},
|
|
57
|
-
'/rs/data': {
|
|
58
|
-
target: bendi
|
|
59
|
-
},
|
|
60
|
-
'/rs/license': {
|
|
61
|
-
target: bendi
|
|
62
|
-
},
|
|
63
|
-
'/rs/db': {
|
|
64
|
-
target: bendi
|
|
65
|
-
},
|
|
66
|
-
'/excel': {
|
|
67
|
-
target: bendi
|
|
68
|
-
},
|
|
69
|
-
'/rs/config': {
|
|
70
|
-
target: bendi
|
|
71
|
-
},
|
|
72
|
-
'/rs/sql/getLicenseById': {
|
|
73
|
-
target: bendi
|
|
74
|
-
},
|
|
75
|
-
'/rs/report': {
|
|
76
|
-
target:
|
|
77
|
-
},
|
|
78
|
-
'/rs/vue': {
|
|
79
|
-
target: bendi
|
|
80
|
-
},
|
|
81
|
-
'/rs/file': {
|
|
82
|
-
target: bendi
|
|
83
|
-
},
|
|
84
|
-
'/rs/sql/singleTable': {
|
|
85
|
-
target: bendi
|
|
86
|
-
},
|
|
87
|
-
'/rs': {
|
|
88
|
-
target: wode
|
|
89
|
-
}
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
var devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
93
|
-
publicPath: config.output.publicPath,
|
|
94
|
-
stats: {
|
|
95
|
-
colors: true,
|
|
96
|
-
chunks: false
|
|
97
|
-
}
|
|
98
|
-
})
|
|
99
|
-
|
|
100
|
-
var hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
101
|
-
// force page reload when html-webpack-plugin template changes
|
|
102
|
-
compiler.plugin('compilation', function (compilation) {
|
|
103
|
-
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
104
|
-
hotMiddleware.publish({action: 'reload'})
|
|
105
|
-
cb()
|
|
106
|
-
})
|
|
107
|
-
})
|
|
108
|
-
|
|
109
|
-
// proxy api requests
|
|
110
|
-
Object.keys(proxyTable).forEach(function (context) {
|
|
111
|
-
var options = proxyTable[context]
|
|
112
|
-
if (typeof options === 'string') {
|
|
113
|
-
options = {target: options}
|
|
114
|
-
}
|
|
115
|
-
app.use(proxyMiddleware(context, options))
|
|
116
|
-
})
|
|
117
|
-
|
|
118
|
-
// handle fallback for HTML5 history API
|
|
119
|
-
app.use(require('connect-history-api-fallback')())
|
|
120
|
-
// app.use(function (req, res, next) {
|
|
121
|
-
// res.header('Access-Control-Allow-Origin', '*')
|
|
122
|
-
// res.header('Access-Control-Allow-Headers', 'X-Requested-With')
|
|
123
|
-
// res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
|
|
124
|
-
// res.header('X-Powered-By', '3,2,1')
|
|
125
|
-
// res.header('Access-Control-Allow-Credentials', 'true')
|
|
126
|
-
// res.header('Content-Type', 'application/json;charset=utf-8')
|
|
127
|
-
// next()
|
|
128
|
-
// })
|
|
129
|
-
|
|
130
|
-
// serve webpack bundle output
|
|
131
|
-
app.use(devMiddleware)
|
|
132
|
-
|
|
133
|
-
// enable hot-reload and state-preserving
|
|
134
|
-
// compilation error display
|
|
135
|
-
app.use(hotMiddleware)
|
|
136
|
-
|
|
137
|
-
// serve pure static assets
|
|
138
|
-
app.use('/static', express.static('./static'))
|
|
139
|
-
|
|
140
|
-
// app.all('/rs/*', function (req, res) {
|
|
141
|
-
// proxy.web(req, res, {
|
|
142
|
-
// target: 'http://127.0.0.1:8081/reports'
|
|
143
|
-
// })
|
|
144
|
-
// })
|
|
145
|
-
|
|
146
|
-
// app.all('/rs/*', function (req, res) {
|
|
147
|
-
// proxy.web(req, res, {
|
|
148
|
-
// target: 'http://127.0.0.1:8081/ldap'
|
|
149
|
-
// })
|
|
150
|
-
// })
|
|
151
|
-
// app.all('/excel/*', function (req, res) {
|
|
152
|
-
// proxy.web(req, res, {
|
|
153
|
-
// target: 'http://127.0.0.1:8081/charge'
|
|
154
|
-
// })
|
|
155
|
-
// })
|
|
156
|
-
|
|
157
|
-
// app.all('/rs/*', function (req, res) {
|
|
158
|
-
// proxy.web(req, res, {
|
|
159
|
-
// target: 'http://127.0.0.1:82/charge'
|
|
160
|
-
// })
|
|
161
|
-
// })
|
|
162
|
-
|
|
163
|
-
// app.all('/*', function (req, res) {
|
|
164
|
-
// proxy.web(req, res, {
|
|
165
|
-
// target: 'http://127.0.0.1:82'
|
|
166
|
-
// })
|
|
167
|
-
// })
|
|
168
|
-
// app.all('/rs/user', function (req, res) {
|
|
169
|
-
// proxy.web(req, res, {
|
|
170
|
-
// target: 'http://127.0.0.1:82'
|
|
171
|
-
// })
|
|
172
|
-
// })
|
|
173
|
-
|
|
174
|
-
module.exports = app.listen(8015, function (err) {
|
|
175
|
-
if (err) {
|
|
176
|
-
console.log(err)
|
|
177
|
-
return
|
|
178
|
-
}
|
|
179
|
-
console.log('Listening at http://localhost:8015')
|
|
180
|
-
})
|
|
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://127.0.0.1:8084'
|
|
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
|
+
'/files': {
|
|
33
|
+
target: bendi
|
|
34
|
+
},
|
|
35
|
+
// 查找资源服务数据
|
|
36
|
+
'/rs/search': {
|
|
37
|
+
target: bendi
|
|
38
|
+
},
|
|
39
|
+
// 查找资源服务数据
|
|
40
|
+
'/rs/logic/getLogin': {
|
|
41
|
+
target: bendi
|
|
42
|
+
},
|
|
43
|
+
// 查找资源服务数据
|
|
44
|
+
'/rs/logic/getInitData': {
|
|
45
|
+
target: bendi
|
|
46
|
+
},
|
|
47
|
+
'/rs/logic/getSaleInitData': {
|
|
48
|
+
target: bendi
|
|
49
|
+
},
|
|
50
|
+
// 用户登录服务地址
|
|
51
|
+
'/rs/user': {
|
|
52
|
+
target: bendi
|
|
53
|
+
},
|
|
54
|
+
'/rs/path/getParams': {
|
|
55
|
+
target: bendi
|
|
56
|
+
},
|
|
57
|
+
'/rs/data': {
|
|
58
|
+
target: bendi
|
|
59
|
+
},
|
|
60
|
+
'/rs/license': {
|
|
61
|
+
target: bendi
|
|
62
|
+
},
|
|
63
|
+
'/rs/db': {
|
|
64
|
+
target: bendi
|
|
65
|
+
},
|
|
66
|
+
'/excel': {
|
|
67
|
+
target: bendi
|
|
68
|
+
},
|
|
69
|
+
'/rs/config': {
|
|
70
|
+
target: bendi
|
|
71
|
+
},
|
|
72
|
+
'/rs/sql/getLicenseById': {
|
|
73
|
+
target: bendi
|
|
74
|
+
},
|
|
75
|
+
'/rs/report': {
|
|
76
|
+
target: wode
|
|
77
|
+
},
|
|
78
|
+
'/rs/vue': {
|
|
79
|
+
target: bendi
|
|
80
|
+
},
|
|
81
|
+
'/rs/file': {
|
|
82
|
+
target: bendi
|
|
83
|
+
},
|
|
84
|
+
'/rs/sql/singleTable': {
|
|
85
|
+
target: bendi
|
|
86
|
+
},
|
|
87
|
+
'/rs': {
|
|
88
|
+
target: wode
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
var devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
93
|
+
publicPath: config.output.publicPath,
|
|
94
|
+
stats: {
|
|
95
|
+
colors: true,
|
|
96
|
+
chunks: false
|
|
97
|
+
}
|
|
98
|
+
})
|
|
99
|
+
|
|
100
|
+
var hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
101
|
+
// force page reload when html-webpack-plugin template changes
|
|
102
|
+
compiler.plugin('compilation', function (compilation) {
|
|
103
|
+
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
104
|
+
hotMiddleware.publish({action: 'reload'})
|
|
105
|
+
cb()
|
|
106
|
+
})
|
|
107
|
+
})
|
|
108
|
+
|
|
109
|
+
// proxy api requests
|
|
110
|
+
Object.keys(proxyTable).forEach(function (context) {
|
|
111
|
+
var options = proxyTable[context]
|
|
112
|
+
if (typeof options === 'string') {
|
|
113
|
+
options = {target: options}
|
|
114
|
+
}
|
|
115
|
+
app.use(proxyMiddleware(context, options))
|
|
116
|
+
})
|
|
117
|
+
|
|
118
|
+
// handle fallback for HTML5 history API
|
|
119
|
+
app.use(require('connect-history-api-fallback')())
|
|
120
|
+
// app.use(function (req, res, next) {
|
|
121
|
+
// res.header('Access-Control-Allow-Origin', '*')
|
|
122
|
+
// res.header('Access-Control-Allow-Headers', 'X-Requested-With')
|
|
123
|
+
// res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
|
|
124
|
+
// res.header('X-Powered-By', '3,2,1')
|
|
125
|
+
// res.header('Access-Control-Allow-Credentials', 'true')
|
|
126
|
+
// res.header('Content-Type', 'application/json;charset=utf-8')
|
|
127
|
+
// next()
|
|
128
|
+
// })
|
|
129
|
+
|
|
130
|
+
// serve webpack bundle output
|
|
131
|
+
app.use(devMiddleware)
|
|
132
|
+
|
|
133
|
+
// enable hot-reload and state-preserving
|
|
134
|
+
// compilation error display
|
|
135
|
+
app.use(hotMiddleware)
|
|
136
|
+
|
|
137
|
+
// serve pure static assets
|
|
138
|
+
app.use('/static', express.static('./static'))
|
|
139
|
+
|
|
140
|
+
// app.all('/rs/*', function (req, res) {
|
|
141
|
+
// proxy.web(req, res, {
|
|
142
|
+
// target: 'http://127.0.0.1:8081/reports'
|
|
143
|
+
// })
|
|
144
|
+
// })
|
|
145
|
+
|
|
146
|
+
// app.all('/rs/*', function (req, res) {
|
|
147
|
+
// proxy.web(req, res, {
|
|
148
|
+
// target: 'http://127.0.0.1:8081/ldap'
|
|
149
|
+
// })
|
|
150
|
+
// })
|
|
151
|
+
// app.all('/excel/*', function (req, res) {
|
|
152
|
+
// proxy.web(req, res, {
|
|
153
|
+
// target: 'http://127.0.0.1:8081/charge'
|
|
154
|
+
// })
|
|
155
|
+
// })
|
|
156
|
+
|
|
157
|
+
// app.all('/rs/*', function (req, res) {
|
|
158
|
+
// proxy.web(req, res, {
|
|
159
|
+
// target: 'http://127.0.0.1:82/charge'
|
|
160
|
+
// })
|
|
161
|
+
// })
|
|
162
|
+
|
|
163
|
+
// app.all('/*', function (req, res) {
|
|
164
|
+
// proxy.web(req, res, {
|
|
165
|
+
// target: 'http://127.0.0.1:82'
|
|
166
|
+
// })
|
|
167
|
+
// })
|
|
168
|
+
// app.all('/rs/user', function (req, res) {
|
|
169
|
+
// proxy.web(req, res, {
|
|
170
|
+
// target: 'http://127.0.0.1:82'
|
|
171
|
+
// })
|
|
172
|
+
// })
|
|
173
|
+
|
|
174
|
+
module.exports = app.listen(8015, function (err) {
|
|
175
|
+
if (err) {
|
|
176
|
+
console.log(err)
|
|
177
|
+
return
|
|
178
|
+
}
|
|
179
|
+
console.log('Listening at http://localhost:8015')
|
|
180
|
+
})
|
package/package.json
CHANGED
|
@@ -434,7 +434,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
|
|
|
434
434
|
console.log('444444444', Util.addDate(new Date(),-6).substring(0,10))
|
|
435
435
|
this.$refs.paged.$refs.cri.model.startDate = Util.addDate(new Date(),-4).substring(0,10) + ' 00:00:00'
|
|
436
436
|
this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
|
|
437
|
-
this.$refs.paged.$refs.cri.search()
|
|
437
|
+
// this.$refs.paged.$refs.cri.search()
|
|
438
438
|
this.getfield = this.config.excelHeaders
|
|
439
439
|
},
|
|
440
440
|
methods: {
|
|
@@ -336,7 +336,7 @@
|
|
|
336
336
|
this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date(),-1).substring(0,10) + ' 23:59:59'
|
|
337
337
|
this.$refs.paged.$refs.criteria.model.inputStartDate = Util.addDate(new Date(),-1).substring(0,10) + ' 00:00:00'
|
|
338
338
|
this.$refs.paged.$refs.criteria.model.inputEndDate = Util.addDate(new Date(),-1).substring(0,10) + ' 23:59:59'
|
|
339
|
-
this.$refs.paged.$refs.criteria.search()
|
|
339
|
+
// this.$refs.paged.$refs.criteria.search()
|
|
340
340
|
},
|
|
341
341
|
methods: {
|
|
342
342
|
initParams() {
|
|
@@ -118,6 +118,15 @@
|
|
|
118
118
|
:options="$parent.$parent.devicetypes"
|
|
119
119
|
close-on-select></v-select>
|
|
120
120
|
</div>
|
|
121
|
+
<div class="col-sm-2 form-group" >
|
|
122
|
+
<label class="font_normal_body">客户状态</label>
|
|
123
|
+
<v-select :value.sync="model.f_user_state"
|
|
124
|
+
v-model="model.f_user_state"
|
|
125
|
+
multiple
|
|
126
|
+
:options='$parent.$parent.userstates' placeholder='请选择'
|
|
127
|
+
condition="f_user_state in {}"
|
|
128
|
+
></v-select>
|
|
129
|
+
</div>
|
|
121
130
|
</div>
|
|
122
131
|
</div>
|
|
123
132
|
</criteria>
|
|
@@ -914,6 +923,9 @@
|
|
|
914
923
|
},
|
|
915
924
|
},
|
|
916
925
|
computed: {
|
|
926
|
+
userstates() {
|
|
927
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('客户状态')]
|
|
928
|
+
},
|
|
917
929
|
authArr () {
|
|
918
930
|
return this.$login.r ? this.$login.r : []
|
|
919
931
|
},
|