From bf1123f732aa18619d6c380b66966b4b4029603c Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Fri, 21 Jun 2024 14:31:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=87=E6=AE=B5=E5=B7=A5?=
 =?UTF-8?q?=E7=A8=8B=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/views/base/section/index.vue | 27 ++++++++++++++++++------
 sgzb-ui/src/views/newLogin.vue           |  4 ++--
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/sgzb-ui/src/views/base/section/index.vue b/sgzb-ui/src/views/base/section/index.vue
index 5db0ed17..1daafc9b 100644
--- a/sgzb-ui/src/views/base/section/index.vue
+++ b/sgzb-ui/src/views/base/section/index.vue
@@ -153,6 +153,7 @@
     >
       <el-upload
         drag
+        ref="uploadRef"
         :action="uploadAction"
         :limit="1"
         accept=".xls, .xlsx"
@@ -160,13 +161,17 @@
         :data="uploadData"
         :on-success="onSuccess"
         :on-progress="onProgress"
+        v-loading="uploadLoading"
+        element-loading-text="数据正在导入，请稍后"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.6)"
       >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">
           将文件拖到此处，或
-          <em>点击上传</em>
+          <em>点击导入</em>
         </div>
-        <div class="el-upload__tip" slot="tip">只能上传.xlx/.xls文件</div>
+        <div class="el-upload__tip" slot="tip">只能选择.xlx/.xls文件进行导入</div>
       </el-upload>
     </el-dialog>
   </div>
@@ -235,13 +240,14 @@ export default {
         // ]
       },
       importVisible: false,
-      uploadAction: process.env.VUE_APP_BASE_API + '/system/sys/file/upload', // 上传地址
+      uploadAction: process.env.VUE_APP_BASE_API + '/base/bmProjectLot/importData', // 上传地址
       headers: {
         Authorization: 'Bearer ' + getToken(),
       },
       uploadData: {
         fileType: 'sx',
       },
+      uploadLoading: false,
     }
   },
   created() {
@@ -413,16 +419,23 @@ export default {
 
     // 导入按钮
     handleImport() {
-      console.log('导入----')
       this.importVisible = true
     },
     // 上传时
     onProgress(file) {
-      console.log(file, '上传时的文件')
+      this.uploadLoading = true
     },
     // 上传成功
-    onSuccess(fileList) {
-      console.log('上传成功！！', fileList)
+    onSuccess(res) {
+      if (res.code == 200) {
+        this.$message.success('导入成功！')
+        this.importVisible = false
+        this.getList()
+      } else {
+        this.$message.error('导入失败，请重新导入！')
+        this.$refs.uploadRef.clearFiles()
+      }
+      this.uploadLoading = false
     },
   },
 }
diff --git a/sgzb-ui/src/views/newLogin.vue b/sgzb-ui/src/views/newLogin.vue
index 38f16058..0ef9206e 100644
--- a/sgzb-ui/src/views/newLogin.vue
+++ b/sgzb-ui/src/views/newLogin.vue
@@ -653,7 +653,7 @@ export default {
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss">
+<style rel="stylesheet/scss" lang="scss" scoped>
 .login {
   //display: flex;
   //justify-content: center;
@@ -747,7 +747,7 @@ export default {
 }
 
 /* 解决验证码输入框与密码输入框对齐问题 */
-.code-container .el-form-item__content {
+::v-deep .code-container .el-form-item__content {
   display: flex;
 }