manage-client-xy 3.2.16 → 3.2.18

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 +36 -46
  2. package/package.json +1 -1
  3. package/src/components/sale/businessquery/AreaGeneralQuery.vue +31 -8
  4. package/src/main.js +10 -10
  5. package/yarn-error.log +1050 -1245
package/build/dev-server.js CHANGED
@@ -1,101 +1,91 @@
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')
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
6
 
7
- const app = express()
8
- const compiler = webpack(config)
9
- // const proxy = httpProxy.createProxyServer()
7
+ var app = express()
8
+ var compiler = webpack(config)
9
+ // var 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
- // 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 = {
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 = {
19
18
  '/resource': {
20
19
  target: 'http://192.168.13.135:31577/'
21
20
  },
22
21
 
23
22
  '/rs/logic/exportfile': {
24
- target: server
25
- },
26
- '/rs/logic/saleExport': {
27
- target: server
28
- },
29
- '/rs/sql/qc_statistics_manage': {
30
- target: server
23
+ target: bendi
31
24
  },
32
25
  '/files': {
33
- target: server
34
- },
35
- '/webapps': {
36
- target: server
26
+ target: fuwu
37
27
  },
38
28
  '/rs/sql': {
39
- target: local
29
+ target: bendi
40
30
  },
41
31
  // 查找资源服务数据
42
32
  '/rs/search': {
43
- target: server
33
+ target: fuwu
44
34
  },
45
35
  // 查找资源服务数据
46
36
  '/rs/logic/getLogin': {
47
- target: server
37
+ target: fuwu
48
38
  },
49
39
  // 查找资源服务数据
50
40
  '/rs/logic/getInitData': {
51
- target: server
41
+ target: fuwu
52
42
  },
53
43
  '/rs/logic/getSaleInitData': {
54
- target: server
44
+ target: fuwu
55
45
  },
56
46
  // 用户登录服务地址
57
47
  '/rs/user': {
58
- target: server
48
+ target: fuwu
59
49
  },
60
50
  '/rs/path/getParams': {
61
- target: server
51
+ target: fuwu
62
52
  },
63
53
  '/rs/data': {
64
- target: server
54
+ target: fuwu
65
55
  },
66
56
  '/rs/license': {
67
- target: server
57
+ target: fuwu
68
58
  },
69
59
  '/rs/db': {
70
- target: server
60
+ target: fuwu
71
61
  },
72
62
  '/excel': {
73
- target: server
63
+ target: fuwu
74
64
  },
75
65
  '/rs/config': {
76
- target: server
66
+ target: fuwu
77
67
  },
78
68
  '/rs/sql/getLicenseById': {
79
- target: server
69
+ target: fuwu
80
70
  },
81
71
  '/rs/report': {
82
- target: server
72
+ target: bendi
83
73
  },
84
74
  '/rs/vue': {
85
- target: server
75
+ target: fuwu
86
76
  },
87
77
  '/rs/file': {
88
- target: server
78
+ target: fuwu
89
79
  },
90
80
  '/rs/logic/SumSettleFileImport': {
91
- target: server
81
+ target: 'http://127.0.0.1:8087'
92
82
  },
93
83
  '/rs': {
94
- target: server
84
+ target: fuwu
95
85
  }
96
86
  }
97
87
 
