address-client 3.2.62 → 3.2.64
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 +162 -162
- package/package.json +1 -1
- package/src/filiale/WEINAN/AddAreaMsg.vue +24 -7
- package/src/filiale/qinhua/StreetList.vue +1 -1
- package/src/filiale/qinhua/sale.js +20 -20
package/build/dev-server.js
CHANGED
|
@@ -1,162 +1,162 @@
|
|
|
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 str = 'http://127.0.0.1:8078', str2= 'http://192.168.50.4:8400/'
|
|
14
|
-
var str3= 'http://192.168.50.4:8400/'
|
|
15
|
-
var proxyTable = {
|
|
16
|
-
'/rs/sql':{
|
|
17
|
-
target: str3,
|
|
18
|
-
secure:true,
|
|
19
|
-
changeOrigin:true
|
|
20
|
-
// target: 'http://127.0.0.1:8080'
|
|
21
|
-
},
|
|
22
|
-
'/webapps':{
|
|
23
|
-
target: str3,
|
|
24
|
-
secure:true,
|
|
25
|
-
changeOrigin:true
|
|
26
|
-
// target: 'http://127.0.0.1:8080'
|
|
27
|
-
},
|
|
28
|
-
'/rs/logic/getLogin': {
|
|
29
|
-
target: str3,
|
|
30
|
-
secure:true,
|
|
31
|
-
changeOrigin:true
|
|
32
|
-
},
|
|
33
|
-
'/rs/logic/getInitData': {
|
|
34
|
-
target: str3,
|
|
35
|
-
secure:true,
|
|
36
|
-
changeOrigin:true,
|
|
37
|
-
},
|
|
38
|
-
'/rs/logic/getSaleInitData': {
|
|
39
|
-
target: str3,
|
|
40
|
-
secure:true,
|
|
41
|
-
changeOrigin:true
|
|
42
|
-
},
|
|
43
|
-
'/rs/logic':{
|
|
44
|
-
target: str3,
|
|
45
|
-
secure:true,
|
|
46
|
-
changeOrigin:true
|
|
47
|
-
// target: 'http://127.0.0.1:8080'
|
|
48
|
-
},
|
|
49
|
-
'/rs/vue': {
|
|
50
|
-
target: str3,
|
|
51
|
-
secure:true,
|
|
52
|
-
changeOrigin:true
|
|
53
|
-
},
|
|
54
|
-
'/rs/user': {
|
|
55
|
-
target: str3,
|
|
56
|
-
secure:true,
|
|
57
|
-
changeOrigin:true
|
|
58
|
-
},
|
|
59
|
-
'/rs/db': {
|
|
60
|
-
target: str3,
|
|
61
|
-
secure:true,
|
|
62
|
-
changeOrigin:true
|
|
63
|
-
},
|
|
64
|
-
'/rs/search': {
|
|
65
|
-
target: str3,
|
|
66
|
-
secure:true,
|
|
67
|
-
changeOrigin:true
|
|
68
|
-
// target: 'http://127.0.0.1:8080'
|
|
69
|
-
},
|
|
70
|
-
'/rs/data': {
|
|
71
|
-
target: str3,
|
|
72
|
-
secure:true,
|
|
73
|
-
changeOrigin:true
|
|
74
|
-
},
|
|
75
|
-
'/rs': {
|
|
76
|
-
// target: 'http://192.168.50.199:8300'
|
|
77
|
-
target: str3,
|
|
78
|
-
secure:true,
|
|
79
|
-
changeOrigin:true
|
|
80
|
-
}
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
var devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
84
|
-
publicPath: config.output.publicPath,
|
|
85
|
-
stats: {
|
|
86
|
-
colors: true,
|
|
87
|
-
chunks: false
|
|
88
|
-
}
|
|
89
|
-
})
|
|
90
|
-
|
|
91
|
-
var hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
92
|
-
// force page reload when html-webpack-plugin template changes
|
|
93
|
-
compiler.plugin('compilation', function (compilation) {
|
|
94
|
-
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
95
|
-
hotMiddleware.publish({ action: 'reload' })
|
|
96
|
-
cb()
|
|
97
|
-
})
|
|
98
|
-
})
|
|
99
|
-
|
|
100
|
-
// proxy api requests
|
|
101
|
-
Object.keys(proxyTable).forEach(function (context) {
|
|
102
|
-
var options = proxyTable[context]
|
|
103
|
-
if (typeof options === 'string') {
|
|
104
|
-
options = { target: options }
|
|
105
|
-
}
|
|
106
|
-
app.use(proxyMiddleware(context, options))
|
|
107
|
-
})
|
|
108
|
-
|
|
109
|
-
// handle fallback for HTML5 history API
|
|
110
|
-
app.use(require('connect-history-api-fallback')())
|
|
111
|
-
|
|
112
|
-
// serve webpack bundle output
|
|
113
|
-
app.use(devMiddleware)
|
|
114
|
-
|
|
115
|
-
// enable hot-reload and state-preserving
|
|
116
|
-
// compilation error display
|
|
117
|
-
app.use(hotMiddleware)
|
|
118
|
-
|
|
119
|
-
// serve pure static assets
|
|
120
|
-
app.use('/static', express.static('./static'))
|
|
121
|
-
|
|
122
|
-
// app.all('/rs/*', function (req, res) {
|
|
123
|
-
// proxy.web(req, res, {
|
|
124
|
-
// target: 'http://127.0.0.1:8081/reports'
|
|
125
|
-
// })
|
|
126
|
-
// })
|
|
127
|
-
|
|
128
|
-
// app.all('/rs/*', function (req, res) {
|
|
129
|
-
// proxy.web(req, res, {
|
|
130
|
-
// target: 'http://127.0.0.1:8081/ldap'
|
|
131
|
-
// })
|
|
132
|
-
// })
|
|
133
|
-
// app.all('/excel/*', function (req, res) {
|
|
134
|
-
// proxy.web(req, res, {
|
|
135
|
-
// target: 'http://127.0.0.1:8081/charge'
|
|
136
|
-
// })
|
|
137
|
-
// })
|
|
138
|
-
|
|
139
|
-
// app.all('/rs/*', function (req, res) {
|
|
140
|
-
// proxy.web(req, res, {
|
|
141
|
-
// target: 'http://127.0.0.1:82/charge'
|
|
142
|
-
// })
|
|
143
|
-
// })
|
|
144
|
-
|
|
145
|
-
// app.all('/*', function (req, res) {
|
|
146
|
-
// proxy.web(req, res, {
|
|
147
|
-
// target: 'http://127.0.0.1:82'
|
|
148
|
-
// })
|
|
149
|
-
// })
|
|
150
|
-
// app.all('/rs/user', function (req, res) {
|
|
151
|
-
// proxy.web(req, res, {
|
|
152
|
-
// target: 'http://127.0.0.1:82'
|
|
153
|
-
// })
|
|
154
|
-
// })
|
|
155
|
-
|
|
156
|
-
module.exports = app.listen(8085, function (err) {
|
|
157
|
-
if (err) {
|
|
158
|
-
console.log(err)
|
|
159
|
-
return
|
|
160
|
-
}
|
|
161
|
-
console.log('Listening at http://localhost:8085')
|
|
162
|
-
})
|
|
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 str = 'http://127.0.0.1:8078', str2= 'http://192.168.50.4:8400/'
|
|
14
|
+
var str3= 'http://192.168.50.4:8400/'
|
|
15
|
+
var proxyTable = {
|
|
16
|
+
'/rs/sql':{
|
|
17
|
+
target: str3,
|
|
18
|
+
secure:true,
|
|
19
|
+
changeOrigin:true
|
|
20
|
+
// target: 'http://127.0.0.1:8080'
|
|
21
|
+
},
|
|
22
|
+
'/webapps':{
|
|
23
|
+
target: str3,
|
|
24
|
+
secure:true,
|
|
25
|
+
changeOrigin:true
|
|
26
|
+
// target: 'http://127.0.0.1:8080'
|
|
27
|
+
},
|
|
28
|
+
'/rs/logic/getLogin': {
|
|
29
|
+
target: str3,
|
|
30
|
+
secure:true,
|
|
31
|
+
changeOrigin:true
|
|
32
|
+
},
|
|
33
|
+
'/rs/logic/getInitData': {
|
|
34
|
+
target: str3,
|
|
35
|
+
secure:true,
|
|
36
|
+
changeOrigin:true,
|
|
37
|
+
},
|
|
38
|
+
'/rs/logic/getSaleInitData': {
|
|
39
|
+
target: str3,
|
|
40
|
+
secure:true,
|
|
41
|
+
changeOrigin:true
|
|
42
|
+
},
|
|
43
|
+
'/rs/logic':{
|
|
44
|
+
target: str3,
|
|
45
|
+
secure:true,
|
|
46
|
+
changeOrigin:true
|
|
47
|
+
// target: 'http://127.0.0.1:8080'
|
|
48
|
+
},
|
|
49
|
+
'/rs/vue': {
|
|
50
|
+
target: str3,
|
|
51
|
+
secure:true,
|
|
52
|
+
changeOrigin:true
|
|
53
|
+
},
|
|
54
|
+
'/rs/user': {
|
|
55
|
+
target: str3,
|
|
56
|
+
secure:true,
|
|
57
|
+
changeOrigin:true
|
|
58
|
+
},
|
|
59
|
+
'/rs/db': {
|
|
60
|
+
target: str3,
|
|
61
|
+
secure:true,
|
|
62
|
+
changeOrigin:true
|
|
63
|
+
},
|
|
64
|
+
'/rs/search': {
|
|
65
|
+
target: str3,
|
|
66
|
+
secure:true,
|
|
67
|
+
changeOrigin:true
|
|
68
|
+
// target: 'http://127.0.0.1:8080'
|
|
69
|
+
},
|
|
70
|
+
'/rs/data': {
|
|
71
|
+
target: str3,
|
|
72
|
+
secure:true,
|
|
73
|
+
changeOrigin:true
|
|
74
|
+
},
|
|
75
|
+
'/rs': {
|
|
76
|
+
// target: 'http://192.168.50.199:8300'
|
|
77
|
+
target: str3,
|
|
78
|
+
secure:true,
|
|
79
|
+
changeOrigin:true
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
var devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
84
|
+
publicPath: config.output.publicPath,
|
|
85
|
+
stats: {
|
|
86
|
+
colors: true,
|
|
87
|
+
chunks: false
|
|
88
|
+
}
|
|
89
|
+
})
|
|
90
|
+
|
|
91
|
+
var hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
92
|
+
// force page reload when html-webpack-plugin template changes
|
|
93
|
+
compiler.plugin('compilation', function (compilation) {
|
|
94
|
+
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
95
|
+
hotMiddleware.publish({ action: 'reload' })
|
|
96
|
+
cb()
|
|
97
|
+
})
|
|
98
|
+
})
|
|
99
|
+
|
|
100
|
+
// proxy api requests
|
|
101
|
+
Object.keys(proxyTable).forEach(function (context) {
|
|
102
|
+
var options = proxyTable[context]
|
|
103
|
+
if (typeof options === 'string') {
|
|
104
|
+
options = { target: options }
|
|
105
|
+
}
|
|
106
|
+
app.use(proxyMiddleware(context, options))
|
|
107
|
+
})
|
|
108
|
+
|
|
109
|
+
// handle fallback for HTML5 history API
|
|
110
|
+
app.use(require('connect-history-api-fallback')())
|
|
111
|
+
|
|
112
|
+
// serve webpack bundle output
|
|
113
|
+
app.use(devMiddleware)
|
|
114
|
+
|
|
115
|
+
// enable hot-reload and state-preserving
|
|
116
|
+
// compilation error display
|
|
117
|
+
app.use(hotMiddleware)
|
|
118
|
+
|
|
119
|
+
// serve pure static assets
|
|
120
|
+
app.use('/static', express.static('./static'))
|
|
121
|
+
|
|
122
|
+
// app.all('/rs/*', function (req, res) {
|
|
123
|
+
// proxy.web(req, res, {
|
|
124
|
+
// target: 'http://127.0.0.1:8081/reports'
|
|
125
|
+
// })
|
|
126
|
+
// })
|
|
127
|
+
|
|
128
|
+
// app.all('/rs/*', function (req, res) {
|
|
129
|
+
// proxy.web(req, res, {
|
|
130
|
+
// target: 'http://127.0.0.1:8081/ldap'
|
|
131
|
+
// })
|
|
132
|
+
// })
|
|
133
|
+
// app.all('/excel/*', function (req, res) {
|
|
134
|
+
// proxy.web(req, res, {
|
|
135
|
+
// target: 'http://127.0.0.1:8081/charge'
|
|
136
|
+
// })
|
|
137
|
+
// })
|
|
138
|
+
|
|
139
|
+
// app.all('/rs/*', function (req, res) {
|
|
140
|
+
// proxy.web(req, res, {
|
|
141
|
+
// target: 'http://127.0.0.1:82/charge'
|
|
142
|
+
// })
|
|
143
|
+
// })
|
|
144
|
+
|
|
145
|
+
// app.all('/*', function (req, res) {
|
|
146
|
+
// proxy.web(req, res, {
|
|
147
|
+
// target: 'http://127.0.0.1:82'
|
|
148
|
+
// })
|
|
149
|
+
// })
|
|
150
|
+
// app.all('/rs/user', function (req, res) {
|
|
151
|
+
// proxy.web(req, res, {
|
|
152
|
+
// target: 'http://127.0.0.1:82'
|
|
153
|
+
// })
|
|
154
|
+
// })
|
|
155
|
+
|
|
156
|
+
module.exports = app.listen(8085, function (err) {
|
|
157
|
+
if (err) {
|
|
158
|
+
console.log(err)
|
|
159
|
+
return
|
|
160
|
+
}
|
|
161
|
+
console.log('Listening at http://localhost:8085')
|
|
162
|
+
})
|
package/package.json
CHANGED
|
@@ -263,8 +263,17 @@
|
|
|
263
263
|
|
|
264
264
|
let initGen = async function (self) {
|
|
265
265
|
await self.initdata()
|
|
266
|
-
|
|
266
|
+
try {
|
|
267
|
+
await self.$LoadParams.loadMeterBook(self.f_filialeids)
|
|
268
|
+
|
|
269
|
+
}catch (e) {
|
|
270
|
+
|
|
271
|
+
}
|
|
272
|
+
try {
|
|
267
273
|
await self.loadMeterBooks();
|
|
274
|
+
}catch (e) {
|
|
275
|
+
|
|
276
|
+
}
|
|
268
277
|
}
|
|
269
278
|
|
|
270
279
|
export default {
|
|
@@ -309,7 +318,7 @@
|
|
|
309
318
|
props: ['f_filialeids','f_special', 'areatype','row','operation','isupload'],
|
|
310
319
|
ready(){
|
|
311
320
|
|
|
312
|
-
|
|
321
|
+
initGen(this)
|
|
313
322
|
|
|
314
323
|
},
|
|
315
324
|
methods: {
|
|
@@ -344,14 +353,22 @@
|
|
|
344
353
|
this.areamodel.f_adjustable_id = val.f_adjustable_id;
|
|
345
354
|
},
|
|
346
355
|
async initParams() {
|
|
347
|
-
|
|
356
|
+
try {
|
|
357
|
+
await this.$LoadParams.loadParam(this.f_filialeids)
|
|
358
|
+
}catch (e) {
|
|
359
|
+
|
|
360
|
+
}
|
|
348
361
|
this.initBrands()
|
|
349
|
-
this.initSafeCheckArea()
|
|
362
|
+
await this.initSafeCheckArea()
|
|
350
363
|
// this.initAdjustables()
|
|
351
364
|
},
|
|
352
365
|
|
|
353
366
|
initBrands () {
|
|
354
|
-
let ret =
|
|
367
|
+
let ret = []
|
|
368
|
+
try {
|
|
369
|
+
ret = this.$GetSaleParam.getGasbrand()
|
|
370
|
+
} catch(e){}
|
|
371
|
+
// let ret = this.$GetSaleParam.getGasbrand()
|
|
355
372
|
let rs = new Array()
|
|
356
373
|
ret.forEach((item, index) =>{
|
|
357
374
|
rs.push({label: item.label, value: item.value.f_meter_brand})
|
|
@@ -366,7 +383,7 @@
|
|
|
366
383
|
orderitem: 'id',
|
|
367
384
|
condition: `f_orgid=${this.$login.f.orgid}`
|
|
368
385
|
}
|
|
369
|
-
let ret = await this.$resetpost('rs/sql/address_singleTableOrderBy',{data: data},{resolveMsg: null, rejectMsg: null})
|
|
386
|
+
let ret = await this.$resetpost('rs/sql/address_singleTableOrderBy',{data: data},{resolveMsg: null, rejectMsg: null,newly:true})
|
|
370
387
|
ret.data.forEach(item => {
|
|
371
388
|
this.safeCheckArea.push({label: item.f_check_book_name, value: item.id})
|
|
372
389
|
})
|
|
@@ -387,7 +404,7 @@
|
|
|
387
404
|
let getAllArea = await this.$resetpost('/rs/search', {
|
|
388
405
|
source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
|
|
389
406
|
userid: this.$login.f.id
|
|
390
|
-
}, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
|
|
407
|
+
}, {resolveMsg: null, rejectMsg: '获取片区出错！！！',newly:true})
|
|
391
408
|
|
|
392
409
|
let arr = getAllArea.data.filter((res) => {
|
|
393
410
|
return res.parentid == val
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
</div>
|
|
27
27
|
</div>
|
|
28
28
|
<div class="row" v-show="$parent.$parent.criteriaShow">
|
|
29
|
-
<div class="form-group"
|
|
29
|
+
<div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
|
|
30
30
|
<label class="font_normal_body">街道名称</label>
|
|
31
31
|
<input type="text" class="input_search" style="width:60%" v-model="model.f_street"
|
|
32
32
|
condition="f_street like '%{}%'" placeholder="街道名称"/>
|
|
@@ -1,20 +1,20 @@
|
|
|
1
|
-
// 分公司特殊组件页面注册
|
|
2
|
-
let specialComp = {
|
|
3
|
-
//小区列表
|
|
4
|
-
'area-list': (resolve) => { require(['./AreaList'], resolve) },
|
|
5
|
-
//地址管理
|
|
6
|
-
'street-list': (resolve) => { require(['./StreetList'], resolve) },
|
|
7
|
-
//地址管理
|
|
8
|
-
'address-list': (resolve) => { require(['./AddressList.vue'], resolve) },
|
|
9
|
-
|
|
10
|
-
'add-area-msg': (resolve) => { require(['./AddAreaMsg.vue'], resolve) },
|
|
11
|
-
'user-address': (resolve) => { require(['./UserAddress.vue'], resolve) },
|
|
12
|
-
'city-manage': (resolve) => { require(['./CityManage.vue'], resolve) },
|
|
13
|
-
'address-manage': (resolve) => { require(['./AddressManage.vue'], resolve) },
|
|
14
|
-
'area-manage': (resolve) => { require(['./AreaManage.vue'], resolve) }
|
|
15
|
-
}
|
|
16
|
-
exports.specialComp = specialComp
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
1
|
+
// 分公司特殊组件页面注册
|
|
2
|
+
let specialComp = {
|
|
3
|
+
//小区列表
|
|
4
|
+
'area-list': (resolve) => { require(['./AreaList'], resolve) },
|
|
5
|
+
//地址管理
|
|
6
|
+
'street-list': (resolve) => { require(['./StreetList'], resolve) },
|
|
7
|
+
//地址管理
|
|
8
|
+
'address-list': (resolve) => { require(['./AddressList.vue'], resolve) },
|
|
9
|
+
|
|
10
|
+
'add-area-msg': (resolve) => { require(['./AddAreaMsg.vue'], resolve) },
|
|
11
|
+
'user-address': (resolve) => { require(['./UserAddress.vue'], resolve) },
|
|
12
|
+
'city-manage': (resolve) => { require(['./CityManage.vue'], resolve) },
|
|
13
|
+
'address-manage': (resolve) => { require(['./AddressManage.vue'], resolve) },
|
|
14
|
+
'area-manage': (resolve) => { require(['./AreaManage.vue'], resolve) }
|
|
15
|
+
}
|
|
16
|
+
exports.specialComp = specialComp
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|