页面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 {
@@ -820,7 +820,312 @@ div::-webkit-scrollbar {
           .this-con {
             width: 100%;
             padding: 1rem;
-            height: 62vh;
+            height: 515px;
+            overflow-y: scroll;
+            overflow-x: hidden;
+            display: flex;
+            flex-direction: column;
+
+            .this-con-list-info {
+              padding-bottom: .5rem;
+              float: left;
+              color: #6da0c3;
+            }
+
+            .this-con-list {
+              padding: 2rem 0;
+              height: auto;
+              float: left;
+              border-bottom: 1px solid #094268;
+
+            }
+
+            .this-con-list:first-child {
+              padding-top: 0;
+
+            }
+
+            .this-con-list:last-child {
+              border-bottom: 0;
+
+            }
+
+            .z-begin {
+              text-align: center;
+              padding: 5px 10px;
+              color: #fff;
+              background: #3c84b5;
+              border-radius: 5px;
+              margin-bottom: 10px;
+              margin: 0 auto;
+            }
+
+            .z-info-list {
+              width: 100%;
+              margin-top: 2rem;
+              display: flex;
+
+              img {
+                border-radius: .3rem;
+              }
+
+              .z-info-list-con {
+                display: flex;
+                flex-direction: column;
+
+                .z-info {
+                  width: 100%;
+                  // background: $eventBG;
+                  margin-top: .5rem;
+                  border-radius: .3rem;
+                  display: flex;
+                  flex-direction: column;
+                }
+              }
+            }
+
+            .el-timeline {
+              .el-timeline-item__tail {
+                border-left: 2px solid #28567f;
+              }
+
+              .el-timeline-item__timestamp {
+                color: $inBlue;
+              }
+
+              .el-card {
+                background: $eventBG;
+                border: 1px $barBorder;
+
+                .el-card__body {
+                  padding: 1rem;
+
+                }
+              }
+            }
+
+
+          }
+
+          .mg-t-8 {
+            margin-top: 8px;
+          }
+
+          .user-and-time {
+            display: flex;
+            flex-direction: column;
+
+            span:first-child {
+              font-size: .8rem;
+              color: #01d1eb;
+              font-weight: bolder;
+              display: inline-block;
+            }
+
+            span:last-child {
+              font-size: .8rem;
+              color: #6da0c3;
+              display: inline-block;
+              padding-top: .2rem;
+            }
+
+            h6 {
+              margin: 0;
+            }
+          }
+
+        }
+
+        .small-bottom-margin {
+          margin-bottom: .2rem !important;
+        }
+      }
+      .forthis1-1{
+        height: 776px;
+        margin-bottom: .5vh;
+        .map-con {
+          height: 100% !important;
+          position: relative !important;
+        }
+
+
+        .this-title {
+          width: 100%;
+          font-size: .7rem;
+          height: 2vh;
+          line-height: 2vh;
+          padding: 0rem 0 0 1rem;
+          display: flex;
+          justify-content: space-between;
+          // background-image: -moz-linear-gradient($GradualGreen);
+          // background-image: -webkit-linear-gradient($GradualGreen);
+          // background-image: linear-gradient($GradualGreen);
+          // box-shadow: $shadowTitle;
+          .el-date-editor {
+            width: 100%;
+          }
+
+          .el-input__inner {
+            background: $barBgc;
+            box-shadow: $shadowTitle;
+            height: 1.5rem;
+            color: $inBlue;
+            border: 1px $barBorder;
+          }
+
+          .el-input__inner:hover {
+            background: #00335c;
+          }
+
+          .el-input__icon {
+            line-height: .5rem;
+            height: auto;
+          }
+
+          i {
+            font-size: 1rem;
+          }
+
+          span {
+            font-family: $fontLED;
+            color: $white;
+            text-shadow: 0 0 15px rgba($color: #1eeb74, $alpha: 1);
+            display: flex;
+            align-items: center;
+
+            img {
+              width: 21px;
+              height: 21px;
+              margin-right: 5px;
+            }
+
+          }
+
+          span:nth-child(2) {
+            font-size: 1.5rem;
+          }
+
+        }
+
+        .i-list-con {
+          width: 100%;
+          overflow-y: scroll;
+          padding: .3rem;
+          // margin-bottom:0.8rem;
+          //天气
+          .weather-img {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            color: $inBlue;
+            padding: .2rem 0 0 .8rem;
+            text-align: center;
+
+          }
+
+          .weather-info {
+            color: $inBlue;
+
+            ul {
+              li {
+                float: left;
+                margin-right: 1rem;
+                height: 1.5rem;
+                line-height: 1.5rem;
+              }
+            }
+          }
+
+          .firestate {
+            width: 85%;
+            margin: 1rem auto;
+            display: flex;
+            align-items: center;
+
+            .state-block1, .state-block2, .state-block3, .state-block4, .state-block5 {
+              width: 20%;
+              height: .2rem;
+            }
+
+            .state-block1 {
+              background-color: #4784ff;
+            }
+
+            .state-block2 {
+              background-color: #25dbcd;
+            }
+
+            .state-block3 {
+              background-color: #dad028;
+            }
+
+            .state-block4 {
+              background-color: #fb7d2a;
+            }
+
+            .state-block5 {
+              background-color: #f04143;
+            }
+
+            .state-on {
+              height: .6rem;
+            }
+
+          }
+
+          //事件列表
+          .event-list-search {
+            padding: 0 .5rem;
+            margin-bottom: 1rem;
+
+          }
+
+
+          // 清除el折叠样式
+          .el-collapse {
+            border: none;
+            margin: 0;
+          }
+
+          .el-collapse-item__header {
+            background: none;
+            padding: 0;
+            height: fit-content !important;
+            border-bottom: none;
+            line-height: normal !important;
+          }
+
+          .el-collapse-item__arrow {
+            color: $inBlue;
+            position: relative;
+            left: -20.5rem;
+            margin: 0;
+          }
+
+          .el-collapse-item__wrap {
+            background: none;
+            border-bottom: none;
+          }
+
+          .el-collapse-item__content {
+            padding-bottom: 0;
+          }
+
+          .this-child {
+            width: 100% !important;
+
+            .d-l-l-text {
+              padding-left: 1.1rem !important;
+              width: auto !important;
+            }
+
+          }
+
+
+          .this-con {
+            width: 100%;
+            padding: 1rem;
+            height: 755px;
             overflow-y: scroll;
             overflow-x: hidden;
             display: flex;

src/components/supermap.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-bind:id="mapDivId" ref="map" style="width: 100%; height: 100%;background: none;">
     <div id="toolbar" v-if="isdynamicPlotting" class="panel panel-primary"
-         style="position:absolute;z-index: 9999;top:4rem;left: 1rem; border-radius: 4px; width: fit-content;height:400px;overflow-y:scroll;background:#040b1f">
+         style="position:absolute;z-index: 9999;top:4rem;left: 1rem; border-radius: 4px; width: fit-content;height:635px;overflow-y:scroll;background:#040b1f">
       <div class="panel-heading" id="panelheading">
         <h5 style=" color: #2bacf7;font-size: 1rem;padding:.5rem;">鼠标标绘</h5>
       </div>

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-1">
                 <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">
+                      <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">
@@ -371,7 +372,7 @@
     </el-dialog>
     <!-- 图片，视频预览 -->
     <el-dialog title="视频预览" :visible.sync="showTcPlayer" width="40%" append-to-body>
-      <TcPlayer ref="TcPlayer" :playVideo="playVideo" :widthHeigt="[70,70]"></TcPlayer>
+      <TcPlayer ref="TcPlayer" :playVideo="playVideo" :widthHeigt="[100,100]"></TcPlayer>
     </el-dialog>
   </div>
 </template>

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">
                         <div class="z-info-list" style="margin-top: 0;">
                           <el-timeline>
                             <el-timeline-item color="#2bacf7" :timestamp="item.createTime"
@@ -850,7 +850,7 @@
     </el-dialog>
     <!-- 图片，视频预览 -->
     <el-dialog title="视频预览" :visible.sync="showTcPlayer" width="40%" customClass="customWidthMp4">
-      <TcPlayer ref="TcPlayer" :playVideo="playVideo" :widthHeigt="[70,70]"></TcPlayer>
+      <TcPlayer ref="TcPlayer" :playVideo="playVideo" :widthHeigt="[100,100]"></TcPlayer>
     </el-dialog>
   </div>
 </template>
@@ -872,7 +872,7 @@ import {
   updateCentereventTEventcatalogueStatus,
   sendTask,
   listResourceByWz,
-  updateYjYuAnm,
+  updateYjYuAn,
   uploadBase64
 } from '@/api/forest'
 import {
@@ -1088,7 +1088,7 @@ export default {
     calendarDay: null//首页日历选择
   },
   methods: {
-     showUpdateYjYuAn() {
+    showUpdateYjYuAn() {
       listYuAn().then(res => {
         //关联预案列表
         if (res.code == 200) {