98
- const devMiddleware = require('webpack-dev-middleware')(compiler, {
88
+ var devMiddleware = require('webpack-dev-middleware')(compiler, {
99
89
  publicPath: config.output.publicPath,
100
90
  stats: {
101
91
  colors: true,
@@ -103,7 +93,7 @@ const devMiddleware = require('webpack-dev-middleware')(compiler, {
103
93
  }
104
94
  })
105
95
 
106
- const hotMiddleware = require('webpack-hot-middleware')(compiler)
96
+ var hotMiddleware = require('webpack-hot-middleware')(compiler)
107
97
  // force page reload when html-webpack-plugin template changes
108
98
  compiler.plugin('compilation', function (compilation) {
109
99
  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
@@ -114,7 +104,7 @@ compiler.plugin('compilation', function (compilation) {
114
104
 
115
105
  // proxy api requests
116
106
  Object.keys(proxyTable).forEach(function (context) {
117
- let options = proxyTable[context]
107
+ var options = proxyTable[context]
118
108
  if (typeof options === 'string') {
119
109
  options = {target: options}
120
110
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client-xy",
3
- "version": "3.2.16",
3
+ "version": "3.2.18",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/sale/businessquery/AreaGeneralQuery.vue CHANGED
@@ -39,11 +39,11 @@
39
39
  close-on-select>
40
40
  </v-select>
41
41
  </div>
42
- <div class="col-sm-2 form-group">
43
- <label for="f_area_id" class="font_normal_body">小区编码</label>
44
- <input id="f_area_id" type="text" style="width:60%" class="input_search" v-model="model.f_area_id"
45
- condition="f_area_id = '{}'" placeholder='小区编码'>
46
- </div>
42
+ <!-- <div class="col-sm-2 form-group">-->
43
+ <!-- <label for="f_area_id" class="font_normal_body">小区编码</label>-->
44
+ <!-- <input id="f_area_id" type="text" style="width:60%" class="input_search" v-model="model.f_area_id"-->
45
+ <!-- condition="f_area_id = '{}'" placeholder='小区编码'>-->
46
+ <!-- </div>-->
47
47
  <!--<div class="col-sm-2 form-group">-->
48
48
  <!--<label class="font_normal_body">客户编号</label>-->
49
49
  <!--<input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"-->
@@ -150,7 +150,7 @@
150
150
  <th rowspan="2">
151
151
  <nobr>小区名称</nobr>
152
152
  </th>
153
- <th colspan="4">
153
+ <th colspan="6">
154
154
  <nobr>用户数(档案户数)</nobr>
155
155
  </th>
156
156
  <th colspan="4">
@@ -173,12 +173,19 @@
173
173
  <th>
174
174
  <nobr>停用</nobr>
175
175
  </th>
176
+ <th>
177
+ <nobr>销户</nobr>
178
+ </th>
176
179
  <th>
177
180
  <nobr>未开户</nobr>
178
181
  </th>
179
182
  <th>
180
- <nobr>销户</nobr>
183
+ <nobr>壁挂锅炉</nobr>
181
184
  </th>
185
+ <th>
186
+ <nobr>楼栋</nobr>
187
+ </th>
188
+
182
189
  <th>
183
190
  <nobr>户数</nobr>
184
191
  </th>
@@ -230,11 +237,17 @@
230
237
  <td style="text-align: center;">
231
238
  <nobr>{{ row.f_tingyong }}</nobr>
232
239
  </td>
240
+ <td style="text-align: center;">
241
+ <nobr>{{ row.f_xiaohu }}</nobr>
242
+ </td>
233
243
  <td style="text-align: center;">
234
244
  <nobr>{{ row.f_weikaihu }}</nobr>
235
245
  </td>
236
246
  <td style="text-align: center;">
237
- <nobr>{{ row.f_xiaohu }}</nobr>
247
+ <nobr>{{ row.bgl }}</nobr>
248
+ </td>
249
+ <td style="text-align: center;">
250
+ <nobr>{{ row.f_building }}</nobr>
238
251
  </td>
239
252
  <td style="text-align: center;">
240
253
  <nobr>{{ row.f_jibiao }}</nobr>
@@ -303,6 +316,14 @@
303
316
  style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
304
317
  销户合计:&emsp;{{ sumsmodel.f_xiaohu }}
305
318
  </td>
319
+ <td
320
+ style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
321
+ 壁挂炉合计:&emsp;{{ sumsmodel.bgl }}
322
+ </td>
323
+ <td
324
+ style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
325
+ 楼栋合计:&emsp;{{ sumsmodel.f_building }}
326
+ </td>
306
327
  <td
307
328
  style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
308
329
  机表抄表户数合计:&emsp;{{ sumsmodel.f_jibiao }}
@@ -405,6 +426,8 @@ export default {
405
426
  endDate: 'this.model.endDate'
406
427
  }, {
407
428
  f_zhengchang: 0,
429
+ bgl:0,
430
+ f_building:0,
408
431
  f_tingyong: 0,
409
432
  f_weikaihu: 0,
410
433
  f_xiaohu: 0,
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')