elink-star
/
epmet-work-pc-chengyang
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

旭日图好了，去掉服务页面bug

feature
tianq 3 years ago
parent
dbd0602eee
commit
d3f08c6fcf
4 changed files with 65 additions and 141 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/views/dataBoard/sida/cpts/fw01gg.vue
  2. 50
      src/views/dataBoard/sida/cpts/fw02gxxq.vue
  3. 20
      src/views/dataBoard/sida/cpts/fwBarOption01.js
  4. 130
      src/views/dataBoard/sida/cpts/zyqd.vue

4
src/views/dataBoard/sida/cpts/fw01gg.vue
View File

@ -117,7 +117,7 @@ export default {
pieData0.push(item.service_category); pieData0.push(item.service_category);
pieData1.push(item.common_service_num); pieData1.push(item.common_service_num);
pieData2.push(item.appoint_service_num); pieData2.push(item.appoint_service_num);
pieData3.push(item.served_person_qty_num); // pieData3.push(item.served_person_qty_num);
}); });
this.pieData = [pieData0, pieData1, pieData2, pieData3]; this.pieData = [pieData0, pieData1, pieData2, pieData3];
@ -131,7 +131,7 @@ export default {
this.pieOption.xAxis[0].data = this.pieData[0]; this.pieOption.xAxis[0].data = this.pieData[0];
this.pieOption.series[0].data = this.pieData[1]; this.pieOption.series[0].data = this.pieData[1];
this.pieOption.series[1].data = this.pieData[2]; this.pieOption.series[1].data = this.pieData[2];
this.pieOption.series[2].data = this.pieData[3]; // this.pieOption.series[2].data = this.pieData[3];
this.$refs.pieChart.setOption(this.pieOption); this.$refs.pieChart.setOption(this.pieOption);
} }
} }

50
src/views/dataBoard/sida/cpts/fw02gxxq.vue
View File

@ -16,7 +16,7 @@
</template> </template>
<script> <script>
import screenEchartsFrame from '@/views/dataBoard/cpts/screen-echarts-frame/index'; import screenEchartsFrame from '@/views/dataBoard/cpts/screen-echarts-frame/index';
import { pieOption } from './fwqdPieOption.js'; // import { pieOption } from './fwqdPieOption.js';
import { requestPostBi } from '@/js/dai/request-bipass'; import { requestPostBi } from '@/js/dai/request-bipass';
export default { export default {
props: { props: {
@ -31,7 +31,45 @@ export default {
showNoData: false, showNoData: false,
timer: null, timer: null,
pieChart: '', pieChart: '',
pieOption: {}, pieOption: {
color: ['#1A95FF', '#FF6138', '#2adcea', '#2cc4ad', '#7377f5', '#32de66', '#8155d4', '#c7ea48', '#ef47c2', 'd43349'],
tooltip: {
trigger: 'item'
},
series: [
{
name: '',
type: 'pie',
radius: [40, 130],
center: ['50%', '50%'],
// roseType: 'area',
itemStyle: {
borderRadius: 1
},
avoidLabelOverlap: false,
labelLine: {
show: false
},
label: {
normal: {
position: 'inner',
show: true,
formatter: '{d}%',
fontSize: 24,
color: '#FFFFFF'
}
},
emphasis: {
label: {
show: true,
// fontSize: 36,
fontWeight: 'bold'
}
},
data: []
}
]
},
pieInitState: false, pieInitState: false,
pieData: [], pieData: [],
@ -118,7 +156,7 @@ export default {
async iniPieChart() { async iniPieChart() {
this.$refs.pieChart.clear(); this.$refs.pieChart.clear();
// 获取pieChart配置 // 获取pieChart配置
this.pieOption = pieOption();
this.pieOption.series[0].name = this.currentTab; this.pieOption.series[0].name = this.currentTab;
this.pieOption.series[0].data = this.pieData; this.pieOption.series[0].data = this.pieData;
this.$refs.pieChart.setOption(this.pieOption); this.$refs.pieChart.setOption(this.pieOption);
@ -131,9 +169,9 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
/deep/.pieMain3 { /deep/.pieMain3 {
.legend { .legend {
.legend-row{ .legend-row {
margin-top:10px!important margin-top: 10px !important;
}
} }
} }
}
</style> </style>

20
src/views/dataBoard/sida/cpts/fwBarOption01.js
View File

@ -107,24 +107,6 @@ export function pieOption() {
}]) }])
}, },
data: [] data: []
}, { } ]
name: '服务人数',
type: 'bar',
barWidth: 12,
stack: 'Ad',
emphasis: {
focus: 'series'
},
itemStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
offset: 0,
color: '#FFAA00'
}, {
offset: 1,
color: 'rgba(168,241,255,0)'
}])
},
data: []
}, ]
} }
} }

130
src/views/dataBoard/sida/cpts/zyqd.vue
View File

