From b9c954dd6dae99304ea39b481d818690268df422 Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Tue, 18 Jun 2024 15:37:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E9=87=87=E9=9B=86=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/dangan/collection/index.vue      | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/dangan-ui/src/views/dangan/collection/index.vue b/dangan-ui/src/views/dangan/collection/index.vue
index d7006df..478c039 100644
--- a/dangan-ui/src/views/dangan/collection/index.vue
+++ b/dangan-ui/src/views/dangan/collection/index.vue
@@ -121,7 +121,7 @@
     </el-dialog>
 
     <el-dialog title="扫描文件上传" :visible.sync="smwj.open" width="1000px" append-to-body>
-      <div style="margin-bottom: 30px;display: flex;align-items:start;min-height: 250px" v-loading="smwj.loading">
+      <div style="margin-bottom: 30px;display: flex;align-items:start;min-height: 250px;" v-loading="smwj.loading">
         <div style="width:250px;border: 1px solid #eee; padding: 10px;">
           <div style="margin-bottom: 5px;">物理书架：</div>
           <el-tree
@@ -139,7 +139,8 @@
           />
         </div>
 
-        <div v-if="smwj.shelfId && smwj.list.length===0" style="width: 650px;margin-left: 20px;">
+        <div v-if="smwj.shelfId && smwj.list.length===0" style="width: 650px;margin-left: 20px;" v-loading="smwj.smloading" element-loading-text="文件扫描中"
+             element-loading-spinner="el-icon-loading">
           <div>
             <el-row class="sm_row" :gutter="20">
               <el-col class="sm_col" :span="8">
@@ -253,6 +254,7 @@ export default {
       // 扫描文件上传
       smwj: {
         loading: false,
+        smloading: false,
         // 是否显示弹出层（用户导入）
         open: false,
         shelfId: undefined,
@@ -288,7 +290,7 @@ export default {
 
       _this.WebScan.initSef('',function (result){
         if(result.code!=200){
-          this.$alert(`初始化失败，返回错误：${result.msg}`, `提示`, {
+          _this.$alert(`初始化失败，返回错误：${result.msg}`, `提示`, {
             type: 'error'
           });
         }else {
@@ -302,14 +304,14 @@ export default {
       let _this = this;
       _this.WebScan.getDevices(function (result){
         if(result.code!=200){
-          this.$alert(`初始化失败，返回错误：${result.msg}`, `提示`, {
+          _this.$alert(`初始化失败，返回错误：${result.msg}`, `提示`, {
             type: 'error'
           });
         }else {
           if(result.data.indexOf('M3230') !== -1){
             _this.WebScanSetParams()
           }else {
-            this.$alert(`未检测到设备`, `提示`, {
+            _this.$alert(`未检测到设备`, `提示`, {
               type: 'error'
             });
           }
@@ -368,11 +370,13 @@ export default {
       };
       _this.WebScan.setParams(form,function(result){
         if(result.code!=200){
-          this.$alert(`${result.msg}`, `提示`, {
+          _this.$alert(`${result.msg}`, `提示`, {
             type: 'error'
           });
         }else{
+          _this.smwj.smloading = true;
           _this.WebScan.startScan(function(result){
+            _this.smwj.smloading = false;
             if(result.code==201){
               _this.smwj.list.push({
                 base64Str: result.image,
@@ -380,7 +384,7 @@ export default {
               })
             }
             if(result.code==500){
-              this.$alert(`${result.msg}`, `提示`, {
+              _this.$alert(`${result.msg}`, `提示`, {
                 type: 'error'
               });
             }