address-client 1.6.81 → 1.6.84
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 +89 -89
- package/package.json +1 -1
- package/src/components/AddAreaMsg.vue +16 -0
- package/src/components/AreaList.vue +31 -4
package/build/dev-server.js
CHANGED
|
@@ -1,89 +1,89 @@
|
|
|
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 gongsi = 'http://192.168.
|
|
14
|
-
var proxyTable = {
|
|
15
|
-
'/rs/search': {
|
|
16
|
-
target: changan
|
|
17
|
-
},
|
|
18
|
-
'/rs/logic/getLogin': {
|
|
19
|
-
target: changan
|
|
20
|
-
},
|
|
21
|
-
'/rs/logic/getInitData': {
|
|
22
|
-
target: changan
|
|
23
|
-
},
|
|
24
|
-
'/rs/vue': {
|
|
25
|
-
target: changan
|
|
26
|
-
},
|
|
27
|
-
'/rs/user': {
|
|
28
|
-
target: changan
|
|
29
|
-
},
|
|
30
|
-
'/rs': {
|
|
31
|
-
target: changan
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
var devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
36
|
-
publicPath: config.output.publicPath,
|
|
37
|
-
stats: {
|
|
38
|
-
colors: true,
|
|
39
|
-
chunks: false
|
|
40
|
-
}
|
|
41
|
-
})
|
|
42
|
-
|
|
43
|
-
var hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
44
|
-
// force page reload when html-webpack-plugin template changes
|
|
45
|
-
compiler.plugin('compilation', function (compilation) {
|
|
46
|
-
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
47
|
-
hotMiddleware.publish({action: 'reload'})
|
|
48
|
-
cb()
|
|
49
|
-
})
|
|
50
|
-
})
|
|
51
|
-
|
|
52
|
-
// proxy api requests
|
|
53
|
-
Object.keys(proxyTable).forEach(function (context) {
|
|
54
|
-
var options = proxyTable[context]
|
|
55
|
-
if (typeof options === 'string') {
|
|
56
|
-
options = {target: options}
|
|
57
|
-
}
|
|
58
|
-
app.use(proxyMiddleware(context, options))
|
|
59
|
-
})
|
|
60
|
-
|
|
61
|
-
// handle fallback for HTML5 history API
|
|
62
|
-
app.use(require('connect-history-api-fallback')())
|
|
63
|
-
// app.use(function (req, res, next) {
|
|
64
|
-
// res.header('Access-Control-Allow-Origin', '*')
|
|
65
|
-
// res.header('Access-Control-Allow-Headers', 'X-Requested-With')
|
|
66
|
-
// res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
|
|
67
|
-
// res.header('X-Powered-By', '3,2,1')
|
|
68
|
-
// res.header('Access-Control-Allow-Credentials', 'true')
|
|
69
|
-
// res.header('Content-Type', 'application/json;charset=utf-8')
|
|
70
|
-
// next()
|
|
71
|
-
// })
|
|
72
|
-
|
|
73
|
-
// serve webpack bundle output
|
|
74
|
-
app.use(devMiddleware)
|
|
75
|
-
|
|
76
|
-
// enable hot-reload and state-preserving
|
|
77
|
-
// compilation error display
|
|
78
|
-
app.use(hotMiddleware)
|
|
79
|
-
|
|
80
|
-
// serve pure static assets
|
|
81
|
-
app.use('/static', express.static('./static'))
|
|
82
|
-
|
|
83
|
-
module.exports = app.listen(8084, function (err) {
|
|
84
|
-
if (err) {
|
|
85
|
-
console.log(err)
|
|
86
|
-
return
|
|
87
|
-
}
|
|
88
|
-
console.log('Listening at http://localhost:8084')
|
|
89
|
-
})
|
|
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 gongsi = 'http://192.168.2.84:7003/', changan = 'http://192.168.2.84:7003/'
|
|
14
|
+
var proxyTable = {
|
|
15
|
+
'/rs/search': {
|
|
16
|
+
target: changan
|
|
17
|
+
},
|
|
18
|
+
'/rs/logic/getLogin': {
|
|
19
|
+
target: changan
|
|
20
|
+
},
|
|
21
|
+
'/rs/logic/getInitData': {
|
|
22
|
+
target: changan
|
|
23
|
+
},
|
|
24
|
+
'/rs/vue': {
|
|
25
|
+
target: changan
|
|
26
|
+
},
|
|
27
|
+
'/rs/user': {
|
|
28
|
+
target: changan
|
|
29
|
+
},
|
|
30
|
+
'/rs': {
|
|
31
|
+
target: changan
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
var devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
36
|
+
publicPath: config.output.publicPath,
|
|
37
|
+
stats: {
|
|
38
|
+
colors: true,
|
|
39
|
+
chunks: false
|
|
40
|
+
}
|
|
41
|
+
})
|
|
42
|
+
|
|
43
|
+
var hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
44
|
+
// force page reload when html-webpack-plugin template changes
|
|
45
|
+
compiler.plugin('compilation', function (compilation) {
|
|
46
|
+
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
47
|
+
hotMiddleware.publish({action: 'reload'})
|
|
48
|
+
cb()
|
|
49
|
+
})
|
|
50
|
+
})
|
|
51
|
+
|
|
52
|
+
// proxy api requests
|
|
53
|
+
Object.keys(proxyTable).forEach(function (context) {
|
|
54
|
+
var options = proxyTable[context]
|
|
55
|
+
if (typeof options === 'string') {
|
|
56
|
+
options = {target: options}
|
|
57
|
+
}
|
|
58
|
+
app.use(proxyMiddleware(context, options))
|
|
59
|
+
})
|
|
60
|
+
|
|
61
|
+
// handle fallback for HTML5 history API
|
|
62
|
+
app.use(require('connect-history-api-fallback')())
|
|
63
|
+
// app.use(function (req, res, next) {
|
|
64
|
+
// res.header('Access-Control-Allow-Origin', '*')
|
|
65
|
+
// res.header('Access-Control-Allow-Headers', 'X-Requested-With')
|
|
66
|
+
// res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
|
|
67
|
+
// res.header('X-Powered-By', '3,2,1')
|
|
68
|
+
// res.header('Access-Control-Allow-Credentials', 'true')
|
|
69
|
+
// res.header('Content-Type', 'application/json;charset=utf-8')
|
|
70
|
+
// next()
|
|
71
|
+
// })
|
|
72
|
+
|
|
73
|
+
// serve webpack bundle output
|
|
74
|
+
app.use(devMiddleware)
|
|
75
|
+
|
|
76
|
+
// enable hot-reload and state-preserving
|
|
77
|
+
// compilation error display
|
|
78
|
+
app.use(hotMiddleware)
|
|
79
|
+
|
|
80
|
+
// serve pure static assets
|
|
81
|
+
app.use('/static', express.static('./static'))
|
|
82
|
+
|
|
83
|
+
module.exports = app.listen(8084, function (err) {
|
|
84
|
+
if (err) {
|
|
85
|
+
console.log(err)
|
|
86
|
+
return
|
|
87
|
+
}
|
|
88
|
+
console.log('Listening at http://localhost:8084')
|
|
89
|
+
})
|
package/package.json
CHANGED
|
@@ -305,6 +305,7 @@
|
|
|
305
305
|
style="width: 60%"
|
|
306
306
|
:value.sync="areamodel.f_price_type" :value-single="true"
|
|
307
307
|
:options='f_price_types' placeholder='气价类型'
|
|
308
|
+
@change="priceChange"
|
|
308
309
|
close-on-select>
|
|
309
310
|
</v-select>
|
|
310
311
|
</div>
|
|
@@ -321,6 +322,7 @@
|
|
|
321
322
|
style="width: 60%"
|
|
322
323
|
:value.sync="areamodel.f_price_name" :value-single="true"
|
|
323
324
|
:options='pricenames' placeholder='气价名称'
|
|
325
|
+
@
|
|
324
326
|
close-on-select>
|
|
325
327
|
</v-select>
|
|
326
328
|
</div>
|
|
@@ -490,6 +492,15 @@
|
|
|
490
492
|
v-model="areamodel.twoalarm" placeholder='第二档报警气量'
|
|
491
493
|
/>
|
|
492
494
|
</div>
|
|
495
|
+
<div class="col-sm-6 form-group form-input-group ">
|
|
496
|
+
<label class="font_normal_body _zoom4">第二套档案标识</label>
|
|
497
|
+
<v-select :value.sync="areamodel.f_second_state"
|
|
498
|
+
v-model="areamodel.f_second_state"
|
|
499
|
+
:search="false"
|
|
500
|
+
:value-single = "true"
|
|
501
|
+
:options='second_states' placeholder='请选择'
|
|
502
|
+
></v-select>
|
|
503
|
+
</div>
|
|
493
504
|
</div>
|
|
494
505
|
<div v-if="f_special" class="col-sm-6">
|
|
495
506
|
<br/>
|
|
@@ -522,6 +533,7 @@ export default {
|
|
|
522
533
|
residential_properties: this.$appdata.getParam('小区性质'),
|
|
523
534
|
heating_style: this.$appdata.getParam('供暖方式'),
|
|
524
535
|
blockslist: this.$appdata.getParam('所属街办'),
|
|
536
|
+
second_states: [{label: '否', value: '否'}, {label: '是', value: '是'}],
|
|
525
537
|
// repair_point: [{label: '航天站', value: '航天站'},
|
|
526
538
|
// {label: '韦曲站', value: '韦曲站'}, {label: '郭杜站', value: '郭杜站'},
|
|
527
539
|
// {label: '沣东站', value: '沣东站'},
|
|
@@ -593,6 +605,10 @@ export default {
|
|
|
593
605
|
this.$LoadParams.loadParam()
|
|
594
606
|
},
|
|
595
607
|
methods: {
|
|
608
|
+
// 气价类型变更修改单价类型
|
|
609
|
+
priceChange(val){
|
|
610
|
+
this.areamodel.price_type = val==='阶梯气价' ?'阶梯单价':'普通单价'
|
|
611
|
+
},
|
|
596
612
|
//初始化省市区,添加街道
|
|
597
613
|
initpcds(pconditon) {
|
|
598
614
|
console.log("省市区准备")
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div id="stand-work-list" class="datapanel flex bg-white p-10">
|
|
3
|
-
<criteria-paged :model="model" v-ref:paged>
|
|
3
|
+
<criteria-paged :model="model" v-ref:paged @sort="sort">
|
|
4
4
|
<criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
|
|
5
5
|
<div novalidate class="form-inline auto" partial>
|
|
6
6
|
<!-- <div class="form-group form-input-group" v-if="$parent.$parent.f_special">
|
|
@@ -77,7 +77,11 @@
|
|
|
77
77
|
<th><nobr>区/县</nobr></th>
|
|
78
78
|
<th><nobr>街道名称</nobr></th>
|
|
79
79
|
<!--民用小区信息开始-->
|
|
80
|
-
<th v-if="!$parent.$parent.$parent.f_special"
|
|
80
|
+
<th v-if="!$parent.$parent.$parent.f_special">
|
|
81
|
+
<!-- <nobr>小区ID</nobr>-->
|
|
82
|
+
<data-order field="oldid" name="小区ID"
|
|
83
|
+
:order.sync="$parent.$parent.$parent.orderFields.oldid"></data-order>
|
|
84
|
+
</th>
|
|
81
85
|
<th v-if="!$parent.$parent.$parent.f_special"><nobr>小区名称</nobr></th>
|
|
82
86
|
<th v-if="!$parent.$parent.$parent.f_special"><nobr>详细地址</nobr></th>
|
|
83
87
|
<!--民用小区信息结束-->
|
|
@@ -134,11 +138,14 @@
|
|
|
134
138
|
export default {
|
|
135
139
|
data () {
|
|
136
140
|
return {
|
|
137
|
-
model: new PagedList('rs/sql/address_getarealist',20),
|
|
141
|
+
model: new PagedList('rs/sql/address_getarealist',20,{orderitem:`' oldid asc '`}),
|
|
138
142
|
userid: this.$login.f.id,
|
|
139
143
|
source:`tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
|
|
140
144
|
addflag: false,
|
|
141
|
-
addtitle:''
|
|
145
|
+
addtitle:'',
|
|
146
|
+
orderFields: {
|
|
147
|
+
oldid:'asc'
|
|
148
|
+
}
|
|
142
149
|
}
|
|
143
150
|
},
|
|
144
151
|
title: '小区管理',
|
|
@@ -170,6 +177,26 @@
|
|
|
170
177
|
}
|
|
171
178
|
}
|
|
172
179
|
},
|
|
180
|
+
sort (field, rule) {
|
|
181
|
+
// 将所有排序方式设为不排序，实现相互排斥
|
|
182
|
+
for (let key in this.orderFields) {
|
|
183
|
+
if (key === field) {
|
|
184
|
+
this.orderFields[key] = rule
|
|
185
|
+
} else {
|
|
186
|
+
this.orderFields[key] = 'no'
|
|
187
|
+
|
|
188
|
+
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
// 如果新规则不排序，还原为默认排序
|
|
192
|
+
if (rule === 'no') {
|
|
193
|
+
this.model.paramSource.orderitem = `'${this.orderitem}'`
|
|
194
|
+
} else {
|
|
195
|
+
this.model.paramSource.orderitem = `'${field} ${rule}'`
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
this.search()
|
|
199
|
+
},
|
|
173
200
|
add(val){
|
|
174
201
|
this.$refs.paged.$refs.grid.selectStore.selected = null
|
|
175
202
|
this.$dispatch('add')
|