manage-client 3.2.249 → 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.
Files changed (5) hide show
  1. package/package.json +1 -1
  2. package/src/filiale/shanxian/BankManager.vue +39 -39
  3. package/src/filiale/shanxian/BussinessType.vue +99 -99
  4. package/src/filiale/shanxian/Paymentpie.vue +143 -142
  5. package/src/filiale/shanxian/SiteManager.vue +103 -114
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.2.249",
3
+ "version": "3.2.250",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/filiale/shanxian/BankManager.vue CHANGED
@@ -8,9 +8,9 @@
8
8
  import * as Util from '../../Util'
9
9
  import co from 'co'
10
10
  import echarts from 'echarts'
11
- import {HttpResetClass } from 'vue-client'
11
+ import {HttpResetClass} from 'vue-client'
12
12
 
13
- let getData = function * (self) {
13
+ let getData = function* (self) {
14
14
  let load = new HttpResetClass()
15
15
  load.load('POST', 'rs/sql/userfilesvalues',
16
16
  {data: {startDate: self.startdate, endDate: self.enddate, f_orgid: self.orgid}},
@@ -20,20 +20,20 @@ let getData = function * (self) {
20
20
  // let arrparams = []
21
21
  console.log('获取数据。。', res.data)
22
22
  let org = []
23
- //let name = []
24
- let minyongvalue=[]
25
- let feiminyongvalue=[]
23
+ // let name = []
24
+ let minyongvalue = []
25
+ let feiminyongvalue = []
26
26
  for (var i = 0; i < res.data.length; i++) {
27
27
  if (!org.includes(res.data[i].org)) {
28
28
  org.push(res.data[i].org)
29
29
  }
30
30
  if (res.data[i].name === '民用') {
31
31
  minyongvalue[org.indexOf(res.data[i].org)] = res.data[i].number
32
- }else{
33
- feiminyongvalue[org.indexOf(res.data[i].org)]= res.data[i].number
32
+ } else {
33
+ feiminyongvalue[org.indexOf(res.data[i].org)] = res.data[i].number
34
34
  }
35
35
  }
36
- self.set(org,minyongvalue,feiminyongvalue)
36
+ self.set(org, minyongvalue, feiminyongvalue)
37
37
  })
38
38
  }
39
39
  export default {
@@ -61,16 +61,16 @@ export default {
61
61
  }
62
62
  },
63
63
  methods: {
64
- set (org,minyongvalue,feiminyongvalue) {
64
+ set (org, minyongvalue, feiminyongvalue) {
65
65
  this.xc = echarts.init(document.getElementById('bm'))
66
66
  this.xc.setOption({
67
- color: [ '#786570', '#c4ccd3' ],
68
- title : {
67
+ color: ['#FE974B', '#3D72FF'],
68
+ title: {
69
69
  text: '新增用户散列图',
70
70
  subtext: '数据查询来源',
71
71
  x: 'left'
72
72
  },
73
- tooltip : {
73
+ tooltip: {
74
74
  trigger: 'axis',
75
75
  formatter: function (params) {
76
76
  var str = ''
@@ -84,47 +84,47 @@ export default {
84
84
  legend: {
85
85
  x: 'left',
86
86
  y: 'bottom',
87
- data: ['民用','非民用']
87
+ data: ['民用', '非民用']
88
88
  },
89
89
  toolbox: {
90
- show : true,
91
- feature : {
92
- dataView : {show: true, readOnly: false},
93
- magicType : {show: true, type: ['line', 'bar']},
94
- restore : {show: true},
95
- saveAsImage : {show: true}
90
+ show: true,
91
+ feature: {
92
+ dataView: {show: true, readOnly: false},
93
+ magicType: {show: true, type: ['line', 'bar']},
94
+ restore: {show: true},
95
+ saveAsImage: {show: true}
96
96
  }
97
97
  },
98
- calculable : true,
99
- xAxis : [
98
+ calculable: true,
99
+ xAxis: [
100
100
  {
101
- type : 'category',
102
- data : org
101
+ type: 'category',
102
+ data: org
103
103
  }
104
104
  ],
105
- yAxis : [
105
+ yAxis: [
106
106
  {
107
- type : 'value'
107
+ type: 'value'
108
108
  }
109
109
  ],
110
- series : [
110
+ series: [
111
111
  {
112
- name:'民用',
113
- type:'bar',
114
- data:minyongvalue,
115
- markLine : {
116
- data : [
117
- {type : 'average', name: '平均值'}
112
+ name: '民用',
113
+ type: 'bar',
114
+ data: minyongvalue,
115
+ markLine: {
116
+ data: [
117
+ {type: 'average', name: '平均值'}
118
118
  ]
119
119
  }
120
120
  },
121
121
  {
122
- name:'非民用',
123
- type:'bar',
124
- data:feiminyongvalue,
125
- markLine : {
126
- data : [
127
- {type : 'average', name : '平均值'}
122
+ name: '非民用',
123
+ type: 'bar',
124
+ data: feiminyongvalue,
125
+ markLine: {
126
+ data: [
127
+ {type: 'average', name: '平均值'}
128
128
  ]
129
129
  }
130
130
  }
@@ -132,7 +132,7 @@ export default {
132
132
  })
133
133
  },
134
134
  searchdata () {
135
- let getGen =getData(this)
135
+ let getGen = getData(this)
136
136
  co(getGen)
137
137
  }
138
138
  },
package/src/filiale/shanxian/BussinessType.vue CHANGED
@@ -5,30 +5,30 @@
5
5
  </template>
6
6
 
7
7
  <script>
8
- /* eslint-disable indent,key-spacing,no-labels */
8
+ /* eslint-disable indent,key-spacing,no-labels */
9
9
 
10
- import * as Util from '../../Util'
10
+ import * as Util from '../../Util'
11
11
  import co from 'co'
12
12
  import echarts from 'echarts'
13
- import {HttpResetClass } from 'vue-client'
13
+ import {HttpResetClass} from 'vue-client'
14
14
 
15
- let getData = function * (self) {
15
+ let getData = function* (self) {
16
16
  let load = new HttpResetClass()
17
- load.load('POST','rs/sql/BusinessType',
18
- {data: {startDate: self.startdate, endDate: self.enddate,f_orgid: self.orgid}},
19
- {resolveMsg: null, rejectMsg: null})
20
- .then((res) => {
21
- self.texttile = '用户类型'
22
- let arrparams = []
23
- let numdata = []
24
- let pricedata = []
25
- for (var i = 0; i < res.data.length; i++) {
17
+ load.load('POST', 'rs/sql/BusinessType',
18
+ {data: {startDate: self.startdate, endDate: self.enddate, f_orgid: self.orgid}},
19
+ {resolveMsg: null, rejectMsg: null})
20
+ .then((res) => {
21
+ self.texttile = '用户类型'
22
+ let arrparams = []
23
+ let numdata = []
24
+ let pricedata = []
25
+ for (var i = 0; i < res.data.length; i++) {
26
26
  arrparams[i] = res.data[i].name
27
27
  numdata[i] = res.data[i].num
28
28
  pricedata[i] = res.data[i].money
29
- }
30
- self.set(arrparams,numdata,pricedata)
31
- })
29
+ }
30
+ self.set(arrparams, numdata, pricedata)
31
+ })
32
32
  }
33
33
  export default {
34
34
  props: {
@@ -44,24 +44,24 @@ export default {
44
44
  type: String
45
45
  }
46
46
  },
47
- data () {
47
+ data () {
48
48
  title: '业务类型'
49
- return {
50
- texttile: '',
51
- xc: ''
52
- }
53
- },
54
- methods: {
55
- set (arrparams,numdata,pricedata) {
56
- this.xc = echarts.init(document.getElementById('sm'))
57
- this.xc.setOption({
58
- color: [ '#A7C2B9', '#E4B1F7' ],
59
- title : {
60
- text: '其他业务散列图',
61
- subtext: '数据查询来源',
62
- x: 'left'
63
- },
64
- tooltip:{
49
+ return {
50
+ texttile: '',
51
+ xc: ''
52
+ }
53
+ },
54
+ methods: {
55
+ set (arrparams, numdata, pricedata) {
56
+ this.xc = echarts.init(document.getElementById('sm'))
57
+ this.xc.setOption({
58
+ color: ['#FE974B', '#3D72FF'],
59
+ title: {
60
+ text: '其他业务散列图',
61
+ subtext: '数据查询来源',
62
+ x: 'left'
63
+ },
64
+ tooltip: {
65
65
  trigger: 'axis',
66
66
  formatter: function (params) {
67
67
  var str = ''
@@ -76,75 +76,75 @@ export default {
76
76
  return str
77
77
  }
78
78
  },
79
- legend: {
80
- x: 'left',
81
- y: 'bottom',
82
- data: ['数量','金额']
83
- },
84
- toolbox: {
85
- show : true,
86
- feature : {
87
- dataView : {show: true, readOnly: false},
88
- magicType : {show: true, type: ['line', 'bar']},
89
- restore : {show: true},
90
- saveAsImage : {show: true}
91
- }
92
- },
93
- calculable : true,
94
- xAxis : [
95
- {
96
- type : 'category',
97
- data : arrparams
98
- }
99
- ],
100
- yAxis : [
101
- {
102
- type : 'value'
103
- }
104
- ],
105
- series : [
106
- {
107
- name:'数量',
108
- type:'bar',
109
- data:numdata,
110
- markLine : {
111
- data : [
112
- {type : 'average', name: '平均值'}
113
- ]
79
+ legend: {
80
+ x: 'left',
81
+ y: 'bottom',
82
+ data: ['数量', '金额']
83
+ },
84
+ toolbox: {
85
+ show: true,
86
+ feature: {
87
+ dataView: {show: true, readOnly: false},
88
+ magicType: {show: true, type: ['line', 'bar']},
89
+ restore: {show: true},
90
+ saveAsImage: {show: true}
114
91
  }
115
92
  },
116
- {
117
- name:'金额',
118
- type:'bar',
119
- data:pricedata,
120
- markLine : {
121
- data : [
122
- {type : 'average', name : '平均值'}
123
- ]
93
+ calculable: true,
94
+ xAxis: [
95
+ {
96
+ type: 'category',
97
+ data: arrparams
98
+ }
99
+ ],
100
+ yAxis: [
101
+ {
102
+ type: 'value'
103
+ }
104
+ ],
105
+ series: [
106
+ {
107
+ name: '数量',
108
+ type: 'bar',
109
+ data: numdata,
110
+ markLine: {
111
+ data: [
112
+ {type: 'average', name: '平均值'}
113
+ ]
114
+ }
115
+ },
116
+ {
117
+ name: '金额',
118
+ type: 'bar',
119
+ data: pricedata,
120
+ markLine: {
121
+ data: [
122
+ {type: 'average', name: '平均值'}
123
+ ]
124
+ }
124
125
  }
125
- }
126
- ]
127
- })
128
- },
129
- searchdata () {
130
- let getGen = getData(this)
131
- co(getGen)
132
- }
133
- },
134
- ready () {
135
- this.searchdata()
136
- },
137
- watch: {
138
- 'startdate' (val) {
139
- this.searchdata()
140
- },
141
- 'enddate' (val) {
142
- this.searchdata()
143
- },
144
- 'orgid' (val) {
145
- this.searchdata()
146
- }
147
- }
126
+ ]
127
+ })
128
+ },
129
+ searchdata () {
130
+ let getGen = getData(this)
131
+ co(getGen)
132
+ }
133
+ },
134
+ ready () {
135
+ this.searchdata()
136
+ },
137
+ watch: {
138
+ 'startdate' (val) {
139
+ this.searchdata()
140
+ },
141
+ 'enddate' (val) {
142
+ this.searchdata()
143
+ },
144
+ 'orgid' (val) {
145
+ this.searchdata()
146
+ }
147
+ }
148
148
 
149
149
  }
150
150
  </script>
package/src/filiale/shanxian/Paymentpie.vue CHANGED
@@ -9,12 +9,12 @@
9
9
  import * as Util from '../../Util'
10
10
  import co from 'co'
11
11
  import echarts from 'echarts'
12
- import { HttpResetClass } from 'vue-client'
12
+ import {HttpResetClass} from 'vue-client'
13
13
 
14
- let getData = function * (self) {
14
+ let getData = function* (self) {
15
15
  let load = new HttpResetClass()
16
- load.load('POST','rs/sql/sellinggasvalue',
17
- {data: {startDate: self.startdate, endDate: self.enddate,key:'f_user_type',f_orgid:self.orgid}},
16
+ load.load('POST', 'rs/sql/sellinggasvalue',
17
+ {data: {startDate: self.startdate, endDate: self.enddate, key: 'f_user_nature', f_orgid: self.orgid}},
18
18
  {resolveMsg: null, rejectMsg: null})
19
19
  .then((res) => {
20
20
  let arrparams = []
@@ -26,26 +26,26 @@ let getData = function * (self) {
26
26
  item.value = res.data[i].gas_value
27
27
  gasdata.push(item)
28
28
  }
29
- console.log("加载echars组件")
30
- self.setGas(arrparams,gasdata)
29
+ console.log('加载echars组件')
30
+ self.setGas(arrparams, gasdata)
31
31
  })
32
32
  let load1 = new HttpResetClass()
33
- load1.load('POST','rs/sql/sellinggasvalue',
34
- {data: {startDate: self.startdate, endDate: self.enddate,key:'f_payment',f_orgid:self.orgid}},
35
- {resolveMsg: null, rejectMsg: null})
36
- .then((res) => {
37
- let arrparams = []
38
- let moneydata = []
39
- for (var i = 0; i < res.data.length; i++) {
40
- let item1={}
33
+ load1.load('POST', 'rs/sql/sellinggasvalue',
34
+ {data: {startDate: self.startdate, endDate: self.enddate, key: 'f_payment', f_orgid: self.orgid}},
35
+ {resolveMsg: null, rejectMsg: null})
36
+ .then((res) => {
37
+ let arrparams = []
38
+ let moneydata = []
39
+ for (var i = 0; i < res.data.length; i++) {
40
+ let item1 = {}
41
41
  arrparams[i] = res.data[i].name
42
42
  item1.name = res.data[i].name
43
43
  item1.value = res.data[i].money_value
44
44
  moneydata.push(item1)
45
- }
46
- console.log("加载echars组件")
47
- self.setMoney(arrparams,moneydata)
48
- })
45
+ }
46
+ console.log('加载echars组件')
47
+ self.setMoney(arrparams, moneydata)
48
+ })
49
49
  }
50
50
  export default {
51
51
  props: {
@@ -60,135 +60,136 @@ export default {
60
60
  orgid: {
61
61
  type: String
62
62
  }
63
- },
64
- data () {
65
- return {
66
- xc: '',
67
- xd: ''
68
- }
69
- },
70
- methods: {
63
+ },
64
+ data () {
65
+ return {
66
+ xc: '',
67
+ xd: ''
68
+ }
69
+ },
70
+ methods: {
71
71
 
72
- setGas (arrparams,gasdata) {
73
- console.log("进入组件")
74
- let option1 = {
75
- title: [
76
- {
77
- text: '收费来源气量金额饼状图',
78
- x: '0%',
79
- y: '0%',
80
- textStyle: {
81
- color: '#010606',
82
- fontSize: 18,
83
- }
84
- }, {
85
- text: '气量分布',
86
- x: '40%',
87
- y: '18%',
88
- textStyle: {
89
- color: '#010606',
90
- fontSize: 16,
91
- }
92
- }],
93
- tooltip: {
94
- trigger: 'item',
95
- formatter: '{a} <br/>{b}: ({c}m³) ({d}%)'
96
- },
97
- legend: {
98
- orient: 'horizontal',
99
- icon: 'circle',
100
- x: 'center',
101
- y: '80%',
72
+ setGas (arrparams, gasdata) {
73
+ console.log('进入组件')
74
+ let option1 = {
75
+ color: ['#FE974B', '#3D72FF', '#00C953'],
76
+ title: [
77
+ {
78
+ text: '收费来源气量金额饼状图',
79
+ x: '0%',
80
+ y: '0%',
81
+ textStyle: {
82
+ color: '#010606',
83
+ fontSize: 18
84
+ }
85
+ }, {
86
+ text: '气量分布',
87
+ x: '40%',
88
+ y: '18%',
89
+ textStyle: {
90
+ color: '#010606',
91
+ fontSize: 16
92
+ }
93
+ }],
94
+ tooltip: {
95
+ trigger: 'item',
96
+ formatter: '{a} <br/>{b}: ({c}m³) ({d}%)'
97
+ },
98
+ legend: {
99
+ orient: 'horizontal',
100
+ icon: 'circle',
101
+ x: 'center',
102
+ y: '80%',
102
103
 
103
- textStyle: {
104
- padding: [0, 0, 0, 4],
105
- color: '#010606'
106
- },
107
- data: arrparams
108
- },
109
- series : [
110
- {
111
- name: '气量',
112
- type: 'pie',
113
- radius: ['0%', '40%'],
114
- center: ['50%', '50%'],
115
- hoverAnimation: true,
116
- minAngle: 15,//最小角度
117
- startAngle: 60, //起始角度
118
- label: {normal: {show:true,}},
119
- labelLine: { normal: {show:true,}},
120
- data: gasdata
121
- },
122
- ]
104
+ textStyle: {
105
+ padding: [0, 0, 0, 4],
106
+ color: '#010606'
107
+ },
108
+ data: arrparams
109
+ },
110
+ series: [
111
+ {
112
+ name: '气量',
113
+ type: 'pie',
114
+ radius: ['0%', '40%'],
115
+ center: ['50%', '50%'],
116
+ hoverAnimation: true,
117
+ minAngle: 15, // 最小角度
118
+ startAngle: 60, // 起始角度
119
+ label: {normal: {show: true}},
120
+ labelLine: {normal: {show: true}},
121
+ data: gasdata
122
+ }
123
+ ]
123
124
 
124
- }
125
- this.xd = echarts.init(document.getElementById('ps'))
126
- this.xd.setOption(option1,true)
127
- },
128
- setMoney (arrparams,moneydata) {
129
- console.log("进入组件")
130
- let option = {
131
- title: [
132
- {
133
- text: '',
134
- x: '0%',
135
- y: '0%',
136
- textStyle: {
137
- color: '#010606',
138
- fontSize: 18,
139
- }
140
- }, {
141
- text: '金额分布',
142
- x: '40%',
143
- y: '18%',
144
- textStyle: {
145
- color: '#010606',
146
- fontSize: 16,
147
- }
148
- }],
149
- tooltip: {
150
- trigger: 'item',
151
- formatter: '{a} <br/>{b}: ({c}元) ({d}%)'
152
- },
153
- legend: {
154
- orient: 'horizontal',
155
- icon: 'circle',
156
- x: 'center',
157
- y: '80%',
125
+ }
126
+ this.xd = echarts.init(document.getElementById('ps'))
127
+ this.xd.setOption(option1, true)
128
+ },
129
+ setMoney (arrparams, moneydata) {
130
+ console.log('进入组件')
131
+ let option = {
132
+ title: [
133
+ {
134
+ text: '',
135
+ x: '0%',
136
+ y: '0%',
137
+ textStyle: {
138
+ color: '#010606',
139
+ fontSize: 18
140
+ }
141
+ }, {
142
+ text: '金额分布',
143
+ x: '40%',
144
+ y: '18%',
145
+ textStyle: {
146
+ color: '#010606',
147
+ fontSize: 16
148
+ }
149
+ }],
150
+ tooltip: {
151
+ trigger: 'item',
152
+ formatter: '{a} <br/>{b}: ({c}元) ({d}%)'
153
+ },
154
+ legend: {
155
+ orient: 'horizontal',
156
+ icon: 'circle',
157
+ x: 'center',
158
+ y: '80%',
158
159
 
159
- textStyle: {
160
- padding: [0, 0, 0, 4],
161
- color: '#010606'
162
- },
163
- data: arrparams
164
- },
165
- series : [
166
- {
167
- name: '金额',
168
- type: 'pie',
169
- radius: ['0%', '40%'],
170
- center: ['50%', '50%'],
171
- hoverAnimation: true,
172
- minAngle: 15,//最小角度
173
- startAngle: 60, //起始角度
174
- label: {normal: {show:true,}},
175
- labelLine: { normal: {show:true,}},
176
- data: moneydata
177
- }
178
- ]
160
+ textStyle: {
161
+ padding: [0, 0, 0, 4],
162
+ color: '#010606'
163
+ },
164
+ data: arrparams
165
+ },
166
+ series: [
167
+ {
168
+ name: '金额',
169
+ type: 'pie',
170
+ radius: ['0%', '40%'],
171
+ center: ['50%', '50%'],
172
+ hoverAnimation: true,
173
+ minAngle: 15, // 最小角度
174
+ startAngle: 60, // 起始角度
175
+ label: {normal: {show: true}},
176
+ labelLine: {normal: {show: true}},
177
+ data: moneydata
178
+ }
179
+ ]
179
180
 
180
- }
181
- this.xc = echarts.init(document.getElementById('pp'))
182
- this.xc.setOption(option,true)
183
- },
184
- searchdata () {
185
- let getGen =getData(this);
186
- co(getGen);
187
- }
188
- },
189
- ready () {
190
- this.searchdata()
191
- },
181
+ }
182
+ this.xc = echarts.init(document.getElementById('pp'))
183
+ this.xc.setOption(option, true)
184
+ },
185
+ searchdata () {
186
+ let getGen = getData(this)
187
+ co(getGen)
188
+ }
189
+ },
190
+ ready () {
191
+ this.searchdata()
192
+ },
192
193
  watch: {
193
194
  'startdate' (val) {
194
195
  this.searchdata()
package/src/filiale/shanxian/SiteManager.vue CHANGED
@@ -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
  },