manage-client 1.60.10-13 → 1.60.10-15
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
CHANGED
|
@@ -1,148 +1,148 @@
|
|
|
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 fuwu = 'http://sangfor.8d394835cb84b8f3a4d536a7f2074b47.com:
|
|
14
|
-
var proxyTable = {
|
|
15
|
-
'/rs/logic/exportfile': {
|
|
16
|
-
target: bendi
|
|
17
|
-
},
|
|
18
|
-
'/files': {
|
|
19
|
-
target: bendi
|
|
20
|
-
},
|
|
21
|
-
// 查找资源服务数据
|
|
22
|
-
'/rs/search': {
|
|
23
|
-
target: fuwu
|
|
24
|
-
},
|
|
25
|
-
// 查找资源服务数据
|
|
26
|
-
'/rs/logic/getLogin': {
|
|
27
|
-
target: fuwu
|
|
28
|
-
},
|
|
29
|
-
// 查找资源服务数据
|
|
30
|
-
'/rs/logic/getInitData': {
|
|
31
|
-
target: fuwu
|
|
32
|
-
},
|
|
33
|
-
// 用户登录服务地址
|
|
34
|
-
'/rs/user': {
|
|
35
|
-
target: fuwu
|
|
36
|
-
},
|
|
37
|
-
'/rs/path/getParams': {
|
|
38
|
-
target: fuwu
|
|
39
|
-
},
|
|
40
|
-
'/rs/data': {
|
|
41
|
-
target: bendi
|
|
42
|
-
},
|
|
43
|
-
'/rs/license': {
|
|
44
|
-
target: bendi
|
|
45
|
-
},
|
|
46
|
-
'/rs/db': {
|
|
47
|
-
target: bendi
|
|
48
|
-
},
|
|
49
|
-
'/excel': {
|
|
50
|
-
target: bendi
|
|
51
|
-
},
|
|
52
|
-
'/rs/config': {
|
|
53
|
-
target: bendi
|
|
54
|
-
},
|
|
55
|
-
'/rs/sql/getLicenseById': {
|
|
56
|
-
target: bendi
|
|
57
|
-
},
|
|
58
|
-
'/rs/report': {
|
|
59
|
-
target: bendi
|
|
60
|
-
},
|
|
61
|
-
'/rs/vue': {
|
|
62
|
-
target: fuwu
|
|
63
|
-
},
|
|
64
|
-
'/rs': {
|
|
65
|
-
target: bendi
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
var devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
70
|
-
publicPath: config.output.publicPath,
|
|
71
|
-
stats: {
|
|
72
|
-
colors: true,
|
|
73
|
-
chunks: false
|
|
74
|
-
}
|
|
75
|
-
})
|
|
76
|
-
|
|
77
|
-
var hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
78
|
-
// force page reload when html-webpack-plugin template changes
|
|
79
|
-
compiler.plugin('compilation', function (compilation) {
|
|
80
|
-
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
81
|
-
hotMiddleware.publish({ action: 'reload' })
|
|
82
|
-
cb()
|
|
83
|
-
})
|
|
84
|
-
})
|
|
85
|
-
|
|
86
|
-
// proxy api requests
|
|
87
|
-
Object.keys(proxyTable).forEach(function (context) {
|
|
88
|
-
var options = proxyTable[context]
|
|
89
|
-
if (typeof options === 'string') {
|
|
90
|
-
options = { target: options }
|
|
91
|
-
}
|
|
92
|
-
app.use(proxyMiddleware(context, options))
|
|
93
|
-
})
|
|
94
|
-
|
|
95
|
-
// handle fallback for HTML5 history API
|
|
96
|
-
app.use(require('connect-history-api-fallback')())
|
|
97
|
-
|
|
98
|
-
// serve webpack bundle output
|
|
99
|
-
app.use(devMiddleware)
|
|
100
|
-
|
|
101
|
-
// enable hot-reload and state-preserving
|
|
102
|
-
// compilation error display
|
|
103
|
-
app.use(hotMiddleware)
|
|
104
|
-
|
|
105
|
-
// serve pure static assets
|
|
106
|
-
app.use('/static', express.static('./static'))
|
|
107
|
-
|
|
108
|
-
// app.all('/rs/*', function (req, res) {
|
|
109
|
-
// proxy.web(req, res, {
|
|
110
|
-
// target: 'http://127.0.0.1:8081/reports'
|
|
111
|
-
// })
|
|
112
|
-
// })
|
|
113
|
-
|
|
114
|
-
// app.all('/rs/*', function (req, res) {
|
|
115
|
-
// proxy.web(req, res, {
|
|
116
|
-
// target: 'http://127.0.0.1:8081/ldap'
|
|
117
|
-
// })
|
|
118
|
-
// })
|
|
119
|
-
// app.all('/excel/*', function (req, res) {
|
|
120
|
-
// proxy.web(req, res, {
|
|
121
|
-
// target: 'http://127.0.0.1:8081/charge'
|
|
122
|
-
// })
|
|
123
|
-
// })
|
|
124
|
-
|
|
125
|
-
// app.all('/rs/*', function (req, res) {
|
|
126
|
-
// proxy.web(req, res, {
|
|
127
|
-
// target: 'http://127.0.0.1:82/charge'
|
|
128
|
-
// })
|
|
129
|
-
// })
|
|
130
|
-
|
|
131
|
-
// app.all('/*', function (req, res) {
|
|
132
|
-
// proxy.web(req, res, {
|
|
133
|
-
// target: 'http://127.0.0.1:82'
|
|
134
|
-
// })
|
|
135
|
-
// })
|
|
136
|
-
// app.all('/rs/user', function (req, res) {
|
|
137
|
-
// proxy.web(req, res, {
|
|
138
|
-
// target: 'http://127.0.0.1:82'
|
|
139
|
-
// })
|
|
140
|
-
// })
|
|
141
|
-
|
|
142
|
-
module.exports = app.listen(8085, function (err) {
|
|
143
|
-
if (err) {
|
|
144
|
-
console.log(err)
|
|
145
|
-
return
|
|
146
|
-
}
|
|
147
|
-
console.log('Listening at http://localhost:8085')
|
|
148
|
-
})
|
|
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 fuwu = 'http://sangfor.8d394835cb84b8f3a4d536a7f2074b47.com:8300/', bendi = 'http://sangfor.8d394835cb84b8f3a4d536a7f2074b47.com:8300/'
|
|
14
|
+
var proxyTable = {
|
|
15
|
+
'/rs/logic/exportfile': {
|
|
16
|
+
target: bendi
|
|
17
|
+
},
|
|
18
|
+
'/files': {
|
|
19
|
+
target: bendi
|
|
20
|
+
},
|
|
21
|
+
// 查找资源服务数据
|
|
22
|
+
'/rs/search': {
|
|
23
|
+
target: fuwu
|
|
24
|
+
},
|
|
25
|
+
// 查找资源服务数据
|
|
26
|
+
'/rs/logic/getLogin': {
|
|
27
|
+
target: fuwu
|
|
28
|
+
},
|
|
29
|
+
// 查找资源服务数据
|
|
30
|
+
'/rs/logic/getInitData': {
|
|
31
|
+
target: fuwu
|
|
32
|
+
},
|
|
33
|
+
// 用户登录服务地址
|
|
34
|
+
'/rs/user': {
|
|
35
|
+
target: fuwu
|
|
36
|
+
},
|
|
37
|
+
'/rs/path/getParams': {
|
|
38
|
+
target: fuwu
|
|
39
|
+
},
|
|
40
|
+
'/rs/data': {
|
|
41
|
+
target: bendi
|
|
42
|
+
},
|
|
43
|
+
'/rs/license': {
|
|
44
|
+
target: bendi
|
|
45
|
+
},
|
|
46
|
+
'/rs/db': {
|
|
47
|
+
target: bendi
|
|
48
|
+
},
|
|
49
|
+
'/excel': {
|
|
50
|
+
target: bendi
|
|
51
|
+
},
|
|
52
|
+
'/rs/config': {
|
|
53
|
+
target: bendi
|
|
54
|
+
},
|
|
55
|
+
'/rs/sql/getLicenseById': {
|
|
56
|
+
target: bendi
|
|
57
|
+
},
|
|
58
|
+
'/rs/report': {
|
|
59
|
+
target: bendi
|
|
60
|
+
},
|
|
61
|
+
'/rs/vue': {
|
|
62
|
+
target: fuwu
|
|
63
|
+
},
|
|
64
|
+
'/rs': {
|
|
65
|
+
target: bendi
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
var devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
70
|
+
publicPath: config.output.publicPath,
|
|
71
|
+
stats: {
|
|
72
|
+
colors: true,
|
|
73
|
+
chunks: false
|
|
74
|
+
}
|
|
75
|
+
})
|
|
76
|
+
|
|
77
|
+
var hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
78
|
+
// force page reload when html-webpack-plugin template changes
|
|
79
|
+
compiler.plugin('compilation', function (compilation) {
|
|
80
|
+
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
81
|
+
hotMiddleware.publish({ action: 'reload' })
|
|
82
|
+
cb()
|
|
83
|
+
})
|
|
84
|
+
})
|
|
85
|
+
|
|
86
|
+
// proxy api requests
|
|
87
|
+
Object.keys(proxyTable).forEach(function (context) {
|
|
88
|
+
var options = proxyTable[context]
|
|
89
|
+
if (typeof options === 'string') {
|
|
90
|
+
options = { target: options }
|
|
91
|
+
}
|
|
92
|
+
app.use(proxyMiddleware(context, options))
|
|
93
|
+
})
|
|
94
|
+
|
|
95
|
+
// handle fallback for HTML5 history API
|
|
96
|
+
app.use(require('connect-history-api-fallback')())
|
|
97
|
+
|
|
98
|
+
// serve webpack bundle output
|
|
99
|
+
app.use(devMiddleware)
|
|
100
|
+
|
|
101
|
+
// enable hot-reload and state-preserving
|
|
102
|
+
// compilation error display
|
|
103
|
+
app.use(hotMiddleware)
|
|
104
|
+
|
|
105
|
+
// serve pure static assets
|
|
106
|
+
app.use('/static', express.static('./static'))
|
|
107
|
+
|
|
108
|
+
// app.all('/rs/*', function (req, res) {
|
|
109
|
+
// proxy.web(req, res, {
|
|
110
|
+
// target: 'http://127.0.0.1:8081/reports'
|
|
111
|
+
// })
|
|
112
|
+
// })
|
|
113
|
+
|
|
114
|
+
// app.all('/rs/*', function (req, res) {
|
|
115
|
+
// proxy.web(req, res, {
|
|
116
|
+
// target: 'http://127.0.0.1:8081/ldap'
|
|
117
|
+
// })
|
|
118
|
+
// })
|
|
119
|
+
// app.all('/excel/*', function (req, res) {
|
|
120
|
+
// proxy.web(req, res, {
|
|
121
|
+
// target: 'http://127.0.0.1:8081/charge'
|
|
122
|
+
// })
|
|
123
|
+
// })
|
|
124
|
+
|
|
125
|
+
// app.all('/rs/*', function (req, res) {
|
|
126
|
+
// proxy.web(req, res, {
|
|
127
|
+
// target: 'http://127.0.0.1:82/charge'
|
|
128
|
+
// })
|
|
129
|
+
// })
|
|
130
|
+
|
|
131
|
+
// app.all('/*', function (req, res) {
|
|
132
|
+
// proxy.web(req, res, {
|
|
133
|
+
// target: 'http://127.0.0.1:82'
|
|
134
|
+
// })
|
|
135
|
+
// })
|
|
136
|
+
// app.all('/rs/user', function (req, res) {
|
|
137
|
+
// proxy.web(req, res, {
|
|
138
|
+
// target: 'http://127.0.0.1:82'
|
|
139
|
+
// })
|
|
140
|
+
// })
|
|
141
|
+
|
|
142
|
+
module.exports = app.listen(8085, function (err) {
|
|
143
|
+
if (err) {
|
|
144
|
+
console.log(err)
|
|
145
|
+
return
|
|
146
|
+
}
|
|
147
|
+
console.log('Listening at http://localhost:8085')
|
|
148
|
+
})
|
package/package.json
CHANGED
|
@@ -126,6 +126,12 @@
|
|
|
126
126
|
condition="f_serial_id = '{}' " placeholder="流水号"
|
|
127
127
|
:size="model.f_serial_id ? model.f_serial_id.length : 1">
|
|
128
128
|
</div>
|
|
129
|
+
<div class="col-sm-3 form-group form-input-group" style="width: 20%">
|
|
130
|
+
<label class="control-label">表号</label>
|
|
131
|
+
<input type="text" class="form-control" v-model="model.f_meternumber"
|
|
132
|
+
condition="f_meternumber = '{}' " placeholder="表号"
|
|
133
|
+
:size="model.f_meternumber ? model.f_meternumber.length : 1">
|
|
134
|
+
</div>
|
|
129
135
|
<div class="col-sm-3 form-group form-input-group" style="width: 20%">
|
|
130
136
|
<label for="startDate" class="control-label">开始日期</label>
|
|
131
137
|
<datepicker id="startDate" placeholder="开始日期" width='100%'
|
|
@@ -248,8 +254,8 @@
|
|
|
248
254
|
model: new PagedList('rs/sql/newsellQuery', 20,{},{f_pregas: 0,f_preamount: 0,f_collection: 0}),
|
|
249
255
|
criteriaShow: true,
|
|
250
256
|
classname: 'table table-bordered table table-hover',
|
|
251
|
-
headData: ["用户编号","用户姓名","用户电话","气量","应交金额","收款","上期结余","本期结余","状态","收费日期","操作员","营业网点","分公司","收费类型","用户类型","用气性质","气价名称","付款方式","流水号","表编号","气表类型","气表品牌","滞纳金","身份证号","小区","用户地址"],
|
|
252
|
-
bodyData: ["f_userinfo_code","f_user_name","f_user_phone","f_pregas","f_preamount","f_collection","f_balance","f_curbalance","f_charge_state","f_delivery_date","f_operator","f_outlets","f_filiale","f_charge_type","f_user_type","f_gasproperties","f_price_name","f_payment","f_serial_id","f_user_id","f_meter_type","f_meter_brand","f_delaypay","f_idnumber","f_residential_area","f_address"],
|
|
257
|
+
headData: ["用户编号","用户姓名","用户电话","表号","气量","应交金额","收款","上期结余","本期结余","状态","收费日期","操作员","营业网点","分公司","收费类型","用户类型","用气性质","气价名称","付款方式","流水号","表编号","气表类型","气表品牌","滞纳金","身份证号","小区","用户地址"],
|
|
258
|
+
bodyData: ["f_userinfo_code","f_user_name","f_user_phone","f_meternumber","f_pregas","f_preamount","f_collection","f_balance","f_curbalance","f_charge_state","f_delivery_date","f_operator","f_outlets","f_filiale","f_charge_type","f_user_type","f_gasproperties","f_price_name","f_payment","f_serial_id","f_user_id","f_meter_type","f_meter_brand","f_delaypay","f_idnumber","f_residential_area","f_address"],
|
|
253
259
|
|
|
254
260
|
filialeNameStr: null,
|
|
255
261
|
filialeCodeStr: this.$login.f.f_orgids,
|