From 6b4f707d94777b871eab26b71ffd9edaeb5eaf2b Mon Sep 17 00:00:00 2001
From: X_Rian <904416525@qq.com>
Date: Fri, 18 Oct 2024 17:27:07 +0800
Subject: [PATCH] =?UTF-8?q?flx:=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../largeMachinery/civilizedConstruction/centerBottom.vue     | 4 ++--
 .../largeMachinery/civilizedConstruction/dialog-article.vue   | 1 +
 .../largeMachinery/civilizedConstruction/indexQuality.vue     | 4 ++--
 .../largeMachinery/civilizedConstruction/leftTop.vue          | 4 ++--
 .../qualityControl/schedulePlan/completionProjectQuantity.vue | 1 +
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/views/sevenLargeScreen/largeMachinery/civilizedConstruction/centerBottom.vue b/src/views/sevenLargeScreen/largeMachinery/civilizedConstruction/centerBottom.vue
index 27b1026..801f448 100644
--- a/src/views/sevenLargeScreen/largeMachinery/civilizedConstruction/centerBottom.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/civilizedConstruction/centerBottom.vue
@@ -1,5 +1,5 @@
 <template>
-	<Card title="现场会">
+	<Card title="专题活动">
 		<div class="bottom-center">
 			<el-carousel ref="carousel" indicator-position="none" :autoplay="false" @change="onChange">
 				<el-carousel-item v-for="item in videoInfo.videoList" :key="item.id">
@@ -150,7 +150,7 @@ const getVideo = () => {
 const configWeekVideoListFn = async () => {
 	let data = {
 		projectSn: store.sn,
-		type: 1
+		type: 3
 	};
 	const res: any = await getSceneExposeSpecialPage(data);
 	if (res.result) {
diff --git a/src/views/sevenLargeScreen/largeMachinery/civilizedConstruction/dialog-article.vue b/src/views/sevenLargeScreen/largeMachinery/civilizedConstruction/dialog-article.vue
index 33d1f62..d83cb59 100644
--- a/src/views/sevenLargeScreen/largeMachinery/civilizedConstruction/dialog-article.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/civilizedConstruction/dialog-article.vue
@@ -14,6 +14,7 @@
 						@click="activeBtn(item, index)"
 					>
 						<div class="text" :title="item.title" :style="getStyle(item)">{{ item.title || "" }}</div>
+						<div class="time" v-show="item.enterpriseIds">单位名称: {{ item.enterpriseNames }}</div>
 						<div class="time">时间: {{ item.createTime || "" }}</div>
 					</div>
 				</div>
diff --git a/src/views/sevenLargeScreen/largeMachinery/civilizedConstruction/indexQuality.vue b/src/views/sevenLargeScreen/largeMachinery/civilizedConstruction/indexQuality.vue
index 2d6c2e4..597e680 100644
--- a/src/views/sevenLargeScreen/largeMachinery/civilizedConstruction/indexQuality.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/civilizedConstruction/indexQuality.vue
@@ -3,7 +3,7 @@
 		<div class="left">
 			<div class="leftTop">
 				<leftTop ref="leftTopRef"></leftTop>
-				<div class="show-more" @click="openPeopleCountDialog(3)">更多</div>
+				<div class="show-more" @click="openPeopleCountDialog(1)">更多</div>
 			</div>
       <div class="leftBottom">
 				<leftBottom ref="leftBottomRef"></leftBottom>
@@ -15,7 +15,7 @@
 			<centerTop class="centerTop" ref="centerTopRef"></centerTop>
       <div class="centerBottom">
 				<centerBottom ref="centerBottomRef"></centerBottom>
-				<div class="show-more" @click="openPeopleCountDialog(1)">更多</div>
+				<div class="show-more" @click="openPeopleCountDialog(3)">更多</div>
 			</div>
 			
 		</div>
diff --git a/src/views/sevenLargeScreen/largeMachinery/civilizedConstruction/leftTop.vue b/src/views/sevenLargeScreen/largeMachinery/civilizedConstruction/leftTop.vue
index 5f0ba20..c567ef2 100644
--- a/src/views/sevenLargeScreen/largeMachinery/civilizedConstruction/leftTop.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/civilizedConstruction/leftTop.vue
@@ -1,5 +1,5 @@
 <template>
-	<Card title="专题活动">
+	<Card title="文明施工亮点">
 		<div class="bottom-left">
 			<el-scrollbar class="list-content">
 				<div class="list-detail" v-for="item in memberCareList" :key="item.id">
@@ -32,7 +32,7 @@ const getMemberCareList = async () => {
 		projectSn: store.sn,
 		pageNo: 1,
 		pageSize: 10,
-		type: 3
+		type: 1
 	});
 	console.log("获取专题活动", res);
 	if (res.success) {
diff --git a/src/views/sevenLargeScreen/qualityControl/schedulePlan/completionProjectQuantity.vue b/src/views/sevenLargeScreen/qualityControl/schedulePlan/completionProjectQuantity.vue
index c157fbb..f399da3 100644
--- a/src/views/sevenLargeScreen/qualityControl/schedulePlan/completionProjectQuantity.vue
+++ b/src/views/sevenLargeScreen/qualityControl/schedulePlan/completionProjectQuantity.vue
@@ -183,6 +183,7 @@ onMounted(async () => {
 		}
 		.el-table__cell {
 			border-bottom-color: #3e5a8d !important;
+			color: #fff !important;
 		}
         .el-table__inner-wrapper::before {
             background-color: #3e5a8d !important;