bug

src/views/dataBoard/sida/cpts/fw05zc.vue

@@ -2,19 +2,41 @@
 	<div class="m-zyqd">
 
 		<el-row :gutter="16">
-			<el-col :span="8">
				<div class="kuangkuang">
					<h3>发布政策数</h3>
					<h2>{{info.pub_policy_total}}</h2>
				</div>
			</el-col>
			<el-col :span="8">
				<div class="kuangkuang">
					<h3>指派服务数</h3>
				<h2>{{info.assign_service_total}}</h2>
				</div>
			</el-col>
			<el-col :span="8">
				<div class="kuangkuang">
					<h3>政策找人数</h3>
				<h2>{{info.policy_search_person_total}}</h2>
				</div>
			</el-col>
+			<el-col :span="8">
+				<div class="kuangkuang">
+					<h3>发布政策数</h3>
+					<h2>{{info.pub_policy_total}}</h2>
+				</div>
+			</el-col>
+			<el-col :span="8">
+				<div class="kuangkuang">
+					<h3>指派服务数</h3>
+					<h2>{{info.assign_service_total}}</h2>
+				</div>
+			</el-col>
+			<el-col :span="8">
+				<div class="kuangkuang">
+					<h3>政策找人数</h3>
+					<h2>{{info.policy_search_person_total}}</h2>
+				</div>
+			</el-col>
 
 		</el-row>
 		<div class="pieMain pieMain2">
-			<div class="pie"><screen-echarts-frame @myChartMethod="pieInitOk" ref="pieChart"></screen-echarts-frame></div>
+			<div class="pie"><screen-echarts-frame @myChartMethod="pieInitOk" ref="pieChart"></screen-echarts-frame>
+			</div>
 		</div>
 	</div>
 </template>
 <script>
-import screenEchartsFrame from '@/views/dataBoard/cpts/screen-echarts-frame/index';
-import { pieOption } from './fwBarOption05.js';
-import { requestPostBi } from '@/js/dai/request-bipass';
-export default {
+	import screenEchartsFrame from '@/views/dataBoard/cpts/screen-echarts-frame/index';
+	import {
+		pieOption
+	} from './fwBarOption05.js';
+	import {
+		requestPostBi
+	} from '@/js/dai/request-bipass';
+	export default {
 		props: {
 			orgId: {
 				type: String,
@@ -51,16 +73,18 @@ export default {
 			async getInfo() {
 				let url = 'policy_search_person';
 				this.$refs.pieChart.showLoading();
-			const { data, code, msg } = await requestPostBi(
-				url,
-				{
+				const {
+					data,
+					code,
+					msg
+				} = await requestPostBi(
+					url, {
 						queryParam: {
 							org_id: this.orgId,
 							start_date: this.searchDate[0],
 							end_date: this.searchDate[1]
 						}
-				},
-				{
+					}, {
 						// mockId: 69463163,
 					}
 				);
@@ -104,11 +128,15 @@ export default {
 				let pieData1 = [];
 				let pieData2 = [];
 				let pieData3 = [];
+
+				let i = 0;
 				data.forEach((item, index) => {
+					if ((item.assign_service_num > 0 || item.pub_policy_num > 0) && i < 10) {
 						pieData0.push(item.common_service_type_name);
 						pieData1.push(item.assign_service_num);
 						pieData2.push(item.pub_policy_num);
-				
+						i++;
+					}
 				});
 
 				this.pieData = [pieData0, pieData1, pieData2];
@@ -126,10 +154,12 @@ export default {
 				this.$refs.pieChart.setOption(this.pieOption);
 			}
 		}
-};
+	};
 </script>
 
 <style lang="scss" src="@/assets/scss/dataBoard/renfang/index.scss" scoped></style>
 <style scoped>
-	.pieMain2{margin-left:0px!important}
+	.pieMain2 {
+		margin-left: 0px !important
+	}
 </style>

src/views/dataBoard/sida/cpts/fwBarOption04.js

@@ -43,7 +43,7 @@ export function pieOption() {
 				alignWithLabel: true
 			},
 			axisLabel: {
-				interval: 1,
+				interval: 0,
 				show: true,
 				textStyle: {
 					color: 'rgba(255,255,255,0.85)', //更改坐标轴文字颜色

src/views/dataBoard/sida/cpts/fwBarOption05.js

@@ -43,7 +43,7 @@ export function pieOption() {
 				alignWithLabel: true
 			},
 			axisLabel: {
-				interval: 3,
+				interval:0,
 				// rotate: 40,
 				show: true,
 				textStyle: {
@@ -75,6 +75,7 @@ export function pieOption() {
 			},
 		}],
 		series: [{
+			realtimeSort: true,
 			name: '指派服务数',
 			type: 'bar',
 			barWidth: 12,

src/views/dataBoard/sida/zy/gonggongList.vue

@@ -1,5 +1,6 @@
 <template>
 	<div>
+		
 		<cpt-tb :col-list="colList" :loading="loading" :header="header" :list="list" :total="total"
 			@handleSizeChange="handleSizeChange" @handlePageNoChange="handlePageNoChange" @operate="showInfo"></cpt-tb>
 		<detail @close="detailId = ''" :detailId="detailId" :detailType="detailType" v-if="detailId != ''" />
@@ -98,9 +99,9 @@
 				if (this.detailType == "volunteer") {
 					service_org_type = "ic_user_volunteer"
 				} else if (this.detailType == "community_org") {
-					service_org_type = "party_unit"
-				} else if (this.detailType == "party_unit") {
 					service_org_type = "community_org"
+				} else if (this.detailType == "party_unit") {
+					service_org_type = "party_unit"
 				}
 				this.loading = true;
 				const url = 'common_service_list';
@@ -160,9 +161,9 @@
 				if (this.detailType == "volunteer") {
 					service_org_type = "ic_user_volunteer"
 				} else if (this.detailType == "community_org") {
-					service_org_type = "party_unit"
-				} else if (this.detailType == "party_unit") {
 					service_org_type = "community_org"
+				} else if (this.detailType == "party_unit") {
+					service_org_type = "party_unit"
 				}
 				const {
 					data,

src/views/dataBoard/sida/zy/peopleRes-detail.vue

@@ -128,7 +128,8 @@
 						{{ item }}
 					</div>
 				</div>
-				<div v-if="currentTab == '个性服务'"><gexingList :id="detailId" :detailType="detailType"></gexingList></div>
+				<div v-if="currentTab == '个性服务'">
+					<gexingList :id="detailId" :detailType="detailType"></gexingList></div>
 				<div v-if="currentTab == '公共服务'"><gonggongList :id="detailId" :detailType="detailType" v-if="detailId != '' || detailType == '联建单位'"></gonggongList></div>
 				<div v-if="currentTab == '联建活动' && detailType == '联建单位'"><lianjianList :id="detailId" :detailType="detailType"></lianjianList></div>
 			</div>
@@ -254,7 +255,7 @@ export default {
 			let mockId = 0;
 			let typeArr = { all: '全部', volunteer: '志愿者', community_org: '社区自组织', party_unit: '联建单位' };
 
-			console.log('this.detailId', this.detailId);
+			console.log('this.detailType', this.detailType);
 			this.title = typeArr[this.detailType] + '详情';
 			if (this.detailType == 'volunteer') {
 				url = 'resident_info';