Merge branch 'ww' into 'main'

fix: system menu default folding && device list column setting device name is null

See merge request huang/yun-teng-iot-front!328

@@ -19,6 +19,7 @@ export const columns: BasicColumn[] = [
   },
   {
     dataIndex: 'name',
+    title: '设备名称/设备SN',
     width: 200,
     align: 'left',
     slots: { customRender: 'name', title: 'deviceTitle' },

@@ -71,7 +71,7 @@
         delMenu,
         handleSuccess
       );
-      const [registerTable, { reload, expandAll }] = useTable({
+      const [registerTable, { reload, collapseAll }] = useTable({
         title: t('routes.common.system.pageSystemTitleMenuList'), //'菜单列表'
         api: getMenuList, //加载数据
         columns, //加载列
@@ -148,7 +148,7 @@
 
       function onFetchSuccess() {
         // 演示默认展开所有表项
-        nextTick(expandAll);
+        nextTick(collapseAll);
       }
 
       return {

@@ -162,31 +162,34 @@
       >
         {{ props.value.name }}
       </div>
-      <Tooltip
-        placement="top"
-        :title="
-          props.value?.updateTime
-            ? dateUtil(props?.value?.updateTime).format(DEFAULT_DATE_FORMAT)
-            : '暂无更新时间'
-        "
+
+      <div
+        class="text-xs text-center p-5"
+        :style="{
+          fontSize: fontSize({ radioRecord: getRadio, basic: 12, max: 12 }),
+          color: '#999',
+        }"
       >
-        <div
-          class="text-xs text-center truncate p-5"
-          :style="{
-            fontSize: fontSize({ radioRecord: getRadio, basic: 12, max: 12 }),
-            color: '#999',
-          }"
+        <Tooltip
+          placement="top"
+          :title="
+            props.value?.updateTime
+              ? dateUtil(props?.value?.updateTime).format(DEFAULT_DATE_FORMAT)
+              : '暂无更新时间'
+          "
         >
-          <span class="mr-2">更新时间:</span>
-          <span>
-            {{
-              props.value?.updateTime
-                ? dateUtil(props?.value?.updateTime).format(DEFAULT_DATE_FORMAT)
-                : '暂无更新时间'
-            }}
-          </span>
-        </div>
-      </Tooltip>
+          <div class="truncate">
+            <span class="mr-2">更新时间:</span>
+            <span>
+              {{
+                props.value?.updateTime
+                  ? dateUtil(props?.value?.updateTime).format(DEFAULT_DATE_FORMAT)
+                  : '暂无更新时间'
+              }}
+            </span>
+          </div>
+        </Tooltip>
+      </div>
     </div>
   </div>
 </template>

@@ -152,31 +152,34 @@
       >
         <span>{{ props.value.name || '电表' }}</span>
       </div>
-      <Tooltip
-        placement="top"
-        :title="
-          props.value?.updateTime
-            ? dateUtil(props?.value?.updateTime).format(DEFAULT_DATE_FORMAT)
-            : '暂无更新时间'
-        "
+
+      <div
+        class="text-center text-xs p-5"
+        :style="{
+          fontSize: fontSize({ radioRecord: getRadio, basic: 12, max: 16 }),
+          color: '#999',
+        }"
       >
-        <div
-          class="text-center text-xs truncate p-5"
-          :style="{
-            fontSize: fontSize({ radioRecord: getRadio, basic: 12, max: 16 }),
-            color: '#999',
-          }"
+        <Tooltip
+          placement="top"
+          :title="
+            props.value?.updateTime
+              ? dateUtil(props?.value?.updateTime).format(DEFAULT_DATE_FORMAT)
+              : '暂无更新时间'
+          "
         >
-          <span class="mr-1">更新时间:</span>
-          <span>
-            {{
-              props.value?.updateTime
-                ? dateUtil(props?.value?.updateTime).format(DEFAULT_DATE_FORMAT)
-                : '暂无更新时间'
-            }}
-          </span>
-        </div>
-      </Tooltip>
+          <div class="truncate">
+            <span class="mr-1">更新时间:</span>
+            <span>
+              {{
+                props.value?.updateTime
+                  ? dateUtil(props?.value?.updateTime).format(DEFAULT_DATE_FORMAT)
+                  : '暂无更新时间'
+              }}
+            </span>
+          </div>
+        </Tooltip>
+      </div>
     </div>
     <div></div>
   </section>

@@ -93,16 +93,17 @@
         </div>
       </div>
     </div>
-    <Tooltip
-      v-if="getShowUpdate"
-      placement="top"
-      :title="
-        props.value?.updateTime
-          ? dateUtil(props?.value?.updateTime).format(DEFAULT_DATE_FORMAT)
-          : '暂无更新时间'
-      "
-    >
-      <div class="text-center text-xs truncate p-5" style="color: #999">
+
+    <div class="text-center text-xs truncate p-5" style="color: #999">
+      <Tooltip
+        v-if="getShowUpdate"
+        placement="top"
+        :title="
+          props.value?.updateTime
+            ? dateUtil(props?.value?.updateTime).format(DEFAULT_DATE_FORMAT)
+            : '暂无更新时间'
+        "
+      >
         <div
           :style="{ fontSize: fontSize({ radioRecord: getRadio, basic: 12, max: 12 }) }"
           class="truncate"
@@ -116,7 +117,7 @@
             }}
           </span>
         </div>
-      </div>
-    </Tooltip>
+      </Tooltip>
+    </div>
   </div>
 </template>

@@ -60,6 +60,7 @@
     showQuickJumper: true,
     pageSize,
     current: page,
+    size: 'small',
     total,
     showTotal: (total) => `总 ${total} 条`,
     onChange: pageChange,
@@ -216,6 +217,7 @@
         :pagination="paginationProp"
         :data-source="dataBoardList"
         :grid="{ gutter: 20, column: 4, xs: 1, sm: 2, md: 2, lg: 3, xl: 3, xxl: 3 }"
+        class="data-board-list"
       >
         <template #renderItem="{ item }">
           <ListItem>
@@ -309,4 +311,9 @@
       }
     }
   }
+
+  .data-board-list:deep(.ant-list-pagination) {
+    padding: 10px;
+    background-color: #fff;
+  }
 </style>