From fe470128a5432662cc3f394280c652c5ab023161 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 28 五月 2025 09:22:59 +0800
Subject: [PATCH] 1、设备TEEP/设备开动率/班次利用率页面新增异常反馈功能 2、设备TEEP页面实现滚动加载(每次滚动加载15条) 3、异常反馈页面增加手动新增反馈异常功能 4、利用率分段与走势分析页面解决重置按钮后请求日期与显示日期不相等问题
---
src/components/page/GlobalLayout.vue | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue
index be54447..f4cc4cc 100644
--- a/src/components/page/GlobalLayout.vue
+++ b/src/components/page/GlobalLayout.vue
@@ -69,7 +69,8 @@
/>
<!-- layout content -->
- <a-layout-content :style="{ height: '100%', paddingTop: fixedHeader ? '59px' : '0' }">
+ <a-layout-content
+ :style="{ height: '100%', paddingTop: fixedHeader ? '59px' : '0' ,background: $route.meta.title=='棣栭〉'?'#151548':''}">
<slot></slot>
</a-layout-content>
@@ -102,7 +103,7 @@
components: {
SideMenu,
GlobalHeader,
- GlobalFooter,
+ GlobalFooter
// update-start---- author:os_chengtgen -- date:20190830 -- for:issues/463 -缂栬瘧涓婚棰滆壊宸茬敓鏁堬紝浣嗚繕涓�鐩磋浆鍦堬紝鏄剧ず涓婚 姝e湪缂栬瘧 ------
// // SettingDrawer
// 娉ㄩ噴杩欎釜鍥犱负鍦ㄤ釜浜鸿缃ā鍧楀凡缁忓姞杞戒簡SettingDrawer椤甸潰
@@ -113,7 +114,7 @@
data() {
return {
collapsed: false,
- activeMenu:{},
+ activeMenu: {},
menus: []
}
},
@@ -136,7 +137,7 @@
this.menus = this.permissionMenuList
//--update-begin----author:liusq---date:20210223------for:鍏充簬娴嬭竟鑿滃崟閬尅鍐呭闂璇︾粏璇存槑 #2255
- this.collapsed=!this.sidebarOpened;
+ this.collapsed = !this.sidebarOpened
//--update-begin----author:liusq---date:20210223------for:鍏充簬娴嬭竟鑿滃崟閬尅鍐呭闂璇︾粏璇存槑 #2255
// 鏍规嵁鍚庡彴閰嶇疆鑿滃崟锛岄噸鏂版帓搴忓姞杞借矾鐢变俊鎭�
@@ -159,17 +160,17 @@
}
},
//update-begin-author:taoyan date:20190430 for:鍔ㄦ�佽矾鐢眛itle鏄剧ず閰嶇疆鐨勮彍鍗晅itle鑰屼笉鏄叾瀵瑰簲璺敱鐨則itle
- myMenuSelect(value){
+ myMenuSelect(value) {
//姝ゅ瑙﹀彂鍔ㄦ�佽矾鐢辫鐐瑰嚮浜嬩欢
- this.findMenuBykey(this.menus,value.key)
- this.$emit("dynamicRouterShow",value.key,this.activeMenu.meta.title)
+ this.findMenuBykey(this.menus, value.key)
+ this.$emit('dynamicRouterShow', value.key, this.activeMenu.meta.title)
},
- findMenuBykey(menus,key){
- for(let i of menus){
- if(i.path==key){
- this.activeMenu = {...i}
- }else if(i.children && i.children.length>0){
- this.findMenuBykey(i.children,key)
+ findMenuBykey(menus, key) {
+ for (let i of menus) {
+ if (i.path == key) {
+ this.activeMenu = { ...i }
+ } else if (i.children && i.children.length > 0) {
+ this.findMenuBykey(i.children, key)
}
}
},
@@ -180,7 +181,7 @@
this.findMenuBykey(this.menus, value.path)
this.activeMenu.meta.title = value.meta.title
this.$emit('dynamicRouterShow', value.path, this.activeMenu.meta.title)
- },
+ }
// update-end-author:sunjianlei date:20210409 for: 淇鍔ㄦ�佸姛鑳芥祴璇曡彍鍗曘�佸甫鍙傛暟鑿滃崟鏍囬閿欒銆佸睍寮�閿欒鐨勯棶棰�
}
--
Gitblit v1.9.3