address-client 3.2.40 → 3.2.42
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/components/UserAddress.vue +1 -1
- package/src/filiale/qianneng/AddAreaMsg.vue +15 -7
- package/src/filiale/qianneng/AddStreetOrPcd.vue +17 -7
- package/src/main.js +21 -21
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://
|
|
14
|
-
var str3= '
|
|
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://219.153.176.6:8400/', str2= 'hhttp://219.153.176.6:8400/'
|
|
14
|
+
var str3= 'http://219.153.176.6: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
|
@@ -317,7 +317,7 @@
|
|
|
317
317
|
</div>
|
|
318
318
|
</validator>
|
|
319
319
|
|
|
320
|
-
<modal :show.sync="isshow" large backdrop="false" :width="900">
|
|
320
|
+
<modal v-if="isshow" :show.sync="isshow" large backdrop="false" :width="900">
|
|
321
321
|
<header slot="modal-header" class="modal-header">
|
|
322
322
|
</header>
|
|
323
323
|
<article slot="modal-body" class="modal-body">
|
|
@@ -335,6 +335,9 @@
|
|
|
335
335
|
initGen(this)
|
|
336
336
|
},
|
|
337
337
|
methods: {
|
|
338
|
+
selected(val){
|
|
339
|
+
this.buildingmodel = {...val.val}
|
|
340
|
+
},
|
|
338
341
|
loadMeterBooks(){
|
|
339
342
|
this.meterbooks = [...this.meterbooks, ...this.$GetSaleParam.getMeterBooks()]
|
|
340
343
|
},
|
|
@@ -569,15 +572,20 @@
|
|
|
569
572
|
// 保存楼栋
|
|
570
573
|
async savebuilding () {
|
|
571
574
|
this.buildingmodel.f_residential_area = this.$refs.areaselect.selectedItems
|
|
572
|
-
this.buildingmodel.f_filialeid = this.f_filialeids
|
|
573
|
-
this.buildingmodel.f_operator = this.$login.f.name
|
|
574
|
-
this.buildingmodel.f_operatorid = this.$login.f.id
|
|
575
|
-
this.buildingmodel.f_orgid = this.$login.f.orgid
|
|
576
|
-
this.buildingmodel.f_orgname = this.$login.f.orgs
|
|
577
|
-
this.buildingmodel.f_depid = this.$login.f.depids
|
|
578
|
-
this.buildingmodel.f_depname = this.$login.f.deps
|
|
575
|
+
this.buildingmodel.f_filialeid = this.buildingmodel.f_filialeid?this.buildingmodel.f_filialeid:this.f_filialeids
|
|
576
|
+
this.buildingmodel.f_operator = this.buildingmodel.f_operator?this.buildingmodel.f_operator:this.$login.f.name
|
|
577
|
+
this.buildingmodel.f_operatorid = this.buildingmodel.f_operatorid?this.buildingmodel.f_operatorid:this.$login.f.id
|
|
578
|
+
this.buildingmodel.f_orgid = this.buildingmodel.f_orgid?this.buildingmodel.f_orgid:this.$login.f.orgid
|
|
579
|
+
this.buildingmodel.f_orgname = this.buildingmodel.f_orgname?this.buildingmodel.f_orgname:this.$login.f.orgs
|
|
580
|
+
this.buildingmodel.f_depid = this.buildingmodel.f_depid?this.buildingmodel.f_depid:this.$login.f.depids
|
|
581
|
+
this.buildingmodel.f_depname = this.buildingmodel.f_depname?this.buildingmodel.f_depname:this.$login.f.deps
|
|
579
582
|
await this.$resetpost('rs/logic/address_savebuilding', this.buildingmodel)
|
|
580
583
|
this.$refs.buildinglist.search()
|
|
584
|
+
this.buildingmodel= {
|
|
585
|
+
f_residential_area: '',
|
|
586
|
+
f_residential_area_id: '',
|
|
587
|
+
f_building: ''
|
|
588
|
+
}
|
|
581
589
|
},
|
|
582
590
|
//保存小区
|
|
583
591
|
async savearea(){
|
|
@@ -146,6 +146,9 @@
|
|
|
146
146
|
getAreaConfig(this)
|
|
147
147
|
},
|
|
148
148
|
methods: {
|
|
149
|
+
selected(val){
|
|
150
|
+
this.pcdmodel = {...val.val}
|
|
151
|
+
},
|
|
149
152
|
async streetyanzheng(){
|
|
150
153
|
console.log(this.streetmodel.f_street_number.length)
|
|
151
154
|
if (this.streetmodel.f_street_number.length != 2){
|
|
@@ -252,15 +255,22 @@
|
|
|
252
255
|
},
|
|
253
256
|
//保存省市区
|
|
254
257
|
async savepcd(){
|
|
255
|
-
this.pcdmodel.f_filialeid = this.f_filialeids
|
|
256
|
-
this.pcdmodel.f_operator = this.$login.f.name
|
|
257
|
-
this.pcdmodel.f_operatorid = this.$login.f.id
|
|
258
|
-
this.pcdmodel.f_orgid = this.$login.f.orgid
|
|
259
|
-
this.pcdmodel.f_orgname = this.$login.f.orgs
|
|
260
|
-
this.pcdmodel.f_depid = this.$login.f.depids
|
|
261
|
-
this.pcdmodel.f_depname = this.$login.f.deps
|
|
258
|
+
this.pcdmodel.f_filialeid = this.pcdmodel.f_filialeid?this.pcdmodel.f_filialeid:this.f_filialeids
|
|
259
|
+
this.pcdmodel.f_operator = this.pcdmodel.f_operator?this.pcdmodel.f_operator:this.$login.f.name
|
|
260
|
+
this.pcdmodel.f_operatorid = this.pcdmodel.f_operatorid?this.pcdmodel.f_operatorid:this.$login.f.id
|
|
261
|
+
this.pcdmodel.f_orgid = this.pcdmodel.f_orgid?this.pcdmodel.f_orgid:this.$login.f.orgid
|
|
262
|
+
this.pcdmodel.f_orgname = this.pcdmodel.f_orgname?this.pcdmodel.f_orgname:this.$login.f.orgs
|
|
263
|
+
this.pcdmodel.f_depid = this.pcdmodel.f_depid?this.pcdmodel.f_depid:this.$login.f.depids
|
|
264
|
+
this.pcdmodel.f_depname = this.pcdmodel.f_depname?this.pcdmodel.f_depname:this.$login.f.deps
|
|
262
265
|
this.pcdmodel.f_pcd = this.pcdmodel.f_province+this.pcdmodel.f_city+this.pcdmodel.f_district
|
|
263
266
|
await this.$resetpost('rs/logic/address_updatepcd', this.pcdmodel)
|
|
267
|
+
this.pcdmodel= {
|
|
268
|
+
f_province:'',
|
|
269
|
+
f_city:'',
|
|
270
|
+
f_district:'',
|
|
271
|
+
f_comments:'',
|
|
272
|
+
f_pcd_number: ''
|
|
273
|
+
}
|
|
264
274
|
},
|
|
265
275
|
//保存街道
|
|
266
276
|
async savestreet(){
|
package/src/main.js
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
|
-
import Vue from 'vue'
|
|
2
|
-
import App from './App'
|
|
3
|
-
import { all } from 'vue-client'
|
|
4
|
-
import { system } from 'system-clients'
|
|
5
|
-
import { sale } from 'sale-client'
|
|
6
|
-
import address from './address'
|
|
7
|
-
|
|
8
|
-
Vue.config.silent = true
|
|
9
|
-
|
|
10
|
-
/** **************************通用组件******************************/
|
|
11
|
-
all()
|
|
12
|
-
address(
|
|
13
|
-
system(false)
|
|
14
|
-
sale()
|
|
15
|
-
require('system-clients/src/styles/less/bootstrap.less')
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
new Vue({
|
|
19
|
-
el: 'body',
|
|
20
|
-
components: { App }
|
|
21
|
-
})
|
|
1
|
+
import Vue from 'vue'
|
|
2
|
+
import App from './App'
|
|
3
|
+
import { all } from 'vue-client'
|
|
4
|
+
import { system } from 'system-clients'
|
|
5
|
+
import { sale } from 'sale-client'
|
|
6
|
+
import address from './address'
|
|
7
|
+
|
|
8
|
+
Vue.config.silent = true
|
|
9
|
+
|
|
10
|
+
/** **************************通用组件******************************/
|
|
11
|
+
all()
|
|
12
|
+
address()
|
|
13
|
+
system(false)
|
|
14
|
+
// sale()
|
|
15
|
+
require('system-clients/src/styles/less/bootstrap.less')
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
new Vue({
|
|
19
|
+
el: 'body',
|
|
20
|
+
components: { App }
|
|
21
|
+
})
|