From 568e60d0eeecb947fd0f7aa8b8806b017334ff76 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 28 四月 2025 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/views/timer/timer.vue |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/admin/src/views/timer/timer.vue b/admin/src/views/timer/timer.vue
index 8529d97..fc76f3e 100644
--- a/admin/src/views/timer/timer.vue
+++ b/admin/src/views/timer/timer.vue
@@ -20,6 +20,7 @@
         <li><el-button type="primary" @click="$refs.OperaTimerWindow.open('鏂板缓浠诲姟')" icon="el-icon-plus" v-permissions="['business:devices:create']">鏂板缓</el-button></li>
       </ul>
       <el-table
+          :height="tableHeightNew"
         v-loading="isWorking.search"
         :data="tableData.list"
         stripe

--
Gitblit v1.9.3