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

清单bug

feature
tianqian 2 years ago
parent
1ebd3f4155
commit
c380aa4fff
6 changed files with 180 additions and 165 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      src/views/dataBoard/sida/cpts/fw03zr.vue
  2. 5
      src/views/dataBoard/sida/cpts/fw04gx.vue
  3. 312
      src/views/dataBoard/sida/cpts/fwqd.vue
  4. 12
      src/views/dataBoard/sida/cpts/zyqd.vue
  5. 3
      src/views/dataBoard/sida/index.vue
  6. 2
      src/views/dataBoard/sida/xq/list.vue

11
src/views/dataBoard/sida/cpts/fw03zr.vue
View File

@ -127,7 +127,8 @@
// mockId: 60031937,
});
if (code === 0) {
this.info = data[0].slice(0, 10);
console.log("data[0]",data[0])
this.info = data[0];
this.lineData1 = this.info.child_service_num.map(item => {
return {
name: item.common_service_type_name,
@ -142,6 +143,8 @@
per: (item.service_person_num / this.info.service_person_total * 100).toFixed(2) + '%'
};
});
this.lineData1=this.lineData1.slice(0, 10)
this.lineData2=this.lineData2.slice(0, 10)
this.resiCategoryData = [...this.lineData1];
console.log(this.resiCategoryData)
} else {
@ -151,4 +154,8 @@
}
};
</script>
<style lang="scss" src="@/assets/scss/dataBoard/renfang/index.scss" scoped></style>
<style lang="scss" src="@/assets/scss/dataBoard/renfang/index.scss" scoped>
/deep/.linecharts .item .item-name{
width: 100px;
}
</style>

5
src/views/dataBoard/sida/cpts/fw04gx.vue
View File

