From f43216a9f4e7262b55c5286cffd1145a76317861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=82=96=E6=99=8B=E9=A3=9E?= <378266566@qq.com>
Date: Fri, 31 Oct 2025 18:13:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=BC=BA=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BD=93=E9=AA=8C=EF=BC=8C=E6=8C=82=E8=BD=BD=E5=89=8D=E5=B0=B1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=98=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/demo/components/ProjectCard.vue | 43 +-----------
 src/views/dashboard/demo/index.vue            | 68 +++++++------------
 2 files changed, 26 insertions(+), 85 deletions(-)

diff --git a/src/views/dashboard/demo/components/ProjectCard.vue b/src/views/dashboard/demo/components/ProjectCard.vue
index 5a7b135..4c07732 100644
--- a/src/views/dashboard/demo/components/ProjectCard.vue
+++ b/src/views/dashboard/demo/components/ProjectCard.vue
@@ -10,54 +10,13 @@ const props = defineProps({
     default: () => {},
   },
 })
-const gridData = ref<any>([])
-
 watch(
   () => props.data,
   (newValue, oldValue) => {
     // 下方信息不会打印在控制台中
     console.log('a has changed', newValue, oldValue)
-    getNewData()
   },
 )
-async function getNewData() {
-  const rows = props.data.Content || []
-  for (const item of rows) {
-    try {
-      const param = item.Point
-      const res = await getExaNow(param)
-
-      let ifColor: boolean = false
-      if (res != null)
-        ifColor = res === '1'
-
-      gridData.value.push(Object.assign({}, item, { ifColor }))
-    }
-    catch (e) {
-    }
-  }
-}
-
-// 页面挂载时批量请求并更新数据（避免在模板中调用异步）
-// onMounted(async () => {
-//   const rows = props.data.Content || []
-//   for (const item of rows) {
-//     try {
-//       const param = item.Point
-//       const res = await getExaNow(param)
-
-//       let ifColor: boolean = false
-//       if (res != null)
-//         ifColor = res === '1'
-
-//       gridData.value.push(Object.assign({}, item, { ifColor }))
-
-//       console.log(gridData.value)
-//     }
-//     catch (e) {
-//     }
-//   }
-// })
 </script>
 
 <template>
@@ -68,7 +27,7 @@ async function getNewData() {
       </a-button>
     </template>
 
-    <CardGrid v-for="item in gridData" :key="item.Point" :class="{ 'bg-[#990000] bg-opacity-50': item.ifColor }" class="flex flex-col items-center justify-center !h-1/3 !w-full !md:w-1/4">
+    <CardGrid v-for="item in props.data.Content" :key="item.Point" :class="{ 'bg-[#990000] bg-opacity-50': item.ifColor }" class="flex flex-col items-center justify-center !h-1/3 !w-full !md:w-1/4">
       <!-- <Icon :icon="item.icon" :color="item.color" size="30" /> -->
       <div class="flex flex-col items-center justify-center">
         <div class="text-center text-base">
diff --git a/src/views/dashboard/demo/index.vue b/src/views/dashboard/demo/index.vue
index 81ceedd..322560b 100644
--- a/src/views/dashboard/demo/index.vue
+++ b/src/views/dashboard/demo/index.vue
@@ -1,7 +1,6 @@
 <script lang="ts" setup>
 import { onMounted, ref } from 'vue'
 import { useRoute } from 'vue-router'
-import { message } from 'ant-design-vue'
 import ProjectCard from './components/ProjectCard.vue'
 import DynamicInfo from './components/DynamicInfo.vue'
 import StaticImg from './components/staticImg.vue'
@@ -16,10 +15,8 @@ import { getExaNow } from '@/api/alert/exa'
 
 const loading = ref(true)
 const route = useRoute()
+const gridData = ref<any[]>([])
 
-setTimeout(() => {
-  loading.value = false
-}, 500)
 // 为了解决系统不支持传参的问题，改为从路由参数中获取id，不是最终解决办法，带系统commitbug
 const id = route.path.split('/').pop() || ''
 const data = ref<any>(data1)
@@ -28,30 +25,32 @@ onMounted(async () => {
   const res = await getDeviceInfo(id)
   if (res)
     data.value = JSON.parse(res.Page_Content)
-  // getColor(data.value)
+  // 加载数据后调用 getNewData 处理 LeftMidUp 数据
+  await getNewData()
+  loading.value = false
 })
 
-// async function getColor(data: any) {
-//   const rows = data.LeftMidUp.Content || []
-//   const gridData = [] as any[]
-//   for (const item of rows) {
-//     try {
-//       const param = item.Point
-//       const res = await getExaNow(param)
-
-//       let ifColor: boolean = false
-//       if (res != null)
-//         ifColor = res === '1'
-
-//       gridData.push(Object.assign({}, item, { ifColor }))
-
-//       console.log(gridData)
-//     }
-//     catch (e) {
-//     }
-//   }
-//   data.LeftMidUp.Content = gridData
-// }
+// 处理故障诊断的数据，为每个对象增加ifColor属性
+async function getNewData() {
+  const rows = data.value.LeftMidUp.Content || []
+  for (const item of rows) {
+    try {
+      const param = item.Point
+      const res = await getExaNow(param)
+      console.log(res)
+      let ifColor: boolean = false
+      if (res != null)
+        ifColor = res === '1'
+      // 直接修改原始对象，添加ifColor属性
+      item.ifColor = ifColor
+    }
+    catch (e) {
+      // 出错时默认添加ifColor为false
+      item.ifColor = false
+    }
+  }
+  console.log(data.value)
+}
 </script>
 
 <template>
@@ -72,23 +71,6 @@ onMounted(async () => {
         <StaticSvg class="m-1 w-full md:w-1/2" :loading="loading" :data="data.LeftDown || {}" />
         <ParameterInfo class="m-1 w-full md:w-1/2" :loading="loading" :data="data.RightDown || {}" />
       </div>
-      <!-- <div class="enter-y w-full !mr-4 lg:w-7/10">
-        <StaticImg :loading="loading" :data="data.LeftUp" class="enter-y" />
-      </div> -->
-
-      <!-- <div class="enter-y w-full !mr-4 lg:w-7/10">
-        <ProjectCard :loading="loading" class="enter-y" />
-        <DynamicInfo :loading="loading" class="enter-y !my-4" />
-      </div>
-      <div class="enter-y w-full lg:w-3/10">
-        <QuickNav :loading="loading" class="enter-y" />
-
-        <Card class="enter-y !my-4" :loading="loading">
-          <img class="mx-auto h-30 xl:h-50" src="@/assets/svg/illustration.svg">
-        </Card>
-
-        <SaleRadar :loading="loading" class="enter-y" />
-      </div> -->
     </div>
   </pagewrapper>
 </template>