From 2d55ed180fddd028bf4f839345bf0ef4d2f032e7 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 07 三月 2025 13:34:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/CNAS/resourceDemand/device/component/files.vue | 21 +++++----------------
1 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/files.vue b/src/views/CNAS/resourceDemand/device/component/files.vue
index bb72b97..c28facd 100644
--- a/src/views/CNAS/resourceDemand/device/component/files.vue
+++ b/src/views/CNAS/resourceDemand/device/component/files.vue
@@ -175,7 +175,7 @@
<el-table-column fixed="right" label="鎿嶄綔" min-width="180">
<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>
+ <el-button type="text" size="small" @click="handleViewClick(scope.row)">缂栬緫</el-button>
<el-button type="text" size="small" @click="handleDeleteClick(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -341,7 +341,7 @@
</el-row>
</span>
</el-dialog>
- <el-dialog title="娣诲姞璁惧闄勪欢" top="5vh" v-if="dialogVisible1" :visible.sync="dialogVisible1" width="40%">
+ <el-dialog title="璁惧闄勪欢" top="5vh" v-if="dialogVisible1" :visible.sync="dialogVisible1" width="40%">
<el-form ref="form" :model="addFile" label-width="120px">
<el-row :gutter="20">
<el-col :span="12">
@@ -618,18 +618,7 @@
handleAttachmentClick(row) {
console.log(row)
if (row.fileName) {
- let state = /\.(jpg|jpeg|png|gif)$/i.test(row.fileName)
- if (state) {
- let url = this.javaApi + '/img/' + row.fileName;
- fileDownload.downloadIamge(url, row.fileName)
- } else {
- const url = this.javaApi + '/word/' + row.fileName
- const link = document.createElement('a');
- link.href = url;
- link.download = row.fileName;
- link.click();
- this.$message.success('涓嬭浇鎴愬姛')
- }
+ this.$download.downloadFileFromUrl(row.fileName)
} else {
this.$message.warning('鏈笂浼犳枃浠讹紒')
}
@@ -1063,14 +1052,14 @@
.device-main {
width: 90%;
margin: 0px 5%;
- height: 460px;
+ height: 500px;
padding: 25px 0px;
background-color: #fff;
}
.device-center {
width: 90%;
- height: 460px;
+ height: 490px;
margin: 0px 5%;
border-radius: 15px;
background-color: #fff;
--
Gitblit v1.9.3