|
@@ -338,16 +338,19 @@ export default {
|
|
|
soil: [],
|
|
|
water: [],
|
|
|
forestry: [],
|
|
|
+ categoryData:[]
|
|
|
},
|
|
|
BData: {
|
|
|
soil: [],
|
|
|
water: [],
|
|
|
forestry: [],
|
|
|
+ categoryData:[]
|
|
|
},
|
|
|
CData: {
|
|
|
soil: [],
|
|
|
water: [],
|
|
|
forestry: [],
|
|
|
+ categoryData:[]
|
|
|
},
|
|
|
streetSelectVal: "全部街道",
|
|
|
streetOptions: [],
|
|
@@ -376,16 +379,19 @@ export default {
|
|
|
this.soil = this.AData.soil;
|
|
|
this.water = this.AData.water;
|
|
|
this.forestry = this.AData.forestry;
|
|
|
+ this.categoryData = this.AData.categoryData
|
|
|
break;
|
|
|
case "B":
|
|
|
this.soil = this.BData.soil;
|
|
|
this.water = this.BData.water;
|
|
|
this.forestry = this.BData.forestry;
|
|
|
+ this.categoryData = this.BData.categoryData
|
|
|
break;
|
|
|
case "C":
|
|
|
this.soil = this.CData.soil;
|
|
|
this.water = this.CData.water;
|
|
|
this.forestry = this.CData.forestry;
|
|
|
+ this.categoryData = this.CData.categoryData
|
|
|
break;
|
|
|
}
|
|
|
},
|
|
@@ -413,7 +419,7 @@ export default {
|
|
|
},
|
|
|
created() {
|
|
|
// 目录
|
|
|
- this.categoryData = Object.keys(street);
|
|
|
+ let category = Object.keys(street);
|
|
|
// 默认A类
|
|
|
this.soil = [];
|
|
|
this.water = [];
|
|
@@ -423,23 +429,23 @@ export default {
|
|
|
let BDataArr = [];
|
|
|
let CDataArr = [];
|
|
|
// 街道排序
|
|
|
- for (let i in this.categoryData) {
|
|
|
+ for (let i in category) {
|
|
|
let ADataSum =
|
|
|
- soilData[this.categoryData[i]].A +
|
|
|
- waterData[this.categoryData[i]].A +
|
|
|
- forestryData[this.categoryData[i]].A;
|
|
|
+ soilData[category[i]].A +
|
|
|
+ waterData[category[i]].A +
|
|
|
+ forestryData[category[i]].A;
|
|
|
let BDataSum =
|
|
|
- soilData[this.categoryData[i]].B +
|
|
|
- waterData[this.categoryData[i]].B +
|
|
|
- forestryData[this.categoryData[i]].B;
|
|
|
+ soilData[category[i]].B +
|
|
|
+ waterData[category[i]].B +
|
|
|
+ forestryData[category[i]].B;
|
|
|
|
|
|
let CDataSum =
|
|
|
- soilData[this.categoryData[i]].C +
|
|
|
- waterData[this.categoryData[i]].C +
|
|
|
- forestryData[this.categoryData[i]].C;
|
|
|
- ADataArr.push({ name: this.categoryData[i], sum: ADataSum });
|
|
|
- BDataArr.push({ name: this.categoryData[i], sum: BDataSum });
|
|
|
- CDataArr.push({ name: this.categoryData[i], sum: CDataSum });
|
|
|
+ soilData[category[i]].C +
|
|
|
+ waterData[category[i]].C +
|
|
|
+ forestryData[category[i]].C;
|
|
|
+ ADataArr.push({ name: category[i], sum: ADataSum });
|
|
|
+ BDataArr.push({ name: category[i], sum: BDataSum });
|
|
|
+ CDataArr.push({ name: category[i], sum: CDataSum });
|
|
|
}
|
|
|
|
|
|
ADataArr.sort(publicFun.compare("sum"));
|
|
@@ -451,23 +457,27 @@ export default {
|
|
|
this.AData.soil.push(soilData[item.name].A);
|
|
|
this.AData.water.push(waterData[item.name].A);
|
|
|
this.AData.forestry.push(forestryData[item.name].A);
|
|
|
+ this.AData.categoryData.push(item.name)
|
|
|
});
|
|
|
|
|
|
BDataArr.forEach((item) => {
|
|
|
this.BData.soil.push(soilData[item.name].B);
|
|
|
this.BData.water.push(waterData[item.name].B);
|
|
|
this.BData.forestry.push(forestryData[item.name].B);
|
|
|
+ this.BData.categoryData.push(item.name)
|
|
|
});
|
|
|
|
|
|
CDataArr.forEach((item) => {
|
|
|
this.CData.soil.push(soilData[item.name].C);
|
|
|
this.CData.water.push(waterData[item.name].C);
|
|
|
this.CData.forestry.push(forestryData[item.name].C);
|
|
|
+ this.CData.categoryData.push(item.name)
|
|
|
});
|
|
|
|
|
|
this.soil = this.AData.soil;
|
|
|
this.water = this.AData.water;
|
|
|
this.forestry = this.AData.forestry;
|
|
|
+ this.categoryData = this.AData.categoryData
|
|
|
|
|
|
// 街道下拉框
|
|
|
for (let key in street) {
|