Merge branch 'main' of http://47.107.152.87:3000/liubiao/dyf-vue-ui

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">

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>

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>

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">

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,