From d667fce729c223e885930bb8edb528ab501b8d6a Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期二, 26 十一月 2024 16:57:53 +0800
Subject: [PATCH] 1. 移动socket客户端类、新增socket/index.js文件（初始化） 2. socketMessage枚举类的完善（增加对每个类型的英文描述字段以及对类型筛选和判断是否为心跳消息的工具方法） 3. 在FYBgTaskCard.vue监听并处理如何刷后台任务状态逻辑
---
src/components/core/BaseContentLayout.vue | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/components/core/BaseContentLayout.vue b/src/components/core/BaseContentLayout.vue
index ce92424..3889435 100644
--- a/src/components/core/BaseContentLayout.vue
+++ b/src/components/core/BaseContentLayout.vue
@@ -5,7 +5,7 @@
</el-header>
<el-container>
<el-aside class="el-aside" :style="'height: ' + mainHeight">
- <el-scrollbar>
+ <el-scrollbar :noresize="true" style="position: relative;">
<slot name="aside"></slot>
</el-scrollbar>
</el-aside>
@@ -30,14 +30,16 @@
if (this.$refs.headerRef) {
const h1 = this.$refs.headerRef.$el.offsetHeight;
const h = h1;
- return `calc(100vh - ${h}px - 60px - var(--el-main-padding) * 2)`;
+ return `calc(100vh - ${h}px - 60px - var(--el-main-padding) * 2 + 6px)`;
} else {
return `calc(100vh - 60px * 2 - var(--el-main-padding) * 2)`;
}
}
},
mounted() {
- this.mainHeight = this.calHeight();
+ setTimeout(() => {
+ this.mainHeight = this.calHeight();
+ }, 150);
}
};
</script>
@@ -45,11 +47,13 @@
<style scoped>
.el-aside {
/* width: initial; */
+ /* overflow-x: auto; */
position: relative;
/* height: calc(100vh - 60px * 2 - 20px * 2); */
/* background-color: aqua; */
/* overflow-y: auto; */
border-right: 1px solid var(--el-color-info-light-7);
+ /* box-shadow: -10px 0px 4px rgba(0, 0, 0, 0.12) inset; */
}
.el-header {
--
Gitblit v1.9.3