From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001 From: Crunchy <3114200645@qq.com> Date: 星期二, 29 四月 2025 13:25:29 +0800 Subject: [PATCH] Merge branch 'dev' into dev_tides --- src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue index 48e5b68..aecefa0 100644 --- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue +++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue @@ -10,6 +10,7 @@ <el-table :data="tableData" height="calc(100vh - 18em)" + :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border style="width: 100%"> <el-table-column label="搴忓彿" type="index" width="120"> <template v-slot="scope"> @@ -46,7 +47,7 @@ </el-table> <el-pagination :current-page="1" :page-size="search.size" :page-sizes="[10, 20, 30, 50, 100]" :total="search.total" layout="->,total, sizes, prev, pager, next, jumper" - @size-change="handleSizeChange" + @size-change="handleSizeChange" background @current-change="handleCurrentChange"> </el-pagination> <el-dialog @@ -128,6 +129,7 @@ } from '@/api/cnas/resourceDemand/facilitiesEnvironment/facilitiesAndEnvironment' import axios from 'axios'; +import {deleteCNASFile} from "@/api/cnas/personal/personalList"; export default { data() { @@ -240,19 +242,20 @@ }) }, handleRemove(file) { - this.$axios.delete(this.$api.personnel.deleteCNASFile + "?fileName=" + file.name).then(res => { - if (res.code === 201) return; + deleteCNASFile({fileName: file.name}).then(res => { this.$message.success('鍒犻櫎鎴愬姛锛�') - let index = this.form.fileList.indexOf(fileName) - if (index != -1) { - this.successFileList.splice(index, 1) + let index = this.form.fileList.indexOf(file.name) + if (index !== -1) { + this.form.fileList.splice(index, 1) } }) }, download(row) { - let url = ''; - url = this.javaApi + '/img/' + row.systemFileName - this.$download.saveAs(url, row.fileName) + if (!row.systemFileName) { + this.$message.warning('鏆傛棤鏂囦欢') + return + } + this.$download.saveAs(row.systemFileName, row.fileName) } } } -- Gitblit v1.9.3