|
|
@@ -1092,11 +1092,9 @@ export default {
|
|
|
data.push([])
|
|
|
col = { title: '用途', dataIndex: 'types', key: 'types', scopedSlots: { customRender: 'types' } }
|
|
|
col2 = { title: '面积（公顷）', dataIndex: 'area', key: 'area', scopedSlots: { customRender: 'area' } }
|
|
|
- // 土地价值
|
|
|
- col3 = { title: '土地价值（元）', dataIndex: 'tdjz', key: 'tdjz', scopedSlots: { customRender: 'tdjz' } }
|
|
|
col.title = item.afieldcname
|
|
|
//列信息
|
|
|
- this.result[resInd].columns.push(col, col2, col3)
|
|
|
+ this.result[resInd].columns.push(col, col2)
|
|
|
}
|
|
|
data[resInd].push(item.result)
|
|
|
//遍历分组
|
|
|
@@ -1113,7 +1111,7 @@ export default {
|
|
|
console.log(map[ai.types])
|
|
|
|
|
|
//判断map里记录类型存在######################
|
|
|
- if (!map[ai.types]) {
|
|
|
+ // if (!map[ai.types]) {
|
|
|
dest.push({
|
|
|
key: ai.types,
|
|
|
types: ai.types,
|
|
|
@@ -1127,18 +1125,6 @@ export default {
|
|
|
pie.count = parseFloat(ai.area)
|
|
|
pies.push(pie)
|
|
|
map[ai.types] = ai
|
|
|
- } else {
|
|
|
- for (let j = 0; j < dest.length; j++) {
|
|
|
- let dj = dest[j]
|
|
|
- if (dj.types === ai.types) {
|
|
|
- dj.area = parseFloat(parseFloat(dj.area) + parseFloat(ai.area)).toFixed(4)
|
|
|
- dj.wkt.push(ai.info)
|
|
|
- dj.objectids.push(ai.objectid)
|
|
|
- pies[j].count = parseFloat(dj.area)
|
|
|
- break
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
//##############################################
|
|
|
}
|
|
|
//饼图
|