@ -88,8 +88,9 @@ export default {
);
this.$refs.pieChart.hideLoading();
if (code === 0) {
if (data && Array.isArray(data) && data.length > 0) {
let info = data[0].slice(0, 10);
let data1 = data.slice(0, 10)
if (data1 && Array.isArray(data1) && data1.length > 0) {
let info = data1[0];
this.info = {
...this.info,
...info

312
src/views/dataBoard/sida/cpts/fwqd.vue
View File

@ -1,11 +1,13 @@
<template>
<div class="m-fwqd">
<div class="tablist">
<div v-for="item in tabList" :key="item" :class="['item', { 'item-sel': currentTab == item }]" @click="handleClick(item)">{{ item }}</div>
<div v-for="item in tabList" :key="item" :class="['item', { 'item-sel': currentTab == item }]"
@click="handleClick(item)">{{ item }}</div>
</div>
<div class="pieMain">
<div class="legend">
<div class="legend-row " :key="'pie' + item.name" v-for="item in pieData" @click="handleClickItem(item)">
<div class="legend-row " :key="'pie' + item.name" v-for="item in pieData"
@click="handleClickItem(item)">
<div class="name">{{ item.name }}</div>
<div class="content">
<div class="num">{{ item.value }}</div>
@ -13,177 +15,181 @@
</div>
</div>
</div>
<div class="pie"><screen-echarts-frame @myChartMethod="pieInitOk" aria-controls="" ref="pieChart"></screen-echarts-frame></div>
<div class="pie"><screen-echarts-frame @myChartMethod="pieInitOk" aria-controls=""
ref="pieChart"></screen-echarts-frame></div>
</div>
</div>
</template>
<script>
import screenEchartsFrame from '@/views/dataBoard/cpts/screen-echarts-frame/index';
import { pieOption } from './fwqdPieOption.js';
import { requestPostBi } from '@/js/dai/request-bipass';
export default {
props: {
orgId: {
type: String,
default: ''
import screenEchartsFrame from '@/views/dataBoard/cpts/screen-echarts-frame/index';
import {
pieOption
} from './fwqdPieOption.js';
import {
requestPostBi
} from '@/js/dai/request-bipass';
export default {
props: {
orgId: {
type: String,
default: ''
},
searchDate: Array
},
searchDate: Array
},
data() {
return {
data: {},
showNoData: false,
timer: null,
pieChart: '',
pieOption: {},
pieInitState: false,
pieData: [],
tabList: [
'公共服务',
'个性服务'
// "下级人口分布",
],
currentTab: '公共服务'
};
},
components: {
screenEchartsFrame
},
mounted() {
// this.init();
},
watch: {
orgId() {
this.init();
data() {
return {
data: {},
showNoData: false,
timer: null,
pieChart: '',
pieOption: {},
pieInitState: false,
pieData: [],
tabList: ['公共服务', '个性服务'
// "下级人口分布",
],
currentTab: '公共服务'
};
},
searchDate() {
this.init();
}
},
methods: {
handleClick(item) {
this.currentTab = item;
this.getInfo();
components: {
screenEchartsFrame
},
mounted() {
// this.init();
},
async init() {
if (this.orgId) {
await this.getInfo();
this.getPie();
watch: {
orgId() {
this.init();
},
searchDate() {
this.init();
}
},
handleClickItem(item) {
let typeArr = { "全部": "all",
"志愿者": "volunteer",
"社区自组织": "community_org",
"联建单位": "party_unit",
"安全应急设备":"safety_emergency_equipment",
"公共服务设备":"common_service_equipment",
"安全生产场所":"enterprise",
"应急场所":"emergency_sites",
"城市管理":"city_management" };
// 场所资源
let path = '';
if (this.currentTab == '个性服务列表') {
path = 'gexingList';
} else if (this.currentTab == '公共服务列表') {
path = 'gonggongList';
}
this.getInfo();
console.log("item.name",item.name)
this.$router.push({
path: `/dataBoard/sida/fw/${path}`,
query: {
org_id: this.orgId,
type: this.currentTab,
type2: typeArr[item.name],
start_date: this.searchDate[0],
end_date: this.searchDate[1]
methods: {
handleClick(item) {
this.currentTab = item;
this.getInfo();
},
async init() {
if (this.orgId) {
await this.getInfo();
this.getPie();
}
});
},
// 获取房屋总数等
async getInfo() {
let url = '';
let mockId = 0;
if (this.currentTab == '公共服务') {
url = 'common_service_view';
mockId = 66900331;
} else {
url = 'self_service_view';
mockId = 66902813;
}
this.$refs.pieChart.showLoading();
const { data, code, msg } = await requestPostBi(
url,
{
},
handleClickItem(item) {
let typeArr = {
"全部": "all",
"志愿者": "volunteer",
"社区自组织": "community_org",
"联建单位": "party_unit",
"安全应急设备": "safety_emergency_equipment",
"公共服务设备": "common_service_equipment",
"安全生产场所": "enterprise",
"应急场所": "emergency_sites",
"城市管理": "city_management"
};
// 场所资源
let path = '';
if (this.currentTab == '个性服务列表') {
path = 'gexingList';
} else if (this.currentTab == '公共服务列表') {
path = 'gonggongList';
}
this.getInfo();
console.log("item.name", item.name)
this.$router.push({
path: `/dataBoard/sida/fw/${path}`,
query: {
org_id: this.orgId,
type: this.currentTab,
type2: typeArr[item.name],
start_date: this.searchDate[0],
end_date: this.searchDate[1]
}
});
},
// 获取房屋总数等
async getInfo() {
let url = '';
let mockId = 0;
if (this.currentTab == '公共服务') {
url = 'common_service_view';
mockId = 66900331;
} else {
url = 'self_service_view';
mockId = 66902813;
}
this.$refs.pieChart.showLoading();
const {
data,
code,
msg
} = await requestPostBi(url, {
queryParam: {
org_id: this.orgId,
start_date: this.searchDate[0],
end_date: this.searchDate[1]
}
},
{
}, {
// mockId: mockId,
});
this.$refs.pieChart.hideLoading();
if (code === 0) {
let data1 = data.slice(0, 10)
// if (data1 && Array.isArray(data1) && data1.length > 0) {
// // let info = data1[0];
// // this.info = {
// // ...this.info,
// // ...info
// // };
// }
this.data = data1.sort((a, b) => {
return b.count - a.count;
});
this.setPieData();
} else {
this.$message.error(msg);
}
);
this.$refs.pieChart.hideLoading();
if (code === 0) {
if (data && Array.isArray(data) && data.length > 0) {
let info = data[0].slice(0, 10);
this.info = {
...this.info,
...info
};
},
pieInitOk() {
this.pieInitState = true;
},
getPie() {
if (this.pieInitState) {
this.setPieData();
} else {
setTimeout(() => {
this.getPie();
}, 500);
}
this.data = data.sort((a, b) => {
return b.count - a.count;
});
this.setPieData();
} else {
this.$message.error(msg);
}
},
pieInitOk() {
this.pieInitState = true;
},
getPie() {
if (this.pieInitState) {
this.setPieData();
} else {
setTimeout(() => {
this.getPie();
}, 500);
},
setPieData() {
let {
data
} = this;
data = JSON.parse(JSON.stringify(data).replace(/count/g, 'value'));
this.pieData = data;
this.iniPieChart();
},
// 获取饼状图
async iniPieChart() {
this.$refs.pieChart.clear();
// 获取pieChart配置
this.pieOption = pieOption();
this.pieOption.series[0].name = this.currentTab;
this.pieOption.series[0].data = this.pieData;
this.$refs.pieChart.setOption(this.pieOption);
},
handelClickMyPei(item) {
this.handleClickItem(item);
}
},
setPieData() {
let { data } = this;
data = JSON.parse(JSON.stringify(data).replace(/count/g, 'value'));
this.pieData = data;
this.iniPieChart();
},
// 获取饼状图
async iniPieChart() {
this.$refs.pieChart.clear();
// 获取pieChart配置
this.pieOption = pieOption();
this.pieOption.series[0].name = this.currentTab;
this.pieOption.series[0].data = this.pieData;
this.$refs.pieChart.setOption(this.pieOption);
},
handelClickMyPei(item) {
this.handleClickItem(item);
}
}
};
};
</script>
<style lang="scss" src="@/assets/scss/dataBoard/renfang/index.scss" scoped></style>
<style lang="scss" scoped>
.pieMain .legend{margin-top:0px;}
</style>
.pieMain .legend {
margin-top: 0px;
}
</style>

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

@ -184,7 +184,7 @@ export default {
this.$refs.pieChart.clear();
// 获取pieChart配置
this.pieOption = {
color: ['#1A95FF', '#FF6138', '#2adcea', '#2cc4ad', '#7377f5', '#32de66', '#8155d4', '#c7ea48', '#ef47c2', 'd43349'],
color: ['#d43349','#1A95FF', '#FF6138', '#2adcea', '#2cc4ad', '#7377f5', '#32de66', '#8155d4', '#c7ea48', '#ef47c2', ],
tooltip: {
trigger: 'item'
},
@ -199,24 +199,25 @@ export default {
},
avoidLabelOverlap: false,
labelLine: {
show: false
show: true
},
label: {
normal: {
position: 'inner',
position: 'top',
show: true,
formatter: function(e) {
let data = e.data;
return `${data.radio}`;
},
fontSize:24,
fontSize:20,
color: '#FFFFFF'
}
},
emphasis: {
label: {
show: true,
fontWeight: 'bold'
fontWeight: 'bold',
position: 'outer',
}
},
data: []
@ -244,7 +245,6 @@ export default {
let data2 = [...data];
console.log('data2', data2);
this.pieOption.series[0].data = data2;
this.$refs.pieChart.setOption(this.pieOption);
},
handelClickMyPei(item) {

3
src/views/dataBoard/sida/index.vue
View File

@ -145,7 +145,8 @@ export default {
path: '/dataBoard/sida/fw',
query: {
org_id: this.orgId,
searchDate:this.searchDate
start_date:this.searchDate[0],
end_date:this.searchDate[1],
}
});
},

2
src/views/dataBoard/sida/xq/list.vue
View File

@ -220,7 +220,7 @@ export default {
page_num,
page_size,
start_date,
end_datem
end_date
}
},
{

Write Preview
Loading…
Cancel
Save