manage-client-xy 3.2.18 → 3.2.20

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.
Files changed (5) hide show
  1. package/build/dev-server.js +46 -36
  2. package/package.json +1 -1
  3. package/src/components/sale/businessquery/AreaGeneralQuery.vue +8 -2
  4. package/src/components/sale/filesquery/UserQuery.vue +1 -1
  5. package/src/main.js +10 -10
package/build/dev-server.js CHANGED
@@ -1,91 +1,101 @@
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')
1
+ const express = require('express')
2
+ const webpack = require('webpack')
3
+ const config = require('./webpack.dev.conf')
4
+ const proxyMiddleware = require('http-proxy-middleware')
5
+ // const httpProxy = require('http-proxy')
6
6
 
7
- var app = express()
8
- var compiler = webpack(config)
9
- // var proxy = httpProxy.createProxyServer()
7
+ const app = express()
8
+ const compiler = webpack(config)
9
+ // const proxy = httpProxy.createProxyServer()
10
10
 
11
11
  // Define HTTP proxies to your custom API backend
12
12
  // https://github.com/chimurai/http-proxy-middleware
13
- // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
14
- var bendi = 'http://172.16.16.162:8300/'
15
- , fuwu = 'http://172.16.16.162:8300/'
16
- // ,fuwu = 'http://172.16.16.162:8300/'
17
- var proxyTable = {
13
+ // const bendi = 'http://127.0.0.1:8089/manage', server = 'http://36.103.224.217:6300/'
14
+
15
+ const server = 'http://192.168.153.129:8300'
16
+ const local = 'http://127.0.0.1:8888/'
17
+ // ,server = 'http://172.16.16.163:8300/'
18
+ const proxyTable = {
18
19
  '/resource': {
19
20
  target: 'http://192.168.13.135:31577/'
20
21
  },
21
22
 
22
23
  '/rs/logic/exportfile': {
23
- target: bendi
24
+ target: server
25
+ },
26
+ '/rs/logic/saleExport': {
27
+ target: server
28
+ },
29
+ '/rs/sql/qc_statistics_manage': {
30
+ target: server
24
31
  },
25
32
  '/files': {
26
- target: fuwu
33
+ target: server
34
+ },
35
+ '/webapps': {
36
+ target: server
27
37
  },
28
38
  '/rs/sql': {
29
- target: bendi
39
+ target: local
30
40
  },
31
41
  // 查找资源服务数据
32
42
  '/rs/search': {
33
- target: fuwu
43
+ target: server
34
44
  },
35
45
  // 查找资源服务数据
36
46
  '/rs/logic/getLogin': {
37
- target: fuwu
47
+ target: server
38
48
  },
39
49
  // 查找资源服务数据
40
50
  '/rs/logic/getInitData': {
41
- target: fuwu
51
+ target: server
42
52
  },
43
53
  '/rs/logic/getSaleInitData': {
44
- target: fuwu
54
+ target: server
45
55
  },
46
56
  // 用户登录服务地址
47
57
  '/rs/user': {
48
- target: fuwu
58
+ target: server
49
59
  },
50
60
  '/rs/path/getParams': {
51
- target: fuwu
61
+ target: server
52
62
  },
53
63
  '/rs/data': {
54
- target: fuwu
64
+ target: server
55
65
  },
56
66
  '/rs/license': {
57
- target: fuwu
67
+ target: server
58
68
  },
59
69
  '/rs/db': {
60
- target: fuwu
70
+ target: server
61
71
  },
62
72
  '/excel': {
63
- target: fuwu
73
+ target: server
64
74
  },
65
75
  '/rs/config': {
66
- target: fuwu
76
+ target: server
67
77
  },
68
78
  '/rs/sql/getLicenseById': {
69
- target: fuwu
79
+ target: server
70
80
  },
71
81
  '/rs/report': {
72
- target: bendi
82
+ target: server
73
83
  },
74
84
  '/rs/vue': {
75
- target: fuwu
85
+ target: server
76
86
  },
77
87
  '/rs/file': {
78
- target: fuwu
88
+ target: server
79
89
  },
80
90
  '/rs/logic/SumSettleFileImport': {
81
- target: 'http://127.0.0.1:8087'
91
+ target: server
82
92
  },
83
93
  '/rs': {
84
- target: fuwu
94
+ target: server
85
95
  }
86
96
  }
87
97
 
88
- var devMiddleware = require('webpack-dev-middleware')(compiler, {
98
+ const devMiddleware = require('webpack-dev-middleware')(compiler, {
89
99
  publicPath: config.output.publicPath,
90
100
  stats: {
91
101
  colors: true,
@@ -93,7 +103,7 @@ var devMiddleware = require('webpack-dev-middleware')(compiler, {
93
103
  }
94
104
  })
95
105
 
96
- var hotMiddleware = require('webpack-hot-middleware')(compiler)
106
+ const hotMiddleware = require('webpack-hot-middleware')(compiler)
97
107
  // force page reload when html-webpack-plugin template changes
98
108
  compiler.plugin('compilation', function (compilation) {
99
109
  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
@@ -104,7 +114,7 @@ compiler.plugin('compilation', function (compilation) {
104
114
 
105
115
  // proxy api requests
106
116
  Object.keys(proxyTable).forEach(function (context) {
107
- var options = proxyTable[context]
117
+ let options = proxyTable[context]
108
118
  if (typeof options === 'string') {
109
119
  options = {target: options}
110
120
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client-xy",
3
- "version": "3.2.18",
3
+ "version": "3.2.20",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/sale/businessquery/AreaGeneralQuery.vue CHANGED
@@ -150,7 +150,7 @@
150
150
  <th rowspan="2">
151
151
  <nobr>小区名称</nobr>
152
152
  </th>
153
- <th colspan="6">
153
+ <th colspan="7">
154
154
  <nobr>用户数(档案户数)</nobr>
155
155
  </th>
156
156
  <th colspan="4">
@@ -167,6 +167,9 @@
167
167
  </th>
168
168
  </tr>
169
169
  <tr>
170
+ <th>
171
+ <nobr>总户数</nobr>
172
+ </th>
170
173
  <th>
171
174
  <nobr>正常</nobr>
172
175
  </th>
@@ -231,6 +234,9 @@
231
234
  <td style="text-align: center;">
232
235
  <nobr>{{ row.f_residential_area }}</nobr>
233
236
  </td>
237
+ <td style="text-align: center;">
238
+ <nobr>{{ row.f_user_number }}</nobr>
239
+ </td>
234
240
  <td style="text-align: center;">
235
241
  <nobr>{{ row.f_zhengchang }}</nobr>
236
242
  </td>
@@ -494,7 +500,7 @@ export default {
494
500
  async getaddress(){
495
501
  console.log('开始获取小区')
496
502
  let HttpReset = new HttpResetClass()
497
- var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
503
+ var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist?pageNo=1&pageSize=5000', {
498
504
  data: {
499
505
  condition: '1=1'
500
506
  }
package/src/components/sale/filesquery/UserQuery.vue CHANGED
@@ -511,7 +511,7 @@
511
511
  async getaddress(){
512
512
  console.log('开始获取小区')
513
513
  let HttpReset = new HttpResetClass()
514
- var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
514
+ var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist?pageNo=1&pageSize=5000', {
515
515
  data: {
516
516
  condition: '1=1'
517
517
  }
package/src/main.js CHANGED
@@ -2,12 +2,12 @@ import Vue from 'vue'
2
2
  import App from './App'
3
3
  import { all } from 'vue-client'
4
4
  import { system } from 'system-clients'
5
- import { sale } from 'sale-client'
5
+ // import { sale } from 'sale-client'
6
6
  import saleManage from './saleManage'
7
- import webmeterManage from './webmeterManage'
8
- import reportManage from './reportManage'
9
- import newmanage from './newmanage'
10
- import ManageHome from './ManageHome'
7
+ // import webmeterManage from './webmeterManage'
8
+ // import reportManage from './reportManage'
9
+ // import newmanage from './newmanage'
10
+ // import ManageHome from './ManageHome'
11
11
  import echarts from 'echarts'
12
12
  import AMap from 'vue-amap';
13
13
 
@@ -38,13 +38,13 @@ AMap.initAMapApiLoader({
38
38
 
39
39
  Vue.prototype.$echarts = echarts
40
40
  all()
41
- sale()
41
+ // sale()
42
42
  system(false)
43
43
  saleManage()
44
- webmeterManage()
45
- ManageHome()
46
- newmanage()
47
- reportManage()
44
+ // webmeterManage()
45
+ // ManageHome()
46
+ // newmanage()
47
+ // reportManage()
48
48
  require('./bootstrap/less/bootstrap.less')
49
49
  require('./bootstrap/less/manageStyle/manageStyle.less')
50
50
  require('./bootstrap/less/manageStyle/manageChile.less')