Merge branch 'dev'

src/views/computer-information/components/ComputerDetail.vue

@@ -91,14 +91,17 @@ async function fetchComputerData(view) { // 默认为当前视图
 
   switch (view) {
     case 'current':
+      gridOptions.loading = true;
       gridOptions.columns = ComputerCurrentColumns;
       currentView.value = 'current';
       const resp = await getCurrentTableData(query);
       gridOptions.data = resp.data;
       gridOptions.pagerConfig.total = resp.total;
+      gridOptions.loading = false;
       // await useTableData(api.getCurrentTableData, query, gridOptions);
       break;
     case 'history':
+      gridOptions.loading = true;
       gridOptions.columns = ComputerPastColumns;
       currentView.value = 'history';
       query.id = id;
@@ -106,6 +109,7 @@ async function fetchComputerData(view) { // 默认为当前视图
       const ret = await getPastTableData(query);
       gridOptions.data = ret.data;
       gridOptions.pagerConfig.total = ret.total;
+      gridOptions.loading = false;
       break;
   }
 }

src/views/computer-information/useColumns.tsx

@@ -1,5 +1,5 @@
 export const ComputerCurrentColumns = [
-  { field: 'platformNumber', title: '电脑编号'},
+  { field: 'platformNumber', title: '平台编号'},
   { field: 'platform', title: '平台'},
   { field: 'platformName', title: '平台名称'},
   { field: 'brandName', title: '品牌'},