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/device/component/files.vue | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/files.vue b/src/views/CNAS/resourceDemand/device/component/files.vue
index c28facd..3a96e5a 100644
--- a/src/views/CNAS/resourceDemand/device/component/files.vue
+++ b/src/views/CNAS/resourceDemand/device/component/files.vue
@@ -25,7 +25,7 @@
<el-col :span="8">
<div class="form-item">
<label>璁惧鍚嶇О</label>
- <!-- <p>{{ Mdata.deviceName }}</p> -->
+<!-- <p>{{ Mdata.deviceName }}</p> -->
<el-tooltip class="item" :content="Mdata.deviceName">
<span class="text-ellipsis">{{ Mdata.deviceName }}</span>
</el-tooltip>
@@ -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">
@@ -170,9 +170,9 @@
<el-table-column prop="quantity" label="浠芥暟" min-width="80" />
<el-table-column prop="pageCount" label="椤电爜" min-width="80" />
<el-table-column prop="provider" label="鎻愪緵鑰�" min-width="150" />
- <el-table-column prop="provideDate" label="褰掓。鏃ユ湡" min-width="150" />
+ <el-table-column prop="provideDate" label="褰掓。鏃ユ湡" min-width="170" />
<el-table-column prop="comments" label="澶囨敞" min-width="150" />
- <el-table-column fixed="right" label="鎿嶄綔" min-width="180">
+ <el-table-column fixed="right" label="鎿嶄綔" min-width="180" align="center">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleAttachmentClick(scope.row)">涓嬭浇闄勪欢</el-button>
<el-button type="text" size="small" @click="handleViewClick(scope.row)">缂栬緫</el-button>
@@ -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;
}
@@ -920,7 +914,6 @@
.page-header {
display: flex;
justify-content: space-between;
- margin-top: 10px;
}
h4 {
--
Gitblit v1.9.3