From c4cfd5c566d137fb60781b8b2e0057d11cf4b051 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 17:33:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/resourceDemand/device/component/files.vue | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/files.vue b/src/views/CNAS/resourceDemand/device/component/files.vue
index c28facd..de19de7 100644
--- a/src/views/CNAS/resourceDemand/device/component/files.vue
+++ b/src/views/CNAS/resourceDemand/device/component/files.vue
@@ -157,7 +157,7 @@
</el-col>
</el-row>
<h4 style="margin-bottom: 10px;margin-top: 10px;"><span class="line"></span><span>闄勪欢鍜岀浉鍏虫枃妗�</span></h4>
- <el-table height="200px" :data="tableDataA">
+ <el-table height="200px" :data="tableDataA" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column header-align="center" align="center" prop="prop" label="搴忓彿" type="index" width="60" />
<el-table-column prop="documentType" label="绫诲瀷" min-width="100">
<template v-slot="scope">
@@ -446,7 +446,6 @@
<script>
import { MessageBox } from 'element-ui'
-import ValueTable from "@/components/Table/value-table.vue";
import fileDownload from '@/utils/file'
import vueQr from 'vue-qr'
import PrintJS from 'print-js'
@@ -484,7 +483,6 @@
}
},
components: {
- ValueTable,
vueQr
},
data() {
@@ -618,7 +616,7 @@
handleAttachmentClick(row) {
console.log(row)
if (row.fileName) {
- this.$download.downloadFileFromUrl(row.fileName)
+ this.$download.saveAs(row.fileName)
} else {
this.$message.warning('鏈笂浼犳枃浠讹紒')
}
@@ -780,10 +778,6 @@
}
this.upLoad = true;
upDeviceParameter(formData).then(res => {
- if (res.code === 201) {
- this.upLoad = false
- return
- }
this.$message.success('淇敼鎴愬姛')
this.upLoad = false
this.getList(this.clickNodeVal.value)
@@ -907,7 +901,7 @@
<style scoped>
.main_div {
- height: calc(100vh - 15em);
+ height: calc(100vh - 19em);
overflow-y: auto;
overflow-x: hidden;
}
--
Gitblit v1.9.3