From df087d7cb894cd63db26abf0eb3b2363079ad5c7 Mon Sep 17 00:00:00 2001
From: tianqian <277562116@qq.com>
Date: Thu, 8 Jun 2023 15:31:53 +0800
Subject: [PATCH] bug

---
 src/views/dataBoard/sida/cpts/fw03zr.vue      |  2 +-
 src/views/dataBoard/sida/cpts/fw04gx.vue      |  2 +-
 src/views/dataBoard/sida/cpts/fwqd.vue        |  3 ++-
 src/views/dataBoard/sida/cpts/xqqd.vue        |  1 +
 src/views/dataBoard/sida/xq/list.vue          | 24 ++++++++++++++++---
 .../modules/shequzhili/issue/cpts/add.vue     |  2 +-
 .../shequzhili/issue/cpts/process-form.vue    |  7 +++---
 7 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/views/dataBoard/sida/cpts/fw03zr.vue b/src/views/dataBoard/sida/cpts/fw03zr.vue
index 74c5b81ae..6e0ab70b9 100644
--- a/src/views/dataBoard/sida/cpts/fw03zr.vue
+++ b/src/views/dataBoard/sida/cpts/fw03zr.vue
@@ -127,7 +127,7 @@
 					// mockId: 60031937,
 				});
 				if (code === 0) {
-					this.info = data[0];
+					this.info = data[0].slice(0, 10);
 					this.lineData1 = this.info.child_service_num.map(item => {
 						return {
 							name: item.common_service_type_name,
diff --git a/src/views/dataBoard/sida/cpts/fw04gx.vue b/src/views/dataBoard/sida/cpts/fw04gx.vue
index 1a210dd11..6bb7290ba 100644
--- a/src/views/dataBoard/sida/cpts/fw04gx.vue
+++ b/src/views/dataBoard/sida/cpts/fw04gx.vue
@@ -89,7 +89,7 @@ export default {
 			this.$refs.pieChart.hideLoading();
 			if (code === 0) {
 				if (data && Array.isArray(data) && data.length > 0) {
-					let info = data[0];
+					let info = data[0].slice(0, 10);
 					this.info = {
 						...this.info,
 						...info
diff --git a/src/views/dataBoard/sida/cpts/fwqd.vue b/src/views/dataBoard/sida/cpts/fwqd.vue
index 933585ef5..997a7026f 100644
--- a/src/views/dataBoard/sida/cpts/fwqd.vue
+++ b/src/views/dataBoard/sida/cpts/fwqd.vue
@@ -131,12 +131,13 @@ export default {
 			this.$refs.pieChart.hideLoading();
 			if (code === 0) {
 				if (data && Array.isArray(data) && data.length > 0) {
-					let info = data[0];
+					let info = data[0].slice(0, 10);
 					this.info = {
 						...this.info,
 						...info
 					};
 				}
+				
 				this.data = data.sort((a, b) => {
 					return b.count - a.count;
 				});
diff --git a/src/views/dataBoard/sida/cpts/xqqd.vue b/src/views/dataBoard/sida/cpts/xqqd.vue
index 8c38fa5b0..1343572c6 100644
--- a/src/views/dataBoard/sida/cpts/xqqd.vue
+++ b/src/views/dataBoard/sida/cpts/xqqd.vue
@@ -78,6 +78,7 @@ export default {
 					type2: item.name,
 					start_date: this.searchDate[0],
 					end_date: this.searchDate[1]
+					
 				}
 			});
 		},
diff --git a/src/views/dataBoard/sida/xq/list.vue b/src/views/dataBoard/sida/xq/list.vue
index b916a5d3e..dc862e84a 100644
--- a/src/views/dataBoard/sida/xq/list.vue
+++ b/src/views/dataBoard/sida/xq/list.vue
@@ -13,13 +13,15 @@
 				</el-select>
 
 				<el-select v-model="type2" @change="init" :clearable="true" class="left10">
-					<el-option value="全部">全部</el-option>
+					
 					<template v-if="listType == '个性需求'">
+						<el-option value="全部">全部</el-option>
 						<el-option value="商家支撑">商家支撑</el-option>
 						<el-option value="服务支撑">服务支撑</el-option>
 						<el-option value="政府支撑">政府支撑</el-option>
 					</template>
 					<template v-if="listType == '共性需求'">
+						<el-option value="全部">全部</el-option>
 						<el-option value="社区养老">社区养老</el-option>
 						<el-option value="社会保障">社会保障</el-option>
 						<el-option value="社区救助">社区救助</el-option>
@@ -201,16 +203,24 @@ export default {
 			const end_date = searchDate[1];
 			this.loading = true;
 			const url = 'need_list';
+			let parent_support_type_code=""
+			 if(listType=="个性需求")
+			 {
+				 parent_support_type_code="user_demand"
+			 }else{
+				 parent_support_type_code="common_demand"
+			 } 
 			const { data, code, msg } = await requestPostBi(
 				url,
 				{
 					queryParam: {
 						org_id,
+						parent_support_type_code:parent_support_type_code,
 						type: this.type2,
 						page_num,
 						page_size,
 						start_date,
-						end_date
+						end_datem
 					}
 				},
 				{
@@ -260,12 +270,20 @@ export default {
 			const start_date = searchDate[0];
 			const end_date = searchDate[1];
 			const url = 'need_list_num';
-
+			let parent_support_type_code=""
+             if(listType=="个性需求")
+			 {
+				 parent_support_type_code="user_demand"
+			 }else{
+				 parent_support_type_code="common_demand"
+			 } 
+			
 			const { data, code, msg } = await requestPostBi(
 				url,
 				{
 					queryParam: {
 						org_id,
+						parent_support_type_code:parent_support_type_code,
 						type: this.type2,
 						start_date,
 						end_date
diff --git a/src/views/modules/shequzhili/issue/cpts/add.vue b/src/views/modules/shequzhili/issue/cpts/add.vue
index 9c411a682..f55f33af5 100644
--- a/src/views/modules/shequzhili/issue/cpts/add.vue
+++ b/src/views/modules/shequzhili/issue/cpts/add.vue
@@ -765,7 +765,7 @@ export default {
   scoped
 ></style>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .el-dialog__body {
   padding: 0 10px 16px !important;
 }
diff --git a/src/views/modules/shequzhili/issue/cpts/process-form.vue b/src/views/modules/shequzhili/issue/cpts/process-form.vue
index 74d03500b..6861198b8 100644
--- a/src/views/modules/shequzhili/issue/cpts/process-form.vue
+++ b/src/views/modules/shequzhili/issue/cpts/process-form.vue
@@ -319,12 +319,13 @@ export default {
 
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/shequzhili/event-info.scss";
+.el-dialog__body {
+  padding: 0 10px 16px !important;
+}
 </style>
 
 
 
 <style>
-.el-dialog__body {
-  padding: 0 10px 16px !important;
-}
+
 </style>