manage-client 3.3.121 → 3.3.122

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.
@@ -14,35 +14,20 @@ import {HttpResetClass} from 'vue-client'
14
14
  let getData = function* (self) {
15
15
  let load = new HttpResetClass()
16
16
  load.load('POST', 'rs/sql/sellinggasvalue',
17
- {data: {startDate: self.startdate, endDate: self.enddate, key: 'f_user_nature', f_orgid: self.orgid}},
17
+ {data: {startDate: self.startdate, endDate: self.enddate, key: 'f_gasproperties', f_orgid: self.orgid}},
18
18
  {resolveMsg: null, rejectMsg: null})
19
19
  .then((res) => {
20
- let arrparams1 = ''
21
- let moneydata1 = ''
22
- let arrparams2 = ''
23
- let moneydata2 = null
24
- let arrparams3 = null
25
- let moneydata3 = null
26
- let color1 = null
27
- let color2 = null
28
- let color3 = null
20
+ let arrparams = []
21
+ let gasdata = []
29
22
  for (var i = 0; i < res.data.length; i++) {
30
- if (res.data[i].name == '民用') {
31
- arrparams1 = res.data[i].name
32
- moneydata1 = res.data[i].money_value
33
- color1 = res.data[i].color
34
- } else if (res.data[i].name == '工业') {
35
- arrparams2 = res.data[i].name
36
- moneydata2 = res.data[i].money_value
37
- color2 = res.data[i].color
38
- } else if (res.data[i].name == '商业') {
39
- arrparams3 = res.data[i].name
40
- moneydata3 = res.data[i].money_value
41
- color3 = res.data[i].color
42
- }
23
+ let item = {}
24
+ arrparams[i] = res.data[i].name
25
+ item.name = res.data[i].name
26
+ item.value = res.data[i].money_value
27
+ gasdata.push(item)
43
28
  }
44
29
  console.log('加载echars组件')
45
- self.setGas(arrparams1, moneydata1, arrparams2, moneydata2, arrparams3, moneydata3, color1, color2, color3)
30
+ self.setGas(arrparams, gasdata)
46
31
  })
47
32
  let load1 = new HttpResetClass()
48
33
  load1.load('POST', 'rs/sql/sellinggasvalueroute',
@@ -56,9 +41,6 @@ let getData = function* (self) {
56
41
  arrparams[i] = res.data[i].name
57
42
  item1.name = res.data[i].name
58
43
  item1.value = res.data[i].money_value
59
- item1.itemStyle = {
60
- color: res.data[i].color
61
- }
62
44
  moneydata.push(item1)
63
45
  }
64
46
  console.log('加载echars组件')
@@ -87,9 +69,13 @@ export default {
87
69
  },
88
70
  methods: {
89
71
 
90
- setGas (arrparams1, moneydata1, arrparams2, moneydata2, arrparams3, moneydata3, color1, color2, color3) {
72
+ setGas (arrparams, gasdata) {
91
73
  console.log('进入组件')
92
74
  let option1 = {
75
+ color: ['#ed7d31', '#FFE400',
76
+ '#ff0000', '#00b050',
77
+ '#5b9bd5', '#7030a0',
78
+ '#165DFF'],
93
79
  title: [
94
80
  {
95
81
  text: '售气金额饼状图',
@@ -122,7 +108,7 @@ export default {
122
108
  padding: [0, 0, 0, 4],
123
109
  color: '#010606'
124
110
  },
125
- data: [arrparams1, arrparams2, arrparams3]
111
+ data: arrparams
126
112
  },
127
113
  series: [
128
114
  {
@@ -135,11 +121,7 @@ export default {
135
121
  startAngle: 60, // 起始角度
136
122
  label: {normal: {show: true}},
137
123
  labelLine: {normal: {show: true}},
138
- data: [
139
- {value: moneydata1, name: arrparams1, itemStyle: {color: color1}},
140
- {value: moneydata2, name: arrparams2, itemStyle: {color: color2}},
141
- {value: moneydata3, name: arrparams3, itemStyle: {color: color3}}
142
- ]
124
+ data: gasdata
143
125
  }
144
126
  ]
145
127
 
@@ -14,42 +14,26 @@ import {HttpResetClass} from 'vue-client'
14
14
  let getData = function* (self) {
15
15
  let load = new HttpResetClass()
16
16
  load.load('POST', 'rs/sql/sellinggasvalue',
17
- {data: {startDate: self.startdate, endDate: self.enddate, key: 'f_user_nature', f_orgid: self.orgid}},
17
+ {data: {startDate: self.startdate, endDate: self.enddate, key: 'f_gasproperties', f_orgid: self.orgid}},
18
18
  {resolveMsg: null, rejectMsg: null})
19
19
  .then((res) => {
20
- let arrparams1 = ''
21
- let gasdata1 = null
22
- let numdata1 = null
23
- let arrparams2 = ''
24
- let gasdata2 = null
25
- let numdata2 = null
26
- let arrparams3 = ''
27
- let gasdata3 = null
28
- let numdata3 = null
29
- let color1 = null
30
- let color2 = null
31
- let color3 = null
20
+ let arrparams = []
21
+ let gasdata = []
22
+ let numdata = []
32
23
  for (var i = 0; i < res.data.length; i++) {
33
- if (res.data[i].name == '民用') {
34
- arrparams1 = res.data[i].name
35
- numdata1 = res.data[i].num_value
36
- gasdata1 = res.data[i].gas_value
37
- color1 = res.data[i].color
38
- } else if (res.data[i].name == '工业') {
39
- arrparams2 = res.data[i].name
40
- numdata2 = res.data[i].num_value
41
- gasdata2 = res.data[i].gas_value
42
- color2 = res.data[i].color
43
- } else if (res.data[i].name == '商业') {
44
- arrparams3 = res.data[i].name
45
- numdata3 = res.data[i].num_value
46
- gasdata3 = res.data[i].gas_value
47
- color3 = res.data[i].color
48
- }
24
+ let item = {}
25
+ let item2 = {}
26
+ arrparams[i] = res.data[i].name
27
+ item.name = res.data[i].name
28
+ item.value = res.data[i].gas_value
29
+ item2.name = res.data[i].name
30
+ item2.value = res.data[i].num_value
31
+ gasdata.push(item)
32
+ numdata.push(item2)
49
33
  }
50
34
  console.log('加载echars组件')
51
- self.setGas(arrparams1, gasdata1, arrparams2, gasdata2, arrparams3, gasdata3, color1, color2, color3)
52
- self.setNum(arrparams1, numdata1, arrparams2, numdata2, arrparams3, numdata3, color1, color2, color3)
35
+ self.setNum(arrparams, numdata)
36
+ self.setGas(arrparams, gasdata)
53
37
  })
54
38
  }
55
39
  export default {
@@ -74,10 +58,13 @@ export default {
74
58
  },
75
59
  methods: {
76
60
 
77
- setNum (arrparams1, numdata1, arrparams2, numdata2, arrparams3, numdata3, color1, color2, color3) {
61
+ setNum (arrparams, gasdata) {
78
62
  console.log('进入组件')
79
63
  let option1 = {
80
- color: ['#00b050', '#ed7d31', '#5b9bd5'],
64
+ color: ['#ed7d31', '#FFE400',
65
+ '#ff0000', '#00b050',
66
+ '#5b9bd5', '#7030a0',
67
+ '#165DFF'],
81
68
  title: [
82
69
  {
83
70
  text: '销售气量饼状图',
@@ -110,7 +97,7 @@ export default {
110
97
  padding: [0, 0, 0, 4],
111
98
  color: '#010606'
112
99
  },
113
- data: [arrparams1, arrparams2, arrparams3]
100
+ data: arrparams
114
101
  },
115
102
  series: [
116
103
  {
@@ -123,11 +110,7 @@ export default {
123
110
  startAngle: 60, // 起始角度
124
111
  label: {normal: {show: true}},
125
112
  labelLine: {normal: {show: true}},
126
- data: [
127
- {value: numdata1, name: arrparams1, itemStyle: {color: color1}},
128
- {value: numdata2, name: arrparams2, itemStyle: {color: color2}},
129
- {value: numdata3, name: arrparams3, itemStyle: {color: color3}}
130
- ],
113
+ data: gasdata,
131
114
  percentPrecision: 4
132
115
  }
133
116
  ]
@@ -136,10 +119,13 @@ export default {
136
119
  this.xd = echarts.init(document.getElementById('num'))
137
120
  this.xd.setOption(option1, true)
138
121
  },
139
- setGas (arrparams1, gasdata1, arrparams2, gasdata2, arrparams3, gasdata3, color1, color2, color3) {
122
+ setGas (arrparams, moneydata) {
140
123
  console.log('进入组件')
141
124
  let option = {
142
- color: ['#7dabbf', '#9ac57d', '#cfcbbf'],
125
+ color: ['#ed7d31', '#FFE400',
126
+ '#ff0000', '#00b050',
127
+ '#5b9bd5', '#7030a0',
128
+ '#165DFF'],
143
129
  title: [
144
130
  {
145
131
  text: '',
@@ -172,7 +158,7 @@ export default {
172
158
  padding: [0, 0, 0, 4],
173
159
  color: '#010606'
174
160
  },
175
- data: [arrparams1, arrparams2, arrparams3]
161
+ data: arrparams
176
162
  },
177
163
  series: [
178
164
  {
@@ -185,11 +171,7 @@ export default {
185
171
  startAngle: 60, // 起始角度
186
172
  label: {normal: {show: true}},
187
173
  labelLine: {normal: {show: true}},
188
- data: [
189
- {value: gasdata1, name: arrparams1, itemStyle: {color: color1}},
190
- {value: gasdata2, name: arrparams2, itemStyle: {color: color2}},
191
- {value: gasdata3, name: arrparams3, itemStyle: {color: color3}}
192
- ],
174
+ data: moneydata,
193
175
  percentPrecision: 4
194
176
  }
195
177
  ]