From 1e1e70da5288f47d8770ba2e7f22f3362e5b577c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 08 十二月 2023 17:16:35 +0800
Subject: [PATCH] 1、全局修改密码弹窗中的新密码校验长度与数据字典password_length设置保持一致 2、报警分析页面优化过快点击多次表格行时图表内容出现数据残留以及加载图表应设置加载中动画，若不设置用户在查询时短时间内不清楚有无数据 3、车间看板以及设备监控页面设备详情弹窗右上角增加关闭按钮、设备详情弹窗透明度加深、设备详情弹窗图表表盘指针对比色加强、调整设备详情弹窗中描述列表子项标题对齐方式由左对齐改为右对齐，锁定运行数据描述列表子项数值宽度，超出部分隐藏出现省略号，悬浮出现气泡卡片 4、设备利用率、设备开动率、班次利用率页面表格前三列增加表头，依次为公司、车间、工段以及表格有关时间值调整为若小时或分钟为0则不显示 5、设备综合效率分析页面表格数据默认每页最多显示10条改为20条 6、设备加工工件报表页面完成布局及功能实现
---
src/components/page/GlobalHeader.vue | 63 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 4 deletions(-)
diff --git a/src/components/page/GlobalHeader.vue b/src/components/page/GlobalHeader.vue
index aceaf87..c1a9b71 100644
--- a/src/components/page/GlobalHeader.vue
+++ b/src/components/page/GlobalHeader.vue
@@ -25,7 +25,11 @@
<div v-else :class="['top-nav-header-index', theme]">
<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"/>
+ <logo class="top-nav-header" :show-title="showTitle" :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"
@@ -58,7 +62,7 @@
components: {
UserMenu,
SMenu,
- Logo,
+ Logo
},
mixins: [mixin],
props: {
@@ -98,6 +102,7 @@
topSmenuStyle: {}
},
chatStatus: '',
+ showTitle: true
}
},
watch: {
@@ -121,6 +126,8 @@
if (this.mode === 'topmenu') {
this.buildTopMenuStyle()
}
+ window.addEventListener('resize', this.handleResize)
+ this.topMenuStyle.topNavHeader = { 'min-width': '165px', width: '165px' }
//update-end--author:sunjianlei---date:20190508------for: 椤堕儴瀵艰埅鏍忚繃闀挎椂鏄剧ず鏇村鎸夐挳-----
},
methods: {
@@ -150,8 +157,8 @@
this.topMenuStyle.headerIndexLeft = {}
} else {
let rightWidth = '360px'
- this.topMenuStyle.topNavHeader = { 'min-width': '165px' }
- this.topMenuStyle.topSmenuStyle = { 'width': 'calc(100% - 165px)' }
+ this.topMenuStyle.topNavHeader = { 'min-width': '50px', width: '50px' }
+ this.topMenuStyle.topSmenuStyle = { 'width': 'calc(100% - 350px)' }
this.topMenuStyle.headerIndexRight = { 'min-width': rightWidth }
this.topMenuStyle.headerIndexLeft = { 'width': `calc(100% - ${rightWidth})` }
}
@@ -165,6 +172,20 @@
},
// update-end-author:sunjianlei date:20210508 for: 淇鍔ㄦ�佸姛鑳芥祴璇曡彍鍗曘�佸甫鍙傛暟鑿滃崟鏍囬閿欒銆佸睍寮�閿欒鐨勯棶棰�
+ handleResize() {
+ console.log('瑙﹀彂灏哄鏀瑰彉', window.innerWidth)
+ if (window.innerWidth > 1680) {
+ this.showTitle = true
+ this.topMenuStyle.topNavHeader = { 'min-width': '165px' }
+ this.topMenuStyle.topSmenuStyle = { 'width': 'calc(100% - 165px)' }
+ } else if (window.innerWidth <= 1680 && window.innerWidth > 1280) {
+ this.showTitle = false
+ this.topMenuStyle.topNavHeader = { 'min-width': '50px', width: '50px' }
+ this.topMenuStyle.topSmenuStyle = { 'width': 'calc(100% - 250px)' }
+ } else if (window.innerWidth <= 1280 && window.innerWidth > 960) {
+ this.topMenuStyle.topSmenuStyle = { 'width': 'calc(100% - 350px)' }
+ }
+ }
}
}
</script>
@@ -223,4 +244,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