manage-client 3.2.248 → 3.2.250

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.
@@ -12,31 +12,20 @@ import {HttpResetClass} from 'vue-client'
12
12
 
13
13
  let getData = function* (self) {
14
14
  let load = new HttpResetClass()
15
- load.load('POST', 'rs/logic/sellinggasvalue',
16
- {data: {startDate: self.startdate, endDate: self.enddate, key: 'f_user_type', f_orgid: self.orgid}},
15
+ load.load('POST', 'rs/sql/sellinggasvalue',
16
+ {data: {startDate: self.startdate, endDate: self.enddate, key: 'f_user_nature', f_orgid: self.orgid}},
17
17
  {resolveMsg: null, rejectMsg: null})
18
18
  .then((res) => {
19
- console.log(res + 'aaaaaaaaaaaa')
20
- self.texttile = '用户类型'
21
- let arrparams1 = []
22
- let numdata1 = []
23
- let gasdata1 = []
24
- let pricedata1 = []
25
- let arrparams2 = []
26
- let numdata2 = []
27
- let gasdata2 = []
28
- let pricedata2 = []
29
- console.log('res.data', res.data)
30
- console.log(res.data.name1)
31
- arrparams1[0] = res.data.name1
32
- numdata1[0] = res.data.num_value1
33
- gasdata1[0] = res.data.gas_value1
34
- pricedata1[0] = res.data.money_value1
35
- arrparams2[0] = res.data.name2
36
- numdata2[0] = res.data.num_value2
37
- gasdata2[0] = res.data.gas_value2
38
- pricedata2[0] = res.data.money_value2
39
- self.set(arrparams1, numdata1, gasdata1, pricedata1, arrparams2, numdata2, gasdata2, pricedata2)
19
+ self.texttile = '用户性质'
20
+ let arrparams = []
21
+ let numdata = []
22
+ let gasdata = []
23
+ for (var i = 0; i < res.data.length; i++) {
24
+ arrparams[i] = res.data[i].name
25
+ numdata[i] = res.data[i].num_value
26
+ gasdata[i] = res.data[i].gas_value
27
+ }
28
+ self.set(arrparams, numdata, gasdata)
40
29
  })
41
30
  }
42
31
  export default {
@@ -53,15 +42,15 @@ export default {
53
42
  type: String
54
43
  }
55
44
  },
45
+ title: '站点管理',
56
46
  data () {
57
- title: '站点管理'
58
47
  return {
59
48
  texttile: '',
60
49
  xc: ''
61
50
  }
62
51
  },
63
52
  methods: {
64
- set (arrparams1, numdata1, gasdata1, pricedata1, arrparams2, numdata2, gasdata2, pricedata2) {
53
+ set (arrparams, numdata, gasdata) {
65
54
  this.xc = echarts.init(document.getElementById('gph'))
66
55
  this.xc.setOption({
67
56
  title: {
@@ -70,16 +59,16 @@ export default {
70
59
  x: 'left'
71
60
  },
72
61
  tooltip: {
73
- trigger: 'item',
62
+ trigger: 'axis',
74
63
  formatter: function (params) {
75
- let str = ''
76
- console.log(JSON.stringify(params) + '-----------')
77
- if (params.seriesName.includes('气量')) {
78
- str += params.seriesName + ': ' + params.value + 'm³'
79
- } else if (params.seriesName.includes('数量')) {
80
- str += params.seriesName + ': ' + params.value + '笔'
81
- } else {
82
- str += params.seriesName + ': ' + params.value + '元'
64
+ var str = ''
65
+ str += params[0].name + '</br>'
66
+ for (var i = 0; i < params.length; i++) {
67
+ if (i === 0) {
68
+ str += params[i].marker + params[i].seriesName + ': ' + params[i].data + '' + '</br>'
69
+ } else {
70
+ str += params[i].marker + params[i].seriesName + ': ' + params[i].data + 'm³' + '</br>'
71
+ }
83
72
  }
84
73
  return str
85
74
  }
@@ -87,7 +76,7 @@ export default {
87
76
  legend: {
88
77
  x: 'left',
89
78
  y: 'bottom',
90
- data: ['民用数量', '民用气量', '民用金额', '非民用数量', '非民用气量', '非民用金额']
79
+ data: ['户数', '气量']
91
80
  },
92
81
  toolbox: {
93
82
  show: true,
@@ -102,7 +91,7 @@ export default {
102
91
  xAxis: [
103
92
  {
104
93
  type: 'category',
105
- data: ['数据']
94
+ data: arrparams
106
95
  }
107
96
  ],
108
97
  yAxis: [
@@ -112,87 +101,15 @@ export default {
112
101
  ],
113
102
  series: [
114
103
  {
115
- name: '民用数量',
104
+ name: '户数',
116
105
  type: 'bar',
117
- data: numdata1,
106
+ data: numdata,
118
107
  barMinHeight: 5,
119
108
  itemStyle: {
120
109
  normal: {
121
110
  color: function (params) {
122
111
  // 给出颜色组
123
- var colorList = ['#FE8463']
124
- return colorList[params.dataIndex]
125
- }
126
- }
127
- },
128
- markLine: {
129
- data: [
130
- {type: 'average', name: '平均值'}
131
- ]
132
- }
133
- },
134
- {
135
- name: '民用气量',
136
- type: 'bar',
137
- data: gasdata1,
138
- itemStyle: {
139
- normal: {
140
- color: function (params) {
141
- // 给出颜色组
142
- var colorList = ['#45AC89']
143
- return colorList[params.dataIndex]
144
- }
145
- }
146
- },
147
- markLine: {
148
- data: [
149
- {type: 'average', name: '平均值'}
150
- ]
151
- }
152
- },
153
- {
154
- name: '民用金额',
155
- type: 'bar',
156
- data: pricedata1,
157
- itemStyle: {
158
- normal: {
159
- color: function (params) {
160
- // 给出颜色组
161
- var colorList = ['#183467']
162
- return colorList[params.dataIndex]
163
- }
164
- }
165
- }
166
- },
167
- {
168
- name: '非民用数量',
169
- type: 'bar',
170
- data: numdata2,
171
- barMinHeight: 5,
172
- itemStyle: {
173
- normal: {
174
- color: function (params) {
175
- // 给出颜色组
176
- var colorList = ['#9BCA63']
177
- return colorList[params.dataIndex]
178
- }
179
- }
180
- },
181
- markLine: {
182
- data: [
183
- {type: 'average', name: '平均值'}
184
- ]
185
- }
186
- },
187
- {
188
- name: '非民用气量',
189
- type: 'bar',
190
- data: gasdata2,
191
- itemStyle: {
192
- normal: {
193
- color: function (params) {
194
- // 给出颜色组
195
- var colorList = ['#26C0C0']
112
+ var colorList = ['#894BE5']
196
113
  return colorList[params.dataIndex]
197
114
  }
198
115
  }
@@ -204,14 +121,14 @@ export default {
204
121
  }
205
122
  },
206
123
  {
207
- name: '非民用金额',
124
+ name: '气量',
208
125
  type: 'bar',
209
- data: pricedata2,
126
+ data: gasdata,
210
127
  itemStyle: {
211
128
  normal: {
212
129
  color: function (params) {
213
130
  // 给出颜色组
214
- var colorList = ['#27727B']
131
+ var colorList = ['#FE974B']
215
132
  return colorList[params.dataIndex]
216
133
  }
217
134
  }
@@ -222,6 +139,78 @@ export default {
222
139
  ]
223
140
  }
224
141
  }
142
+ // {
143
+ // name: '商业数量',
144
+ // type: 'bar',
145
+ // data: numdata2,
146
+ // itemStyle: {
147
+ // normal: {
148
+ // color: function (params) {
149
+ // // 给出颜色组
150
+ // var colorList = ['#894BE5']
151
+ // return colorList[params.dataIndex]
152
+ // }
153
+ // }
154
+ // }
155
+ // },
156
+ // {
157
+ // name: '商业气量',
158
+ // type: 'bar',
159
+ // data: gasdata2,
160
+ // barMinHeight: 5,
161
+ // itemStyle: {
162
+ // normal: {
163
+ // color: function (params) {
164
+ // // 给出颜色组
165
+ // var colorList = ['#FE974B']
166
+ // return colorList[params.dataIndex]
167
+ // }
168
+ // }
169
+ // },
170
+ // markLine: {
171
+ // data: [
172
+ // {type: 'average', name: '平均值'}
173
+ // ]
174
+ // }
175
+ // },
176
+ // {
177
+ // name: '工业数量',
178
+ // type: 'bar',
179
+ // data: numdata3,
180
+ // itemStyle: {
181
+ // normal: {
182
+ // color: function (params) {
183
+ // // 给出颜色组
184
+ // var colorList = ['#894BE5']
185
+ // return colorList[params.dataIndex]
186
+ // }
187
+ // }
188
+ // },
189
+ // markLine: {
190
+ // data: [
191
+ // {type: 'average', name: '平均值'}
192
+ // ]
193
+ // }
194
+ // },
195
+ // {
196
+ // name: '工业气量',
197
+ // type: 'bar',
198
+ // data: gasdata3,
199
+ // itemStyle: {
200
+ // normal: {
201
+ // color: function (params) {
202
+ // // 给出颜色组
203
+ // var colorList = ['#FE974B']
204
+ // return colorList[params.dataIndex]
205
+ // }
206
+ // }
207
+ // },
208
+ // markLine: {
209
+ // data: [
210
+ // {type: 'average', name: '平均值'}
211
+ // ]
212
+ // }
213
+ // }
225
214
  ]
226
215
  })
227
216
  },
@@ -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()