From c31fe17c0367369f5b81e63d47a673dc31dd4cb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=82=96=E6=99=8B=E9=A3=9E?= <378266566@qq.com>
Date: Tue, 16 Sep 2025 16:59:56 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E6=95=85=E9=9A=9C?=
 =?UTF-8?q?=E5=8F=98=E8=89=B2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 +-
 src/components/Page/src/PageWrapper.vue       |   2 +-
 src/design/theme.less                         | 108 ++++++++++++++++++
 .../dashboard/demo/components/ProjectCard.vue |  48 ++++++--
 .../demo/components/WorkbenchHeader.vue       |  25 ++--
 src/views/dashboard/demo/index copy.vue       |  68 +++++++++++
 src/views/dashboard/demo/index.vue            |   6 +-
 7 files changed, 238 insertions(+), 21 deletions(-)
 create mode 100644 src/views/dashboard/demo/index copy.vue

diff --git a/.env.development b/.env.development
index 2ac4b3e..2245ebb 100644
--- a/.env.development
+++ b/.env.development
@@ -7,7 +7,7 @@ VITE_PUBLIC_PATH = /
 # 本地开发代理，可以解决跨域及多地址代理
 # 如果接口地址匹配到，则会转发到http://localhost:3000，防止本地出现跨域问题
 # 可以有多个，注意多个不能换行，否则代理将会失效
-VITE_PROXY = [["/dev-api","http://localhost:48080/admin-api"]]
+VITE_PROXY = [["/dev-api","http://120.26.116.243:48080/admin-api"]]
 # VITE_PROXY=[["/api","http://vben.xingyuv.com/test"]]
 
 # 是否删除Console.log
diff --git a/src/components/Page/src/PageWrapper.vue b/src/components/Page/src/PageWrapper.vue
index 64f5108..921370b 100644
--- a/src/components/Page/src/PageWrapper.vue
+++ b/src/components/Page/src/PageWrapper.vue
@@ -129,7 +129,7 @@ watch(
     <PageHeader
       v-if="getShowHeader"
       v-bind="omit($attrs, 'class')"
-      ref="headerRef" class="m-1" :style="getHeaderStyle"
+      ref="headerRef" :style="getHeaderStyle"
       style="padding:6px 8px;" :ghost="ghost" :title="title"
     >
       <template #default>
diff --git a/src/design/theme.less b/src/design/theme.less
index 1f981eb..e6ba309 100644
--- a/src/design/theme.less
+++ b/src/design/theme.less
@@ -60,3 +60,111 @@ html[data-theme="dark"] {
     color: rgb(0 0 0 / 90%);
   }
 }
