From 6ded2ee6a9d9097d45f8f79a7e6429cf55ed7cc3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 07 三月 2025 16:59:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/platform/oil.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/admin/src/views/platform/oil.vue b/admin/src/views/platform/oil.vue
index 8ae45c5..b509ac6 100644
--- a/admin/src/views/platform/oil.vue
+++ b/admin/src/views/platform/oil.vue
@@ -31,7 +31,8 @@
<el-button type="primary" :loading="isWorking.export" v-permissions="['business:platformwatergas:exportExcel']"
@click="handleImport">瀵煎叆</el-button>
</ul>
- <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
+ <el-table
+ :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="carCode" label="杞︾墝鍙�" fixed min-width="150px"></el-table-column>
<el-table-column prop="timeInfo" label="浣跨敤鏈堜唤" fixed min-width="100px">
@@ -40,7 +41,7 @@
</template>
</el-table-column>
<el-table-column prop="num" label="娌硅�楋紙鍗囷級" fixed min-width="150px"></el-table-column>
- <el-table-column prop="content" label="璇存槑" min-width="120px"></el-table-column>
+ <el-table-column show-overflow-tooltip prop="content" label="璇存槑" min-width="120px"></el-table-column>
<el-table-column prop="editDate" label="鏈�杩戞搷浣滄椂闂�" min-width="140px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:platformwatergas:update', 'business:platformwatergas:delete'])" label="鎿嶄綔"
--
Gitblit v1.9.3