elink-star
/
epmet-oper-gov
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

历史未完成

dev
tianq 3 years ago
parent
1781b983e1
commit
e1d1f4d190
3 changed files with 81 additions and 91 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. 19
      src/views/modules/census/census-accountActiveList.vue
  2. 11
      src/views/modules/census/census-accountList.vue
  3. 124
      src/views/modules/census/census-houseList.vue

19
src/views/modules/census/census-accountActiveList.vue
View File

@ -72,8 +72,6 @@
<el-table-column prop="accountActivityCount" label="活跃账号数" align="center" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="accountActivityCount" label="活跃账号数" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="accountCount" align="center" width="110" label="总账号数" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="accountCount" align="center" width="110" label="总账号数" :show-overflow-tooltip="true"></el-table-column>
</el-table> </el-table>
</div> </div>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -101,7 +99,6 @@
<el-table-column label="序号" fixed="left" type="index" align="center" width="50" /> <el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
<el-table-column prop="agencyName" align="center" label="组织名称" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="agencyName" align="center" label="组织名称" :show-overflow-tooltip="true"></el-table-column>
</el-table> </el-table>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
@ -154,9 +151,9 @@ export default {
tableData: [], tableData: [],
formData: { formData: {
orgId:"", orgId: '',
startDate:"", startDate: '',
endDate:"", endDate: ''
}, },
cateOptions: [], cateOptions: [],
eventTypeCheck: [], eventTypeCheck: [],
@ -289,7 +286,7 @@ export default {
console.log('getCountLeveldata', data); console.log('getCountLeveldata', data);
if (code === 0) { if (code === 0) {
this.censusData = data; this.censusData = data;
console.log("this.censusData ",this.censusData ) console.log('this.censusData ', this.censusData);
} else { } else {
this.$message.error(msg); this.$message.error(msg);
} }
@ -339,13 +336,12 @@ export default {
} }
}, },
deepTree(arr, child) { deepTree(arr) {
if (Array.isArray(arr) && arr.length > 0) { if (Array.isArray(arr)) {
return arr.map(item => { return arr.map(item => {
// if (child === 'subAgencyList') item.value = item.orgType + '-' + item.orgId
return { return {
...item, ...item,
[child]: (item[child] && item[child].length > 0 && this.deepTree(item[child], child)) || null subAgencyList: (item.subAgencyList.length > 0 && this.deepTree(item.subAgencyList)) || null
}; };
}); });
} }
@ -359,7 +355,6 @@ export default {
@import '@/assets/scss/modules/management/list-main.scss'; @import '@/assets/scss/modules/management/list-main.scss';
@import '@/assets/scss/modules/shequzhili/event-info.scss'; @import '@/assets/scss/modules/shequzhili/event-info.scss';
.btnSearch { .btnSearch {
width: 100px; width: 100px;
height: 36px; height: 36px;
background: #2195fe; background: #2195fe;

11
src/views/modules/census/census-accountList.vue
View File

@ -449,15 +449,14 @@ export default {
this.pageNo = val; this.pageNo = val;
this.showNext(); this.showNext();
}, },
deepTree(arr, child) { deepTree(arr) {
if (Array.isArray(arr) && arr.length > 0) { if (Array.isArray(arr)) {
return arr.map(item => { return arr.map(item => {
// if (child === 'subAgencyList') item.value = item.orgType + '-' + item.orgId
return { return {
...item, ...item,
[child]: (item[child] && item[child].length > 0 && this.deepTree(item[child], child)) || null subAgencyList: item.subAgencyList.length > 0 && this.deepTree(item.subAgencyList) || null
}; }
}); })
} }
}, },
pieInitOk() { pieInitOk() {

124
src/views/modules/census/census-houseList.vue
View File

@ -58,7 +58,19 @@
></screen-echarts-frame> ></screen-echarts-frame>
</div> </div>
</el-col> </el-col>
<el-col :span="12"></el-col> <el-col :span="12" style="display:flex;align-items: center;">
<div class="legend">
<div class="legend-row" :key="item.name" v-for="(item, index) in chartData.data" @click="handleClickItem(item)">
<div class="kuai" :style="{ backgroundColor: color[index] }"></div>
<div class="content">
<div class="name">{{ item.name }}</div>
<div class="num">{{ item.value }}</div>
<div class="unit" :style="{ color: color[index] }">{{ item.value / 100 }}%</div>
</div>
</div>
</div>
</el-col>
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -173,7 +185,10 @@ export default {
pieInitState: false, pieInitState: false,
pieInitState2: false, pieInitState2: false,
pieOption: [], pieOption: [],
pieOption2: [] pieOption2: [],
color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
chartData: [],
pieData: []
}; };
}, },
computed: { computed: {
@ -291,14 +306,10 @@ export default {
// let data = [...this.pieData]; // let data = [...this.pieData];
// console.log('data', data); // console.log('data', data);
let chartData = { let chartData = {
name: ['1', '2', '3', '4'], name: ['反骨', '反骨2', '反骨3', '反骨4'],
data: [ data: [{ value: 62, name: '反骨' }, { value: 44, name: '反骨2' }, { value: 123, name: '反骨3' }, { value: 232, name: '反骨4' }]
{ value: 23, id: '22', level: 'ddd', name: 'name' },
{ value: 23, id: '22', level: 'ddd', name: 'name' },
{ value: 23, id: '22', level: 'ddd', name: 'name' },
{ value: 23, id: '22', level: 'ddd', name: 'name' }
]
}; };
this.chartData = chartData;
// chartData.name = data.map(item => item.agencyName); // chartData.name = data.map(item => item.agencyName);
// chartData.data = data.map(item => { // chartData.data = data.map(item => {
// return { value: item.count, id: item.agencyId, level: item.agencyLevel, name: item.agencyName }; // return { value: item.count, id: item.agencyId, level: item.agencyLevel, name: item.agencyName };
@ -312,12 +323,7 @@ export default {
// console.log('data', data); // console.log('data', data);
let chartData = { let chartData = {
name: ['1', '2', '3', '4'], name: ['1', '2', '3', '4'],
data: [ data: [{ value: 62, name: '1' }, { value: 243, name: '2' }]
{ value: 23, id: '22', level: 'ddd', name: 'name' },
{ value: 23, id: '22', level: 'ddd', name: 'name' },
{ value: 23, id: '22', level: 'ddd', name: 'name' },
{ value: 23, id: '22', level: 'ddd', name: 'name' }
]
}; };
// chartData.name = data.map(item => item.agencyName); // chartData.name = data.map(item => item.agencyName);
// chartData.data = data.map(item => { // chartData.data = data.map(item => {
@ -331,35 +337,7 @@ export default {
this.$refs.pieChart.clear(); this.$refs.pieChart.clear();
// 获取pieChart配置 // 获取pieChart配置
this.pieOption = { this.pieOption = {
// legend: { color: this.color,
// itemHeight: 14,
// itemWidth: 14,
// icon: 'rect',
// orient: 'vertical',
// top: 'center',
// right: '5%',
// textStyle: {
// align: 'left',
// color: '#',
// verticalAlign: 'middle',
// rich: {
// name: {
// width: 80,
// fontSize: 16
// },
// value: { width: 20, align: 'right', fontFamily: 'Medium', fontSize: 16 },
// rate: { width: 10, align: 'right', fontSize: 16 }
// }
// },
// // data: datas,
// formatter: name => {
// // if (datas.length) {
// // const item = datas.filter(item => item.name === name)[0];
// // return `{name|${name}}{value| ${item.value}} {rate| 宗}`;
// // }
// }
// },
color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#FEB349', '#FE6252'],
title: { title: {
text: '12345', text: '12345',
subtext: '房屋总数(分)', subtext: '房屋总数(分)',
@ -416,24 +394,18 @@ export default {
tooltip: { tooltip: {
show: true show: true
}, },
data: [ data: chartData.data
{ value: 1048, name: 'Search Engine' },
{ value: 735, name: 'Direct' },
{ value: 580, name: 'Email' },
{ value: 484, name: 'Union Ads' },
{ value: 300, name: 'Video Ads' }
]
} }
] ]
}; };
this.$refs.pieChart.setOption(this.pieOption); this.$refs.pieChart.setOption(this.pieOption);
}, },
async iniPieChart2(chartData) { async iniPieChart2(chartData) {
console.log('dddddddddddd');
this.$refs.pieChart2.clear(); this.$refs.pieChart2.clear();
// 获取pieChart配置 // 获取pieChart配置
this.pieOption2 = { this.pieOption2 = {
color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#FEB349', '#FE6252'], color: this.color,
title: { title: {
text: '12345', text: '12345',
subtext: '房屋总数(分)', subtext: '房屋总数(分)',
@ -463,13 +435,7 @@ export default {
show: true show: true
}, },
z: 9999, z: 9999,
data: [ data: chartData.data
{ value: 1048, name: 'Search Engine' },
{ value: 735, name: 'Direct' },
{ value: 580, name: 'Email' },
{ value: 484, name: 'Union Ads' },
{ value: 300, name: 'Video Ads' }
]
}, },
{ {
type: 'pie', type: 'pie',
@ -590,13 +556,12 @@ export default {
this.formData.orgId = obj.agencyId; this.formData.orgId = obj.agencyId;
this.formData.level = obj.level; this.formData.level = obj.level;
}, },
deepTree(arr, child) { deepTree(arr) {
if (Array.isArray(arr) && arr.length > 0) { if (Array.isArray(arr)) {
return arr.map(item => { return arr.map(item => {
// if (child === 'subAgencyList') item.value = item.orgType + '-' + item.orgId
return { return {
...item, ...item,
[child]: (item[child] && item[child].length > 0 && this.deepTree(item[child], child)) || null subAgencyList: (item.subAgencyList.length > 0 && this.deepTree(item.subAgencyList)) || null
}; };
}); });
} }
@ -609,6 +574,37 @@ export default {
@import '@/assets/scss/buttonstyle.scss'; @import '@/assets/scss/buttonstyle.scss';
@import '@/assets/scss/modules/management/list-main.scss'; @import '@/assets/scss/modules/management/list-main.scss';
@import '@/assets/scss/modules/shequzhili/event-info.scss'; @import '@/assets/scss/modules/shequzhili/event-info.scss';
.legend {
display: flex;flex-flow:row wrap;
.legend-row {
width: 33.3%;
display: flex;
margin-bottom: 30px;
.kuai {
width: 12px;
height: 12px;
border-radius: 4px;
}
.content {
.name {
font-size: 14px;
color: #999;
}
.num {
font-size: 16px;
font-weight: bold;
display: inline-block;
}
.unit{
font-size: 16px;
display: inline-block;
margin-left: 15px;
}
}
}
}
.btnSearch { .btnSearch {
width: 100px; width: 100px;
height: 36px; height: 36px;

Write Preview
Loading…
Cancel
Save