+
+.workbench[data-theme="dark"] {
+  --text-color: rgb(255 255 255 0.85);
+  --component-background: rgb(36 37 37 75%);
+  --border-color: #b6b7b9;
+
+  color: rgb(255 255 255 0.85);
+  background: rgb(36 37 37 75%);
+  border-color: #b6b7b9;
+
+  .xingyuv-basic-table .ant-table-wrapper {
+    color: rgb(255 255 255 0.85);
+    background: rgb(36 37 37 75%);
+  }
+
+  .ant-table-wrapper table {
+    color: rgb(255 255 255 0.85);
+    background: rgb(36 37 37 75%);
+  }
+
+  .ant-table-wrapper .ant-table-thead > tr > td {
+    color: rgb(255 255 255 0.85);
+    background: rgb(36 37 37 75%);
+  }
+
+  .ant-table-container {
+    color: rgb(255 255 255 0.85);
+    background: rgb(36 37 37 75%);
+  }
+
+  .ant-table-wrapper .ant-table .ant-table-header {
+    color: rgb(255 255 255 0.85);
+    background: rgb(36 37 37 75%);
+  }
+
+  .ant-table-wrapper .ant-table.ant-table-small {
+    color: rgb(255 255 255 0.85);
+    background: rgb(36 37 37 75%);
+  }
+
+  .ant-card-head-title {
+    color: rgb(255 255 255 0.85);
+  }
+
+  .ant-card-body {
+    color: rgb(255 255 255 0.85);
+  }
+
+  .ant-list-split .ant-list-item {
+    border-block-end: 1px solid #8b949e;
+  }
+
+  .ant-list .ant-list-item .ant-list-item-meta .ant-list-item-meta-title {
+    color: rgb(255 255 255 0.85);
+  }
+
+  .ant-list .ant-list-item .ant-list-item-meta .ant-list-item-meta-description {
+    color: rgb(255 255 255 0.85);
+  }
+
+  .ant-comment .ant-comment-content-author-name {
+    color: #8b949e;
+  }
+
+  .ant-comment .ant-comment-content-author-name > * {
+    color: #8b949e;
+  }
+
+  .ant-comment .ant-comment-content-author-name > *:hover {
+    color: #8b949e;
+  }
+
+  .ant-comment .ant-comment-content-author-time {
+    color: #8b949e;
+  }
+
+  .ant-list .ant-list-item {
+    color: rgb(255 255 255 0.85);
+  }
+
+  .text-secondary {
+    color: #8b949e;
+  }
+
+  .ant-card-grid-hoverable:hover {
+    box-shadow:
+      0 3px 6px -4px rgb(0 0 0 / 48%),
+      0 6px 16px 0 rgb(0 0 0 / 32%),
+      0 9px 28px 8px rgb(0 0 0 / 20%);
+  }
+
+  .ant-card-grid {
+    box-shadow:
+      1px 0 0 0 #434343,
+      0 1px 0 0 #434343,
+      1px 1px 0 0 #434343,
+      1px 0 0 0 #434343 inset,
+      0 1px 0 0 #434343 inset;
+  }
+
+  .ant-calendar-selected-day .ant-calendar-date {
+    color: rgb(0 0 0 / 80%);
+  }
+
+  .ant-select-tree li .ant-select-tree-node-content-wrapper.ant-select-tree-node-selected {
+    color: rgb(0 0 0 / 90%);
+  }
+}
diff --git a/src/views/dashboard/demo/components/ProjectCard.vue b/src/views/dashboard/demo/components/ProjectCard.vue
index ab4571b..51732ff 100644
--- a/src/views/dashboard/demo/components/ProjectCard.vue
+++ b/src/views/dashboard/demo/components/ProjectCard.vue
@@ -1,7 +1,9 @@
 <script lang="ts" setup>
 import { Card, CardGrid } from 'ant-design-vue'
+import { computed, onBeforeMount, onMounted, ref } from 'vue'
 import { groupItems } from './data'
 import { Icon } from '@/components/Icon'
+import { getExaNow } from '@/api/alert/exa'
 
 const props = defineProps({
   data: {
@@ -9,6 +11,37 @@ const props = defineProps({
     default: () => {},
   },
 })
+
+const gridData = ref<any>([])
+
+// 页面挂载时批量请求并更新数据（避免在模板中调用异步）
+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) {
+    }
+  }
+})
+
+async function ifColor(pointCode: string) {
+  const res = await getExaNow(pointCode)
+  console.log(res)
+  if (res)
+    return false
+  return false
+}
 </script>
 
 <template>
