From fb582add0f0e56f91bceabab201ff815b57afa01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=88=E5=85=86=E5=A2=9E?= <你的邮箱@example.com>
Date: Thu, 7 May 2026 18:28:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=80=E5=87=BA=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E5=BC=B9=E6=A1=86=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=A1=AB=E6=8A=A5=E9=A2=84=E8=A7=88=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E5=92=8C=E5=9B=BE=E7=89=87=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E8=BD=AE=E8=AF=A2=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/layout/components/Navbar.vue     |  41 ++++---
 .../guoYuSheShiShuJuTianBaoForm.vue           |  23 +---
 .../guoYuSheShiShuJuTianBao/index.vue         | 112 ++++++++----------
 3 files changed, 74 insertions(+), 102 deletions(-)

diff --git a/frontend/src/layout/components/Navbar.vue b/frontend/src/layout/components/Navbar.vue
index 08706d4..60febd6 100644
--- a/frontend/src/layout/components/Navbar.vue
+++ b/frontend/src/layout/components/Navbar.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { onMounted, onBeforeUnmount } from "vue";
 import { useRoute, useRouter } from "vue-router";
-import { ElMessageBox } from "element-plus";
+import { Modal } from "ant-design-vue";
 import { UserOutlined, LogoutOutlined } from "@ant-design/icons-vue";
 // 国际化
 import { useI18n } from "vue-i18n";
