From 975cdf4ec2ac89ece5f3a52efe06555921c8ce7a Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Mon, 15 Jul 2024 22:32:16 +0800
Subject: [PATCH] =?UTF-8?q?2024=E5=B9=B47=E6=9C=8815=E6=97=A5=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=AD=89=E5=BE=85=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bl/blStuInfo/components/BlStuInfoV2Form.vue    | 14 ++++++++++++--
 .../components/BlTeacherInfoV2Form.vue             | 11 ++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/jeecgboot-vue3/src/views/bl/blStuInfo/components/BlStuInfoV2Form.vue b/jeecgboot-vue3/src/views/bl/blStuInfo/components/BlStuInfoV2Form.vue
index 8503000..dd9c153 100644
--- a/jeecgboot-vue3/src/views/bl/blStuInfo/components/BlStuInfoV2Form.vue
+++ b/jeecgboot-vue3/src/views/bl/blStuInfo/components/BlStuInfoV2Form.vue
@@ -64,7 +64,9 @@
           <span>温馨提示：点击导入后选择数据模板进行导入！</span>
         </a-col>
         <span style="text-align: center;">
-          <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls($event, { id: formData.id})">导入</j-upload-button>
+          <a-spin :spinning="uploadButtonSpinning">
+            <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXlsPlus($event, { id: formData.id})">导入</j-upload-button>
+          </a-spin>
         </span>
       </div>
       <div v-if="current == 2" style="padding: 20px;text-align: center;line-height: 100px;">
@@ -114,7 +116,7 @@ const formData = reactive<Record<string, any>>({
 
 
   //注册table数据
-  const {  onImportXls } = useListPage({
+  const { onImportXls } = useListPage({
     importConfig: {
       url: getImportUrl,
       success: handleSuccess
@@ -126,6 +128,8 @@ const formData = reactive<Record<string, any>>({
 
 
 const current = ref<number>(0);
+const uploadButtonSpinning = ref<boolean>(false);
+
 const next = () => {
   current.value++;
 };
@@ -149,6 +153,7 @@ const validatorRules = {
 const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
 //上传完成回调
 function handleSuccess(){
+  uploadButtonSpinning.value = false;
   current.value++;
   console.log("参数--------》",{id:formData.id})
   defHttp.get({url:'/blStuAnswer/blStuAnswer/createWord',params:{id:formData.id}}).then(res=>{
@@ -244,6 +249,11 @@ async function submitForm() {
     });
 }
 
+function onImportXlsPlus(...d) {
+  uploadButtonSpinning.value = true;
+  onImportXls(...d);
+}
+
 defineExpose({
   add,
   edit,
diff --git a/jeecgboot-vue3/src/views/bl/blTeacherInfo/components/BlTeacherInfoV2Form.vue b/jeecgboot-vue3/src/views/bl/blTeacherInfo/components/BlTeacherInfoV2Form.vue
index 9221d77..03d2b71 100644
--- a/jeecgboot-vue3/src/views/bl/blTeacherInfo/components/BlTeacherInfoV2Form.vue
+++ b/jeecgboot-vue3/src/views/bl/blTeacherInfo/components/BlTeacherInfoV2Form.vue
@@ -64,7 +64,9 @@
           <span>温馨提示：点击导入后选择数据模板进行导入！</span>
         </a-col>
         <span style="text-align: center;">
-          <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls($event, { id: formData.id})">导入</j-upload-button>
+          <a-spin :spinning="uploadButtonSpinning">
+            <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXlsPlus($event, { id: formData.id})">导入</j-upload-button>
+          </a-spin>
         </span>
       </div>
       <div v-if="current == 2" style="padding: 20px;text-align: center;line-height: 100px;">
@@ -126,6 +128,7 @@ const formData = reactive<Record<string, any>>({
 
 
 const current = ref<number>(0);
+const uploadButtonSpinning = ref<boolean>(false);
 const next = () => {
   current.value++;
 };
@@ -149,6 +152,7 @@ const validatorRules = {
 const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
 //上传完成回调
 function handleSuccess(){
+  uploadButtonSpinning.value = false;
   current.value++;
   console.log("参数--------》",{id:formData.id})
   defHttp.get({url:'/blTeacherAnswer/blTeacherAnswer/createWord',params:{id:formData.id}}).then(res=>{
@@ -244,6 +248,11 @@ async function submitForm() {
     });
 }
 
+function onImportXlsPlus(...d) {
+  uploadButtonSpinning.value = true;
+  onImportXls(...d);
+}
+
 defineExpose({
   add,
   edit,