页面bug

src/assets/styles/base.scss

@@ -221,19 +221,19 @@ div::-webkit-scrollbar {
   display: none;
 }
 
-#toolbar::-webkit-scrollbar {
-  width: 20px !important;
-  display: block !important;
-}
-
-#toolbar::-webkit-scrollbar-track {
-  background: linear-gradient(0deg, rgba(10, 19, 47, 1.0) 0%, rgba(36, 46, 104, 1.0) 100%) !important;
-}
-
-#toolbar::-webkit-scrollbar-thumb {
-  background: transparent !important;
-  box-shadow: 0px 0px 0px 100vh black !important;
-}
+//#toolbar::-webkit-scrollbar {
+//  width: 20px !important;
+//  display: block !important;
+//}
+//
+//#toolbar::-webkit-scrollbar-track {
+//  background: linear-gradient(0deg, rgba(10, 19, 47, 1.0) 0%, rgba(36, 46, 104, 1.0) 100%) !important;
+//}
+//
+//#toolbar::-webkit-scrollbar-thumb {
+//  background: transparent !important;
+//  box-shadow: 0px 0px 0px 100vh black !important;
+//}
 
 #icon {
   margin-bottom: 5rem;
@@ -341,7 +341,7 @@ div::-webkit-scrollbar {
 }
 
 .h-39 {
-  height: 39vh;
+  height: 39vh !important;
 }
 
 .h-40 {

src/components/v-fastmenu.vue

@@ -22,8 +22,8 @@
 						<el-button type="primary" size="small" @click="resetPwd">修改密码</el-button>
 						<el-button type="warning" size="small" @click="logout">退出登录</el-button>
 					</div>
-					<a href="#" style="border-top: 1px solid #334780;"><i class="el-icon-s-home"></i>返回首页</a>
-					<a href="#"><i class="el-icon-monitor"></i>管理系统</a>
+					<a href="https://117.78.49.164:15001/index58" style="border-top: 1px solid #334780;"><i class="el-icon-s-home"></i>返回首页</a>
+<!--					<a href="#"><i class="el-icon-monitor"></i>管理系统</a>-->
 				</div>
 				<div slot="reference" style="text-align: center; width:4rem;height:3rem;">
 					<img src="@/assets/images/mascot-small.png" />

src/components/vBottomMenu.vue

@@ -246,14 +246,14 @@
           <!-- 左侧end -->
           <!-- 右侧 -->
           <el-col :span="6" class="dia-right">
-            <div class="e-right" style="height: 75vh;!important;">
-              <div class="forthis" style="height: 75vh;!important;">
+            <div class="e-right">
+              <div class="forthis1">
                 <dv-border-box-7 backgroundColor="#040b1f" :color="['#25335d', '#5baffd']"
-                                 style="padding-bottom:1rem ;height: 75vh;!important;">
-                  <div class="i-list-con" style="height: 75vh;!important;">
-                    <div class="this-con" style="height: 75vh;!important;">
-                      <div class="z-info-list" style="margin-top: 0;height: 75vh;!important;">
-                        <el-timeline style="height: 75vh;!important;">
+                                 style="padding-bottom:1rem ;">
+                  <div class="i-list-con">
+                    <div class="this-con h-45">
+                      <div class="z-info-list" style="margin-top: 0;">
+                        <el-timeline>
                           <el-timeline-item color="#2bacf7" :timestamp="item.createTime"
                                             placement="top" v-for="(item,index) in eventLogList">
                             <el-card style="width: 40vh">
@@ -262,6 +262,7 @@
                                   <span>{{ item.createName }}</span>
                                   <span v-if="eventLogList.length - 1 == index&&address!=null&&address!=''"><i
                                     class="el-icon-location"></i> {{ address }}</span>
+                                  <span v-else></span>
                                 </div>
                                 <div class="z-info">
                                   <div class="this-con-list-info">

src/views/eventdetailsdialog.vue

@@ -75,7 +75,7 @@
                   <dv-border-box-7 backgroundColor="#040b1f" :color="['#25335d', '#5baffd']"
                                    style="padding-bottom:1rem ;">
                     <div class="i-list-con">
-                      <div class="this-con h-45">
+                      <div class="this-con h-39">
                         <div class="z-info-list" style="margin-top: 0;">
                           <el-timeline>
                             <el-timeline-item color="#2bacf7" :timestamp="item.createTime"