@@ -20,28 +20,28 @@ const userStore = useUserStore();
 const route = useRoute();
 const router = useRouter();
 function logout() {
-  ElMessageBox.confirm("确定注销并退出系统吗？", "提示", {
-    confirmButtonText: "确定",
-    cancelButtonText: "取消",
+  Modal.confirm({
+    title: "提示?",
+    content: "确定注销并退出系统吗？",
+    okText: "确定",
     type: "warning",
-  }).then(() => {
-    userStore
-      .logout()
-      .then(() => {
-        tagsViewStore.delAllViews();
-      })
-      .then(() => {
-        router.push(`/login`);
-      });
+    onOk: async () => {
+      userStore
+        .logout()
+        .then(() => {
+          tagsViewStore.delAllViews();
+        })
+        .then(() => {
+          router.push(`/login`);
+        });
+    },
   });
 }
 function changePassword() {
-  router.push('/changePassword');
+  router.push("/changePassword");
 }
-onMounted(() => {
-});
-onBeforeUnmount(() => {
-});
+onMounted(() => {});
+onBeforeUnmount(() => {});
 </script>
 
 <template>
@@ -54,8 +54,7 @@ onBeforeUnmount(() => {
         >
           <!-- <h1 class="text-blank font-bold text-[16px]">{{ t("login.title") }}</h1> -->
           <h1 class="text-blank font-bold text-[16px]">{{ t("login.titleSjtb") }}</h1>
-          </a
-        >
+        </a>
       </transition>
       <Sidebar />
 
@@ -70,7 +69,7 @@ onBeforeUnmount(() => {
         </a-space>
         <template #overlay>
           <a-menu>
-            <a-menu-item key="changePassword" @click="changePassword" >
+            <a-menu-item key="changePassword" @click="changePassword">
               <UserOutlined />
               修改密码
             </a-menu-item>
diff --git a/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuTianBao/guoYuSheShiShuJuTianBaoForm.vue b/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuTianBao/guoYuSheShiShuJuTianBaoForm.vue
index 1905869..c60967f 100644
--- a/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuTianBao/guoYuSheShiShuJuTianBaoForm.vue
+++ b/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuTianBao/guoYuSheShiShuJuTianBaoForm.vue
@@ -271,6 +271,7 @@
               :multiple="false"
               accept=".mp4"
               :before-upload="beforeVideoUpload"
+              @preview="handleVideoPreview"
               :disabled="isView"
               :maxCount="5"
               @remove="handleVideoRemove"
@@ -651,11 +652,8 @@ const handleVideoPreview = () => {
 
 // 预览图片
 const handleImagePreview = async (file: any) => {
-  if (!props.isView) {
-    return "";
-  }
   emit("preview-click", { picpthList: imageFileList.value }, "formImage", 0);
-  return "";
+  return Promise.reject();
 };
 // 确认操作
 const handleOk = async () => {
@@ -847,23 +845,6 @@ defineExpose({
     padding: 0;
     border: 1px solid #d9d9d9;
     border-radius: 2px;
-
-    /* 删除预览按钮 */
-    .ant-upload-list-item-actions {
-      a {
-        display: none;
-      }
-    }
-  }
-}
-.imgupload_hidden {
-  :deep(.ant-upload-list-item) {
-    /* 删除预览按钮 */
-    .ant-upload-list-item-actions {
-      a {
-        display: block;
-      }
-    }
   }
 }
 </style>
diff --git a/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuTianBao/index.vue b/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuTianBao/index.vue
index d87dfd9..739ff6f 100644
--- a/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuTianBao/index.vue
+++ b/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuTianBao/index.vue
@@ -311,7 +311,12 @@
 <script lang="ts" setup>
 import { ref, computed, onMounted, h, nextTick, watch } from "vue";
 import { message, Modal } from "ant-design-vue"; // 假设使用 ant-design-vue
-import { LeftOutlined, RightOutlined, CloseCircleOutlined, ExclamationCircleOutlined } from "@ant-design/icons-vue"; // 引入图标组件
+import {
+  LeftOutlined,
+  RightOutlined,
+  CloseCircleOutlined,
+  ExclamationCircleOutlined,
+} from "@ant-design/icons-vue"; // 引入图标组件
 import BasicTable from "@/components/BasicTable/index.vue";
 import GuoYuSheShiShuJuTianBaoSearch from "./guoYuSheShiShuJuTianBaoSearch.vue";
 import GuoYuSheShiShuJuTianBaoTable from "./guoYuSheShiShuJuTianBaoTable.vue";
@@ -337,7 +342,6 @@ import { Tag } from "ant-design-vue"; // 确保导入 Tag
 import { getDictItemsByCode } from "@/api/dict";
 
 const baseUrl = import.meta.env.VITE_APP_PREVIEW_URL;
-const baseUrlPreview = import.meta.env.VITE_APP_BASE_URL;
 const baseUrlApi = import.meta.env.VITE_APP_BASE_API_URL;
 // --- 类型定义 ---
 interface FormData {
@@ -747,17 +751,21 @@ const handleModalOk = () => {
   Modal.confirm({
     title: "是否提交导入数据?",
     onOk: async () => {
-      let res: any = await batchSaveDraft({
-        taskId: taskId.value
-      });
-      if (res && res?.code == 0) {
-        fileTableData.value = [];
-        taskId.value = "";
-        tableRef.value?.refresh();
-        visible.value = false;
-        message.success("导入成功");
-      } else {
-        message.error("导入失败,请检查数据是否正确");
+      try {
+        let res: any = await batchSaveDraft({
+          taskId: taskId.value,
+        });
+        if (res && res?.code == 0) {
+          fileTableData.value = [];
+          taskId.value = "";
+          tableRef.value?.refresh();
+          visible.value = false;
+          message.success("导入成功");
+        } else {
+          message.error("导入失败,请检查数据是否正确");
+        }
+      } catch (error) {
+        message.error("导入数据失败");
       }
     },
   });
@@ -785,7 +793,7 @@ const handleCustomCancel = () => {
   });
 };
 const importBtn = async () => {
-  let res: any = await checkImportStatus(); 
+  let res: any = await checkImportStatus();
   taskId.value = "";
   if (res?.code == 0) {
     const { hasImportingTask, currentTask } = res?.data || {};
@@ -796,17 +804,16 @@ const importBtn = async () => {
       visible.value = true;
       fileLoading.value = true;
       if (currentTask.status == "UPLOADED") {
-        if (visible.value) message.warning(currentTask.statusText);
+        if (visible.value) {
+          // message.warning(currentTask.statusText)
+          setTimeout(() => {
+            if (visible.value) importBtn();
+          }, 5000);
+        }
       } else if (currentTask.status == "VALIDATED") {
         nextTick(async () => {
-          try {
-            modalTableRef.value.editingRowIndex = null;
-            getFileList();
-          } catch (error) {
-            message.error("导入失败");
-          } finally {
-            fileLoading.value = false;
-          }
+          modalTableRef.value.editingRowIndex = null;
+          getFileList();
         });
       }
     } else {
@@ -818,39 +825,28 @@ const importBtn = async () => {
 };
 const getFileList = async () => {
   let res: any = await getLastImportResult();
-  fileTableaAnalysis(res, "get");
-}
+  fileTableaAnalysis(res);
+};
 // 上传文件
 const fileChange = (file: File) => {
-  try {
-    nextTick(async () => {
-      visible.value = true;
-      fileLoading.value = true;
-      fileTableData.value = [];
-      const formData = new FormData();
-      formData.append("file", file);
-      let res: any = await importFishZip(formData);
-      const { code } = res.data || {};
-      try {
-        if (code == 1) {
-          message.error("导入失败");
-        } else {
-          taskId.value = res.data.taskId;
-          if (res.data.summary) {
-            message.success(res.data.summary);
-          } else {
-            message.success("导入成功");
-          }
-          fileTableaAnalysis(res, "file");
-        }
-      } catch (error) {
-        message.error("导入失败");
-      }
-    });
-  } catch (error) {
-  } finally {
-    fileLoading.value = false;
-  }
+  nextTick(async () => {
+    visible.value = true;
+    fileLoading.value = true;
+    fileTableData.value = [];
+    setTimeout(() => {
+      if (visible.value) importBtn();
+    }, 5000);
+    const formData = new FormData();
+    formData.append("file", file);
+    await importFishZip(formData);
+    try {
+      setTimeout(() => {
+        if (visible.value) importBtn();
+      }, 5000);
+    } catch (error) {
+      message.error("导入失败");
+    }
+  });
 };
 // 获取文件列表
 const handleFileSelect = (e: Event) => {
@@ -886,14 +882,10 @@ const resetFileInput = () => {
     fileInputRef.value.value = "";
   }
 };
-const fileTableaAnalysis = (res: any, type: string) => {
+const fileTableaAnalysis = (res: any) => {
   let data = [];
   let list = [];
-  if (type == "file") {
-    list = res.data.rows;
-  } else {
-    list = res.data.result.rows;
-  }
+  list = res.data.result.rows;
   list.sort((a: any, b: any) => {
     const keyA =
       a.rowIndex !== undefined && a.rowIndex !== null ? Number(a.rowIndex) : -1;