From 8f38a93c9c9ddaf547200a542aecced93f8857a3 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期一, 11 十一月 2024 15:11:50 +0800
Subject: [PATCH] 报警分析页面子表格持续时间增加默认升序排序功能
---
src/components/page/GlobalLayout.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue
index 7b0aa51..cbd3a3f 100644
--- a/src/components/page/GlobalLayout.vue
+++ b/src/components/page/GlobalLayout.vue
@@ -69,7 +69,7 @@
/>
<!-- layout content -->
- <a-layout-content :style="{ height: '100%', paddingTop: fixedHeader ? '59px' : '0' }">
+ <a-layout-content :style="{ height: '100%', paddingTop: fixedHeader ? '59px' : '0' ,display:'flex',flexDirection:'column'}">
<slot></slot>
</a-layout-content>
@@ -134,11 +134,11 @@
//--update-begin----author:scott---date:20190320------for:鏍规嵁鍚庡彴鑿滃崟閰嶇疆锛屽垽鏂槸鍚﹁矾鐢辫彍鍗曞瓧娈碉紝鍔ㄦ�侀�夋嫨鏄惁鐢熸垚璺敱锛堜负浜嗘敮鎸佸弬鏁癠RL鑿滃崟锛�------
//this.menus = this.mainRouters.find((item) => item.path === '/').children;
this.menus = this.permissionMenuList
-
+
//--update-begin----author:liusq---date:20210223------for:鍏充簬娴嬭竟鑿滃崟閬尅鍐呭闂璇︾粏璇存槑 #2255
this.collapsed=!this.sidebarOpened;
//--update-begin----author:liusq---date:20210223------for:鍏充簬娴嬭竟鑿滃崟閬尅鍐呭闂璇︾粏璇存槑 #2255
-
+
// 鏍规嵁鍚庡彴閰嶇疆鑿滃崟锛岄噸鏂版帓搴忓姞杞借矾鐢变俊鎭�
//console.log('----鍔犺浇鑿滃崟閫昏緫----')
//console.log(this.mainRouters)
@@ -451,6 +451,7 @@
padding: 0 20px 0 0;
display: flex;
height: 59px;
+ color: #fff;
.ant-menu.ant-menu-horizontal {
border: none;
@@ -463,7 +464,7 @@
display: flex;
.logo.top-nav-header {
- width: 165px;
+ width: 240px;
height: 64px;
position: relative;
line-height: 64px;
@@ -498,7 +499,7 @@
}
&.light {
- background-color: #fff;
+ background-color: #E74C3C;
.header-index-wide {
.header-index-left {
--
Gitblit v1.9.3