Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/visu_traffic_01_siping_2.5d' into visu_traffic_01_siping_2.5d

彭宇 2 gadi atpakaļ
vecāks
revīzija
732ca89dae
3 mainītis faili ar 10 papildinājumiem un 2 dzēšanām
  1. 4 0
      src/assets/styles/base.scss
  2. 3 0
      src/views/firespread.vue
  3. 3 2
      src/views/forest.vue

+ 4 - 0
src/assets/styles/base.scss

@@ -342,6 +342,10 @@ div::-webkit-scrollbar {
 #toolbar {
   color: $inBlue;
 }
+//全局搜索容器
+.sj-search {
+  padding:.5rem .8rem;
+}
 
 .w-5 {
   width: 5.5rem;

+ 3 - 0
src/views/firespread.vue

@@ -2095,6 +2095,9 @@ export default {
       getNewDataByDate(eventCode).then(function(res){
         that.windDirection=res.data.windDirection
         that.windSpeed=res.data.windSpeed
+        setTimeout(() => {
+          that.showheatPlotting()
+        }, 2000)
       })
     },
     // 获取消防左侧菜单列表

+ 3 - 2
src/views/forest.vue

@@ -288,12 +288,13 @@
                 <span>事件列表</span>
                 <dv-decoration-3 style="width:150px;height:15px;margin-right: 1rem;" />
               </div>
-              <div class="i-list-con small-bottom-margin" style="height: 30vh;">
-                <div class="event-list-search">
+              <div class="sj-search">
                   <el-input placeholder="请输入内容" prefix-icon="el-icon-search" v-model="eventSearch"
                     @change="getEventList(calendarDay, 10, 1, eventSearch)">
                   </el-input>
                 </div>
+              <div class="i-list-con small-bottom-margin" style="height: 24vh;">
+                
                 <div class="d-l-con padding-box nowrap" v-for="(item, index) in eventList"
                   @click="dropLocation(item.latitude, item.longitude,item.eventCode)" data-html2canvas-ignore>
                   <div class="bgt-img">