manage-client 3.2.286 → 3.2.288
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
CHANGED
|
@@ -19,9 +19,9 @@ var qtx= 'http://36.103.222.144:6300/'
|
|
|
19
19
|
// var bendi = 'http://203.57.101.233:8400/'
|
|
20
20
|
// var bendi = 'http://121.36.106.17:8400/'
|
|
21
21
|
// var fuwu = 'http://203.57.101.233:9001'
|
|
22
|
-
var bendi = 'http://
|
|
22
|
+
var bendi = 'http://192.168.50.4:8400'
|
|
23
23
|
// var bendi = 'http://119.187.112.234:8400/'
|
|
24
|
-
var wode = 'http://
|
|
24
|
+
var wode = 'http://127.0.0.1:8084'
|
|
25
25
|
// 192.168.
|
|
26
26
|
// var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
|
|
27
27
|
// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
|
|
@@ -73,7 +73,7 @@ var proxyTable = {
|
|
|
73
73
|
target: bendi
|
|
74
74
|
},
|
|
75
75
|
'/rs/report': {
|
|
76
|
-
target:
|
|
76
|
+
target: wode
|
|
77
77
|
},
|
|
78
78
|
'/rs/vue': {
|
|
79
79
|
target: bendi
|
|
@@ -85,7 +85,7 @@ var proxyTable = {
|
|
|
85
85
|
target: bendi
|
|
86
86
|
},
|
|
87
87
|
'/rs': {
|
|
88
|
-
target:
|
|
88
|
+
target: bendi
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
91
|
|
package/package.json
CHANGED
|
@@ -52,13 +52,14 @@
|
|
|
52
52
|
<export-excel :data="$parent.$parent.getCondition"
|
|
53
53
|
:field="$parent.$parent.getfield"
|
|
54
54
|
:header="$parent.$parent.other"
|
|
55
|
+
:footer="$parent.$parent.footer"
|
|
55
56
|
sqlurl="rs/logic/exportfile"
|
|
56
|
-
sql-name="
|
|
57
|
+
sql-name="manageBrandHouseCount"
|
|
57
58
|
template-name='用户查询报表'
|
|
58
59
|
:choose-col="true"></export-excel>
|
|
59
60
|
<print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
|
|
60
61
|
titletable="用户查询" :starthead="$parent.$parent.startDate" :defaultfield="$parent.$parent.defaultfield"
|
|
61
|
-
></print-data>
|
|
62
|
+
:sumsmodel="$parent.$parent.sumsmodel"></print-data>
|
|
62
63
|
</div>
|
|
63
64
|
</div>
|
|
64
65
|
</div>
|
|
@@ -116,6 +117,32 @@
|
|
|
116
117
|
<template partial='foot'></template>
|
|
117
118
|
</data-grid>
|
|
118
119
|
</criteria-paged>
|
|
120
|
+
<table class="table-hover">
|
|
121
|
+
<tr style="position: relative" class="table-bordered">
|
|
122
|
+
<td
|
|
123
|
+
style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
|
|
124
|
+
汇总信息
|
|
125
|
+
</td>
|
|
126
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
127
|
+
综合总用户数: {{sumsmodel.f_total_users}}
|
|
128
|
+
</td>
|
|
129
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
130
|
+
总民用用户数: {{sumsmodel.f_civilian_users}}
|
|
131
|
+
</td>
|
|
132
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
133
|
+
总非民用用户数: {{sumsmodel.f_non_civilian_users}}
|
|
134
|
+
</td>
|
|
135
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
136
|
+
总机表用户数: {{sumsmodel.f_mechanical_meter_users}}
|
|
137
|
+
</td>
|
|
138
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
139
|
+
总卡表用户数: {{sumsmodel.f_card_meter_users}}
|
|
140
|
+
</td>
|
|
141
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
142
|
+
总物联网表用户数: {{sumsmodel.f_iot_meter_users}}
|
|
143
|
+
</td>
|
|
144
|
+
</tr>
|
|
145
|
+
</table>
|
|
119
146
|
</div>
|
|
120
147
|
</div>
|
|
121
148
|
</div>
|
|
@@ -148,7 +175,14 @@ export default {
|
|
|
148
175
|
data: {},
|
|
149
176
|
other:[],
|
|
150
177
|
footer:[],
|
|
151
|
-
model: new PagedList('rs/sql/manageBrandHouseCount', 20, {
|
|
178
|
+
model: new PagedList('rs/sql/manageBrandHouseCount', 20, { f_orgid: 'this.model.f_orgid'},{
|
|
179
|
+
f_total_users: 0,
|
|
180
|
+
f_civilian_users: 0,
|
|
181
|
+
f_non_civilian_users: 0,
|
|
182
|
+
f_mechanical_meter_users :0,
|
|
183
|
+
f_card_meter_users: 0,
|
|
184
|
+
f_iot_meter_users: 0
|
|
185
|
+
}),
|
|
152
186
|
gasproperties:[],
|
|
153
187
|
show:false,
|
|
154
188
|
rowdata:{},
|
|
@@ -162,7 +196,8 @@ export default {
|
|
|
162
196
|
fields: {},
|
|
163
197
|
thead: '',
|
|
164
198
|
tfoot: '',
|
|
165
|
-
defaultfield: []
|
|
199
|
+
defaultfield: [],
|
|
200
|
+
sumsmodel: {}
|
|
166
201
|
}
|
|
167
202
|
},
|
|
168
203
|
ready() {
|
|
@@ -174,29 +209,38 @@ export default {
|
|
|
174
209
|
},
|
|
175
210
|
methods: {
|
|
176
211
|
getotherfooter(){
|
|
177
|
-
this.other=[];
|
|
178
|
-
this.footer=[];
|
|
212
|
+
this.other = [];
|
|
213
|
+
this.footer = [];
|
|
179
214
|
let exportdata = this.getCondition;
|
|
180
|
-
let otherInData=[];
|
|
215
|
+
let otherInData = [];
|
|
181
216
|
otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
|
|
217
|
+
let footerData = [], exportfield = this.getfield;
|
|
218
|
+
footerData.push("合计");
|
|
219
|
+
let self = this;
|
|
220
|
+
for (var field in self.sumsmodel) {
|
|
221
|
+
footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
|
|
222
|
+
}
|
|
223
|
+
this.footer.push(footerData);
|
|
182
224
|
this.other.push(otherInData);
|
|
183
225
|
},
|
|
184
226
|
search(){
|
|
185
227
|
this.$refs.paged.$refs.cri.search()
|
|
186
228
|
},
|
|
187
229
|
selfSearch(args) {
|
|
188
|
-
let orgcondition = '
|
|
230
|
+
let orgcondition = ' ui.f_orgid in (' + this.f_orgid + ')'
|
|
189
231
|
if (this.f_depid[0]) {
|
|
190
|
-
orgcondition += " and
|
|
232
|
+
orgcondition += " and ui.f_depid in("+this.f_depid.toString()+')'
|
|
191
233
|
}
|
|
192
234
|
if(this.f_operatorid[0]) {
|
|
193
|
-
orgcondition += ' and
|
|
235
|
+
orgcondition += ' and ui.f_operatorid in (' + this.f_operatorid + ')'
|
|
194
236
|
}
|
|
195
237
|
this.startDate=this.$refs.paged.$refs.cri.model.startDate.substring(0,10)
|
|
196
238
|
this.endDate=this.$refs.paged.$refs.cri.model.endDate.substring(0,10)
|
|
197
239
|
this.orgCondtionStr=orgcondition
|
|
198
240
|
this.$refs.paged.$refs.cri.model.f_orgid = orgcondition
|
|
199
241
|
this.model.search(args.f_orgid, args.model)
|
|
242
|
+
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
|
|
243
|
+
console.log('合计字段', this.sumsmodel)
|
|
200
244
|
},
|
|
201
245
|
getRes (obj) {
|
|
202
246
|
this.orgname = obj.res[0]
|
|
@@ -266,6 +310,12 @@ export default {
|
|
|
266
310
|
this.put()
|
|
267
311
|
}
|
|
268
312
|
},
|
|
313
|
+
sumsmodel:{
|
|
314
|
+
handler: function(val) {
|
|
315
|
+
this.getotherfooter();
|
|
316
|
+
},
|
|
317
|
+
deep: true
|
|
318
|
+
},
|
|
269
319
|
'modelval.length'() {
|
|
270
320
|
this.put()
|
|
271
321
|
}
|