From effd1877ca7f045a6b341f776f7cb0d43131ba65 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Fri, 28 Jul 2023 19:27:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/RigthBottLeftView.vue          | 44 +++++++++----------
 .../planFinishSituation/index.vue             |  4 +-
 .../planFinishSituation/index.vue             |  4 +-
 .../planFinishSituation/index.vue             |  4 +-
 4 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/RigthBottLeftView.vue b/src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/RigthBottLeftView.vue
index 0e76575..5d3b8ae 100644
--- a/src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/RigthBottLeftView.vue
+++ b/src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/RigthBottLeftView.vue
@@ -153,9 +153,9 @@ const getInvestMentData = async () => {
 		dataObj.value = res.result;
 	}
 };
-onMounted(() => {
+onMounted(async () => {
 	console.log(666);
-	getInvestMentData();
+	await getInvestMentData();
 	setjindua();
 	setjindub();
 	setjinduc();
@@ -185,7 +185,7 @@ const setjindua = () => {
 			{
 				top: "40%",
 				left: "center",
-				text: "97%",
+				text: dataObj.value.payRatio + "%",
 				textStyle: {
 					color: "#fff",
 					fontSize: 16
@@ -202,7 +202,7 @@ const setjindua = () => {
 				data: [
 					{
 						name: "",
-						value: 40,
+						value: dataObj.value.realPayAmountTotal,
 						labelLine: {
 							show: false
 						},
@@ -244,7 +244,7 @@ const setjindua = () => {
 					{
 						//画剩余的刻度圆环
 						name: "",
-						value: 3,
+						value: dataObj.value.totalAmount - dataObj.value.realPayAmountTotal,
 
 						itemStyle: {
 							borderColor: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -270,7 +270,7 @@ const setjindua = () => {
 					{
 						// 解决叠加明显的问题
 						name: "",
-						value: 0.2,
+						value: 0,
 						itemStyle: {
 							color: "rgba(0,0,0,0)"
 						}
@@ -287,7 +287,7 @@ const setjindub = () => {
 			{
 				top: "40%",
 				left: "center",
-				text: "97%",
+				text: dataObj.value.payRatio1 + "%",
 				textStyle: {
 					color: "#fff",
 					fontSize: 16
@@ -304,7 +304,7 @@ const setjindub = () => {
 				data: [
 					{
 						name: "",
-						value: 40,
+						value: dataObj.value.realPayAmountTotal,
 						labelLine: {
 							show: false
 						},
@@ -346,7 +346,7 @@ const setjindub = () => {
 					{
 						//画剩余的刻度圆环
 						name: "",
-						value: 3,
+						value: dataObj.value.settlementAmount - dataObj.value.realPayAmountTotal,
 
 						itemStyle: {
 							borderColor: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -389,7 +389,7 @@ const setjinduc = () => {
 			{
 				top: "40%",
 				left: "center",
-				text: "97%",
+				text: dataObj.value.payRatio2 + "%",
 				textStyle: {
 					color: "#fff",
 					fontSize: 16
@@ -407,7 +407,7 @@ const setjinduc = () => {
 				data: [
 					{
 						name: "",
-						value: 40,
+						value: dataObj.value.realPayAmountByYear,
 						labelLine: {
 							show: false
 						},
@@ -449,7 +449,7 @@ const setjinduc = () => {
 					{
 						//画剩余的刻度圆环
 						name: "",
-						value: 3,
+						value: dataObj.value.totalAmountByYear - dataObj.value.realPayAmountByYear,
 
 						itemStyle: {
 							borderColor: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -490,17 +490,17 @@ const setjindud = () => {
 	let data = [
 		{
 			name: "请款报审",
-			value: 165
+			value: dataObj.value.paymentTotal
 		},
 		{
-			name: "审定应付",
-			value: 206
+			name: "",
+			value: dataObj.value.totalAmount - dataObj.value.paymentTotal
 		}
 	];
 	myChart.setOption({
 		title: {
 			text: "请款情况",
-			top: "50%",
+			top: "52%",
 			left: "center",
 			textStyle: {
 				color: "white",
@@ -576,17 +576,17 @@ const setjindue = () => {
 	let data = [
 		{
 			name: "实际支付",
-			value: 200
+			value: dataObj.value.realPayAmountTotal
+		},
+		{
+			name: "",
+			value: dataObj.value.totalAmount - dataObj.value.realPayAmountTotal
 		}
-		// {
-		// 	name: "代付账款",
-		// 	value: 200
-		// }
 	];
 	myChart.setOption({
 		title: {
 			text: "支付情况",
-			top: "50%",
+			top: "52%",
 			left: "center",
 			textStyle: {
 				color: "white",
diff --git a/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue b/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue
index de9be2e..2a651bf 100644
--- a/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue
+++ b/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue
@@ -43,7 +43,9 @@
 					:onReset="true"
 				>
 					<template #investmentPaymentId="scope">
-						<span>{{ scope.row.investmentPaymentId ? "已支付" : "未支付" }}</span>
+						<span :style="{ color: scope.row.investmentPaymentId ? 'var(--el-menu-text-color)' : '#F80840' }">{{
+							scope.row.investmentPaymentId ? "已支付" : "未支付"
+						}}</span>
 					</template>
 					<template #applyStartTime="{ row }">
 						<span v-if="row.applyStartTime">{{ row.applyStartTime + "~" + row.applyEndTime }}</span>
diff --git a/src/views/hz-enterprise/progressManagement/planFinishSituation/index.vue b/src/views/hz-enterprise/progressManagement/planFinishSituation/index.vue
index 13c14c4..41bdafd 100644
--- a/src/views/hz-enterprise/progressManagement/planFinishSituation/index.vue
+++ b/src/views/hz-enterprise/progressManagement/planFinishSituation/index.vue
@@ -40,7 +40,9 @@
 					<el-button class="btnStyle" @click="handleAddItem">新增</el-button>
 				</template>
 				<template #investmentPaymentId="scope">
-					<span>{{ scope.row.investmentPaymentId ? "已支付" : "未支付" }}</span>
+					<span :style="{ color: scope.row.investmentPaymentId ? 'var(--el-menu-text-color)' : '#F80840' }">{{
+						scope.row.investmentPaymentId ? "已支付" : "未支付"
+					}}</span>
 				</template>
 				<template #operation="{ row }">
 					<el-button type="primary" link @click="handleItemDetail(2, row)">
diff --git a/src/views/hz-project/progressManagement/planFinishSituation/index.vue b/src/views/hz-project/progressManagement/planFinishSituation/index.vue
index 6044c18..dc6e50e 100644
--- a/src/views/hz-project/progressManagement/planFinishSituation/index.vue
+++ b/src/views/hz-project/progressManagement/planFinishSituation/index.vue
@@ -16,7 +16,9 @@
 				<el-button class="btnStyle" @click="handleAddItem">新增</el-button>
 			</template>
 			<template #investmentPaymentId="scope">
-				<span>{{ scope.row.investmentPaymentId ? "已支付" : "未支付" }}</span>
+				<span :style="{ color: scope.row.investmentPaymentId ? 'var(--el-menu-text-color)' : '#F80840' }">{{
+					scope.row.investmentPaymentId ? "已支付" : "未支付"
+				}}</span>
 			</template>
 			<template #applyStartTime="{ row }">
 				<span v-if="row.applyStartTime">{{ row.applyStartTime + "~" + row.applyEndTime }}</span>