From 908ce43ff21c2068ef5148b0a417423c8ed9eae5 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 三月 2025 16:37:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/views/platform/water.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/admin/src/views/platform/water.vue b/admin/src/views/platform/water.vue
index fd99d89..8498378 100644
--- a/admin/src/views/platform/water.vue
+++ b/admin/src/views/platform/water.vue
@@ -2,7 +2,7 @@
<TableLayout :permissions="['business:platformwatergas:query']">
<SearchFormCollapse slot="search-form" :need-more="false">
<el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
- <el-form-item title="璇烽�夋嫨骞存湀鏃堕棿" label="" >
+ <el-form-item title="璇烽�夋嫨骞存湀鏃堕棿" label="" prop="timeInfo" >
<el-date-picker
@change="search"
clearable
@@ -27,6 +27,7 @@
<el-button type="primary" :loading="isWorking.export" v-permissions="['business:notice:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
</ul>
<el-table
+ :height="tableHeightNew"
v-loading="isWorking.search"
:data="tableData.list"
stripe
@@ -39,7 +40,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'])"
--
Gitblit v1.9.3