manage-client 3.2.247 → 3.2.249
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://203.57.101.233:8400/'
|
|
23
23
|
// var bendi = 'http://119.187.112.234:8400/'
|
|
24
|
-
var wode = 'http://
|
|
24
|
+
var wode = 'http://203.57.101.233:8400/'
|
|
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'
|
package/package.json
CHANGED
package/src/App.vue
CHANGED
|
@@ -1,29 +1,32 @@
|
|
|
1
|
-
<template>
|
|
2
|
-
<div>
|
|
3
|
-
<app-base class="bg">
|
|
4
|
-
<div class='flex'>
|
|
5
|
-
<article>
|
|
6
|
-
<!--<route :comp="{name: 'liaoyuan-manage-home'}"></route>-->
|
|
7
|
-
<!--<route :comp="{name: 'meter-reading'}"></route>-->
|
|
8
|
-
<!--<route :comp="{name: 'Gasproperties'}"></route>-->
|
|
9
|
-
<!--<route :comp="{name: 'vender-management'}"></route>-->
|
|
10
|
-
<!--<route :comp="{name: 'malfunction-home'}"></route>-->
|
|
11
|
-
<route :comp="{name: 'login'}"></route>
|
|
12
|
-
<!-- <route :comp="{name: 'call-report-main-page'}"></route>-->
|
|
13
|
-
<!-- <route :comp="{name: 'load-data'}"></route> -->
|
|
14
|
-
<!--<route :comp="{name: 'load-params', props: {componentName: 'login'}}"></route>-->
|
|
15
|
-
<!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
|
|
16
|
-
</article>
|
|
17
|
-
</div>
|
|
18
|
-
</app-base>
|
|
19
|
-
</div>
|
|
20
|
-
</template>
|
|
21
|
-
|
|
22
|
-
<script>
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
export default {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
1
|
+
<template>
|
|
2
|
+
<div>
|
|
3
|
+
<app-base class="bg">
|
|
4
|
+
<div class='flex'>
|
|
5
|
+
<article>
|
|
6
|
+
<!--<route :comp="{name: 'liaoyuan-manage-home'}"></route>-->
|
|
7
|
+
<!--<route :comp="{name: 'meter-reading'}"></route>-->
|
|
8
|
+
<!--<route :comp="{name: 'Gasproperties'}"></route>-->
|
|
9
|
+
<!--<route :comp="{name: 'vender-management'}"></route>-->
|
|
10
|
+
<!--<route :comp="{name: 'malfunction-home'}"></route>-->
|
|
11
|
+
<route :comp="{name: 'login'}"></route>
|
|
12
|
+
<!-- <route :comp="{name: 'call-report-main-page'}"></route>-->
|
|
13
|
+
<!-- <route :comp="{name: 'load-data'}"></route> -->
|
|
14
|
+
<!--<route :comp="{name: 'load-params', props: {componentName: 'login'}}"></route>-->
|
|
15
|
+
<!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
|
|
16
|
+
</article>
|
|
17
|
+
</div>
|
|
18
|
+
</app-base>
|
|
19
|
+
</div>
|
|
20
|
+
</template>
|
|
21
|
+
|
|
22
|
+
<script>
|
|
23
|
+
|
|
24
|
+
import Vue from 'vue'
|
|
25
|
+
export default {
|
|
26
|
+
|
|
27
|
+
ready() {
|
|
28
|
+
Vue.timeout = 90000
|
|
29
|
+
},
|
|
30
|
+
|
|
31
|
+
}
|
|
32
|
+
</script>
|
|
@@ -89,13 +89,11 @@
|
|
|
89
89
|
<label class="font_normal_body">小区名称</label>
|
|
90
90
|
<v-select :value.sync="model.f_residential_area"
|
|
91
91
|
class="select_list select"
|
|
92
|
-
enter-push
|
|
93
|
-
multiple = "true"
|
|
94
92
|
v-model="model.f_residential_area"
|
|
95
93
|
style="width: 60%"
|
|
94
|
+
condition="f_residential_area like '%{}%'"
|
|
96
95
|
:options='$parent.$parent.residentialArea' placeholder='选择小区'
|
|
97
96
|
close-on-select>
|
|
98
|
-
|
|
99
97
|
</v-select>
|
|
100
98
|
</div>
|
|
101
99
|
<!-- <div class="col-sm-2 form-group">-->
|
|
@@ -404,7 +402,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
|
|
|
404
402
|
let HttpReset = new HttpResetClass()
|
|
405
403
|
var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
|
|
406
404
|
data: {
|
|
407
|
-
condition: `1=1 and s.
|
|
405
|
+
condition: `1=1 and s.f_filialeid = '${this.$login.f.orgid}'`
|
|
408
406
|
}
|
|
409
407
|
}, {resolveMsg: null, rejectMsg: '获取小区失败!'})
|
|
410
408
|
console.log('小区',data)
|
|
@@ -444,14 +442,13 @@ import {HttpResetClass, PagedList} from 'vue-client'
|
|
|
444
442
|
}
|
|
445
443
|
},
|
|
446
444
|
enable(row) {
|
|
447
|
-
let obj = {data: {name: ''}}
|
|
448
|
-
if (this.$refs.paged.$refs.grid.selectStore.selected==null){
|
|
449
|
-
|
|
450
|
-
}else if(this.$refs.paged.$refs.grid.selectStore.selected.data==null){
|
|
451
|
-
|
|
452
|
-
}
|
|
445
|
+
// let obj = {data: {name: ''}}
|
|
446
|
+
// if (this.$refs.paged.$refs.grid.selectStore.selected==null){
|
|
447
|
+
// this.$refs.paged.$refs.grid.selectStore.selected = obj
|
|
448
|
+
// }else if(this.$refs.paged.$refs.grid.selectStore.selected.data==null){
|
|
449
|
+
// Object.assign(this.$refs.paged.$refs.grid.selectStore.selected, obj)
|
|
450
|
+
// }
|
|
453
451
|
Object.assign(this.enableData, row)
|
|
454
|
-
|
|
455
452
|
this.enbaleShow = true
|
|
456
453
|
},
|
|
457
454
|
confirmEnable() {
|
|
@@ -120,25 +120,25 @@
|
|
|
120
120
|
</div>
|
|
121
121
|
<div class="col-sm-2 form-group">
|
|
122
122
|
<label class="font_normal_body">时间区间</label>
|
|
123
|
-
<datepicker :disabled-days-of-Week="[]" :format="'yyyy-MM-dd
|
|
123
|
+
<datepicker :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'"
|
|
124
124
|
:show-reset-button="reset"
|
|
125
|
-
:value.sync="model.
|
|
125
|
+
:value.sync="model.startDate1"
|
|
126
126
|
id="startDate"
|
|
127
127
|
style="width:60%"
|
|
128
128
|
placeholder="开始时间"
|
|
129
|
-
v-model="model.
|
|
129
|
+
v-model="model.startDate1">
|
|
130
130
|
</datepicker>
|
|
131
131
|
</div>
|
|
132
132
|
<div class="col-sm-2 form-group">
|
|
133
133
|
<label class="font_normal_body" style="word-break:keep-all;"> 至 </label>
|
|
134
|
-
<datepicker :disabled-days-of-Week="[]" :format="'yyyy-MM-dd
|
|
134
|
+
<datepicker :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'"
|
|
135
135
|
:show-reset-button="reset"
|
|
136
|
-
:value.sync="model.
|
|
136
|
+
:value.sync="model.endDate1"
|
|
137
137
|
style="width:60%"
|
|
138
138
|
id="endDate"
|
|
139
139
|
style="width:60%"
|
|
140
140
|
placeholder="结束日期"
|
|
141
|
-
v-model="model.
|
|
141
|
+
v-model="model.endDate1">
|
|
142
142
|
</datepicker>
|
|
143
143
|
</div>
|
|
144
144
|
<div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
|
|
@@ -369,8 +369,10 @@ import {HttpResetClass, PagedList} from 'vue-client'
|
|
|
369
369
|
operator: [],
|
|
370
370
|
filename: '',
|
|
371
371
|
searchshow: true,
|
|
372
|
-
|
|
373
|
-
|
|
372
|
+
startDate1:'',
|
|
373
|
+
endDate1:'',
|
|
374
|
+
// startDate: '',
|
|
375
|
+
// endDate: '',
|
|
374
376
|
echarts: false,
|
|
375
377
|
isActiveTotalForm: false,
|
|
376
378
|
condition: '1=1',
|
|
@@ -466,8 +468,10 @@ import {HttpResetClass, PagedList} from 'vue-client'
|
|
|
466
468
|
|
|
467
469
|
},
|
|
468
470
|
search(args) {
|
|
469
|
-
this.startDate = this.$refs.paged.$refs.cri.model.startDate
|
|
470
|
-
this.endDate = this.$refs.paged.$refs.cri.model.endDate
|
|
471
|
+
// this.startDate = this.$refs.paged.$refs.cri.model.startDate
|
|
472
|
+
// this.endDate = this.$refs.paged.$refs.cri.model.endDate
|
|
473
|
+
console.log('--------------------', args)
|
|
474
|
+
console.log('--------------------', this)
|
|
471
475
|
if (this.endDate == '' || this.startDate == '') {
|
|
472
476
|
return this.$showMessage("时间区间的开始和结束时间不能为空！")
|
|
473
477
|
}
|
|
@@ -530,6 +534,12 @@ import {HttpResetClass, PagedList} from 'vue-client'
|
|
|
530
534
|
}
|
|
531
535
|
},
|
|
532
536
|
computed: {
|
|
537
|
+
startDate(){
|
|
538
|
+
return this.startDate1 + ' 00:00:00'
|
|
539
|
+
},
|
|
540
|
+
endDate(){
|
|
541
|
+
return this.endDate1 + ' 23:59:59'
|
|
542
|
+
},
|
|
533
543
|
houseTypes() {
|
|
534
544
|
return [{label: '全部', value: ''}, ...this.$appdata.getParam('房屋类型')]
|
|
535
545
|
},
|
|
@@ -132,6 +132,7 @@
|
|
|
132
132
|
<div class="col-sm-2 form-group">
|
|
133
133
|
<label class="font_normal_body">气价类型</label>
|
|
134
134
|
<v-select :value.sync="model.pricetype" v-model="model.pricetype"
|
|
135
|
+
@change="$parent.$parent.pricetypechanged"
|
|
135
136
|
placeholder='气价类型' :options="$parent.$parent.pricetypes"
|
|
136
137
|
close-on-select v-ref:type>
|
|
137
138
|
</v-select>
|
|
@@ -904,6 +905,9 @@
|
|
|
904
905
|
})
|
|
905
906
|
},
|
|
906
907
|
methods: {
|
|
908
|
+
pricetypechanged(){
|
|
909
|
+
this.$refs.paged.$refs.cri.model.f_price_name = []
|
|
910
|
+
},
|
|
907
911
|
// 获取设备下拉选
|
|
908
912
|
async getEquipment () {
|
|
909
913
|
let HttpReset = new HttpResetClass()
|