From 9624c957d1313d196ebc80b06c1cb0fc65b274b5 Mon Sep 17 00:00:00 2001
From: mqh <1571896045@qq.com>
Date: Thu, 20 Jul 2023 14:59:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AF=BC=E5=85=A5=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E6=96=B0=E9=A1=B5=E9=9D=A22.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/modulex/ModulexList.vue         | 66 +++++--------------
 1 file changed, 17 insertions(+), 49 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue b/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue
index 2692368..b80e141 100644
--- a/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue
+++ b/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue
@@ -122,31 +122,9 @@
         </a-modal>
       </a-upload>
 
-      <!--      <a-upload name="file" :showUploadList="false" :multiple="false"
-                      :headers="tokenHeader" :action="tablexImportExcelUrl" @change="handleImportExcel">-->
       <a-button type="primary" icon="import"
-                @click="showProcess( 1)">导入实体
+                @click="showProcess( tablexData)">导入实体
       </a-button>
-      <!--      <a-button type="primary" icon="import" @click="showModalImport()">导入实体</a-button>-->
-      <!--      <a-modal
-              title="正在上传..."
-              :visible="ModalData.isVisible==='true'"
-              :confirm-loading="false"
-              :mask="true"
-              :maskClosable="false"
-              :keyboard="false"
-              :closable="false"
-              :footer="false"
-            >
-              <p>当前状态：{{ ModalData.status }}</p>
-              <p>总记录数：{{ ModalData.records }}</p>
-              <p>已上传：{{ ModalData.uploaded }}</p>
-              <a-progress
-                :percent="parseInt(String(ModalData.uploaded/ModalData.records*100))"
-                title="上传进度："
-                status="active" :steps="ModalData.records"/>
-            </a-modal>-->
-      <!--      </a-upload>-->
 
       <a-button @click="fanhui" type="primary" icon="rollback">返回</a-button>
       <a-button type="primary" icon="download" @click="exportxsxl('模块，功能，规则表')">导出综合表</a-button>
@@ -530,35 +508,25 @@ export default {
     ruleImportExcelUrl: function () {
       return `${window._CONFIG['domianURL']}/${this.url.ruleImportExcelUrl}`
     },
+    tablexData: function () {
+      return {
+        note: ['对应模块id(必填)：填写正确的模块名称',
+          '中文名称(必填)：与模块名称相同。',
+          '英文名称(必填)：与模块名称相同，写模块名称的英文名称。',
+          '结构图(选填)：类图或E-R图，可以为空，不填写。',
+          '实体状态：可填入值为[正常、停用、废弃]，若不填写，默认为“正常”状态。',
+          '版本状态: 可填入值为[当前、历史]，若不填写，默认为“当前”状态',
+          '版本号：请填写小与五位数的正整数'
+        ],
+        title: '导入实体',
+        uploadUrl: this.tablexImportExcelUrl,
+        downUrl: this.tablexDownExcelUrl
+      }
+    }
   },
   methods: {
     // 显示进度
-    showProcess(type) {
-      let data = {
-        uploadUrl: '',
-        downUrl: '',
-        title: '',
-        note: []
-      }
-      switch (type) {
-        case 1: {
-          data.note = ['对应模块id(必填)：填写正确的模块名称',
-            '中文名称(必填)：与模块名称相同。',
-            '英文名称(必填)：与模块名称相同，写模块名称的英文名称。',
-            '结构图(选填)：类图或E-R图，可以为空，不填写。',
-            '实体状态：可填入值为[正常、停用、废弃]，若不填写，默认为“正常”状态。',
-            '版本状态: 可填入值为[当前、历史]，若不填写，默认为“当前”状态',
-            '版本号：请填写小与五位数的正整数'
-          ]
-          data.title = '导入实体'
-          data.uploadUrl = this.tablexImportExcelUrl
-          data.downUrl = this.tablexDownExcelUrl
-          break;
-        }
-        default: {
-          return
-        }
-      }
+    showProcess(data) {
       let userId = store.getters.userInfo.id
       let base_url = window._CONFIG['domianURL']
       base_url = base_url.replace('http', 'ws')