From 15b0d7c5ae71d3857375d2c2bf5c5590ff32676f Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 21 Jun 2022 17:01:04 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E5=8A=A0=E9=98=B4?=
 =?UTF-8?q?=E5=BD=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/components/header.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index 6c4639dd..3fc68faa 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -131,6 +131,7 @@
   const select = ref(router.currentRoute.value.name)
   const mynoticeFlag = ref(false)
   const mynoticeData = ref([])
+  // eslint-disable-next-line no-undef
   const navList = ref(navListManagement.navList)
   const props = defineProps({
     showView: { type: String, default: '' },
@@ -362,6 +363,7 @@
   }
   .white {
     background-color: #fff;
+    box-shadow: 0 0.02rem 0.1rem rgba(0, 0, 0, 0.1);
     .name {
       color: #0058e1;
     }

From 25eed3e27b91b084f3779ab0308af764f28b33bc Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 21 Jun 2022 17:01:19 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E9=9D=92=E5=B2=9B=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/static/config/location.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js
index 0b85c99c..50aebc14 100644
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@@ -1,12 +1,12 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-04-01 10:51:45
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-06-21 16:58:56
  * @Description: 数据资源参数配置
  */
-// const newLocation = 'qingdao'
-const newLocation = 'baotou'
+const newLocation = 'qingdao'
+// const newLocation = 'baotou'
 // const newLocation = 'xihaian'
 
 // 数据资源数据

From c9855a55c30fbb3c4c2dd9d45dc30337e9858b3b Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 21 Jun 2022 17:04:20 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1bug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/components/header.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index 3fc68faa..17e0cad5 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -265,21 +265,21 @@
     if (mynoticeDom) {
       mynoticeDom.addEventListener('mouseover', () => {
         mynoticeFlag.value = true
-        document.documentElement.style.overflow = 'hidden'
+        document.documentElement.style.overflowY = 'hidden'
       })
       mynoticeDom.addEventListener('mouseout', () => {
         mynoticeFlag.value = false
-        document.documentElement.style.overflow = 'scroll'
+        document.documentElement.style.overflowY = 'scroll'
       })
     }
     if (mynotice) {
       mynotice.addEventListener('mouseover', () => {
         mynoticeFlag.value = true
-        document.documentElement.style.overflow = 'hidden'
+        document.documentElement.style.overflowY = 'hidden'
       })
       mynotice.addEventListener('mouseout', () => {
         mynoticeFlag.value = false
-        document.documentElement.style.overflow = 'scroll'
+        document.documentElement.style.overflowY = 'scroll'
       })
     }
     mybus.on('getSgcNum', () => {

From 7b8cdbd0e7c7ff024078a94052c55dcb3dad0bda Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 21 Jun 2022 17:06:05 +0800
Subject: [PATCH 4/4] =?UTF-8?q?3840*1080=E5=88=87=E6=8D=A2=E9=80=82?=
 =?UTF-8?q?=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/App.vue                          | 11 +++++++++--
 front/src/views/home/components/header.vue |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/front/src/App.vue b/front/src/App.vue
index fb388474..ee08e473 100644
--- a/front/src/App.vue
+++ b/front/src/App.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.wuhongjian
  * @Date: 2022-05-06 11:12:00
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-13 17:45:49
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-06-21 16:59:46
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -26,4 +26,11 @@
 </script>
 <style lang="less">
   @import '~@/vab/styles/vab.less';
+  #vue-admin-beautiful{
+    max-width: 1920px;
+    max-height: 1080px;
+    margin: auto;
+    height: 100%;
+    position: relative;
+  }
 </style>
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index 84106d79..ecefa67d 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -295,7 +295,7 @@
   }
   .home-header {
     height: 0.64rem;
-    width: 100%;
+    // width: 100%;
     display: flex;
     justify-content: center;
     align-items: center;