From aa1f2e8fdb180682e29bf93dfd31439b832e024e Mon Sep 17 00:00:00 2001
From: shi <936384804@qq.com>
Date: Fri, 12 Sep 2025 19:33:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E7=BA=A7?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectScreen/components/header.vue       | 22 +++++++++----------
 .../ProjectScreen/components/leftPage.vue     | 12 +++++-----
 .../ProjectScreen/components/optionList.ts    |  4 ++--
 .../ProjectScreen/components/rightPage.vue    |  6 ++---
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/views/projectLarge/ProjectScreen/components/header.vue b/src/views/projectLarge/ProjectScreen/components/header.vue
index 8cfdc63..4415e64 100644
--- a/src/views/projectLarge/ProjectScreen/components/header.vue
+++ b/src/views/projectLarge/ProjectScreen/components/header.vue
@@ -11,20 +11,16 @@
       </div>
     </div>
     <div class="title">
-      <div>新能源项目级管理平台</div>
-      <div>Coal Science Construction Management - New Energy Project Level Management Platform</div>
+      <div>{{ currentProjectName }}</div>
+      <div>施工现场数智化管理</div>
     </div>
     <div class="header_right">
       <div class="top-bar">
         <!-- 左侧：天气图标 + 日期文字 -->
         <div class="left-section">
           <div class="weather-list" @mouseenter="requestPause" @mouseleave="resumeScroll">
-            <div
-              v-for="(item, i) in weatherList"
-              :key="i"
-              class="weather-item"
-              :style="{ transform: `translateY(-${offsetY}px)`, transition: transition }"
-            >
+            <div v-for="(item, i) in weatherList" :key="i" class="weather-item"
+              :style="{ transform: `translateY(-${offsetY}px)`, transition: transition }">
               <img :src="`/assets/demo/${item.icon}.png`" alt="" />
               <div>{{ item.weather }}{{ item.tempMin }}°/{{ item.tempMax }}°</div>
               <div>{{ item.week }}({{ item.date }})</div>
@@ -63,6 +59,10 @@
 <script setup lang="ts">
 import { ref, onMounted, onUnmounted } from 'vue';
 import { getScreenSafetyDay, getScreenWeather } from '@/api/projectScreen';
+import { useUserStoreHook } from '@/store/modules/user';
+
+const userStore = useUserStoreHook();
+const currentProjectName = computed(() => userStore.selectedProject?.name);
 
 interface Weather {
   week: string;
@@ -230,13 +230,13 @@ onUnmounted(() => {
   text-align: center;
 }
 
-.title > div:first-child {
+.title>div:first-child {
   /* 第一个子元素的样式 */
   font-size: 38px;
   letter-spacing: 0.1em;
 }
 
-.title > div:last-child {
+.title>div:last-child {
   /* 最后一个子元素的样式 */
   font-size: 14px;
 }
@@ -269,7 +269,7 @@ onUnmounted(() => {
       display: flex;
       align-items: center;
 
-      & > div:last-child {
+      &>div:last-child {
         margin-left: 10px;
       }
 
diff --git a/src/views/projectLarge/ProjectScreen/components/leftPage.vue b/src/views/projectLarge/ProjectScreen/components/leftPage.vue
index 2ec5dd1..07c1556 100644
--- a/src/views/projectLarge/ProjectScreen/components/leftPage.vue
+++ b/src/views/projectLarge/ProjectScreen/components/leftPage.vue
@@ -70,7 +70,8 @@
           <div class="attendance_item_title">{{ item.teamName }}</div>
           <div class="attendance_item_number">{{ item.attendanceNumber }} <span class="subfont">人/{{ item.allNumber
           }}</span></div>
-          <div class="attendance_item_rate">{{ item.attendanceRate.toFixed(2) }} %</div>
+          <div class="attendance_item_rate">{{ item.attendanceRate != '0' ? item.attendanceRate :
+            `${item.attendanceRate}.00` }} %</div>
           <div class="attendance_item_date subfont">{{ item.attendanceTime }}</div>
         </div>
       </div>
@@ -101,9 +102,7 @@ const newId = ref('')
 const attendanceCount = ref(0)
 const attendanceRate = ref(0)
 const peopleCount = ref(0)
-const teamAttendanceList = ref([
-  { id: "", teamName: "", attendanceNumber: 0, allNumber: 0, attendanceRate: 0, attendanceTime: "" },
-])
+const teamAttendanceList = ref([])
 
 /**
  * 显示新闻详情
@@ -124,6 +123,7 @@ const getPeopleData = async () => {
   const res = await getScreenPeople(props.projectId);
   const { data, code } = res
   if (code === 200) {
+    console.log(data)
     attendanceCount.value = data.attendanceCount
     attendanceRate.value = data.attendanceRate
     peopleCount.value = data.peopleCount
@@ -306,7 +306,9 @@ onUnmounted(() => {
 }
 
 .attendance_list {
-  padding: 0px 30px;
+  width: calc(100% - 30px);
+  padding: 0px 15px;
+  margin: 0 auto;
   font-size: 14px;
 
   .attendance_item {
diff --git a/src/views/projectLarge/ProjectScreen/components/optionList.ts b/src/views/projectLarge/ProjectScreen/components/optionList.ts
index 41f9e48..7c80489 100644
--- a/src/views/projectLarge/ProjectScreen/components/optionList.ts
+++ b/src/views/projectLarge/ProjectScreen/components/optionList.ts
@@ -4,7 +4,7 @@ export let pieOption = {
     {
       type: 'text',
       left: 'center',
-      top: '40%',
+      top: '43%',
       style: {
         // 需要从接口替换
         text: '70%',
@@ -16,7 +16,7 @@ export let pieOption = {
     {
       type: 'text',
       left: 'center',
-      top: '50%',
+      top: '55%',
       style: {
         text: '总进度',
         fontSize: 14,
diff --git a/src/views/projectLarge/ProjectScreen/components/rightPage.vue b/src/views/projectLarge/ProjectScreen/components/rightPage.vue
index 8f425f9..81f63c8 100644
--- a/src/views/projectLarge/ProjectScreen/components/rightPage.vue
+++ b/src/views/projectLarge/ProjectScreen/components/rightPage.vue
@@ -104,6 +104,7 @@ const getScreenImgProcessData = async () => {
     pieData.forEach((item: any) => {
       item.value = data[item.label]
     })
+    console.log(pieData)
     initPieChart()
   }
 }
@@ -113,9 +114,9 @@ const getScreenImgProcessData = async () => {
  */
 const getScreenGeneralizeData = async () => {
   const res = await getScreenGeneralize(props.projectId);
-  const { data, code } = res
+  const { data, code, msg } = res
   if (code === 200) {
-    generalize.value = data
+    generalize.value = msg
   }
 }
 
@@ -183,7 +184,6 @@ onUnmounted(() => {
   height: 100px;
   margin: 0 15px;
   padding: 0 10px;
-  margin-top: 15px;
   box-sizing: border-box;
   overflow-y: auto;