From bc707e83c3932c12c9edab06a10afeaeedd4e214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B1=E5=B1=8B?= <3180483789@qq.com>
Date: Fri, 21 Jul 2023 09:56:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modulex/modules/ModulexImport.vue   | 27 ++++---------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/modulex/modules/ModulexImport.vue b/ant-design-vue-jeecg/src/views/modulex/modules/ModulexImport.vue
index 58bf422..fe114be 100644
--- a/ant-design-vue-jeecg/src/views/modulex/modules/ModulexImport.vue
+++ b/ant-design-vue-jeecg/src/views/modulex/modules/ModulexImport.vue
@@ -53,7 +53,7 @@
       </a-form-model-item>
     </a-form>
     <template slot="footer">
-      <a-button type="primary" @click="handleCancel" :disabled="btnState">确定</a-button>
+      <a-button type="primary" @click="handleCancel" :disabled="closeable == 'true' ? false : true">确定</a-button>
     </template>
   </a-modal>
 </template>
@@ -76,15 +76,16 @@ export default {
       visible: false,
       model: {},
       // 注意事项默认值
+      closeable: 'true',
       uploadFinished: false,
       ModalData: {
         uploaded: '0',
         isVisible: 'false',
         records: '0',
         status: '判断文件结构',
-        closeable:'false'
+        // closeable: 'false'
       },
-      btnState:false,
+      btnState: false,
       form: this.$form.createForm(this),
       url:
         {
@@ -100,7 +101,7 @@ export default {
         'Los Angeles battles huge wildfires.'
       ],
       stateFontColor: 'stateFontColor',
-      ws:{}
+      ws: {}
 
     }
   },
@@ -108,17 +109,6 @@ export default {
   },
   computed: {},
   methods: {
-    // 上传
-    // 显示进度
-    /*    showProcess() {
-          let userId = store.getters.userInfo.id
-          let baseUrl = window._CONFIG['domianURL']
-          baseUrl = baseUrl.replace('http', 'ws')
-          let ws = new WebSocket(`${baseUrl}/uploadProcess/${userId}`)
-          ws.onmessage = (e) => {
-            this.ModalData = JSON.parse(e.data)
-          }
-        },*/
     // 上传文件
     handleChange(info) {
       if (info.file.status !== 'uploading') {
@@ -175,15 +165,8 @@ export default {
       this.ws.close()
     },
     handleCancel() {
-      console.log(4444)
-      if(this.ModalData.closeable == 'false'){
-        this.btnState=!this.btnState
-      }
         this.close()
         this.ws.close()
-      // this.close()
-      // this.ws.close()
-      // console.log(4444)
     },
     // 关闭提示标签
     onClose(e) {