address-client 3.2.103 → 3.2.104-yangchun
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 +70 -59
- package/package.json +100 -100
- package/src/components/AreaManage.vue +4 -0
- package/src/filiale/yangchun/AddAreaMsg.vue +9 -1
- package/src/main.js +2 -1
package/build/dev-server.js
CHANGED
|
@@ -12,83 +12,94 @@ var proxy = httpProxy.createProxyServer()
|
|
|
12
12
|
// https://github.com/chimurai/http-proxy-middleware
|
|
13
13
|
var str = 'http://127.0.0.1:8288/', str2= 'http://172.168.1.11:9001/#'
|
|
14
14
|
var str3= 'http://172.168.1.11:9001/#'
|
|
15
|
+
var str4='http://127.0.0.1:8080'
|
|
16
|
+
const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/', 'http://192.168.50.67:31785']
|
|
15
17
|
var proxyTable = {
|
|
16
|
-
'/
|
|
17
|
-
target:
|
|
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'
|
|
18
|
+
'/api': {
|
|
19
|
+
target: v4Url
|
|
27
20
|
},
|
|
21
|
+
'/invoice/rs/logic/getInvoice': {
|
|
22
|
+
target: serverRul
|
|
23
|
+
},
|
|
24
|
+
'/rs/sql/address_getarealist':{
|
|
25
|
+
target:str4
|
|
26
|
+
},
|
|
27
|
+
'/rs/sql/filemanage_getUserfies':{
|
|
28
|
+
target: 'http://127.0.0.1:8080/'
|
|
29
|
+
},
|
|
30
|
+
'/rs/logic/importNetworkValve':{
|
|
31
|
+
target: 'http://127.0.0.1:8080/'
|
|
32
|
+
},
|
|
33
|
+
'/rs/file': {
|
|
34
|
+
target: localUrl
|
|
35
|
+
},
|
|
36
|
+
'/webapps': {
|
|
37
|
+
target: serverRul
|
|
38
|
+
},
|
|
39
|
+
'/rs/sql/singleTable': {
|
|
40
|
+
target: serverRul
|
|
41
|
+
},
|
|
42
|
+
'/invoice': {
|
|
43
|
+
target: serverRul
|
|
44
|
+
},
|
|
45
|
+
// 查找资源服务数据
|
|
46
|
+
'/rs/search': {
|
|
47
|
+
target: serverRul
|
|
48
|
+
},
|
|
49
|
+
// 查找资源服务数据
|
|
28
50
|
'/rs/logic/getLogin': {
|
|
29
|
-
target:
|
|
30
|
-
secure:true,
|
|
31
|
-
changeOrigin:true
|
|
51
|
+
target: serverRul
|
|
32
52
|
},
|
|
53
|
+
// 查找资源服务数据
|
|
33
54
|
'/rs/logic/getInitData': {
|
|
34
|
-
target:
|
|
35
|
-
secure:true,
|
|
36
|
-
changeOrigin:true,
|
|
55
|
+
target: serverRul
|
|
37
56
|
},
|
|
38
57
|
'/rs/logic/getSaleInitData': {
|
|
39
|
-
target:
|
|
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
|
|
58
|
+
target: serverRul
|
|
53
59
|
},
|
|
60
|
+
// 用户登录服务地址
|
|
54
61
|
'/rs/user': {
|
|
55
|
-
target:
|
|
56
|
-
|
|
57
|
-
|
|
62
|
+
target: serverRul
|
|
63
|
+
},
|
|
64
|
+
'/rs/path': {
|
|
65
|
+
target: serverRul
|
|
66
|
+
},
|
|
67
|
+
'/rs/data': {
|
|
68
|
+
target: serverRul
|
|
69
|
+
},
|
|
70
|
+
'/rs/license': {
|
|
71
|
+
target: serverRul
|
|
58
72
|
},
|
|
59
73
|
'/rs/db': {
|
|
60
|
-
target:
|
|
61
|
-
secure:true,
|
|
62
|
-
changeOrigin:true
|
|
74
|
+
target: serverRul
|
|
63
75
|
},
|
|
64
|
-
'/
|
|
65
|
-
target:
|
|
66
|
-
secure:true,
|
|
67
|
-
changeOrigin:true
|
|
68
|
-
// target: 'http://127.0.0.1:8080'
|
|
76
|
+
'/excel': {
|
|
77
|
+
target: serverRul
|
|
69
78
|
},
|
|
70
|
-
'/rs/
|
|
71
|
-
target:
|
|
72
|
-
secure:true,
|
|
73
|
-
changeOrigin:true
|
|
79
|
+
'/rs/config': {
|
|
80
|
+
target: serverRul
|
|
74
81
|
},
|
|
75
|
-
'/rs/
|
|
76
|
-
target:
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
82
|
+
'/rs/report': {
|
|
83
|
+
target: serverRul
|
|
84
|
+
},
|
|
85
|
+
'/rs/vue': {
|
|
86
|
+
target: serverRul
|
|
87
|
+
},
|
|
88
|
+
'/rs/logic/webHandReverse': {
|
|
89
|
+
target: 'http://localhost:8085'
|
|
80
90
|
},
|
|
81
91
|
'/rs/logic': {
|
|
82
|
-
target:
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
92
|
+
target: localUrl
|
|
93
|
+
},
|
|
94
|
+
'/rs/sql': {
|
|
95
|
+
target: localUrl
|
|
96
|
+
},
|
|
97
|
+
'/webmeter': {
|
|
98
|
+
target: serverRul
|
|
86
99
|
},
|
|
87
100
|
'/rs': {
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
secure:true,
|
|
91
|
-
changeOrigin:true
|
|
101
|
+
target: serverRul
|
|
102
|
+
// changeOrigin: true
|
|
92
103
|
}
|
|
93
104
|
}
|
|
94
105
|
|
package/package.json
CHANGED
|
@@ -1,100 +1,100 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "address-client",
|
|
3
|
-
"version": "3.2.
|
|
4
|
-
"description": "地址管理前台组件",
|
|
5
|
-
"author": "wanbochao",
|
|
6
|
-
"license": "ISC",
|
|
7
|
-
"main": "src/index.js",
|
|
8
|
-
"keywords": [
|
|
9
|
-
"sale"
|
|
10
|
-
],
|
|
11
|
-
"scripts": {
|
|
12
|
-
"unit": "karma start test/unit/karma.conf.js",
|
|
13
|
-
"example": "node build/example-server.js",
|
|
14
|
-
"dev": "node build/dev-server.js",
|
|
15
|
-
"lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
|
|
16
|
-
"build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
|
|
17
|
-
"e2e": "node test/e2e/runner.js",
|
|
18
|
-
"make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js && publish",
|
|
19
|
-
"release": "bash build/release.sh"
|
|
20
|
-
},
|
|
21
|
-
"repository": {
|
|
22
|
-
"type": "git",
|
|
23
|
-
"url": "https://gitee.com/aote/address_management.git"
|
|
24
|
-
},
|
|
25
|
-
"dependencies": {
|
|
26
|
-
"less-loader": "^2.2.3",
|
|
27
|
-
"vue": "^1.0.17"
|
|
28
|
-
},
|
|
29
|
-
"devDependencies": {
|
|
30
|
-
"babel-core": "^6.0.0",
|
|
31
|
-
"babel-loader": "^6.0.0",
|
|
32
|
-
"babel-plugin-transform-runtime": "^6.0.0",
|
|
33
|
-
"babel-preset-es2015": "^6.0.0",
|
|
34
|
-
"babel-preset-stage-2": "^6.0.0",
|
|
35
|
-
"chai": "^3.5.0",
|
|
36
|
-
"co": "^4.6.0",
|
|
37
|
-
"connect-history-api-fallback": "^1.1.0",
|
|
38
|
-
"cross-env": "^1.0.7",
|
|
39
|
-
"cross-spawn": "^2.1.5",
|
|
40
|
-
"css-loader": "^0.23.0",
|
|
41
|
-
"echarts": "^4.1.0",
|
|
42
|
-
"eslint": "^2.0.0",
|
|
43
|
-
"eslint-config-standard": "^5.1.0",
|
|
44
|
-
"eslint-friendly-formatter": "^1.2.2",
|
|
45
|
-
"eslint-loader": "^1.3.0",
|
|
46
|
-
"eslint-plugin-html": "^1.3.0",
|
|
47
|
-
"eslint-plugin-promise": "^1.0.8",
|
|
48
|
-
"eslint-plugin-standard": "^1.3.2",
|
|
49
|
-
"eslint-plugin-vue": "^0.1.1",
|
|
50
|
-
"eventsource-polyfill": "^0.9.6",
|
|
51
|
-
"express": "^4.13.3",
|
|
52
|
-
"extract-text-webpack-plugin": "^1.0.1",
|
|
53
|
-
"file-loader": "^0.8.4",
|
|
54
|
-
"function-bind": "^1.0.2",
|
|
55
|
-
"html-webpack-plugin": "^2.8.1",
|
|
56
|
-
"http-proxy-middleware": "^0.11.0",
|
|
57
|
-
"inject-loader": "^2.0.1",
|
|
58
|
-
"isparta-loader": "^2.0.0",
|
|
59
|
-
"jasmine-core": "^2.4.1",
|
|
60
|
-
"jquery": "^3.3.1",
|
|
61
|
-
"json-loader": "^0.5.4",
|
|
62
|
-
"karma": "^1.4.1",
|
|
63
|
-
"karma-chrome-launcher": "^2.2.0",
|
|
64
|
-
"karma-coverage": "^1.1.1",
|
|
65
|
-
"karma-mocha": "^1.3.0",
|
|
66
|
-
"karma-sinon-chai": "^1.3.1",
|
|
67
|
-
"karma-sourcemap-loader": "^0.3.7",
|
|
68
|
-
"karma-spec-reporter": "0.0.31",
|
|
69
|
-
"karma-webpack": "^2.0.2",
|
|
70
|
-
"less": "^2.7.3",
|
|
71
|
-
"mkdirp": "^0.5.1",
|
|
72
|
-
"mocha": "^3.2.0",
|
|
73
|
-
"ncp": "^2.0.0",
|
|
74
|
-
"rimraf": "^2.5.0",
|
|
75
|
-
"sale-client": "3.2.11-17",
|
|
76
|
-
"selenium-server": "2.52.0",
|
|
77
|
-
"sinon": "^2.1.0",
|
|
78
|
-
"sinon-chai": "^2.8.0",
|
|
79
|
-
"style": "0.0.3",
|
|
80
|
-
"style-loader": "^0.20.3",
|
|
81
|
-
"ldap-clients": "3.0.48",
|
|
82
|
-
"system-clients": "3.2.68",
|
|
83
|
-
"url-loader": "^0.5.7",
|
|
84
|
-
"vue-client": "1.24.98",
|
|
85
|
-
"vue-hot-reload-api": "^1.2.0",
|
|
86
|
-
"vue-html-loader": "^1.0.0",
|
|
87
|
-
"vue-loader": "^8.2.1",
|
|
88
|
-
"vue-resource": "^1.5.0",
|
|
89
|
-
"vue-router": "^0.7.13",
|
|
90
|
-
"vue-strap": "^1.0.9",
|
|
91
|
-
"vue-style-loader": "^1.0.0",
|
|
92
|
-
"vue-validator": "2.1.7",
|
|
93
|
-
"webpack": "^1.12.2",
|
|
94
|
-
"webpack-dev-middleware": "^1.4.0",
|
|
95
|
-
"webpack-hot-middleware": "^2.6.0",
|
|
96
|
-
"webpack-merge": "^0.8.3",
|
|
97
|
-
"jsencrypt": "3.0.0-rc.1",
|
|
98
|
-
"axios": "0.15.3"
|
|
99
|
-
}
|
|
100
|
-
}
|
|
1
|
+
{
|
|
2
|
+
"name": "address-client",
|
|
3
|
+
"version": "3.2.104-yangchun",
|
|
4
|
+
"description": "地址管理前台组件",
|
|
5
|
+
"author": "wanbochao",
|
|
6
|
+
"license": "ISC",
|
|
7
|
+
"main": "src/index.js",
|
|
8
|
+
"keywords": [
|
|
9
|
+
"sale"
|
|
10
|
+
],
|
|
11
|
+
"scripts": {
|
|
12
|
+
"unit": "karma start test/unit/karma.conf.js",
|
|
13
|
+
"example": "node build/example-server.js",
|
|
14
|
+
"dev": "node build/dev-server.js",
|
|
15
|
+
"lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
|
|
16
|
+
"build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
|
|
17
|
+
"e2e": "node test/e2e/runner.js",
|
|
18
|
+
"make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js && publish",
|
|
19
|
+
"release": "bash build/release.sh"
|
|
20
|
+
},
|
|
21
|
+
"repository": {
|
|
22
|
+
"type": "git",
|
|
23
|
+
"url": "https://gitee.com/aote/address_management.git"
|
|
24
|
+
},
|
|
25
|
+
"dependencies": {
|
|
26
|
+
"less-loader": "^2.2.3",
|
|
27
|
+
"vue": "^1.0.17"
|
|
28
|
+
},
|
|
29
|
+
"devDependencies": {
|
|
30
|
+
"babel-core": "^6.0.0",
|
|
31
|
+
"babel-loader": "^6.0.0",
|
|
32
|
+
"babel-plugin-transform-runtime": "^6.0.0",
|
|
33
|
+
"babel-preset-es2015": "^6.0.0",
|
|
34
|
+
"babel-preset-stage-2": "^6.0.0",
|
|
35
|
+
"chai": "^3.5.0",
|
|
36
|
+
"co": "^4.6.0",
|
|
37
|
+
"connect-history-api-fallback": "^1.1.0",
|
|
38
|
+
"cross-env": "^1.0.7",
|
|
39
|
+
"cross-spawn": "^2.1.5",
|
|
40
|
+
"css-loader": "^0.23.0",
|
|
41
|
+
"echarts": "^4.1.0",
|
|
42
|
+
"eslint": "^2.0.0",
|
|
43
|
+
"eslint-config-standard": "^5.1.0",
|
|
44
|
+
"eslint-friendly-formatter": "^1.2.2",
|
|
45
|
+
"eslint-loader": "^1.3.0",
|
|
46
|
+
"eslint-plugin-html": "^1.3.0",
|
|
47
|
+
"eslint-plugin-promise": "^1.0.8",
|
|
48
|
+
"eslint-plugin-standard": "^1.3.2",
|
|
49
|
+
"eslint-plugin-vue": "^0.1.1",
|
|
50
|
+
"eventsource-polyfill": "^0.9.6",
|
|
51
|
+
"express": "^4.13.3",
|
|
52
|
+
"extract-text-webpack-plugin": "^1.0.1",
|
|
53
|
+
"file-loader": "^0.8.4",
|
|
54
|
+
"function-bind": "^1.0.2",
|
|
55
|
+
"html-webpack-plugin": "^2.8.1",
|
|
56
|
+
"http-proxy-middleware": "^0.11.0",
|
|
57
|
+
"inject-loader": "^2.0.1",
|
|
58
|
+
"isparta-loader": "^2.0.0",
|
|
59
|
+
"jasmine-core": "^2.4.1",
|
|
60
|
+
"jquery": "^3.3.1",
|
|
61
|
+
"json-loader": "^0.5.4",
|
|
62
|
+
"karma": "^1.4.1",
|
|
63
|
+
"karma-chrome-launcher": "^2.2.0",
|
|
64
|
+
"karma-coverage": "^1.1.1",
|
|
65
|
+
"karma-mocha": "^1.3.0",
|
|
66
|
+
"karma-sinon-chai": "^1.3.1",
|
|
67
|
+
"karma-sourcemap-loader": "^0.3.7",
|
|
68
|
+
"karma-spec-reporter": "0.0.31",
|
|
69
|
+
"karma-webpack": "^2.0.2",
|
|
70
|
+
"less": "^2.7.3",
|
|
71
|
+
"mkdirp": "^0.5.1",
|
|
72
|
+
"mocha": "^3.2.0",
|
|
73
|
+
"ncp": "^2.0.0",
|
|
74
|
+
"rimraf": "^2.5.0",
|
|
75
|
+
"sale-client": "3.2.11-17",
|
|
76
|
+
"selenium-server": "2.52.0",
|
|
77
|
+
"sinon": "^2.1.0",
|
|
78
|
+
"sinon-chai": "^2.8.0",
|
|
79
|
+
"style": "0.0.3",
|
|
80
|
+
"style-loader": "^0.20.3",
|
|
81
|
+
"ldap-clients": "3.0.48",
|
|
82
|
+
"system-clients": "3.2.68",
|
|
83
|
+
"url-loader": "^0.5.7",
|
|
84
|
+
"vue-client": "1.24.98",
|
|
85
|
+
"vue-hot-reload-api": "^1.2.0",
|
|
86
|
+
"vue-html-loader": "^1.0.0",
|
|
87
|
+
"vue-loader": "^8.2.1",
|
|
88
|
+
"vue-resource": "^1.5.0",
|
|
89
|
+
"vue-router": "^0.7.13",
|
|
90
|
+
"vue-strap": "^1.0.9",
|
|
91
|
+
"vue-style-loader": "^1.0.0",
|
|
92
|
+
"vue-validator": "2.1.7",
|
|
93
|
+
"webpack": "^1.12.2",
|
|
94
|
+
"webpack-dev-middleware": "^1.4.0",
|
|
95
|
+
"webpack-hot-middleware": "^2.6.0",
|
|
96
|
+
"webpack-merge": "^0.8.3",
|
|
97
|
+
"jsencrypt": "3.0.0-rc.1",
|
|
98
|
+
"axios": "0.15.3"
|
|
99
|
+
}
|
|
100
|
+
}
|
|
@@ -66,6 +66,10 @@
|
|
|
66
66
|
if (obj.val.f_adjustable_id != null && obj.val.f_adjustable_id != '' && !(obj.val.f_adjustable_id instanceof Array)) {
|
|
67
67
|
this.$refs.addareamsg.areamodel.f_adjustable_id = parseInt(obj.val.f_adjustable_id)
|
|
68
68
|
}
|
|
69
|
+
if(this.$refs.addareamsg.filtName()){
|
|
70
|
+
this.$refs.addareamsg.areamodel.selladd='0'}else {
|
|
71
|
+
this.$refs.addareamsg.areamodel.selladd='1'
|
|
72
|
+
}
|
|
69
73
|
// this.$refs.addareamsg.initdata(obj.val)
|
|
70
74
|
// this.$refs.addareamsg.initrow(obj.val)
|
|
71
75
|
}
|
|
@@ -323,7 +323,8 @@ export default {
|
|
|
323
323
|
f_meter_style:'',
|
|
324
324
|
f_position:'',
|
|
325
325
|
f_comments:'',
|
|
326
|
-
f_meter_type: ''
|
|
326
|
+
f_meter_type: '',
|
|
327
|
+
selladd:'0'
|
|
327
328
|
},
|
|
328
329
|
// 初始化小区数据
|
|
329
330
|
areaslist:[],
|
|
@@ -348,6 +349,11 @@ export default {
|
|
|
348
349
|
initGen(this)
|
|
349
350
|
},
|
|
350
351
|
methods: {
|
|
352
|
+
filtName(){
|
|
353
|
+
console.log("小区名称",this.areamodel.f_residential_area)
|
|
354
|
+
console.log('权限限制',this.areamodel.f_residential_area.includes('L'))
|
|
355
|
+
return this.areamodel.f_residential_area.includes('L')
|
|
356
|
+
},
|
|
351
357
|
loadMeterBooks(){
|
|
352
358
|
this.meterbooks = [...this.meterbooks, ...this.$GetSaleParam.getMeterBooks()]
|
|
353
359
|
},
|
|
@@ -597,6 +603,8 @@ export default {
|
|
|
597
603
|
if(this.f_special){
|
|
598
604
|
this.areamodel.f_special='1'
|
|
599
605
|
}
|
|
606
|
+
if(this.areamodel.selladd==='0'){
|
|
607
|
+
this.areamodel.f_residential_area=this.areamodel.f_residential_area+'(L)'}
|
|
600
608
|
this.areamodel.f_filialeid = this.f_filialeids
|
|
601
609
|
this.areamodel.f_operator = this.$login.f.name
|
|
602
610
|
this.areamodel.f_operatorid = this.$login.f.id
|