From ac4bb50b66034f9841ba2398a168ed746c673aea Mon Sep 17 00:00:00 2001
From: tk <fiyne1a@dingtalk.com>
Date: Mon, 23 Dec 2024 10:33:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E6=A1=A3=E6=A1=88?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=A9=BA=E5=88=97=E8=A1=A8loading=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/admin/src/components/scTable/index.vue      | 9 +++++----
 src/frontend/admin/src/views/sys/dept/index.vue          | 2 +-
 src/frontend/admin/src/views/sys/job/all/index.vue       | 8 +++++++-
 src/frontend/admin/src/views/sys/log/operation/index.vue | 2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/frontend/admin/src/components/scTable/index.vue b/src/frontend/admin/src/components/scTable/index.vue
index ba7e1aae..7387e262 100644
--- a/src/frontend/admin/src/components/scTable/index.vue
+++ b/src/frontend/admin/src/components/scTable/index.vue
@@ -338,17 +338,18 @@ export default {
             },
         }
     },
-    mounted() {
+    async mounted() {
         this.pagerCount = document.body.clientWidth < 1000 ? 3 : 11
         //判断是否开启自定义列
         if (this.column) {
-            this.getCustomColumn()
+            await this.getCustomColumn()
         } else {
             this.userColumn = this.column
         }
         //判断是否静态数据
         if (this.queryApi) {
-            this.getData()
+            const res = await this.getData()
+            this.$emit('dataChange', res, this.tableData)
         } else if (this.data) {
             this.tableData = this.data
             this.total = this.tableData.length
@@ -519,7 +520,7 @@ export default {
                 this.loading = false
             }
             this.$refs.scTable?.setScrollTop(0)
-            this.$emit('dataChange', res, this.tableData)
+            return res
         },
         //清空数据
         _clearData() {
diff --git a/src/frontend/admin/src/views/sys/dept/index.vue b/src/frontend/admin/src/views/sys/dept/index.vue
index 2a9090c5..bc336e7b 100644
--- a/src/frontend/admin/src/views/sys/dept/index.vue
+++ b/src/frontend/admin/src/views/sys/dept/index.vue
@@ -163,7 +163,7 @@ export default {
     inject: ['reload'],
     methods: {
         async getStatistics() {
-            this.statistics.total = this.$refs.table?.total
+            this.statistics.total = this.$refs.table?.tableData?.length
             const res = await Promise.all([
                 this.$API.sys_dept.countBy.post({
                     dynamicFilter: {
diff --git a/src/frontend/admin/src/views/sys/job/all/index.vue b/src/frontend/admin/src/views/sys/job/all/index.vue
index 076b9f82..6bc4c8c5 100644
--- a/src/frontend/admin/src/views/sys/job/all/index.vue
+++ b/src/frontend/admin/src/views/sys/job/all/index.vue
@@ -300,7 +300,13 @@ export default {
                 }),
                 this.$API.sys_job.countBy.post({
                     dynamicFilter: {
-                        filters: this.query.dynamicFilter.filters,
+                        filters: [
+                            ...this.query.dynamicFilter.filters,
+                            {
+                                field: 'LastStatusCode',
+                                operator: 'notEqual',
+                            },
+                        ],
                     },
                     requiredFields: ['LastStatusCode'],
                 }),
diff --git a/src/frontend/admin/src/views/sys/log/operation/index.vue b/src/frontend/admin/src/views/sys/log/operation/index.vue
index 2680c9d9..7ceb0016 100644
--- a/src/frontend/admin/src/views/sys/log/operation/index.vue
+++ b/src/frontend/admin/src/views/sys/log/operation/index.vue
@@ -139,7 +139,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column :label="$t('请求服务')" align="center">
-                    <el-table-column :label="$t('路径')" prop="apiPathCrc32" show-overflow-tooltip sortable="custom">
+                    <el-table-column :label="$t('路径')" min-width="300" prop="apiPathCrc32" show-overflow-tooltip sortable="custom">
                         <template #default="{ row }">
                             <p>
                                 {{ apis?.find((x) => x.pathCrc32 === row.apiPathCrc32)?.id }}