manage-client 3.2.96 → 3.2.98

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.
File without changes
@@ -1,176 +1,177 @@
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 bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
14
- var shaoguan='http://119.146.1.106:8300/'
15
- var qtx='http://36.103.222.144:6300/'
16
- var bendi = 'http://localhost:8090/'
17
- // var bendi = 'http://172.168.1.11:9001'
18
- var fuwu = 'http://192.168.50.4:8400'
19
- // var fuwu = 'http://172.168.1.11:9001'
20
- var system = 'http://192.168.50.4:8400'
21
- //192.168.
22
- // var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
23
- // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
24
- var proxyTable = {
25
- '/rs/logic/exportfile': {
26
- target: fuwu
27
- },
28
- '/files': {
29
- target: fuwu
30
- },
31
- // 查找资源服务数据
32
- '/rs/search': {
33
- target: fuwu
34
- },
35
- // 查找资源服务数据
36
- '/rs/logic/getLogin': {
37
- target: fuwu
38
- },
39
- // 查找资源服务数据
40
- '/rs/logic/getInitData': {
41
- target: fuwu
42
- },
43
- '/rs/logic/getSaleInitData':{
44
- target: fuwu
45
- },
46
- // 用户登录服务地址
47
- '/rs/user': {
48
- target: fuwu
49
- },
50
- '/rs/path/getParams': {
51
- target: fuwu
52
- },
53
- '/rs/data': {
54
- target: fuwu
55
- },
56
- '/rs/license': {
57
- target: fuwu
58
- },
59
- '/rs/db': {
60
- target: fuwu
61
- },
62
- '/excel': {
63
- target: fuwu
64
- },
65
- '/rs/config': {
66
- target: fuwu
67
- },
68
- '/rs/sql/getLicenseById': {
69
- target: fuwu
70
- },
71
- '/rs/report': {
72
- target: bendi
73
- },
74
- '/rs/vue': {
75
- target: fuwu
76
- },
77
- '/rs/file': {
78
- target: bendi
79
- },
80
- '/rs/logic/SumSettleFileImport': {
81
- target: 'http://127.0.0.1:8080'
82
- },
83
- '/rs': {
84
- target: bendi
85
- }
86
- }
87
-
88
- var devMiddleware = require('webpack-dev-middleware')(compiler, {
89
- publicPath: config.output.publicPath,
90
- stats: {
91
- colors: true,
92
- chunks: false
93
- }
94
- })
95
-
96
- var hotMiddleware = require('webpack-hot-middleware')(compiler)
97
- // force page reload when html-webpack-plugin template changes
98
- compiler.plugin('compilation', function (compilation) {
99
- compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
100
- hotMiddleware.publish({action: 'reload'})
101
- cb()
102
- })
103
- })
104
-
105
- // proxy api requests
106
- Object.keys(proxyTable).forEach(function (context) {
107
- var options = proxyTable[context]
108
- if (typeof options === 'string') {
109
- options = {target: options}
110
- }
111
- app.use(proxyMiddleware(context, options))
112
- })
113
-
114
- // handle fallback for HTML5 history API
115
- app.use(require('connect-history-api-fallback')())
116
- // app.use(function (req, res, next) {
117
- // res.header('Access-Control-Allow-Origin', '*')
118
- // res.header('Access-Control-Allow-Headers', 'X-Requested-With')
119
- // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
120
- // res.header('X-Powered-By', '3,2,1')
121
- // res.header('Access-Control-Allow-Credentials', 'true')
122
- // res.header('Content-Type', 'application/json;charset=utf-8')
123
- // next()
124
- // })
125
-
126
- // serve webpack bundle output
127
- app.use(devMiddleware)
128
-
129
- // enable hot-reload and state-preserving
130
- // compilation error display
131
- app.use(hotMiddleware)
132
-
133
- // serve pure static assets
134
- app.use('/static', express.static('./static'))
135
-
136
- // app.all('/rs/*', function (req, res) {
137
- // proxy.web(req, res, {
138
- // target: 'http://127.0.0.1:8081/reports'
139
- // })
140
- // })
141
-
142
- // app.all('/rs/*', function (req, res) {
143
- // proxy.web(req, res, {
144
- // target: 'http://127.0.0.1:8081/ldap'
145
- // })
146
- // })
147
- // app.all('/excel/*', function (req, res) {
148
- // proxy.web(req, res, {
149
- // target: 'http://127.0.0.1:8081/charge'
150
- // })
151
- // })
152
-
153
- // app.all('/rs/*', function (req, res) {
154
- // proxy.web(req, res, {
155
- // target: 'http://127.0.0.1:82/charge'
156
- // })
157
- // })
158
-
159
- // app.all('/*', function (req, res) {
160
- // proxy.web(req, res, {
161
- // target: 'http://127.0.0.1:82'
162
- // })
163
- // })
164
- // app.all('/rs/user', function (req, res) {
165
- // proxy.web(req, res, {
166
- // target: 'http://127.0.0.1:82'
167
- // })
168
- // })
169
-
170
- module.exports = app.listen(8085, function (err) {
171
- if (err) {
172
- console.log(err)
173
- return
174
- }
175
- console.log('Listening at http://localhost:8085')
176
- })
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 bendi = 'http://127.0.0.1:8082'
14
+ // fuwu = 'http://36.103.224.217:6300/'
15
+ var shaoguan='http://119.146.1.106:8300/'
16
+ var qtx='http://36.103.222.144:6300/'
17
+ // var bendi = 'http://localhost:8082'
18
+ // var bendi = 'http://172.168.1.11:9001'
19
+ var fuwu = 'http://192.168.50.4:8400'
20
+ // var fuwu = 'http://172.168.1.11:9001'
21
+ var system = 'http://192.168.50.4:8400'
22
+ //192.168.
23
+ // var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
24
+ // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
25
+ var proxyTable = {
26
+ '/rs/logic/exportfile': {
27
+ target: fuwu
28
+ },
29
+ '/files': {
30
+ target: fuwu
31
+ },
32
+ // 查找资源服务数据
33
+ '/rs/search': {
34
+ target: fuwu
35
+ },
36
+ // 查找资源服务数据
37
+ '/rs/logic/getLogin': {
38
+ target: fuwu
39
+ },
40
+ // 查找资源服务数据
41
+ '/rs/logic/getInitData': {
42
+ target: fuwu
43
+ },
44
+ '/rs/logic/getSaleInitData':{
45
+ target: fuwu
46
+ },
47
+ // 用户登录服务地址
48
+ '/rs/user': {
49
+ target: fuwu
50
+ },
51
+ '/rs/path/getParams': {
52
+ target: fuwu
53
+ },
54
+ '/rs/data': {
55
+ target: fuwu
56
+ },
57
+ '/rs/license': {
58
+ target: fuwu
59
+ },
60
+ '/rs/db': {
61
+ target: fuwu
62
+ },
63
+ '/excel': {
64
+ target: fuwu
65
+ },
66
+ '/rs/config': {
67
+ target: fuwu
68
+ },
69
+ '/rs/sql/getLicenseById': {
70
+ target: fuwu
71
+ },
72
+ '/rs/report': {
73
+ target: bendi
74
+ },
75
+ '/rs/vue': {
76
+ target: fuwu
77
+ },
78
+ '/rs/file': {
79
+ target: bendi
80
+ },
81
+ '/rs/logic/SumSettleFileImport': {
82
+ target: 'http://127.0.0.1:8080'
83
+ },
84
+ '/rs': {
85
+ target: bendi
86
+ }
87
+ }
88
+
89
+ var devMiddleware = require('webpack-dev-middleware')(compiler, {
90
+ publicPath: config.output.publicPath,
91
+ stats: {
92
+ colors: true,
93
+ chunks: false
94
+ }
95
+ })
96
+
97
+ var hotMiddleware = require('webpack-hot-middleware')(compiler)
98
+ // force page reload when html-webpack-plugin template changes
99
+ compiler.plugin('compilation', function (compilation) {
100
+ compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
101
+ hotMiddleware.publish({action: 'reload'})
102
+ cb()
103
+ })
104
+ })
105
+
106
+ // proxy api requests
107
+ Object.keys(proxyTable).forEach(function (context) {
108
+ var options = proxyTable[context]
109
+ if (typeof options === 'string') {
110
+ options = {target: options}
111
+ }
112
+ app.use(proxyMiddleware(context, options))
113
+ })
114
+
115
+ // handle fallback for HTML5 history API
116
+ app.use(require('connect-history-api-fallback')())
117
+ // app.use(function (req, res, next) {
118
+ // res.header('Access-Control-Allow-Origin', '*')
119
+ // res.header('Access-Control-Allow-Headers', 'X-Requested-With')
120
+ // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
121
+ // res.header('X-Powered-By', '3,2,1')
122
+ // res.header('Access-Control-Allow-Credentials', 'true')
123
+ // res.header('Content-Type', 'application/json;charset=utf-8')
124
+ // next()
125
+ // })
126
+
127
+ // serve webpack bundle output
128
+ app.use(devMiddleware)
129
+
130
+ // enable hot-reload and state-preserving
131
+ // compilation error display
132
+ app.use(hotMiddleware)
133
+
134
+ // serve pure static assets
135
+ app.use('/static', express.static('./static'))
136
+
137
+ // app.all('/rs/*', function (req, res) {
138
+ // proxy.web(req, res, {
139
+ // target: 'http://127.0.0.1:8081/reports'
140
+ // })
141
+ // })
142
+
143
+ // app.all('/rs/*', function (req, res) {
144
+ // proxy.web(req, res, {
145
+ // target: 'http://127.0.0.1:8081/ldap'
146
+ // })
147
+ // })
148
+ // app.all('/excel/*', function (req, res) {
149
+ // proxy.web(req, res, {
150
+ // target: 'http://127.0.0.1:8081/charge'
151
+ // })
152
+ // })
153
+
154
+ // app.all('/rs/*', function (req, res) {
155
+ // proxy.web(req, res, {
156
+ // target: 'http://127.0.0.1:82/charge'
157
+ // })
158
+ // })
159
+
160
+ // app.all('/*', function (req, res) {
161
+ // proxy.web(req, res, {
162
+ // target: 'http://127.0.0.1:82'
163
+ // })
164
+ // })
165
+ // app.all('/rs/user', function (req, res) {
166
+ // proxy.web(req, res, {
167
+ // target: 'http://127.0.0.1:82'
168
+ // })
169
+ // })
170
+
171
+ module.exports = app.listen(8085, function (err) {
172
+ if (err) {
173
+ console.log(err)
174
+ return
175
+ }
176
+ console.log('Listening at http://localhost:8085')
177
+ })
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.2.96",
3
+ "version": "3.2.98",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -225,7 +225,7 @@
225
225
  data: {},
