From 1ea1ad2c56e95e71e1756cfca73e7183f9795ac9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 16 四月 2025 15:23:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_test
---
src/views/CNAS/resourceDemand/device/component/calibration.vue | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/calibration.vue b/src/views/CNAS/resourceDemand/device/component/calibration.vue
index df025bd..b0fcdfa 100644
--- a/src/views/CNAS/resourceDemand/device/component/calibration.vue
+++ b/src/views/CNAS/resourceDemand/device/component/calibration.vue
@@ -7,7 +7,7 @@
<!-- <el-button size="small" type="primary" @click="handleDown">瀵煎嚭Excel</el-button> -->
</div>
<div class="tables" style="margin-top: 10px;">
- <el-table :data="tableData" height="calc(100vh - 20em)">
+ <el-table :data="tableData" height="calc(100vh - 20em)" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="搴忓彿" type="index" width="120">
<template v-slot="scope">
<span>{{ (search.current - 1) * search.size + scope.$index + 1 }}</span>
@@ -36,8 +36,8 @@
</el-table-column>
</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" style="margin-right: 5%;"
- @size-change="handleSizeChange" @current-change="handleCurrentChange">
+ :total="search.total" layout="->,total, sizes, prev, pager, next, jumper"
+ @size-change="handleSizeChange" @current-change="handleCurrentChange" background>
</el-pagination>
</div>
<!-- 鏍″噯椤圭洰缁存姢 -->
@@ -78,6 +78,7 @@
</h4>
<!-- 璁惧鏍″噯鍙傛暟琛ㄦ牸 -->
<el-table ref="calibrateTable" v-loading="calibrateParamsLoading" :data="calibrateParams" max-height="450" stripe
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
style="width: 100%">
<el-table-column label="缂栧彿" type="index" width="80"></el-table-column>
<el-table-column label="璁￠噺鍙傛暟" prop="measurementParameter"></el-table-column>
@@ -204,7 +205,7 @@
<span class="line"></span><span>鏍″噯鏉＄洰纭缁撴灉</span>
</span>
</h4>
- <el-table ref="calibrateTable" :data="calibrateParams" border>
+ <el-table ref="calibrateTable" :data="calibrateParams" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="缂栧彿" type="index" width="60"></el-table-column>
<el-table-column label="璁￠噺鍙傛暟" prop="measurementParameter"></el-table-column>
<el-table-column label="閲忕▼鑼冨洿" prop="rangeOfMeasurement"></el-table-column>
@@ -416,16 +417,7 @@
})
},
handleAttachmentClick(row) {
- let state = /\.(jpg|jpeg|png|gif)$/i.test(row.systemFileName)
- if (state) {
- let url = this.javaApi + '/img/' + row.systemFileName;
- this.$download.saveAs(url, row.systemFileName)
- this.$message.success('涓嬭浇鎴愬姛')
- } else {
- const url = this.javaApi + '/word/' + row.systemFileName
- this.$download.saveAs(url, row.systemFileName)
- this.$message.success('涓嬭浇鎴愬姛')
- }
+ this.$download.saveAs(row.systemFileName, row.systemFileName)
},
//瀵煎嚭
handleDown() {
@@ -437,7 +429,6 @@
this.outLoading = false
const blob = new Blob([res], { type: 'application/octet-stream' });
this.$download.saveAs(blob, '璁惧鏍″噯.xlsx')
- this.$message.success('瀵煎嚭鎴愬姛')
})
},
deleteFile() {
--
Gitblit v1.9.3