Merge branch 'dev-rmd2' of Rmengdi/LQBZ_web into master

src/views/als/flightData/index.vue

@@ -339,7 +339,9 @@ export default {
           this.getDataImportAPI({ aircraftId: this.aircaftModelIdList })
           this.submitBtnLoading = false
         }
-      } catch (error) {}
+      } catch (error) {
+        this.submitBtnLoading = false
+      }
     },
 
     async updateDataImportAPI() {
@@ -354,7 +356,9 @@ export default {
           this.submitBtnLoading = false
           this.getDataImportAPI({ aircraftId: this.aircaftModelIdList })
         }
-      } catch (error) {}
+      } catch (error) {
+        this.submitBtnLoading = false
+      }
     },
 
     treeNodeClick(data) {
@@ -474,6 +478,7 @@ export default {
         this.upload.open = false
         this.upload.isUploading = false
         this.$refs.upload.clearFiles()
+        this.submitBtnLoading = false
       }
       // this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + '</div>', '导入结果', { dangerouslyUseHTMLString: true })
     },

src/views/als/intelligentQA/index.vue

@@ -58,8 +58,7 @@
         <div class="contentRight">
           <div>
             <div class="source">
-              <!-- <el-link :href="`${fileInfo.url}`" style="color: #209cc1" :underline="false" target="_blank"> -->
-              <el-link @click="downloadFile(fileInfo.url)" style="color: #209cc1" :underline="false" target="_blank">
+              <el-link :href="`${fileInfo.url}`" style="color: #209cc1" :underline="false" target="_blank">
                 <el-tooltip class="item" effect="dark" content="点击可下载" placement="top">
                   <span> 来源：《{{ moreData.file_name }}{{ moreData.fileName }}》</span>
                 </el-tooltip>
@@ -95,7 +94,6 @@ import { getListByIdsApi } from '@/api/als/oss'
 import VueOfficeDocx from '@vue-office/docx'
 import VueOfficePdf from '@vue-office/pdf'
 import '@vue-office/docx/lib/index.css'
-import { localResource } from '../utils/common'
 
 export default {
   name: 'IntelligentQA',
@@ -282,10 +280,6 @@ export default {
       } catch (error) {}
     },
 
-    downloadFile(url) {
-      localResource(url)
-    },
-
     deleteHistory(id) {
       this.$confirm('是否删除该条记录？', '提示', {
         confirmButtonText: '确定',