From 4abb93deab37da6416891f439d9ee8954d97df16 Mon Sep 17 00:00:00 2001
From: liutao <790864623@qq.com>
Date: Thu, 7 May 2026 08:39:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/StatusDistributionChart.vue    | 52 +++++++++++++++----
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/src/views/iot/runoverview/components/StatusDistributionChart.vue b/src/views/iot/runoverview/components/StatusDistributionChart.vue
index 2dacea95..2b9ec06d 100644
--- a/src/views/iot/runoverview/components/StatusDistributionChart.vue
+++ b/src/views/iot/runoverview/components/StatusDistributionChart.vue
@@ -23,12 +23,17 @@
       </div>
       <div class="chart-panel__side">
         <div class="chart-panel__side-title">{{ t('DataCollection.RunOverview.summaryTitle') }}</div>
-        <Echart :options="pieOption" height="320px" />
-        <div class="chart-panel__legend">
-          <div v-for="item in summary" :key="item.status" class="chart-panel__legend-item">
-            <span class="dot" :style="{ background: statusColors[item.status] }"></span>
-            <span class="label">{{ statusLabelMap[item.status] }}</span>
-            <span class="value">{{ item.percent.toFixed(2) }}% ({{ item.hours.toFixed(2) }}h)</span>
+        <div class="chart-panel__summary-layout">
+<!--          <div class="chart-panel__pie">
+            <Echart :options="pieOption" height="280px" />
+          </div>&ndash;&gt;-->
+        <Echart :options="pieOption" height="280px" />
+          <div class="chart-panel__legend">
+            <div v-for="item in summary" :key="item.status" class="chart-panel__legend-item">
+              <span class="dot" :style="{ background: statusColors[item.status] }"></span>
+              <span class="label">{{ statusLabelMap[item.status] }}</span>
+              <span class="value">{{ item.percent.toFixed(2) }}% ({{ item.hours.toFixed(2) }}h)</span>
+            </div>
           </div>
         </div>
       </div>
@@ -198,20 +203,34 @@ const pieOption = computed<EChartsOption>(() => ({
 }
 
 .chart-panel__side {
-  padding: 8px 8px 0;
+  padding: 8px 12px 0;
+}
+
+.chart-panel__summary-layout {
+  display: grid;
+  grid-template-columns: minmax(180px, 220px) minmax(180px, 1fr);
+  align-items: center;
+  gap: 8px 16px;
+  min-height: 280px;
+}
+
+.chart-panel__pie {
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 
 .chart-panel__legend {
   display: flex;
   flex-direction: column;
-  gap: 10px;
-  margin-top: -8px;
+  gap: 14px;
+  justify-content: center;
 }
 
 .chart-panel__legend-item {
   display: grid;
-  grid-template-columns: 12px 1fr auto;
-  gap: 8px;
+  grid-template-columns: 12px 52px 1fr;
+  gap: 10px;
   align-items: center;
   color: #344054;
   font-size: 13px;
@@ -230,11 +249,22 @@ const pieOption = computed<EChartsOption>(() => ({
 .value {
   color: #101828;
   font-weight: 600;
+  text-align: left;
 }
 
 @media (max-width: 1100px) {
   .chart-panel__body {
     grid-template-columns: 1fr;
   }
+
+  .chart-panel__summary-layout {
+    grid-template-columns: 1fr;
+    justify-items: center;
+  }
+
+  .chart-panel__legend {
+    width: 100%;
+    max-width: 320px;
+  }
 }
 </style>

From bedd8d9bcaecf7cf080df512a52da009802b02a3 Mon Sep 17 00:00:00 2001
From: liutao <790864623@qq.com>
Date: Thu, 7 May 2026 16:20:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=97=B6=E7=9C=9F?=
 =?UTF-8?q?=E5=8A=A0=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/iot/device/detailForm.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/iot/device/detailForm.vue b/src/views/iot/device/detailForm.vue
index dc3e160a..66654719 100644
--- a/src/views/iot/device/detailForm.vue
+++ b/src/views/iot/device/detailForm.vue
@@ -11,7 +11,7 @@
           </el-button>
         </div>
       </div>
-      <el-tabs v-model="deviceTabActive">
+      <el-tabs v-model="deviceTabActive" :onclick="changeClick">
         <el-tab-pane :label="deviceAttributeTabLabel" name="deviceAttribute">
           <DeviceAttributeList :device-id="attributeDeviceId" />
         </el-tab-pane>
@@ -599,6 +599,9 @@ const resetDeviceAlarmQuery = () => {
   deviceAlarmQueryParams.pageNo = 1
   getDeviceAlarmList()
 }
+const changeClick = () => {
+  deviceTabActive.value==='deviceRule' ? getRuleList() : getDeviceAlarmList()
+}
 
 const openCreateRuleForm = () => {
   if (!attributeDeviceId.value) {