From 1f4c79169a0d3ef46f2430b61d4999e1be6261b3 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 06 五月 2024 14:59:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/page/wel.vue | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/page/wel.vue b/src/page/wel.vue
index 882532a..03cdf33 100644
--- a/src/page/wel.vue
+++ b/src/page/wel.vue
@@ -41,7 +41,7 @@
</div>
</div>
<el-card class="box-card todo-card">
- <el-row>
+ <el-row style="height: 100%;">
<el-col :span="12">
<ul class="type-box">
<li v-for="(m,i) in tabList" :key="i" :class="{active:current == i}" @click="changeTab(m,i)">{{ m }}</li>
@@ -100,13 +100,15 @@
</template>
</el-calendar>
</el-col>
- <el-col :span="12" style="padding: 16px 20px;box-sizing: border-box;height: 100%;overflow-y: auto;">
+ <el-col :span="12" style="padding: 16px 20px;box-sizing: border-box;height: 100%;">
<div class="todo-span"><span>寰呭姙</span></div>
- <div class="todo-info" v-for="(item,index) in todoList" :key="index" v-show="todoList.length>0">
- <div class="todo-info-state"></div>
- <span>{{ item }}</span>
+ <div style="height: calc(100% - 30px);overflow-y: auto;">
+ <div class="todo-info" v-for="(item,index) in todoList" :key="index" v-show="todoList.length>0">
+ <div class="todo-info-state"></div>
+ <span>{{ item }}</span>
+ </div>
+ <span class="no-info" v-if="todoList.length==0">鏆傛棤</span>
</div>
- <span class="no-info" v-if="todoList.length==0">鏆傛棤</span>
</el-col>
</el-row>
</el-card>
@@ -185,7 +187,8 @@
height: 65vh;
overflow: hidden;
>>>.el-card__body{
- padding: 0px 0px 5px
+ padding: 0px 0px 5px;
+ height: 100%;
}
.todo-span{
height:17px;
--
Gitblit v1.9.3