manage-client 3.3.11 → 3.3.12

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/package.json +1 -1
  2. package/src/components/WebReport/EchartsBox.vue +17 -7
  3. package/src/components/WebReport/Paymentpie.vue +2 -2
  4. package/src/components/webmeter/newwebmeter/NewException/MeterExceptionList.vue +1 -1
  5. package/src/filiale/shanxian/ChangeMeterQuery.vue +2 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.3.11",
3
+ "version": "3.3.12",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/WebReport/EchartsBox.vue CHANGED
@@ -39,12 +39,12 @@
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
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,7 +61,7 @@
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>
@@ -69,7 +69,7 @@
69
69
  <div style="height: 97%;" v-if="showPage === 2">
70
70
  <div class="flex-row" style="flex: 1;height: 96%">
71
71
  <div style="flex: 1">
72
- <gas-properties-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'></gas-properties-manager>
72
+ <gas-properties-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid'></gas-properties-manager>
73
73
  </div>
74
74
  </div>
75
75
  </div>
@@ -102,7 +102,7 @@ export default {
102
102
  jurisdiction: this.$login.r,
103
103
  model: {
104
104
  id: [this.$login.f.orgid],
105
- orgid: [this.$login.f.orgid],
105
+ orgid: this.$login.f.orgid,
106
106
  startDate: Util.toStandardDateString(),
107
107
  endDate: Util.toStandardDateString()
108
108
  }
@@ -121,7 +121,17 @@ export default {
121
121
  }
122
122
  },
123
123
  getRes (obj) {
124
- this.model.orgid = obj
124
+ console.log('obj--------',obj)
125
+ let stringValue = ''
126
+ for (var i = 0; i < obj.length; i++) {
127
+ if (i === obj.length - 1) {
128
+ stringValue = stringValue + "'" + obj[i] + "'"
129
+ } else {
130
+ stringValue = stringValue + "'" + obj[i] + "',"
131
+ }
132
+ }
133
+ console.log('stringValue--------',stringValue)
134
+ this.model.orgid = stringValue
125
135
  }
126
136
  }
127
137
  }
package/src/components/WebReport/Paymentpie.vue CHANGED
@@ -105,7 +105,7 @@ export default {
105
105
  },
106
106
  series : [
107
107
  {
108
- name: '',
108
+ name: '气量',
109
109
  type: 'pie',
110
110
  radius: ['0%', '40%'],
111
111
  center: ['25%', '50%'],
@@ -117,7 +117,7 @@ export default {
117
117
  data: gasdata
118
118
  },
119
119
  {
120
- name: '笔数',
120
+ name: '金额',
121
121
  type: 'pie',
122
122
  radius: ['0%', '40%'],
123
123
  center: ['65%', '50%'],
package/src/components/webmeter/newwebmeter/NewException/MeterExceptionList.vue CHANGED
@@ -340,7 +340,7 @@
340
340
  props: ['data'],
341
341
  data() {
342
342
  return {
343
- model: new PagedList('rs/sql/getExceptionList', 20),
343
+ model: new PagedList('rs/sql/getExceptionList',20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate'}),
344
344
  reportStr: null,
345
345
  show: false,
346
346
  startDate: '',
package/src/filiale/shanxian/ChangeMeterQuery.vue CHANGED
@@ -177,12 +177,12 @@
177
177
  </div>
178
178
  <div class="col-sm-2 form-group">
179
179
  <label class="font_normal_body">旧&emsp;表&emsp;号</label>
180
- <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
180
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber_old"
181
181
  condition="f_meternumber_old = '{}'" placeholder='旧表号'>
182
182
  </div>
183
183
  <div class="col-sm-2 form-group">
184
184
  <label class="font_normal_body">旧&emsp;卡&emsp;号</label>
185
- <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
185
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_card_old"
186
186
  condition="f_card_old = '{}'" placeholder='旧卡号'>
187
187
  </div>
188
188
  </div>