From 9f7777c83f2d07c8d83c506ab2a13bc543f47de9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 10 四月 2025 11:08:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/categoryDcaProblem.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/admin/src/views/business/categoryDcaProblem.vue b/admin/src/views/business/categoryDcaProblem.vue
index 1149c72..55f6eae 100644
--- a/admin/src/views/business/categoryDcaProblem.vue
+++ b/admin/src/views/business/categoryDcaProblem.vue
@@ -17,7 +17,7 @@
<div
style="width: 100%; height: 50px; background: rgba(242, 242, 242, 1); line-height: 50px; text-align: center; font-size: 14px;">
DCA涓婚</div>
- <div style="width: 100%; height: calc(100vh - 170px); overflow-y: scroll;">
+ <div style="width: 100%; height: calc(100vh - 130px); overflow-y: scroll;">
<Tree :list="treeList" :alllist="treeList" :defaultProps="{ name: 'name', status: 'fsStatus', children: 'childList', id: 'id' }"
@callback="callback" />
</div>
@@ -30,7 +30,7 @@
v-permissions="['business:category:create']">鏂板缓</el-button></li>
<li><el-button type="danger" @click="deleteByIdInBatch(true,getfindTreePage)" icon="el-icon-delete" v-permissions="['business:category:delete']">鎵归噺鍒犻櫎</el-button></li>
</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="name" label="鍚嶇О" min-width="100px"></el-table-column>
<el-table-column prop="parentName" label="鎵�灞炵埗绾�" min-width="150px"></el-table-column>
--
Gitblit v1.9.3