@@ -19,14 +52,15 @@ const props = defineProps({
       </a-button>
     </template>
 
-    <CardGrid v-for="item in props.data.Content" :key="item.Point" class="!h-1/3 !w-full !md:w-1/4">
+    <CardGrid v-for="item in gridData" :key="item.Point" :class="{ 'bg-[#990000] bg-opacity-50': item.ifColor }" class="!h-1/3 !w-full !md:w-1/4">
       <!-- <Icon :icon="item.icon" :color="item.color" size="30" /> -->
-      <div class="text-center text-lg">
-        {{ item.Point }}
-      </div>
-
-      <div class="text-secondary mt-2 h-10 flex">
-        {{ item.FaultDesc }}
+      <div class="flex flex-col items-center">
+        <div class="text-center text-base">
+          {{ item.FaultDesc }}
+        </div>
+        <div class="text-secondary mt-1 h-10 flex">
+          {{ item.Point }}
+        </div>
       </div>
       <!-- <div class="text-secondary flex justify-between">
         <span>{{ item.group }}</span>
diff --git a/src/views/dashboard/demo/components/WorkbenchHeader.vue b/src/views/dashboard/demo/components/WorkbenchHeader.vue
index af2d12d..7f20a60 100644
--- a/src/views/dashboard/demo/components/WorkbenchHeader.vue
+++ b/src/views/dashboard/demo/components/WorkbenchHeader.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import { Card } from 'ant-design-vue'
+
 const props = defineProps({
   data: {
     type: Object,
@@ -8,15 +10,14 @@ const props = defineProps({
 </script>
 
 <template>
-  <div>
-    <!-- <Avatar :src="userinfo.user.avatar || headerImg" :size="72" class="!mx-auto !block" /> -->
-    <div class="mt-2 md:mt-0">
-      <h1 class="text-center text-lg md:text-2xl">
-        <!-- 早安, {{ userinfo.user.nickname }}, 开始您一天的工作吧！ -->
-        {{ props.data.title }}
-      </h1>
-      <!-- <span class="text-secondary"> 今日晴，20℃ - 32℃！ </span> -->
-    </div>
+  <!-- <Avatar :src="userinfo.user.avatar || headerImg" :size="72" class="!mx-auto !block" /> -->
+  <div class="mt-2 md:mt-0">
+    <h1 class="text-center text-lg md:text-2xl">
+      <!-- 早安, {{ userinfo.user.nickname }}, 开始您一天的工作吧！ -->
+      {{ props.data.title }}
+    </h1>
+    <!-- <span class="text-secondary"> 今日晴，20℃ - 32℃！ </span> -->
+    <!-- </div> -->
     <!-- <div class="mt-4 flex flex-1 justify-end md:mt-0">
       <div class="flex flex-col justify-center text-right">
         <span class="text-secondary"> 待办 </span>
@@ -34,3 +35,9 @@ const props = defineProps({
     </div> -->
   </div>
 </template>
+
+<style scoped>
+::v-deep(.ant-card-grid) {
+  padding:15px;
+}
+</style>
diff --git a/src/views/dashboard/demo/index copy.vue b/src/views/dashboard/demo/index copy.vue
new file mode 100644
index 0000000..c2c97e6
--- /dev/null
+++ b/src/views/dashboard/demo/index copy.vue	
@@ -0,0 +1,68 @@
+<script lang="ts" setup>
+import { onMounted, ref } from 'vue'
+import WorkbenchHeader from './components/WorkbenchHeader.vue'
+import ProjectCard from './components/ProjectCard.vue'
+import DynamicInfo from './components/DynamicInfo.vue'
+import StaticImg from './components/staticImg.vue'
+import ParameterInfo from './components/ParameterInfo.vue'
+import Operation from './components/Operation.vue'
+import data from './components/demo.json'
+import { PageWrapper } from '@/components/Page'
+
+const loading = ref(true)
+
+onMounted(() => {
+  const htmlRoot = document.getElementsByClassName('workbench')
+  // let theme = window.localStorage.getItem('__APP__DARK__MODE__')
+  const theme = 'dark'
+
+  if (htmlRoot && theme) {
+    for (let i = 0; i < htmlRoot.length; i++)
+      htmlRoot[i].setAttribute('data-theme', theme)
+  }
+  // theme = htmlRoot = null
+})
+
+setTimeout(() => {
+  loading.value = false
+}, 500)
+</script>
+
+<template>
+  <div class="workbench m-1" data-theme="light">
+    <WorkbenchHeader class="workbench m-1" data-theme="light" :data="data" />
+    <div class="enter-y workbench h-92 md:flex" data-theme="light">
+      <StaticImg data-theme="light" class="workbench m-1 w-full md:w-1/4" :loading="loading" :data="data.LeftUp" />
+      <ProjectCard data-theme="light" class="enter-y workbench m-1 w-full md:w-1/2" :loading="loading" :data="data.LeftMidUp" />
+      <div class="enter-y w-full !mr-4 md:w-1/4">
+        <DynamicInfo :loading="loading" data-theme="light" class="workbench enter-y m-1 h-35 w-full" :data="data.RightMidUp" />
+        <Operation data-theme="light" class="workbench enter-y m-1 h-54 w-full" :loading="loading" :data="data.RightUp" />
+      </div>
+    </div>
+    <div class="enter-y workbench h-95 md:flex" data-theme="light">
+      <StaticImg data-theme="light" class="workbench m-1 w-full md:w-1/2" :loading="loading" :data="data.LeftDown" />
+      <ParameterInfo data-theme="light" class="workbench 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>
+</template>
+
+<style lang="less">
+
+</style>
diff --git a/src/views/dashboard/demo/index.vue b/src/views/dashboard/demo/index.vue
index 9127850..2884f1f 100644
--- a/src/views/dashboard/demo/index.vue
+++ b/src/views/dashboard/demo/index.vue
@@ -19,13 +19,13 @@ setTimeout(() => {
 <template>
   <PageWrapper class="m-1">
     <template #headerContent>
-      <WorkbenchHeader :data="data" />
+      <WorkbenchHeader class="m-1" :data="data" />
     </template>
     <div class="bg-[#f5f5f5]">
       <div class="enter-y h-95 md:flex">
         <StaticImg class="m-1 w-full md:w-1/4" :loading="loading" :data="data.LeftUp" />
         <ProjectCard class="enter-y m-1 w-full md:w-1/2" :loading="loading" :data="data.LeftMidUp" />
-        <div class="enter-y w-full !mr-4 md:w-1/4">
+        <div class="enter-y w-full md:w-1/4">
           <DynamicInfo :loading="loading" class="enter-y m-1 h-35 w-full" :data="data.RightMidUp" />
           <Operation class="enter-y m-1 h-57 w-full" :loading="loading" :data="data.RightUp" />
         </div>
@@ -52,5 +52,5 @@ setTimeout(() => {
         <SaleRadar :loading="loading" class="enter-y" />
       </div> -->
     </div>
-  </PageWrapper>
+  </pagewrapper>
 </template>

From 5dbfc3b835cf6948be535defb1007893f614f7ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=82=96=E6=99=8B=E9=A3=9E?= <378266566@qq.com>
Date: Wed, 17 Sep 2025 18:38:37 +0800
Subject: [PATCH 2/6] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AEid?=
 =?UTF-8?q?=E8=AF=BB=E5=8F=96=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=A1=B5=E9=9D=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/device/index.ts                       |  8 ++++
 .../dashboard/demo/components/ProjectCard.vue | 48 ++++++++-----------
 .../dashboard/demo/components/staticImg.vue   |  4 --
 src/views/dashboard/demo/index.vue            | 43 +++++++++++++++--
 4 files changed, 69 insertions(+), 34 deletions(-)
 create mode 100644 src/api/device/index.ts

diff --git a/src/api/device/index.ts b/src/api/device/index.ts
new file mode 100644
index 0000000..2606d35
--- /dev/null
+++ b/src/api/device/index.ts
@@ -0,0 +1,8 @@
+import { defHttp } from '@/utils/http/axios'
+
+// 获得地区树
+export function getDeviceInfo(id: string) {
+  return defHttp.get({ url: `/device/info?id=${id}` })
+}
+
+// 获得 IP 对应的地区名
diff --git a/src/views/dashboard/demo/components/ProjectCard.vue b/src/views/dashboard/demo/components/ProjectCard.vue
index 51732ff..2af3a5b 100644
--- a/src/views/dashboard/demo/components/ProjectCard.vue
+++ b/src/views/dashboard/demo/components/ProjectCard.vue
@@ -3,7 +3,7 @@ import { Card, CardGrid } from 'ant-design-vue'
 import { computed, onBeforeMount, onMounted, ref } from 'vue'
 import { groupItems } from './data'
 import { Icon } from '@/components/Icon'
-import { getExaNow } from '@/api/alert/exa'
+
 
 const props = defineProps({
   data: {
@@ -12,36 +12,30 @@ const props = defineProps({
   },
 })
 
-const gridData = ref<any>([])
 
-// 页面挂载时批量请求并更新数据（避免在模板中调用异步）
-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'
+// const gridData = ref<any>([])
+
+// 页面挂载时批量请求并更新数据（避免在模板中调用异步）
+// onMounted(async () => {
+//   const rows = props.data.Content || []
+//   for (const item of rows) {
+//     try {
+//       const param = item.Point
+//       const res = await getExaNow(param)
 
-      gridData.value.push(Object.assign({}, item, { ifColor }))
+//       let ifColor: boolean = false
+//       if (res != null)
+//         ifColor = res === '1'
 
-      console.log(gridData.value)
-    }
-    catch (e) {
-    }
-  }
-})
+//       gridData.value.push(Object.assign({}, item, { ifColor }))
 
-async function ifColor(pointCode: string) {
-  const res = await getExaNow(pointCode)
-  console.log(res)
-  if (res)
-    return false
-  return false
-}
+//       console.log(gridData.value)
+//     }
+//     catch (e) {
+//     }
+//   }
+// })
 </script>
 
 <template>
@@ -52,7 +46,7 @@ async function ifColor(pointCode: string) {
       </a-button>
     </template>
 
-    <CardGrid v-for="item in gridData" :key="item.Point" :class="{ 'bg-[#990000] bg-opacity-50': item.ifColor }" class="!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="!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">
         <div class="text-center text-base">
diff --git a/src/views/dashboard/demo/components/staticImg.vue b/src/views/dashboard/demo/components/staticImg.vue
index 95139bd..8141c7e 100644
--- a/src/views/dashboard/demo/components/staticImg.vue
+++ b/src/views/dashboard/demo/components/staticImg.vue
@@ -1,9 +1,5 @@
 <script lang="ts" setup>
 import { Card, CardGrid } from 'ant-design-vue'
-import { ref } from 'vue'
-import { navItems } from './data'
-import { Icon } from '@/components/Icon'
-
 const props = defineProps({
   data: {
     type: Object,
diff --git a/src/views/dashboard/demo/index.vue b/src/views/dashboard/demo/index.vue
index 2884f1f..f12ad38 100644
--- a/src/views/dashboard/demo/index.vue
+++ b/src/views/dashboard/demo/index.vue
@@ -1,23 +1,60 @@
 <script lang="ts" setup>
-import { ref } from 'vue'
+import { onBeforeMount, onMounted, ref } from 'vue'
+import { useRoute } from 'vue-router'
+import { message } from 'ant-design-vue'
 import WorkbenchHeader from './components/WorkbenchHeader.vue'
 import ProjectCard from './components/ProjectCard.vue'
 import DynamicInfo from './components/DynamicInfo.vue'
 import StaticImg from './components/staticImg.vue'
 import ParameterInfo from './components/ParameterInfo.vue'
 import Operation from './components/Operation.vue'
-import data from './components/demo.json'
+import data1 from './components/demo.json'
 import { PageWrapper } from '@/components/Page'
+import { getDeviceInfo } from '@/api/device'
+import { getExaNow } from '@/api/alert/exa'
 
 const loading = ref(true)
+const route = useRoute()
 
 setTimeout(() => {
   loading.value = false
 }, 500)
+
+const data = ref<any>(data1)
+const id = ref<any>(route.query.id)
+onBeforeMount(async () => {
+  const res = await getDeviceInfo(id.value)
+  console.log(res)
+  if (res)
+    data.value = JSON.parse(res.Page_Content)
+  getColor(data.value)
+})
+
+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
+}
 </script>
 
 <template>
-  <PageWrapper class="m-1">
+  <PageWrapper v-if="id != null && id !== undefined" class="m-1">
     <template #headerContent>
       <WorkbenchHeader class="m-1" :data="data" />
     </template>

From 200b108f68aa1d7999b2ab8f604e14d7ecd83bb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=82=96=E6=99=8B=E9=A3=9E?= <378266566@qq.com>
Date: Wed, 17 Sep 2025 18:42:43 +0800
Subject: [PATCH 3/6] =?UTF-8?q?fix:=E6=9C=AC=E5=9C=B0=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=94=B9=E4=B8=BA=E6=9C=AC=E5=9C=B0=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=EF=BC=8C=E4=B8=8D=E5=BD=B1=E5=93=8D=E9=83=A8=E7=BD=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.development b/.env.development
index 2245ebb..2ac4b3e 100644
--- a/.env.development
+++ b/.env.development
@@ -7,7 +7,7 @@ VITE_PUBLIC_PATH = /
 # 本地开发代理，可以解决跨域及多地址代理
 # 如果接口地址匹配到，则会转发到http://localhost:3000，防止本地出现跨域问题
 # 可以有多个，注意多个不能换行，否则代理将会失效
-VITE_PROXY = [["/dev-api","http://120.26.116.243:48080/admin-api"]]
+VITE_PROXY = [["/dev-api","http://localhost:48080/admin-api"]]
 # VITE_PROXY=[["/api","http://vben.xingyuv.com/test"]]
 
 # 是否删除Console.log

From c184e89de0d66a64ac810b58baae73f28322b281 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=82=96=E6=99=8B=E9=A3=9E?= <378266566@qq.com>
Date: Thu, 18 Sep 2025 10:08:10 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix:=E8=A7=A3=E5=86=B3=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=8D=E6=94=AF=E6=8C=81url=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/demo/index.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/dashboard/demo/index.vue b/src/views/dashboard/demo/index.vue
index f12ad38..2157827 100644
--- a/src/views/dashboard/demo/index.vue
+++ b/src/views/dashboard/demo/index.vue
@@ -21,9 +21,10 @@ setTimeout(() => {
 }, 500)
 
 const data = ref<any>(data1)
-const id = ref<any>(route.query.id)
+const id = route.path.split('/').pop() || ''
 onBeforeMount(async () => {
-  const res = await getDeviceInfo(id.value)
+  console.log(route.path)
+  const res = await getDeviceInfo(id)
   console.log(res)
   if (res)
     data.value = JSON.parse(res.Page_Content)

From 9ddf6f65d00b3efcc366e318b95abb2cef7d1977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=82=96=E6=99=8B=E9=A3=9E?= <378266566@qq.com>
Date: Thu, 18 Sep 2025 10:09:01 +0800
Subject: [PATCH 5/6] =?UTF-8?q?fix:=E8=A7=A3=E5=86=B3=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=8D=E6=94=AF=E6=8C=81url=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/demo/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/dashboard/demo/index.vue b/src/views/dashboard/demo/index.vue
index 2157827..0cb4501 100644
--- a/src/views/dashboard/demo/index.vue
+++ b/src/views/dashboard/demo/index.vue
@@ -21,6 +21,7 @@ setTimeout(() => {
 }, 500)
 
 const data = ref<any>(data1)
+// 为了解决系统不支持传参的问题，改为从路由参数中获取id，不是最终解决办法，带系统commitbug
 const id = route.path.split('/').pop() || ''
 onBeforeMount(async () => {
   console.log(route.path)

From fa9d21e5519141ce6d55618b48dfca53c0ff1d1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=82=96=E6=99=8B=E9=A3=9E?= <378266566@qq.com>
Date: Thu, 18 Sep 2025 10:14:31 +0800
Subject: [PATCH 6/6] =?UTF-8?q?fix:=E6=8D=A2=E4=B8=80=E7=A7=8D=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E5=AE=9E=E7=8E=B0=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 | 40 +++++++++----------
 src/views/dashboard/demo/index.vue            | 38 +++++++++---------
 2 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/src/views/dashboard/demo/components/ProjectCard.vue b/src/views/dashboard/demo/components/ProjectCard.vue
index 2af3a5b..b355498 100644
--- a/src/views/dashboard/demo/components/ProjectCard.vue
+++ b/src/views/dashboard/demo/components/ProjectCard.vue
@@ -3,7 +3,7 @@ import { Card, CardGrid } from 'ant-design-vue'
 import { computed, onBeforeMount, onMounted, ref } from 'vue'
 import { groupItems } from './data'
 import { Icon } from '@/components/Icon'
-
+import { getExaNow } from '@/api/alert/exa'
 
 const props = defineProps({
   data: {
@@ -12,30 +12,28 @@ const props = defineProps({
   },
 })
 
-
-
-// const gridData = ref<any>([])
+const gridData = ref<any>([])
 
 // 页面挂载时批量请求并更新数据（避免在模板中调用异步）
-// onMounted(async () => {
-//   const rows = props.data.Content || []
-//   for (const item of rows) {
-//     try {
-//       const param = item.Point
-//       const res = await getExaNow(param)
+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'
+      let ifColor: boolean = false
+      if (res != null)
+        ifColor = res === '1'
 
-//       gridData.value.push(Object.assign({}, item, { ifColor }))
+      gridData.value.push(Object.assign({}, item, { ifColor }))
 
-//       console.log(gridData.value)
-//     }
-//     catch (e) {
-//     }
-//   }
-// })
+      console.log(gridData.value)
+    }
+    catch (e) {
+    }
+  }
+})
 </script>
 
 <template>
@@ -46,7 +44,7 @@ const props = defineProps({
       </a-button>
     </template>
 
-    <CardGrid v-for="item in props.data.Content" :key="item.Point" :class="{ 'bg-[#990000] bg-opacity-50': item.ifColor }" class="!h-1/3 !w-full !md:w-1/4">
+    <CardGrid v-for="item in gridData" :key="item.Point" :class="{ 'bg-[#990000] bg-opacity-50': item.ifColor }" class="!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">
         <div class="text-center text-base">
diff --git a/src/views/dashboard/demo/index.vue b/src/views/dashboard/demo/index.vue
index 0cb4501..0818d14 100644
--- a/src/views/dashboard/demo/index.vue
+++ b/src/views/dashboard/demo/index.vue
@@ -29,30 +29,30 @@ onBeforeMount(async () => {
   console.log(res)
   if (res)
     data.value = JSON.parse(res.Page_Content)
-  getColor(data.value)
+  // getColor(data.value)
 })
 
-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)
+// 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'
+//       let ifColor: boolean = false
+//       if (res != null)
+//         ifColor = res === '1'
 
-      gridData.push(Object.assign({}, item, { ifColor }))
+//       gridData.push(Object.assign({}, item, { ifColor }))
 
-      console.log(gridData)
-    }
-    catch (e) {
-    }
-  }
-  data.LeftMidUp.Content = gridData
-}
+//       console.log(gridData)
+//     }
+//     catch (e) {
+//     }
+//   }
+//   data.LeftMidUp.Content = gridData
+// }
 </script>
 
 <template>