|
@@ -85,7 +85,7 @@
|
|
|
style="height: 300px;"
|
|
|
color="#6C6FBE"
|
|
|
:xAxisRotate="resize"
|
|
|
- :yMax="1000"
|
|
|
+ :yMax="1000000"
|
|
|
yUnit="kg"
|
|
|
:xAxisData="XdaysData1"
|
|
|
:seriesData="hswTypeBarData"
|
|
@@ -99,7 +99,7 @@
|
|
|
style="height: 300px;"
|
|
|
color="#6C6FBE"
|
|
|
yUnit="kg"
|
|
|
- :yMax="1000"
|
|
|
+ :yMax="1000000"
|
|
|
:xAxisRotate="resize"
|
|
|
:xAxisData="XdaysData1"
|
|
|
:seriesData="hswTypeLineData"
|
|
@@ -197,24 +197,28 @@ export default {
|
|
|
qyTotalPieData () {
|
|
|
const list = this.totalGroupRubbiData ? this.totalGroupRubbiData.cleanReportData : []
|
|
|
const temp = []
|
|
|
- list.map(item => {
|
|
|
- temp.push({
|
|
|
- name: item.rubbishTypeDictValue,
|
|
|
- value: Number(item.cleanWeight / 1000).toFixed(2)
|
|
|
+ if (list) {
|
|
|
+ list.map(item => {
|
|
|
+ temp.push({
|
|
|
+ name: item.rubbishTypeDictValue,
|
|
|
+ value: Number(item.cleanWeight / 1000).toFixed(2)
|
|
|
+ })
|
|
|
})
|
|
|
- })
|
|
|
+ }
|
|
|
return temp
|
|
|
},
|
|
|
// 各清运司机占比
|
|
|
sjTotalPieData () {
|
|
|
const list = this.totalGroupUserData ? this.totalGroupUserData.cleanReportData : []
|
|
|
const temp = []
|
|
|
- list.map(item => {
|
|
|
- temp.push({
|
|
|
- name: item.operatorName,
|
|
|
- value: Number(item.cleanWeight / 1000).toFixed(2)
|
|
|
+ if (list) {
|
|
|
+ list.map(item => {
|
|
|
+ temp.push({
|
|
|
+ name: item.operatorName,
|
|
|
+ value: Number(item.cleanWeight / 1000).toFixed(2)
|
|
|
+ })
|
|
|
})
|
|
|
- })
|
|
|
+ }
|
|
|
return temp
|
|
|
}
|
|
|
},
|
|
@@ -300,8 +304,8 @@ export default {
|
|
|
)
|
|
|
},
|
|
|
// 查询分类数据字典
|
|
|
- getTypeCode () {
|
|
|
- let _this = this
|
|
|
+ getTypeCode (params) {
|
|
|
+ const _this = this
|
|
|
getLookUpData({
|
|
|
pageNo: 1,
|
|
|
pageSize: 1000,
|
|
@@ -324,7 +328,9 @@ export default {
|
|
|
data: []
|
|
|
})
|
|
|
})
|
|
|
- _this.getGroupDateAndRubbishType()
|
|
|
+ setTimeout(() => {
|
|
|
+ _this.getGroupDateAndRubbishType(params)
|
|
|
+ }, 500)
|
|
|
})
|
|
|
},
|
|
|
// 查询网点列表
|
|
@@ -348,6 +354,8 @@ export default {
|
|
|
const searchTime = this.searchForm.queryWord.toString().split(',')
|
|
|
this.beginDate = this.exitTime(searchTime[0])
|
|
|
this.endDate = this.exitTime(searchTime[1])
|
|
|
+ this.XdaysData = []
|
|
|
+ this.XdaysData1 = []
|
|
|
this.getPageData()
|
|
|
} else {
|
|
|
this.$message.error('请选择统计区间')
|
|
@@ -430,41 +438,42 @@ export default {
|
|
|
this.isNoData = true
|
|
|
}
|
|
|
})
|
|
|
-
|
|
|
- if(this.hswTypeBarData.length==0){
|
|
|
- this.getTypeCode()
|
|
|
- }else{
|
|
|
- this.getGroupDateAndRubbishType()
|
|
|
+
|
|
|
+ if (this.hswTypeBarData.length == 0) {
|
|
|
+ this.getTypeCode(params)
|
|
|
+ } else {
|
|
|
+ this.getGroupDateAndRubbishType(params)
|
|
|
}
|
|
|
},
|
|
|
// 各回收物类型清运数据柱状图
|
|
|
- getGroupDateAndRubbishType(){
|
|
|
+ getGroupDateAndRubbishType (params) {
|
|
|
findTotalGroupDateAndRubbishType(params).then(res => {
|
|
|
console.log(res, '各回收物类型清运数据柱状图')
|
|
|
if (res.status == 200) {
|
|
|
- let data = res.data.cleanReportData
|
|
|
+ const data = res.data.cleanReportData
|
|
|
// x 时间轴
|
|
|
- for(let key in data){
|
|
|
+ for (const key in data) {
|
|
|
this.XdaysData1.push(key)
|
|
|
}
|
|
|
- this.formAtGroupDateAndRubbishType(data,this.hswTypeBarData)
|
|
|
- this.formAtGroupDateAndRubbishType(data,this.hswTypeLineData)
|
|
|
+ this.formAtGroupDateAndRubbishType(data, this.hswTypeBarData)
|
|
|
+ this.formAtGroupDateAndRubbishType(data, this.hswTypeLineData)
|
|
|
} else {
|
|
|
this.isNoData = true
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
// 格式化数据
|
|
|
- formAtGroupDateAndRubbishType(data,obj){
|
|
|
+ formAtGroupDateAndRubbishType (data, obj) {
|
|
|
obj.map(item => {
|
|
|
- let ret = []
|
|
|
- for(let key in data){
|
|
|
- let leve2 = data[key]
|
|
|
- let row = leve2[item.code]
|
|
|
- ret.push(row?row.cleanWeight:0)
|
|
|
+ const ret = []
|
|
|
+ for (const key in data) {
|
|
|
+ const leve2 = data[key]
|
|
|
+ const row = leve2[item.code]
|
|
|
+ ret.push(row ? (Number(row.cleanWeight / 1000).toFixed(2)) : 0)
|
|
|
}
|
|
|
item.data = ret
|
|
|
})
|
|
|
+ console.log(obj, 'obj')
|
|
|
}
|
|
|
},
|
|
|
beforeRouteEnter (to, from, next) {
|