226
226
  other: [],
227
227
  footer: [],
228
- model: new PagedList('rs/sql/CancellationQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}),
228
+ model: new PagedList('rs/sql/CancellationQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " 'f_operate_date desc '"}),
229
229
  criteriaShow: false,
230
230
  headData: ["客户编号", "客户名称", "操作人", "操作日期", "销户状态", "销户原因", "同步状态"],
231
231
  bodyData: ["f_userinfo_id", "f_user_name", "f_operator", "f_operate_date", "f_state", "f_comments", "f_sendsuccess"],
@@ -261,7 +261,7 @@
261
261
  orderFields: {
262
262
  f_input_date : 'no'
263
263
  },
264
- model: new PagedList('rs/sql/cardhandplanQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " f_input_date desc"}, {
264
+ model: new PagedList('rs/sql/cardhandplanQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " 'f_input_date desc ' "}, {
265
265
  f_real_amount: 0
266
266
  }),
267
267
  initres: {
@@ -13,8 +13,7 @@
13
13
  v-model="model.startDate"
14
14
  :value.sync="model.startDate"
15
15
  :format="'yyyy-MM-dd HH:mm:ss'"
16
- :show-reset-button="true"
17
- condition="f_input_date >= '{}'">
16
+ :show-reset-button="true">
18
17
  </datepicker>
19
18
  </div>
20
19
  <div class="col-sm-2 form-group">
@@ -23,8 +22,7 @@
23
22
  v-model="model.endDate"
24
23
  :value.sync="model.endDate"
25
24
  :format="'yyyy-MM-dd HH:mm:ss'"
26
- :show-reset-button="true"
27
- condition="f_input_date <= '{}'">
25
+ :show-reset-button="true">
28
26
  </datepicker>
29
27
  </div>
30
28
  <div class="col-sm-2 form-group">
@@ -352,7 +350,7 @@
352
350
  </th>
353
351
  <th>
354
352
  <nobr>上期底数</nobr>
355
- </th>/
353
+ </th>
356
354
  <th>
357
355
  <nobr>本期底数</nobr>
358
356
  </th>
@@ -743,8 +741,8 @@
743
741
  // self.loadMeterBooks()
744
742
  self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
745
743
  self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
746
- self.$refs.paged.$refs.cri.model.handStartDate = self.$login.toStandardDateString() + ' 00:00:00'
747
- self.$refs.paged.$refs.cri.model.handEndDate = self.$login.toStandardDateString() + ' 23:59:59'
744
+ // self.$refs.paged.$refs.cri.model.handStartDate = self.$login.toStandardDateString() + ' 00:00:00'
745
+ // self.$refs.paged.$refs.cri.model.handEndDate = self.$login.toStandardDateString() + ' 23:59:59'
748
746
 
749
747
  // self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
750
748
  // self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
@@ -766,7 +764,7 @@
766
764
  other:[],
767
765
  footer:[],
768
766
  data: {},
769
- model: new PagedList('rs/sql/handplanQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`' z '`}, {
767
+ model: new PagedList('rs/sql/handplanQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`' z '`,startDate: 'this.model.startDate', endDate: 'this.model.endDate'}, {
770
768
  f_oughtamount: 0,
771
769
  f_oughtfee: 0,
772
770
  f_debt_money: 0,
@@ -1052,8 +1050,8 @@
1052
1050
  this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
1053
1051
  this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
1054
1052
  }
1055
- if (this.$refs.paged.$refs.cri.model.handStartDate === ''|| this.$refs.paged.$refs.cri.model.handEndDate === '') {
1056
- this.$showMessage('请选择下发开始时间和下发结束时间!')
1053
+ if (this.$refs.paged.$refs.cri.model.startDate === ''|| this.$refs.paged.$refs.cri.model.endDate === '') {
1054
+ this.$showMessage('请选择录入日期开始时间和结束时间!')
1057
1055
  return
1058
1056
  }
1059
1057
  this.area = this.$refs.paged.$refs.cri.model.f_residential_area
@@ -211,7 +211,7 @@
211
211
  orderFields: {
212
212
  f_operate_date: 'no'
213
213
  },
214
- model: new PagedList('rs/sql/movemeterQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}),
214
+ model: new PagedList('rs/sql/movemeterQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " 'f_operate_date desc ' "}),
215
215
  criteriaShow: false,
216
216
  // headData: ["客户编号", "客户名称", "操作人", "操作日期", "启用状态", "停用原因", "其他停用原因", "同步状态"],
217
217
  // bodyData: ["f_userinfo_id", "f_user_name", "f_operator", "f_operate_date", "f_state", "f_comments", "f_othereason", "f_sendsuccess"],
@@ -191,7 +191,7 @@
191
191
  data: {},
192
192
  other:[],
193
193
  footer:[],
194
- model: new PagedList('rs/sql/privilegeQuery', 20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate',orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"},{
194
+ model: new PagedList('rs/sql/privilegeQuery', 20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate',orderitem: this.orderitem?`${this.orderitem}`: " 'f_operate_date desc '"},{
195
195
  f_privilege_gas:0,
196
196
  f_privilege_money:0
197
197
  }),
@@ -1,61 +1,61 @@
1
- <template>
2
- <tab-button class="foot_tabset" :active="-1">
3
- <tabs header="指令查询" v-if="permission('指令查询')">
4
- <instruct-manage v-if="show.includes('指令查询')"></instruct-manage>
5
- </tabs>
6
- <tabs header="上报查询" v-if="permission('上报查询')">
7
- <report-list v-if="show.includes('上报查询')"></report-list>
8
- </tabs>
9
- <tabs header="结算查询" v-if="permission('结算查询')">
10
- <report-data-query v-if="show.includes('结算查询')"></report-data-query>
11
- </tabs>
12
- <tabs header="缴费查询" v-if="permission('缴费查询')">
13
- <recharge-instruct-query v-if="show.includes('缴费查询')"></recharge-instruct-query>
14
- </tabs>
15
- <tabs header="异常查询" v-if="permission('异常查询')">
16
- <meter-exception-list v-if="show.includes('异常查询')"></meter-exception-list>
17
- </tabs>
18
- <tabs header="用户失联" v-if="permission('用户失联')">
19
- <user-lost-contact-analysis v-if="show.includes('用户失联')"></user-lost-contact-analysis>
20
- </tabs>
21
- <tabs header="失联查询" v-if="permission('失联查询')">
22
- <lost-contact-analysis-list v-if="show.includes('失联查询')"></lost-contact-analysis-list>
23
- </tabs>
24
- <tabs header="用气查询" v-if="permission('用气查询')">
25
- <use-gas-statistics v-if="show.includes('用气查询')"></use-gas-statistics>
26
- </tabs>
27
- <tabs header="未用气查询" v-if="permission('未用气查询')">
28
- <get-no-meteread-query v-if="show.includes('未用气查询')"></get-no-meteread-query>
29
- </tabs>
30
- </tab-button>
31
-
32
- </template>
33
-
34
- <script>
35
- import TabButton from '../sale/common/TabButton'
36
- import Tabs from '../sale/common/Tabs'
37
-
38
- export default {
39
- title: '物联查询',
40
- data () {
41
- return {
42
- show: []
43
- }
44
- },
45
- components: {Tabs, TabButton},
46
- methods: {
47
- permission (name) {
48
- // 保留是为了后面可能也会和综合查询一样加权限
49
- if (this.$login.r.find(value => value === '物联查询')) {
50
- if (!this.$login.r.find(value => value === name)) {
51
- return false
52
- }
53
- }
54
- return true
55
- }
56
- }
57
- }
58
- </script>
59
-
60
- <style scoped>
61
- </style>
1
+ <template>
2
+ <tab-button class="foot_tabset" :active="-1">
3
+ <tabs header="指令查询" v-if="permission('指令查询')">
4
+ <instruct-manage v-if="show.includes('指令查询')"></instruct-manage>
5
+ </tabs>
6
+ <tabs header="上报查询" v-if="permission('上报查询')">
7
+ <report-list v-if="show.includes('上报查询')"></report-list>
8
+ </tabs>
9
+ <tabs header="结算查询" v-if="permission('结算查询')">
10
+ <report-data-query v-if="show.includes('结算查询')"></report-data-query>
11
+ </tabs>
12
+ <tabs header="缴费查询" v-if="permission('缴费查询')">
13
+ <recharge-instruct-query v-if="show.includes('缴费查询')"></recharge-instruct-query>
14
+ </tabs>
15
+ <tabs header="异常查询" v-if="permission('异常查询')">
16
+ <meter-exception-list v-if="show.includes('异常查询')"></meter-exception-list>
17
+ </tabs>
18
+ <tabs header="用户失联" v-if="permission('用户失联')">
19
+ <user-lost-contact-analysis v-if="show.includes('用户失联')"></user-lost-contact-analysis>
20
+ </tabs>
21
+ <tabs header="失联查询" v-if="permission('失联查询')">
22
+ <lost-contact-analysis-list v-if="show.includes('失联查询')"></lost-contact-analysis-list>
23
+ </tabs>
24
+ <tabs header="用气查询" v-if="permission('用气查询')">
25
+ <use-gas-statistics v-if="show.includes('用气查询')"></use-gas-statistics>
26
+ </tabs>
27
+ <tabs header="未用气查询" v-if="permission('未用气查询')">
28
+ <get-no-meteread-query v-if="show.includes('未用气查询')"></get-no-meteread-query>
29
+ </tabs>
30
+ </tab-button>
31
+
32
+ </template>
33
+
34
+ <script>
35
+ import TabButton from '../sale/common/TabButton'
36
+ import Tabs from '../sale/common/Tabs'
37
+
38
+ export default {
39
+ title: '物联查询',
40
+ data () {
41
+ return {
42
+ show: []
43
+ }
44
+ },
45
+ components: {Tabs, TabButton},
46
+ methods: {
47
+ permission (name) {
48
+ // 保留是为了后面可能也会和综合查询一样加权限
49
+ if (this.$login.r.find(value => value === '物联查询')) {
50
+ if (!this.$login.r.find(value => value === name)) {
51
+ return false
52
+ }
53
+ }
54
+ return true
55
+ }
56
+ }
57
+ }
58
+ </script>
59
+
60
+ <style scoped>
61
+ </style>