manage-client 3.2.272 → 3.2.273
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.
package/package.json
CHANGED
|
@@ -17,17 +17,32 @@ let getData = function* (self) {
|
|
|
17
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
|
-
let
|
|
21
|
-
let
|
|
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
|
|
22
29
|
for (var i = 0; i < res.data.length; i++) {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
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
|
+
}
|
|
28
43
|
}
|
|
29
44
|
console.log('加载echars组件')
|
|
30
|
-
self.setGas(
|
|
45
|
+
self.setGas(arrparams1, moneydata1, arrparams2, moneydata2, arrparams3, moneydata3, color1, color2, color3)
|
|
31
46
|
})
|
|
32
47
|
let load1 = new HttpResetClass()
|
|
33
48
|
load1.load('POST', 'rs/sql/sellinggasvalueroute',
|
|
@@ -69,10 +84,9 @@ export default {
|
|
|
69
84
|
},
|
|
70
85
|
methods: {
|
|
71
86
|
|
|
72
|
-
setGas (
|
|
87
|
+
setGas (arrparams1, moneydata1, arrparams2, moneydata2, arrparams3, moneydata3, color1, color2, color3) {
|
|
73
88
|
console.log('进入组件')
|
|
74
89
|
let option1 = {
|
|
75
|
-
color: ['#FE974B', '#3D72FF', '#00C953'],
|
|
76
90
|
title: [
|
|
77
91
|
{
|
|
78
92
|
text: '售气金额饼状图',
|
|
@@ -105,7 +119,7 @@ export default {
|
|
|
105
119
|
padding: [0, 0, 0, 4],
|
|
106
120
|
color: '#010606'
|
|
107
121
|
},
|
|
108
|
-
data:
|
|
122
|
+
data: [arrparams1, arrparams2, arrparams3]
|
|
109
123
|
},
|
|
110
124
|
series: [
|
|
111
125
|
{
|
|
@@ -118,7 +132,11 @@ export default {
|
|
|
118
132
|
startAngle: 60, // 起始角度
|
|
119
133
|
label: {normal: {show: true}},
|
|
120
134
|
labelLine: {normal: {show: true}},
|
|
121
|
-
data:
|
|
135
|
+
data: [
|
|
136
|
+
{value: moneydata1, name: arrparams1, itemStyle: {color: color1}},
|
|
137
|
+
{value: moneydata2, name: arrparams2, itemStyle: {color: color2}},
|
|
138
|
+
{value: moneydata3, name: arrparams3, itemStyle: {color: color3}}
|
|
139
|
+
]
|
|
122
140
|
}
|
|
123
141
|
]
|
|
124
142
|
|
|
@@ -129,6 +147,7 @@ export default {
|
|
|
129
147
|
setMoney (arrparams, moneydata) {
|
|
130
148
|
console.log('进入组件')
|
|
131
149
|
let option = {
|
|
150
|
+
color: ['#fc8251', '#5470c6', '#91cd77', '#ef6567', '#f9c956', '#75bedc'],
|
|
132
151
|
title: [
|
|
133
152
|
{
|
|
134
153
|
text: '',
|
|
@@ -17,23 +17,39 @@ let getData = function* (self) {
|
|
|
17
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
|
-
let
|
|
21
|
-
let
|
|
22
|
-
let
|
|
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
|
|
23
32
|
for (var i = 0; i < res.data.length; i++) {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
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
|
+
}
|
|
33
49
|
}
|
|
34
50
|
console.log('加载echars组件')
|
|
35
|
-
self.
|
|
36
|
-
self.
|
|
51
|
+
self.setGas(arrparams1, gasdata1, arrparams2, gasdata2, arrparams3, gasdata3, color1, color2, color3)
|
|
52
|
+
self.setNum(arrparams1, numdata1, arrparams2, numdata2, arrparams3, numdata3, color1, color2, color3)
|
|
37
53
|
})
|
|
38
54
|
}
|
|
39
55
|
export default {
|
|
@@ -58,7 +74,7 @@ export default {
|
|
|
58
74
|
},
|
|
59
75
|
methods: {
|
|
60
76
|
|
|
61
|
-
setNum (
|
|
77
|
+
setNum (arrparams1, numdata1, arrparams2, numdata2, arrparams3, numdata3, color1, color2, color3) {
|
|
62
78
|
console.log('进入组件')
|
|
63
79
|
let option1 = {
|
|
64
80
|
color: ['#FE974B', '#3D72FF', '#00C953'],
|
|
@@ -94,7 +110,7 @@ export default {
|
|
|
94
110
|
padding: [0, 0, 0, 4],
|
|
95
111
|
color: '#010606'
|
|
96
112
|
},
|
|
97
|
-
data:
|
|
113
|
+
data: [arrparams1, arrparams2, arrparams3]
|
|
98
114
|
},
|
|
99
115
|
series: [
|
|
100
116
|
{
|
|
@@ -107,7 +123,11 @@ export default {
|
|
|
107
123
|
startAngle: 60, // 起始角度
|
|
108
124
|
label: {normal: {show: true}},
|
|
109
125
|
labelLine: {normal: {show: true}},
|
|
110
|
-
data:
|
|
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
|
+
],
|
|
111
131
|
percentPrecision: 4
|
|
112
132
|
}
|
|
113
133
|
]
|
|
@@ -116,7 +136,7 @@ export default {
|
|
|
116
136
|
this.xd = echarts.init(document.getElementById('num'))
|
|
117
137
|
this.xd.setOption(option1, true)
|
|
118
138
|
},
|
|
119
|
-
setGas (
|
|
139
|
+
setGas (arrparams1, gasdata1, arrparams2, gasdata2, arrparams3, gasdata3, color1, color2, color3) {
|
|
120
140
|
console.log('进入组件')
|
|
121
141
|
let option = {
|
|
122
142
|
color: ['#FE974B', '#3D72FF', '#00C953'],
|
|
@@ -152,7 +172,7 @@ export default {
|
|
|
152
172
|
padding: [0, 0, 0, 4],
|
|
153
173
|
color: '#010606'
|
|
154
174
|
},
|
|
155
|
-
data:
|
|
175
|
+
data: [arrparams1, arrparams2, arrparams3]
|
|
156
176
|
},
|
|
157
177
|
series: [
|
|
158
178
|
{
|
|
@@ -165,7 +185,11 @@ export default {
|
|
|
165
185
|
startAngle: 60, // 起始角度
|
|
166
186
|
label: {normal: {show: true}},
|
|
167
187
|
labelLine: {normal: {show: true}},
|
|
168
|
-
data:
|
|
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
|
+
],
|
|
169
193
|
percentPrecision: 4
|
|
170
194
|
}
|
|
171
195
|
]
|
|
@@ -114,7 +114,7 @@
|
|
|
114
114
|
condition="f_collection <= {} " placeholder="">
|
|
115
115
|
</div>
|
|
116
116
|
</div>
|
|
117
|
-
<div class="col-sm-2 form-group"
|
|
117
|
+
<div class="col-sm-2 form-group">
|
|
118
118
|
<label class="font_normal_body" for="startDate">抄表日期</label>
|
|
119
119
|
<datepicker id="startDate" placeholder="开始日期" style="width: 60%"
|
|
120
120
|
v-model="model.startDate"
|
|
@@ -124,7 +124,7 @@
|
|
|
124
124
|
:show-reset-button="reset">
|
|
125
125
|
</datepicker>
|
|
126
126
|
</div>
|
|
127
|
-
<div class="col-sm-2 form-group"
|
|
127
|
+
<div class="col-sm-2 form-group">
|
|
128
128
|
<label class="font_normal_body" for="endDate">抄表日期</label>
|
|
129
129
|
<datepicker id="endDate" placeholder="结束日期" style="width: 60%"
|
|
130
130
|
v-model="model.endDate"
|
|
@@ -293,9 +293,9 @@
|
|
|
293
293
|
}).catch((error) => {
|
|
294
294
|
this.$emit('error', error)
|
|
295
295
|
})
|
|
296
|
-
this.$refs.paged.$refs.criteria.model.startDate = Util.addDate(new Date()
|
|
297
|
-
this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date()
|
|
298
|
-
this.$refs.paged.$refs.criteria.search()
|
|
296
|
+
// this.$refs.paged.$refs.criteria.model.startDate = Util.addDate(new Date(),0).substring(0,10) + ' 00:00:00'
|
|
297
|
+
// this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date(),0).substring(0,10) + ' 23:59:59'
|
|
298
|
+
// this.$refs.paged.$refs.criteria.search()
|
|
299
299
|
},
|
|
300
300
|
methods: {
|
|
301
301
|
initParams() {
|
|
@@ -354,6 +354,16 @@
|
|
|
354
354
|
},
|
|
355
355
|
|
|
356
356
|
search (args) {
|
|
357
|
+
let isUserinfoCodeEdit = (this.$refs.paged.$refs.criteria.model.f_userinfo_code !== '')
|
|
358
|
+
if (this.$refs.paged.$refs.criteria.model.startDate == '' && this.$refs.paged.$refs.criteria.model.endDate == ''){
|
|
359
|
+
if (isUserinfoCodeEdit){
|
|
360
|
+
this.$refs.paged.$refs.criteria.model.startDate = '1990-01-01 00:00:00'
|
|
361
|
+
this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date(),1).substring(0,10) + ' 00:00:00'
|
|
362
|
+
}else{
|
|
363
|
+
this.$refs.paged.$refs.criteria.model.startDate = Util.addDate(new Date(),0).substring(0,10) + ' 00:00:00'
|
|
364
|
+
this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date(),0).substring(0,10) + ' 23:59:59'
|
|
365
|
+
}
|
|
366
|
+
}
|
|
357
367
|
args.condition = `${args.condition}`+this.orgcondition
|
|
358
368
|
this.condition = args.condition
|
|
359
369
|
this.model.search(args.condition, args.model)
|
|
@@ -364,6 +374,7 @@
|
|
|
364
374
|
// else
|
|
365
375
|
// args.condition = `${args.condition}` + 'and m.f_orgid in ' + '(' + this.$login.f.orgid + ')'
|
|
366
376
|
// this.model.search(args.condition, args.model)
|
|
377
|
+
|
|
367
378
|
}
|
|
368
379
|
},
|
|
369
380
|
watch: {
|
|
@@ -385,6 +396,7 @@
|
|
|
385
396
|
}
|
|
386
397
|
},
|
|
387
398
|
computed: {
|
|
399
|
+
|
|
388
400
|
getCondition() {
|
|
389
401
|
|
|
390
402
|
return {
|