From b64d6db597d332c699f84e4928f6d3e5551851f1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 04 三月 2025 16:43:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue b/src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue
index 57ed36d..bf9e244 100644
--- a/src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue
+++ b/src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue
@@ -6,14 +6,14 @@
<el-button type="primary" size="small" @click="addFun">鏂� 澧�</el-button>
<el-button type="primary" size="small" @click="approvalFun">瀹� 鎵�</el-button>
<el-button type="primary" size="small" @click="approveFun">鎵� 鍑�</el-button>
- <el-upload style="display: inline-block; padding: 0 6px" :action="action" :headers="headers" :on-error="onError"
- :show-file-list="false" :on-success="onSuccess">
+ <el-upload style="display: inline-block; padding: 0 6px" :action="action" :headers="uploadHeader"
+ :on-error="onError" :show-file-list="false" :on-success="onSuccess">
<el-button size="small" type="primary">瀵� 鍏�</el-button>
</el-upload>
<el-button size="small" @click="openDownloadDia">瀵煎嚭</el-button>
</div>
</div>
- <el-table :data="tableData" style="width: 100%" height="calc(100vh - 18em)">
+ <el-table :data="tableData" style="width: 100%" height="calc(100vh - 18em)" key="table0">
<el-table-column type="index" label="搴忓彿" width="120">
<template v-slot="scope">
<span>{{ (search.current - 1) * search.size + scope.$index + 1 }}</span>
@@ -96,7 +96,6 @@
</template>
<script>
-import { getToken } from "@/utils/auth";
import {
getPageList,
riskAnalysisApprovalOfControlPlanChecklist,
@@ -121,11 +120,6 @@
}
},
computed: {
- headers() {
- return {
- 'Authorization': "Bearer " + getToken()
- }
- },
action() {
return this.javaApi + '/manageControlPlanList/importControlPlanList'
},
@@ -283,7 +277,6 @@
openDownloadDia() {
exportSignificantRiskFactors().then(res => {
this.outLoading = false
- this.$message.success('瀵煎嚭鎴愬姛')
const blob = new Blob([res], { type: 'application/msword' });
this.$download.saveAs(blob, '閲嶅ぇ椋庨櫓鍥犵礌鍒嗘瀽鍙婃帶鍒惰鍒掓竻鍗�' + '.docx');
})
--
Gitblit v1.9.3