From 492d43c7098b1d1974f59488b43145db5ae68597 Mon Sep 17 00:00:00 2001
From: fengerli <528575642@qq.com>
Date: Tue, 7 Oct 2025 15:40:33 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/controlCenter/controlPanel/index.vue  | 6 ++++++
 src/views/equipmentManagement/devices/index.vue | 7 +++++++
 src/views/homeIndex/components/DeviceUsage.vue  | 2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/views/controlCenter/controlPanel/index.vue b/src/views/controlCenter/controlPanel/index.vue
index 872b29b..56a98bb 100644
--- a/src/views/controlCenter/controlPanel/index.vue
+++ b/src/views/controlCenter/controlPanel/index.vue
@@ -124,6 +124,12 @@
                   </div>
                 </template>
               </el-table-column>
+               <el-table-column label="绑定状态" align="center" prop="bindingStatus">
+                <template #default="scope">
+                  <div class="normal green" v-if="scope.row.bindingStatus == 1">已绑定</div>
+                  <div class="normal red" v-if="scope.row.bindingStatus == 0">未绑定</div>
+                </template>
+              </el-table-column>
 
               <el-table-column label="操作" fixed="right" width="180" class-name="small-padding fixed-width">
                 <template #default="scope">
diff --git a/src/views/equipmentManagement/devices/index.vue b/src/views/equipmentManagement/devices/index.vue
index 5f6ff9f..083e27c 100644
--- a/src/views/equipmentManagement/devices/index.vue
+++ b/src/views/equipmentManagement/devices/index.vue
@@ -106,6 +106,13 @@
                 {{ scope.row.bindingStatus === 1 ? '已绑定' : '未绑定' }}
               </el-tag>
             </template>
+          </el-table-column>
+            <el-table-column prop="onlineStatus" label="设备状态">
+            <template #default="scope">
+              <el-tag :type="scope.row.onlineStatus === 1 ? 'success' : 'info'">
+                {{ scope.row.onlineStatus === 1 ? '在线' : '离线' }}
+              </el-tag>
+            </template>
           </el-table-column>
           <el-table-column prop="deviceStatus" label="设备状态" v-hasPermi="['equipment:devices:allocate']">
             <template #default="scope">
diff --git a/src/views/homeIndex/components/DeviceUsage.vue b/src/views/homeIndex/components/DeviceUsage.vue
index ccbb300..ce59e94 100644
--- a/src/views/homeIndex/components/DeviceUsage.vue
+++ b/src/views/homeIndex/components/DeviceUsage.vue
@@ -113,7 +113,7 @@ const initChart = () => {
             name: '使用频次',
             type: 'bar',
             data: [], // 初始空数据
-            barWidth: '10px',
+            barWidth: '9px',
             stack: 'total',
             label: {
                 show: true,

From eb598255f3f0347dea0a7e799f8a2ef5a88b48b3 Mon Sep 17 00:00:00 2001
From: fengerli <528575642@qq.com>
Date: Tue, 7 Oct 2025 15:46:08 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E5=9C=B0=E7=82=B9?=
 =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=9C=B0=E7=82=B9=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE=E6=97=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/equipmentAlarmRecord/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/equipmentAlarmRecord/index.vue b/src/views/equipmentAlarmRecord/index.vue
index 9e5b971..190406c 100644
--- a/src/views/equipmentAlarmRecord/index.vue
+++ b/src/views/equipmentAlarmRecord/index.vue
@@ -103,7 +103,7 @@
                 </div>
                 <div class="label">报警地点</div>
                 <div class="alearmADD">
-                  {{ item.location }}
+                 {{ item.location && item.location !== '[]' ? item.location : '无' }}
                 </div>
                 <div v-if="item.treatmentState === 0" class="dl_bot d_fl">
                   <div v-if="item.durationTime">时长:{{ item.durationTime }}</div>

From 2dca6e3ff810622fad98ecd1ca394db552e104fe Mon Sep 17 00:00:00 2001
From: fengerli <528575642@qq.com>
Date: Tue, 7 Oct 2025 15:56:22 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=81=94=E8=B0=83=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=EF=BC=8C=E6=8E=A7=E5=88=B6=E8=AE=BE=E5=A4=87=E4=BB=85=E5=9C=A8?=
 =?UTF-8?q?=E7=BA=BF=E7=8A=B6=E6=80=81=EF=BC=8C=E5=8F=91=E9=80=81=E6=8C=87?=
 =?UTF-8?q?=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/debugCenter/debugPanel/index.vue | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/views/debugCenter/debugPanel/index.vue b/src/views/debugCenter/debugPanel/index.vue
index 6c95584..19a864d 100644
--- a/src/views/debugCenter/debugPanel/index.vue
+++ b/src/views/debugCenter/debugPanel/index.vue
@@ -69,7 +69,7 @@
         :data="List"
         :height="Status.showSearch.length > 0 ? 'calc(100vh - 355px)' : 'calc(100vh - 255px)'"
       >
-        <el-table-column type="selection" width="50" align="center" />
+        <el-table-column type="selection" width="50" align="center"  :selectable="isSelectable"/>
         <el-table-column label="设备名称" align="center" prop="deviceName" />
         <el-table-column label="设备图片" align="center" prop="devicePic">
           <template #default="scope">
@@ -337,6 +337,12 @@ function handleQuery() {
   queryTime = setTimeout(getList, 500);
 }
 
+const isSelectable = (row: any) => {
+  // 仅当在线状态（onlineStatus == 1）时允许选中
+  return row.onlineStatus === 1;
+}
+
+
 function getList() {
   Status.loading = true;
   api
@@ -1079,4 +1085,13 @@ onMounted(() => {
 .SingEditContent .item .imgContent:hover .opt {
   display: block !important;
 }
+
+.green {
+  color: rgba(0, 165, 82, 1);
+}
+
+.red {
+  color: rgba(224, 52, 52, 1);
+}
+
 </style>