Commit 77398391325bcdc52f8aa6a43407f90ec78d4e05

Authored by sqy
1 parent 135ef43c

'fix:为表格统一添加上标题,修复首页骨架屏没数据问题'

@@ -74,6 +74,7 @@ @@ -74,6 +74,7 @@
74 const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo); 74 const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
75 // 表格hooks 75 // 表格hooks
76 const [registerTable, { reload }] = useTable({ 76 const [registerTable, { reload }] = useTable({
  77 + title: '告警联系人列表',
77 api: getAlarmContact, 78 api: getAlarmContact,
78 columns, 79 columns,
79 clickToRowSelect: false, 80 clickToRowSelect: false,
@@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
34 34
35 setup() { 35 setup() {
36 const [registerTable, { reload }] = useTable({ 36 const [registerTable, { reload }] = useTable({
  37 + title: '告警记录列表',
37 api: getDeviceAlarm, 38 api: getDeviceAlarm,
38 columns: alarmColumns, 39 columns: alarmColumns,
39 formConfig: { 40 formConfig: {
@@ -56,8 +56,8 @@ @@ -56,8 +56,8 @@
56 </Card> 56 </Card>
57 </div> 57 </div>
58 <Card v-else :bordered="false" :bodyStyle="{ padding: 0 }" v-bind="$attrs"> 58 <Card v-else :bordered="false" :bodyStyle="{ padding: 0 }" v-bind="$attrs">
59 - <Skeleton active :paragraph="{ rows: 10 }" :loading="!tenantTop10.length">  
60 - <Descriptions :column="1" style="min-height: 180px" title="租户消息量TOP10"> 59 + <Skeleton active :paragraph="{ rows: 10 }" :loading="!tenantTop10">
  60 + <Descriptions :column="1" title="租户消息量TOP10" v-if="tenantTop10.length">
61 <template v-for="(item, index) in tenantTop10" :key="item.name"> 61 <template v-for="(item, index) in tenantTop10" :key="item.name">
62 <DescriptionsItem> 62 <DescriptionsItem>
63 <span 63 <span
@@ -114,6 +114,7 @@ @@ -114,6 +114,7 @@
114 {{ item.name }} 114 {{ item.name }}
115 </Tooltip> 115 </Tooltip>
116 </div> 116 </div>
  117 +
117 <div class="flex w-7/10"> 118 <div class="flex w-7/10">
118 <Progress 119 <Progress
119 :showInfo="false" 120 :showInfo="false"
@@ -142,6 +143,7 @@ @@ -142,6 +143,7 @@
142 </DescriptionsItem> 143 </DescriptionsItem>
143 </template> 144 </template>
144 </Descriptions> 145 </Descriptions>
  146 + <Empty v-else :image="Empty.PRESENTED_IMAGE_SIMPLE" />
145 </Skeleton> 147 </Skeleton>
146 <h1 style="color: rgba(0, 0, 0, 0.85); font-weight: bold; font-size: 16px"> 148 <h1 style="color: rgba(0, 0, 0, 0.85); font-weight: bold; font-size: 16px">
147 本月即将过期租户</h1 149 本月即将过期租户</h1
@@ -269,7 +271,9 @@ @@ -269,7 +271,9 @@
269 const tenantTop10 = ref<{ name: string; count: number }[]>([]); 271 const tenantTop10 = ref<{ name: string; count: number }[]>([]);
270 onMounted(async () => { 272 onMounted(async () => {
271 if (isAdmin(props.role)) { 273 if (isAdmin(props.role)) {
272 - tenantTop10.value = await getTenantTop10(); 274 + const res = await getTenantTop10();
  275 + if (res) tenantTop10.value = res;
  276 + else tenantTop10.value = [];
273 return; 277 return;
274 } 278 }
275 const notice = await notifyMyGetrPageApi({ page: 1, pageSize: 5 }); 279 const notice = await notifyMyGetrPageApi({ page: 1, pageSize: 5 });
@@ -70,6 +70,7 @@ @@ -70,6 +70,7 @@
70 ); 70 );
71 const NotifyManagerDrawerRef = ref(); 71 const NotifyManagerDrawerRef = ref();
72 const [registerTable, { reload }] = useTable({ 72 const [registerTable, { reload }] = useTable({
  73 + title: '通知列表',
73 api: notifyGetTableApi, 74 api: notifyGetTableApi,
74 columns, 75 columns,
75 formConfig: { 76 formConfig: {
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
30 setup() { 30 setup() {
31 const [registerModal, { openModal }] = useModal(); 31 const [registerModal, { openModal }] = useModal();
32 const [registerTable, { reload }] = useTable({ 32 const [registerTable, { reload }] = useTable({
  33 + title: '我的通知',
33 api: notifyMyGetrPageApi, 34 api: notifyMyGetrPageApi,
34 columns, 35 columns,
35 formConfig: { 36 formConfig: {
@@ -120,7 +120,7 @@ @@ -120,7 +120,7 @@
120 registerTable, 120 registerTable,
121 { reload, getSelectRowKeys, getSelectRows, setLoading, clearSelectedRowKeys }, 121 { reload, getSelectRowKeys, getSelectRows, setLoading, clearSelectedRowKeys },
122 ] = useTable({ 122 ] = useTable({
123 - title: '数据转换列表', 123 + title: '数据流转列表',
124 clickToRowSelect: false, 124 clickToRowSelect: false,
125 columns, 125 columns,
126 api: getConvertApi, 126 api: getConvertApi,
@@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@
58 const [registerDrawer, { openDrawer }] = useDrawer(); 58 const [registerDrawer, { openDrawer }] = useDrawer();
59 const { createMessage } = useMessage(); 59 const { createMessage } = useMessage();
60 const [registerTable, { reload, getSelectRowKeys }] = useTable({ 60 const [registerTable, { reload, getSelectRowKeys }] = useTable({
61 - title: '', 61 + title: '租户配置列表',
62 clickToRowSelect: false, 62 clickToRowSelect: false,
63 api: getTableTenantProfileApi, 63 api: getTableTenantProfileApi,
64 columns, 64 columns,
@@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
92 }, 92 },
93 ]; 93 ];
94 const [tenantTable, { reload, setLoading }] = useTable({ 94 const [tenantTable, { reload, setLoading }] = useTable({
95 - title: '租户', 95 + title: '租户列表',
96 api: getTenantPage, 96 api: getTenantPage,
97 columns: getBasicColumns(), 97 columns: getBasicColumns(),
98 useSearchForm: true, 98 useSearchForm: true,