lipenghui 3 сар өмнө
parent
commit
a6c830f54e

+ 11 - 8
src/views/pms/device/monitor/index.vue

@@ -146,7 +146,7 @@
                 <!-- 按钮 -->
                 <div class="flex items-center px-0">
                   <el-button
-                    class="flex-1 !px-2 !h-[32px] !ml-[10px] text-[13px]"
+                    class="flex-1 !px-2 !h-[32px] text-[13px]"
                     type="warning"
                     plain
                     @click="openDetail(item.id, item.ifInline, item.lastInlineTime,item.deviceName,item.deviceCode)"
@@ -169,9 +169,13 @@
         :data="list"
         :stripe="true"
         :show-overflow-tooltip="true"
-        @selection-change="handleSelectionChange"
+
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column label="序号" width="60" align="center">
+          <template #default="scope">
+            {{ scope.$index + 1 }}
+          </template>
+        </el-table-column>
         <el-table-column label="设备名称" align="center" prop="deviceName">
           <template #default="scope">
             <el-link @click="openDetail(scope.row.id)">{{ scope.row.deviceName }}</el-link>
@@ -191,9 +195,9 @@
           </template>
         </el-table-column>
         <el-table-column
-          label="最后上线时间"
+          label="最新数据时间"
           align="center"
-          prop="onlineTime"
+          prop="lastInlineTime"
           :formatter="dateFormatter"
           width="180px"
         />
@@ -202,8 +206,7 @@
             <el-button
               link
               type="primary"
-              @click="openDetail(scope.row.id)"
-              v-hasPermi="['iot:product:query']"
+              @click="openDetail(scope.row.id, scope.row.ifInline, scope.row.lastInlineTime,scope.row.deviceName,scope.row.deviceCode)"
             >
               查看
             </el-button>
@@ -251,7 +254,7 @@ const list = ref<DeviceVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
-  pageSize: 10,
+  pageSize: 12,
   deviceCode: undefined,
   deviceName: undefined,
   brand: undefined,