From e39e55c977b8d2345273578951a4eb1f3d16e39d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Fri, 13 Dec 2024 16:51:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/shells/index/index.vue   | 14 +-----------
 src/style/common.styl              |  7 +++---
 static/Magic4/HMI_JavaApp_Map.html |  6 +++---
 static/Magic4/HMI_Map2.html        | 34 +++++++++++++++++++-----------
 4 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/src/pages/shells/index/index.vue b/src/pages/shells/index/index.vue
index 8459ea0..7119084 100644
--- a/src/pages/shells/index/index.vue
+++ b/src/pages/shells/index/index.vue
@@ -44,7 +44,7 @@
         <jxTime></jxTime>
       </div>
     </div>
-    <div class="body-conatiner" :class="{'body-conatiner_1': $route.path !== '/index/home'}">
+    <div class="body-conatiner" :class="{'body-conatiner_1': $route.path !== '/index/home', 'body-conatiner_2': $route.path === '/index/teach'}">
       <div class="hud_left"></div>
       <div class="hud_right"></div>
       <div class="bottom_bg"></div>
@@ -171,13 +171,6 @@ export default {
     // this.timer = setInterval(() => {
     //   this._queryHead()
     // }, this.itime)
-    if (this.menus.length) {
-      this.menus.map(el => {
-        if (el.router === this.$route.path) {
-          this.childmenus = el.children
-        }
-      })
-    }
     if (this.$i18n.locale === 'zh-cn') {
       this.selectType = 'zh-cn'
     } else if (this.$i18n.locale === 'en-us') {
@@ -269,11 +262,6 @@ export default {
     async _sysMenuBuild () {
       let res = await sysMenuBuild()
       this.menus = [...res]
-      res.map(el => {
-        if (el.router === this.$route.path) {
-          this.childmenus = el.children
-        }
-      })
       this.$store.dispatch('getMenus', [...res])
     },
     async _authLogout () {
diff --git a/src/style/common.styl b/src/style/common.styl
index ffb4fe1..8b0e9c2 100644
--- a/src/style/common.styl
+++ b/src/style/common.styl
@@ -54,11 +54,12 @@
   position relative
   _fj()
   _wh(100%, 100%)
-  padding-top 124px
-  padding-bottom 54px
+  padding 107px 0 54px 0
   background center / 100% 100% url(../images/new/bg.png) no-repeat
 .body-conatiner_1
   background center / 100% 100% url(../images/new/bg_1.png) no-repeat
+.body-conatiner_2
+  padding 0
 .side-bar-container
   _wh(228px, 100%)
   padding-top 101px
@@ -69,7 +70,7 @@
   _wh(2.72rem, 100%)
 .right_side
   _wh(100%, 100%)
-  padding 0 30px 0 30px
+  padding 0 26.5px
 .content_wrap
   _wh(100%, 100%)
 .title_wrap
diff --git a/static/Magic4/HMI_JavaApp_Map.html b/static/Magic4/HMI_JavaApp_Map.html
index e348b4f..f066d88 100644
--- a/static/Magic4/HMI_JavaApp_Map.html
+++ b/static/Magic4/HMI_JavaApp_Map.html
@@ -25,7 +25,7 @@
       height: 100%;
     }
     .sidebar .nav:not(.sub-menu) {
-      margin-top: 101px;
+      margin-top: 211px;
     }
     .sidebar .nav .nav-item {
       height: 120px;
@@ -91,11 +91,11 @@
     }
     .main-panel {
       width: calc(100% - 228px);
-      padding-right: 53px;
+      padding: 107px 53px 54px 0;
     }
     .content-wrapper {
       height: 100%;
-      padding: 0 30px;
+      padding: 0 26.5px;
       background: transparent;
       overflow: hidden;
     }
diff --git a/static/Magic4/HMI_Map2.html b/static/Magic4/HMI_Map2.html
index 3799a1c..e6ca5af 100644
--- a/static/Magic4/HMI_Map2.html
+++ b/static/Magic4/HMI_Map2.html
@@ -1282,14 +1282,14 @@
     <div class="title_wrap"><h2>地图</h2></div>
     <div class="page_container">
         <div class="top">
-            <img id="ButtonImage_Vertical_FollowCar" src="Led_Display/Button_Vertical_Off.bmp"/>
-            <input type=button class="btn" id="Button_CanvasInit" data-i18n-value="map.canvasInit" value="初始化" style="width:10%;height:50px;background:#FD4F00FF"></input>
-            <input type=button class="btn" id="Button_FindCar" data-i18n-value="map.findCar" value="车辆位置" style="width:10%;height:50px;background:#FD4F00FF"></input>
-            <input type=button class="btn" id="Button_ZoomIn" data-i18n-value="map.zoomIn" value="缩小" style="width:10%;height:50px;background:#FD4F00FF"></input>
-            <input type=button class="btn" id="Button_ZoomOut" data-i18n-value="map.zoomOut" value="放大" style="width:10%;height:50px;background:#FD4F00FF"></input>
+            <!-- <img id="ButtonImage_Vertical_FollowCar" src="Led_Display/Button_Vertical_Off.bmp"/> -->
+            <input type=button class="btn button_1" id="Button_CanvasInit" data-i18n-value="map.canvasInit" value="初始化"></input>
+            <input type=button class="btn button_1" id="Button_FindCar" data-i18n-value="map.findCar" value="车辆位置"></input>
+            <input type=button class="btn button_1" id="Button_ZoomIn" data-i18n-value="map.zoomIn" value="缩小"></input>
+            <input type=button class="btn button_1" id="Button_ZoomOut" data-i18n-value="map.zoomOut" value="放大"></input>
         </div>
         <div id="output"></div>
-        <canvas id="myCanvas" style="background:white;" width="1503px" height="616px"></canvas>
+        <canvas id="myCanvas" style="border: 2px solid #3989EE;background-color: #fff;" width="1510px" height="660px"></canvas>
     </div>
 </body>
 <script type="text/javascript" src="js/i18n/TimeI18n.js"></script>
@@ -1306,17 +1306,13 @@
         background-color: transparent;
     }
     .top{
-        margin: 0 55px 31px 55px;
+        display: flex;
+        margin: 0 0 10px 0;
     }
     .top img{
         vertical-align: middle;
         margin: 0px 5px;
     }
-    .top input{
-        display: inline-block;
-        margin: 0px 5px;
-        color: white;
-    }
     .title_wrap{
         width: 100%;
         height: 102px;
@@ -1337,5 +1333,19 @@
         background: center / 100% 100% url(./images/bg-task-r2.png) no-repeat;
         padding: 31px 31px 31px 45px;
     }
+    .button_1 {
+        width: 200px;
+        height: 75px;
+        font-size: 30px;
+        color: #fff;
+        margin-right: 20px;
+        /* background: center / 100% 100% url(./images/btn_1.png) no-repeat; */
+        /* background: radial-gradient(at bottom center, #65b4fe 0%, #3A90E1 50%, #368CDF 100%); */
+        background: repeating-linear-gradient(135deg,#2D67CE,#2D67CE 4px,#2764CD 4px,#2764CD 8px);
+        border: 2px solid #3377ED;
+    }
+    .button_1:hover {
+        color: #3CC1FF
+    }
 </style>
 </html>
\ No newline at end of file