From f360cde8ff0b28ba677a4693cf45f47f206dd746 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 21 五月 2025 17:52:54 +0800
Subject: [PATCH] 1、设备管理中设备属性的字段显隐权限调整到设备状态字段 2、设备日志添加批量导出功能
---
src/components/page/GlobalHeader.vue | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/src/components/page/GlobalHeader.vue b/src/components/page/GlobalHeader.vue
index 4463912..6e635aa 100644
--- a/src/components/page/GlobalHeader.vue
+++ b/src/components/page/GlobalHeader.vue
@@ -17,8 +17,8 @@
:type="collapsed ? 'menu-unfold' : 'menu-fold'"
@click="toggle"/>
- <span v-if="device === 'desktop'">娆㈣繋杩涘叆 Jeecg-Boot 浼佷笟绾т綆浠ｇ爜骞冲彴</span>
- <span v-else>Jeecg-Boot</span>
+ <span v-if="device === 'desktop'">娆㈣繋杩涘叆 涓浗鑸彂鎴愬彂</span>
+ <span v-else>涓浗鑸彂鎴愬彂</span>
<user-menu :theme="theme"/>
</div>
@@ -27,6 +27,10 @@
<div class="header-index-wide">
<div class="header-index-left" :style="topMenuStyle.headerIndexLeft">
<logo class="top-nav-header" :show-title="device !== 'mobile'" :style="topMenuStyle.topNavHeader"/>
+ <div class="top-nav-text">
+ <div style="width:100%;height: 50%;line-height:35px">瀵嗙骇锛氬唴閮�</div>
+ <div style="width:100%;height: 50%;line-height:25px">璀﹀憡锛氭湰绯荤粺绂佹瀛樺偍銆佸鐞嗐�佷紶杈撴秹瀵嗕俊鎭�</div>
+ </div>
<div v-if="device !== 'mobile'" :style="topMenuStyle.topSmenuStyle">
<s-menu
mode="horizontal"
@@ -152,7 +156,7 @@
} else {
let rightWidth = '400px'
this.topMenuStyle.topNavHeader = { 'min-width': '165px' }
- this.topMenuStyle.topSmenuStyle = { 'width': 'calc(100% - 165px)' }
+ this.topMenuStyle.topSmenuStyle = { 'width': 'calc(100% - 165px - 300px)' }
this.topMenuStyle.headerIndexRight = { 'min-width': rightWidth, 'white-space': 'nowrap' }
this.topMenuStyle.headerIndexLeft = { 'width': `calc(100% - ${rightWidth})` }
}
@@ -223,5 +227,38 @@
}
/* update_end author:scott date:20190220 for: 缂╁皬棣栭〉甯冨眬椤堕儴鐨勯珮搴�*/
+ .top-nav-text {
+ color: #f00;
+ height: 100%
+ }
+ @media screen and (min-width: 1920px) {
+ .top-nav-text {
+ min-width: 400px;
+ }
+ }
+
+ @media screen and (min-width: 1680px) and (max-width: 1920px) {
+ .top-nav-text {
+ min-width: 300px;
+ }
+ }
+
+ @media screen and (min-width: 1400px) and (max-width: 1680px) {
+ .top-nav-text {
+ min-width: 300px;
+ }
+ }
+
+ @media screen and (min-width: 1280px) and (max-width: 1400px) {
+ .top-nav-text {
+ min-width: 450px;
+ }
+ }
+
+ @media screen and (max-width: 1280px) {
+ .top-nav-text {
+ min-width: 300px;
+ }
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3