瀏覽代碼

页面调整

lipenghui 3 月之前
父節點
當前提交
ae6cbcc603
共有 2 個文件被更改,包括 15 次插入12 次删除
  1. 3 3
      src/views/pms/device/monitor/index.vue
  2. 12 9
      src/views/pms/inspect/route/InspectItemList.vue

+ 3 - 3
src/views/pms/device/monitor/index.vue

@@ -89,7 +89,7 @@
                 <!-- 标题区域 -->
                 <div class="flex items-center mb-3">
                   <div class="mr-2.5 flex items-center">
-                    <el-image :src="defaultIconUrl" class="w-[18px] h-[18px]" />
+                    <img src="@/assets/svgs/iot/card-fill.svg" class="w-[18px] h-[18px]" />
                   </div>
                   <div class="text-[16px] font-600 flex-1">{{ item.deviceName }}</div>
                   <!-- 添加设备状态标签 -->
@@ -135,7 +135,7 @@
                     </div>
                   </div>
                   <div class="w-[100px] h-[100px]">
-                    <el-image :src="defaultPicUrl" class="w-full h-full" />
+                    <img src="@/assets/imgs/iot/device.png" class="w-full h-full" />
                   </div>
                 </div>
 
@@ -285,7 +285,7 @@ const products = ref<ProductVO[]>([]) // 产品列表
 const deviceGroups = ref<DeviceGroupVO[]>([]) // 设备分组列表
 const selectedIds = ref<number[]>([]) // 选中的设备编号数组
 const viewMode = ref<'card' | 'list'>('card') // 视图模式状态
-const defaultPicUrl = ref('/src/assets/imgs/iot/device.png') // 默认设备图片
+const defaultPicUrl = ref('@/src/assets/imgs/iot/device.png') // 默认设备图片
 const defaultIconUrl = ref('/src/assets/svgs/iot/card-fill.svg') // 默认设备图标
 
 /** 查询列表 */

+ 12 - 9
src/views/pms/inspect/route/InspectItemList.vue

@@ -145,25 +145,28 @@ const handleRowClick = (row) => {
 const open = async (classify, id) => {
   dialogVisible.value = true
   selectedRows.value = []
+  queryParams.createTime = undefined
+  queryParams.item = undefined
+  queryParams.pageNo = 1;
   if (id) {
     queryParams.deviceId = id
+    await getList()
+    debugger
+    if (list.value.length === 0) {
+      queryParams.deviceId = undefined
+      queryParams.deviceClassify = classify
+      await getList()
+    }
   } else {
     queryParams.deviceClassify = classify
+    await getList()
   }
-  queryParams.createTime = undefined
-  queryParams.item = undefined
-  queryParams.pageNo = 1;
-  await getList()
 }
 defineExpose({ open })
 const { wsCache } = useCache()
 const getList = async () => {
   loading.value = true
   try {
-    // const user = wsCache.get(CACHE_KEY.USER)
-    // queryParams.deptId = user.user.deptId
-    console.log(JSON.stringify(queryParams))
-
     const data = await IotInspectItemApi.getIotInspectItemPage(queryParams)
     list.value = data.list
     list.value = list.value.sort((a, b) => {
@@ -188,7 +191,7 @@ const handleConfirm = () => {
       ...row,
       // 确保返回必要字段
       code: row.item,
-      name: row.standard
+      name: row.standard,
     }))
   )
   dialogVisible.value = false