manage-client 3.3.138 → 3.3.139-mx

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 +189 -189
  2. package/package.json +111 -111
  3. package/src/components/webmeter/instruction/NewQueryInstruct.vue +575 -575
  4. package/src/filiale/qianneng/ArrearsQuery.vue +2 -2
  5. package/src/filiale/shanxian/EchartsBox.vue +27 -15
package/src/filiale/qianneng/ArrearsQuery.vue CHANGED
@@ -606,7 +606,7 @@
606
606
  async inputtorchange(){
607
607
  let val = this.$refs.paged.$refs.cri.model.f_inputtor;
608
608
  if(val != null && val != ""){
609
- let bookData = this.booksAllData.filter(item => val.includes(item.f_inputtor) && this.allorgid.includes(item.f_orgid))
609
+ let bookData = this.booksAllData.filter(item => val.includes(item.f_inputtor) && this.$login.f.orgid ==item.f_orgid)
610
610
  let rs = bookData.map(x => {
611
611
  return {
612
612
  label: `[${x.f_book_code}]-${x.f_book_name}`,
@@ -622,7 +622,7 @@
622
622
  },
623
623
  async initmeterbook(){
624
624
  console.log('allorgid-allorgid', this.allorgid)
625
- let bs = this.booksAllData.filter(item => this.allorgid.includes(item.f_orgid)).map(x => {
625
+ let bs = this.booksAllData.filter(item => this.$login.f.orgid === item.f_orgid).map(x => {
626
626
  return {
627
627
  label: `[${x.f_book_code}]-${x.f_book_name}`,
628
628
  value: x.id
package/src/filiale/shanxian/EchartsBox.vue CHANGED
@@ -32,19 +32,19 @@
32
32
  @res-select="getRes"
33
33
  :initresid="model.id">
34
34
  </res-select>
35
- <!--<button class="button_search button_spacing" @click="changePage()">下一页</button>-->
35
+ <button class="button_search button_spacing" @click="changePage()">下一页</button>
36
36
  </div>
37
37
  </div>
38
38
  </div>
39
39
  <div style="height: 97%;" v-if="showPage === 1">
40
40
  <div class="flex-row" style="flex: 1;border-bottom: 1px dashed #888;height: 48%">
41
41
  <div style="flex: 1;border-right: 1px dashed #888;width: 50%">
42
- <site-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
42
+ <site-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid'
43
43
  v-ref:pay></site-manager>
44
- <!-- <test></test>-->
44
+ <!-- <test></test>-->
45
45
  </div>
46
46
  <div style="flex: 1;width: 50%">
47
- <bank-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
47
+ <bank-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid'
48
48
  v-ref:pay></bank-manager>
49
49
  </div>
50
50
  </div>
@@ -52,7 +52,7 @@
52
52
 
53
53
  <div class="flex-row" style="flex: 1;width: 50%;border-right: 1px dashed #888;">
54
54
  <div style="flex: 1;">
55
- <paymentpie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
55
+ <paymentpie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid'
56
56
  v-ref:pay></paymentpie>
57
57
  </div>
58
58
  <!-- <div style="flex: 1;">-->
@@ -61,18 +61,20 @@
61
61
  </div>
62
62
 
63
63
  <div style="flex: 1;width: 50%">
64
- <bussiness-type :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
64
+ <bussiness-type :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid'
65
65
  v-ref:pay></bussiness-type>
66
66
  </div>
67
67
  </div>
68
68
  </div>
69
- <!--<div style="height: 97%;" v-if="showPage === 2">-->
70
- <!--<div class="flex-row" style="flex: 1;height: 96%">-->
71
- <!--<div style="flex: 1">-->
72
- <!--<gas-properties-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'></gas-properties-manager>-->
73
- <!--</div>-->
74
- <!--</div>-->
75
- <!--</div>-->
69
+ <div style="height: 97%;" v-if="showPage === 2">
70
+ <iframe src="http://localhost:9528/#/delink?link=Djo3XxaqkLKZj%2FNyNZb1I9qXNNTXtU8q2suV1gLoctDSHjBZhItBv7kdGk3tkmNbSzivrmUw4nmzeBjDMXipHw&user=G1HjKLLYHyGklUkcspd0S6AW8ZCkhQaU6b1jG21gFZ9R2T%2BlxtB4p5ZlYsfZvnu2tNaFzvtxr6uYBPtfoZZNyw"
71
+ width="100%" height="100%" style="border: none;" ></iframe>
72
+ <!-- <div class="flex-row" style="flex: 1;height: 96%">-->
73
+ <!-- <div style="flex: 1">-->
74
+ <!-- <gas-properties-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid'></gas-properties-manager>-->
75
+ <!-- </div>-->
76
+ <!-- </div>-->
77
+ </div>
76
78
  </div>
77
79
 
78
80
  </template>
@@ -102,7 +104,7 @@ export default {
102
104
  jurisdiction: this.$login.r,
103
105
  model: {
104
106
  id: [this.$login.f.orgid],
105
- orgid: [this.$login.f.orgid],
107
+ orgid: this.$login.f.orgid,
106
108
  startDate: Util.toStandardDateString(),
107
109
  endDate: Util.toStandardDateString()
108
110
  }
@@ -121,7 +123,17 @@ export default {
121
123
  }
122
124
  },
123
125
  getRes (obj) {
124
- this.model.orgid = obj
126
+ console.log('obj--------',obj)
127
+ let stringValue = ''
128
+ for (var i = 0; i < obj.length; i++) {
129
+ if (i === obj.length - 1) {
130
+ stringValue = stringValue + "'" + obj[i] + "'"
131
+ } else {
132
+ stringValue = stringValue + "'" + obj[i] + "',"
133
+ }
134
+ }
135
+ console.log('stringValue--------',stringValue)
136
+ this.model.orgid = stringValue
125
137
  }
126
138
  }
127
139
  }