From 39cec7480e4dd231ff967b2c101768a6ad2e8b23 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 10 Mar 2022 09:43:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/ImportFile/index.vue | 110 +++++++++++--------
 1 file changed, 66 insertions(+), 44 deletions(-)

diff --git a/jero-web/src/components/ImportFile/index.vue b/jero-web/src/components/ImportFile/index.vue
index 9a0dcff2c..cdeaeb6c4 100644
--- a/jero-web/src/components/ImportFile/index.vue
+++ b/jero-web/src/components/ImportFile/index.vue
@@ -1,77 +1,99 @@
 <template>
-    <div>
-      <a-upload name="file" :showUploadList="false"
-                class="upload-text"
-                :multiple="false" :headers="tokenHeader"
-                :action="importUrl"
-                @change="handleImportZip"
-                accept=".zip">
-        <a-icon type="import" :rotate="270"/>
-        {{$t('import')}}
-      </a-upload>
-    </div>
+  <div>
+    <a-upload name="file" :showUploadList="false"
+              class="upload-text"
+              :multiple="false" :headers="tokenHeader"
+              :action="importUrl"
+              @change="handleImportZip"
+              accept=".zip">
+      <a-icon type="import" :rotate="270"/>
+      {{$t('import')}}
+    </a-upload>
+  </div>
 </template>
 
 <script>
   import Vue from 'vue'
-  import { ACCESS_TOKEN } from "@/store/mutation-types"
+  import { ACCESS_TOKEN } from '@/store/mutation-types'
   import eventBUs from '../../common/event'
+
   export default {
     name: 'index',
-    props:{
+    props: {
       url: {
         type: Object,
         default: {}
-      },
+      }
     },
-    data(){
-        return{
-          tokenHeader: {'X-Access-Token': Vue.ls.get(ACCESS_TOKEN)},
-          importUrl:window._CONFIG['domianURL']+this.url.importZipUrl,
-        }
+    data() {
+      return {
+        tokenHeader: { 'X-Access-Token': Vue.ls.get(ACCESS_TOKEN) },
+        importUrl: window._CONFIG['domianURL'] + this.url.importZipUrl
+      }
     },
     mounted() {
     },
-    methods:{
-      handleImportZip(info){
+    methods: {
+      handleImportZip(info) {
         this.spinning = true
         if (info.file.status !== 'uploading') {
-          console.log(info.file, info.fileList);
+          console.log(info.file, info.fileList)
         }
 
         if (info.file.status === 'done') {
           if (info.file.response.success) {
-            // this.$message.success(`${info.file.name} 文件上传成功`);
             if (info.file.response.code === 201) {
-              let { message, result: { msg,error, fileUrl, fileName } } = info.file.response
-              let href = window._CONFIG['domianURL'] + fileUrl
+              let { message } = info.file.response
+              let { name } = info.file
               let content = []
-              for (let i = 0; i < error.length; i++) {
-                content.push(<div>{error[i]}</div>)
+              if (message) {
+                message = message.split('</br>')
+                message.forEach(res => {
+                  if (res) {
+                    content.push( < div > { res } < /div>)
+                  }
+                })
               }
               this.$warning({
-                title: message,
+                title: name,
                 content: (
-                  <div>
-                  <span>{msg}</span><br/>
-                  {content}
-                  </div>
+                  < div >
+                  { content }
+                  < /div>
               )
             })
             } else {
+              eventBUs.$emit('searchReset')
               this.$message.success(info.file.response.message || `${info.file.name} 文件导入成功`)
             }
-            eventBUs.$emit('searchReset')
             this.spinning = false
           } else {
-            this.$message.error(`${info.file.name} ${info.file.response.message}`);
+            let { message } = info.file.response
+            let { name } = info.file
+            let content = []
+            if (message) {
+              message = message.split('</br>')
+              message.forEach(res => {
+                if (res) {
+                  content.push( < div > { res } < /div>)
+                }
+              })
+            }
+            this.$warning({
+              title: name,
+              content: (
+                < div >
+                { content }
+                < /div>
+            )
+          })
             this.spinning = false
           }
         } else if (info.file.status === 'error') {
           if (info.file.response.status === 500) {
             let data = info.file.response
             const token = Vue.ls.get(ACCESS_TOKEN)
-            if (token && data.message.includes("Token失效")) {
+            if (token && data.message.includes('Token失效')) {
               Modal.error({
                 title: '登录已过期',
                 content: '很抱歉，登录已过期，请重新登录',
@@ -80,26 +102,26 @@
                 onOk: () => {
                   store.dispatch('Logout').then(() => {
                     Vue.ls.remove(ACCESS_TOKEN)
-                    window.location.reload();
+                    window.location.reload()
                   })
                 }
               })
             }
             this.spinning = false
           } else {
-            this.$message.error(`文件导入失败: ${info.file.msg} `);
+            this.$message.error(`文件导入失败: ${info.file.msg} `)
             this.spinning = false
           }
         }
-      },
-    },
+      }
+    }
   }
 </script>
 
 <style>
-.upload-text .ant-upload{
-  font-size: 14px!important;
-  font-weight: 400!important;
-  color: #040B29!important;
-}
+  .upload-text .ant-upload {
+    font-size: 14px !important;
+    font-weight: 400 !important;
+    color: #040B29 !important;
+  }
 </style>
\ No newline at end of file