@ -114,7 +114,6 @@ export default {
}, },
// 获取房屋总数等 // 获取房屋总数等
async getInfo() { async getInfo() {
console.log('this.orgId', this.orgId);
let url = ''; let url = '';
if (this.currentTab == '人资源') { if (this.currentTab == '人资源') {
url = 'people_res_view'; url = 'people_res_view';
@ -195,7 +194,6 @@ export default {
type: 'sunburst', type: 'sunburst',
radius: ['20%', '100%'], radius: ['20%', '100%'],
center: ['50%', '50%'], center: ['50%', '50%'],
// roseType: 'area',
itemStyle: { itemStyle: {
borderRadius: 1 borderRadius: 1
}, },
@ -203,24 +201,21 @@ export default {
labelLine: { labelLine: {
show: false show: false
}, },
// {a}：系列名。
// {b}：数据名。
// {c}：数据值。
// {@xxx}：数据中名为 'xxx' 的维度的值，如 {@product} 表示名为 'product' 的维度的值。
// {@[n]}：数据中维度 n 的值，如 {@[3]} 表示维度 3 的值，从 0 开始计数。
label: { label: {
normal: { normal: {
position: 'inner', position: 'inner',
show: true, show: true,
formatter: '{@radio}', formatter: function(e) {
fontSize: 16, let data = e.data;
return `${data.radio}`;
},
fontSize:24,
color: '#FFFFFF' color: '#FFFFFF'
} }
}, },
emphasis: { emphasis: {
label: { label: {
show: true, show: true,
// fontSize: 36,
fontWeight: 'bold' fontWeight: 'bold'
} }
}, },
@ -229,119 +224,28 @@ export default {
] ]
}; };
this.pieOption.series[0].name = this.currentTab; this.pieOption.series[0].name = this.currentTab;
console.log('ddd', 'pieDatatotal');
let data = this.pieData; let data = this.pieData;
let pieDatatotal = data let pieDatatotal = data
.map(item => item.value) .map(item => item.value)
.reduce(function(prev, cur, index, arr) { .reduce(function(prev, cur, index, arr) {
console.log(prev, cur, index);
return prev + cur; return prev + cur;
}); });
console.log(pieDatatotal, 'pieDatatotal');
let data2 = data.map(item => { data.forEach(item => {
return { item.radio = item.value == 0 ? '0%' : ((item.value / pieDatatotal) * 100).toFixed(2) + '%';
value: item.value, if (item.children.length > 0) {
name: item.name, let children = item.children;
children: item.children, children.forEach(item2 => {
radio: item.value == 0 ? '0' : ((item.value / pieDatatotal) * 100).toFixed(2) item2.radio = item2.value == 0 ? '0%' : ((item2.value / pieDatatotal) * 100).toFixed(2) + '%';
}; });
}
}); });
console.log(data2, 'data2'); let data2 = [...data];
console.log('data2', data2);
this.pieOption.series[0].data = data2; this.pieOption.series[0].data = data2;
this.$refs.pieChart.setOption(this.pieOption); this.$refs.pieChart.setOption(this.pieOption);
// [
// {
// "org_id": "7b6f9a9f9f38d5f9fa7ce94a93d6eb28",
// "name": "志愿者",
// "count": 19,
// "child": [
// {
// "name": "调解员",
// "count": 0
// },
// {
// "name": "文化队伍",
// "count": 0
// },
// {
// "name": "楼委会",
// "count": 0
// },
// {
// "name": "老友俱乐部",
// "count": 0
// },
// {
// "name": "能人达人",
// "count": 0
// },
// {
// "name": "代办员",
// "count": 0
// },
// {
// "name": "采集员",
// "count": 0
// }
// ]
// },
// {
// "org_id": "7b6f9a9f9f38d5f9fa7ce94a93d6eb28",
// "name": "联建单位",
// "count": 7,
// "child": [
// {
// "name": "其他",
// "count": 1
// },
// {
// "name": "两新组织",
// "count": 0
// },
// {
// "name": "基金会",
// "count": 1
// },
// {
// "name": "楼宇党建",
// "count": 1
// },
// {
// "name": "民办非企业单位",
// "count": 1
// },
// {
// "name": "区域单位党建",
// "count": 0
// },
// {
// "name": "社会团体",
// "count": 0
// },
// {
// "name": "机关直属部门",
// "count": 2
// }
// ]
// },
// {
// "org_id": "7b6f9a9f9f38d5f9fa7ce94a93d6eb28",
// "name": "社区自组织",
// "count": 0,
// "child": [
// {
// "name": "组织",
// "count": 0
// },
// {
// "name": "网格",
// "count": 0
// }
// ]
// }
// ]
}, },
handelClickMyPei(item) { handelClickMyPei(item) {
this.handleClickItem(item); this.handleClickItem(item);

Write Preview
Loading…
Cancel
Save