From 13a60da2424da8cd50e52e35e0126e23e34ea6f3 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期日, 16 三月 2025 15:58:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/resourceDemand/device/component/borrow.vue | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/borrow.vue b/src/views/CNAS/resourceDemand/device/component/borrow.vue
index a3e98ee..9b21be1 100644
--- a/src/views/CNAS/resourceDemand/device/component/borrow.vue
+++ b/src/views/CNAS/resourceDemand/device/component/borrow.vue
@@ -182,7 +182,7 @@
</span>
</el-dialog>
<el-dialog title="娴佺▼璺熻釜" top="5vh" :visible.sync="dialogVisible0" width="60%">
- <el-table :data="deviceLogs" style="width: 100%">
+ <el-table :data="deviceLogs" style="width: 100%" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column type="index" width="50">
</el-table-column>
<el-table-column prop="operator" label="鎿嶄綔浜�" width="180">
@@ -565,7 +565,6 @@
})
.then(() => {
deleteDeviceBorrow({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refresh();
});
--
Gitblit v1.9.3