From 57055359f4526daff1612ee0fc92ee3a82a1ee18 Mon Sep 17 00:00:00 2001
From: X_Rian <904416525@qq.com>
Date: Thu, 31 Oct 2024 19:08:20 +0800
Subject: [PATCH] =?UTF-8?q?flx:=E6=8F=90=E4=BA=A4=E7=8E=B0=E5=9C=BA?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../agjtLiveScreen/liveScreen/leftTop.vue     | 76 +++++++++++++------
 1 file changed, 53 insertions(+), 23 deletions(-)

diff --git a/src/views/agjtLiveScreen/liveScreen/leftTop.vue b/src/views/agjtLiveScreen/liveScreen/leftTop.vue
index 3bc58a4..8f9931c 100644
--- a/src/views/agjtLiveScreen/liveScreen/leftTop.vue
+++ b/src/views/agjtLiveScreen/liveScreen/leftTop.vue
@@ -18,9 +18,19 @@
 						</div>
 						<div class="lineBox">
 							<div class="boxInner1">
+								<span class="aLine">项目名称：</span>
+								<span class="cLine">{{ item.name || "--" }}</span>
+							</div>
+							<div class="boxInner2">
 								<span class="aLine">项目编号：</span>
 								<span class="cLine">{{ item.projectEnterprise.projectNumber || "--" }}</span>
 							</div>
+						</div>
+						<div class="lineBox">
+							<div class="boxInner1">
+								<span class="aLine">项目经理：</span>
+								<span class="cLine">{{ item.projectEnterprise.projectManage || "--" }}</span>
+							</div>
 							<div class="boxInner2">
 								<span class="aLine">建筑面积：</span>
 								<span v-if="item.projectEnterprise.projectAcreage"
@@ -31,8 +41,8 @@
 						</div>
 						<div class="lineBox">
 							<div class="boxInner1">
-								<span class="aLine">项目经理：</span>
-								<span class="cLine">{{ item.projectEnterprise.projectManage || "--" }}</span>
+								<span class="aLine">项目类型：</span>
+								<span class="cLine">{{ item.projectEnterprise.cbsProjectTypeName || "--" }}</span>
 							</div>
 							<div class="boxInner2">
 								<span class="aLine">联系电话：</span>
@@ -41,23 +51,13 @@
 						</div>
 						<div class="lineBox">
 							<div class="boxInner1">
-								<span class="aLine">项目类型：</span>
-								<span class="cLine">{{ item.projectEnterprise.cbsProjectTypeName || "--" }}</span>
-							</div>
-							<div class="boxInner2">
 								<span class="aLine">工程类别：</span>
 								<span class="cLine">{{ item.projectEnterprise.projectTypeName || "--" }}</span>
 							</div>
-						</div>
-						<div class="lineBox">
-							<div class="boxInner1">
+							<div class="boxInner2">
 								<span class="aLine">开工日期：</span>
 								<span class="cLine">{{ item.projectEnterprise.startWorkDate || "--" }}</span>
 							</div>
-							<div class="boxInner2">
-								<span class="aLine">竣工日期：</span>
-								<span class="cLine">{{ item.projectEnterprise.completionDate || "--" }}</span>
-							</div>
 						</div>
 						<div class="lineBox">
 							<div class="boxInner1">
@@ -65,8 +65,8 @@
 								<span class="cLine">{{ item.projectEnterprise.constructionStageName || "--" }}</span>
 							</div>
 							<div class="boxInner2">
-								<span class="aLine">结构类型：</span>
-								<span class="cLine">{{ item.projectEnterprise.structureTypeName || "--" }}</span>
+								<span class="aLine">竣工日期：</span>
+								<span class="cLine">{{ item.projectEnterprise.completionDate || "--" }}</span>
 							</div>
 						</div>
 						<div class="lineBox">
@@ -75,6 +75,10 @@
 								<span class="cLine">{{item.projectEnterprise.projectBuildArea || '--'}}</span>
 							</div> -->
 							<div class="boxInner1">
+								<span class="aLine">结构类型：</span>
+								<span class="cLine">{{ item.projectEnterprise.structureTypeName || "--" }}</span>
+							</div>
+							<div class="boxInner2">
 								<span class="aLine">工程状态：</span>
 								<span class="cLine">{{
 									item.projectEnterprise.bulidStatus == 0
@@ -207,19 +211,45 @@ async function getCbsProjectInfo() {
 	});
 	cbsProjectInfo.value = [];
 	peList.map((item: any, i: any) => {
-		cbsProjectInfo.value.push(item);
 		let processList = pList.filter((item2: any) => item2.enterpriseId == item.id) || [];
-		if (processList.length == 0) return;
+		if (processList.length == 0) {
+			cbsProjectInfo.value.push(item);
+			return
+		};
 		// console.log(555555555, processList);
+		const resultList = item.supplierInfos.map((ele: any) => {
+				return [{
+					...item,
+					name: ele.cbsName,
+					projectEnterprise: ele,
+				},{
+					id: item.id,
+					name: ele.cbsName,
+					lbType: 2,
+					processList: processList.map((item3: any) => item3)
+				}];
+			});
 		cbsProjectInfo.value = [
 			...cbsProjectInfo.value,
-			{
-				id: item.id,
-				name: item.projectEnterprise.cbsName,
-				lbType: 2,
-				processList: processList.map((item3: any) => item3)
-			}
+			...resultList.flat(),
 		];
+		// [
+		// 	...cbsProjectInfo.value,
+		// 	// {
+		// 	// 	id: item.id,
+		// 	// 	name: item.projectEnterprise.cbsName,
+		// 	// 	lbType: 2,
+		// 	// 	processList: processList.map((item3: any) => item3)
+		// 	// }
+		// 	...item.supplierInfos.map((ele: any) => {
+		// 		return {
+		// 				id: item.id,
+		// 				name: ele.cbsName,
+		// 				lbType: 2,
+		// 				processList: processList.map((item3: any) => item3)
+		// 		}
+		// 	})
+		// ];
 		// if (processList.length > 3) {
 		// 	let tempList: any = [];
 		// 	processList.map((item3: any, i: any) => {