whao 2 gadi atpakaļ
vecāks
revīzija
c528da7af6

BIN
src/assets/images/integrated/event-img-sub.png


BIN
src/assets/images/integrated/weather/yin.png


+ 150 - 17
src/assets/styles/base.scss

@@ -5,6 +5,7 @@ $fontLED:led;
 //颜色
 $white:#fff;
 $inBlue:#2bacf7;
+$subtitle:#638395;
 $inBlueHover:#07ffc1;
 $inYellow:#ffd014;
 $deepBlue:#0b293a;
@@ -40,6 +41,9 @@ $barShadow: rgba($color: #033551, $alpha: .5) 0px 0px 18px inset;
 $barBorder: solid rgba($color: #134040, $alpha: .7);
 $tableBorder: solid rgba($color: #288686, $alpha: .7);
 $countBorder: solid rgba($color: #00aeff, $alpha: .9);
+$searchBorder: solid rgba($color: #33467f, $alpha: 1);
+$searchBG:#191e2d;
+
 //icon
 $iconBg:#f5ad1b,#58b35d,#0FA2FF,#da8ec5,#78bfc2,#a28e52,#ff6063,#96bd5b,#f5ad1b,#da8ec5,#5f89ce,#78bfc2,#bec278,#f07779;
 $iconColor:#32e583,#f5ad1b,#da8ec5,#5f89ce,#78bfc2,#bec278,#f07779;
@@ -203,39 +207,52 @@ div::-webkit-scrollbar {
 .h-16{
 	height: 16vh;
 }
+.h-18{
+	height: 18vh;
+}
 .h-19{
-	height: 19.5vh;
+	height: 19vh;
+}
+.h-20{
+	height: 20vh;
 }
 .h-21{
 	height: 21vh;
 }
+.h-22{
+	height: 22vh;
+}
 .h-25{
 	height: 25vh;
 }
+.h-26{
+	height: 26vh !important;
+}
+.h-27{
+	height: 27vh;
+}
 .h-28{
-	height: 28vh;
+	height: 28vh !important;
 }
-.h-30{
+.h-29{
 		height: 29vh;
 }
+.h-29-5{
+		height: 29.5vh;
+}
+
 .h-35 {
 		height: 34vh;
 }
 .h-32{
 		height: 31.6vh;
 }
-.h-25 {
-		height: 25vh;
+.h-39 {
+		height: 39vh;
 }
 
-.h-26{
-	height: 25vh !important;
-}
-.h-28{
-	height: 28vh !important;
-}
 .h-40 {
-		height: 39vh;
+		height: 40vh;
 }
 .h-43{
 		height: 42vh;
@@ -325,6 +342,10 @@ div::-webkit-scrollbar {
 	flex-direction: row !important;
 }
 
+.padding-box{
+	padding-top:.3rem !important;
+	padding-bottom:.3rem !important;
+}
 
 .d-tit {
 	display: flex;
@@ -353,6 +374,7 @@ div::-webkit-scrollbar {
 .icon-text-col{
 	margin-top: .5rem;
 }
+
 // 弹层按钮组
 .info-button-group{
 			position: absolute;
@@ -487,7 +509,7 @@ div::-webkit-scrollbar {
 				position: absolute;
 				font-size: 14px;				
 				top: 10vh;
-				height: 85vh;
+				height: auto;
 				display: flex;
 				z-index: 1000;
 				flex-direction: column;
@@ -497,7 +519,7 @@ div::-webkit-scrollbar {
 			}
 			.leftbar{
 				width: 23rem;
-				left: .3rem;
+				left: 0;
 				-webkit-transform: translateX(0);
 				transform: translateX(0);
 				transition: all 0.5s ease-in-out;
@@ -505,12 +527,12 @@ div::-webkit-scrollbar {
 			}
 			.rightbar{
 				width: 19rem;
-				right: .3rem;
+				right: 0;
 				-webkit-transform: translateX(0);
 				transform: translateX(0);
 				transition: all 0.5s ease-in-out;
 			    .right-item1{
-					width: 16rem;
+					width: 19rem;
 				}
 				.right-item2{
 					width: 18rem;
@@ -726,7 +748,70 @@ div::-webkit-scrollbar {
 					width: 100%;
 					overflow-y: scroll;
 					padding: .3rem;
-					margin-bottom:0.8rem;
+					// 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-input__inner{
+							border: 1px $searchBorder;
+							background-color: $searchBG;
+							color: $inBlue;
+						}
+					}
+				
+					
 					// 清除el折叠样式
 					.el-collapse{
 						border: none;
@@ -1177,6 +1262,54 @@ div::-webkit-scrollbar {
 					color: $fBlueG;
 					line-height: 1.2rem;
 				}
+				//曝光台
+				.bgt-state{
+					width: 35%;
+					padding: 0.3rem 0.5rem;
+					border: 2px solid rgba(0, 174, 255, 0.9);
+					-webkit-box-shadow: 0 0 0.5rem 0 #00c8ff inset;
+					box-shadow: 0 0 0.5rem 0 #00c8ff inset;
+					border-radius: 0.3rem;
+					font-size: .7rem;
+					z-index: 1000;
+					display: flex;
+					margin-right: .5rem;
+					align-content: center;
+					justify-content: space-between;
+					color: $white;
+					
+					.bgt-state-frequency{
+						width: 1.2rem;
+						height: 1.2rem;
+						font-size: 1rem;
+						background-color: #1294a0;
+						text-align: center;
+						line-height: 1.2rem;
+						
+					}
+					.bgt-state-minute{
+						
+					}
+					
+				}
+				.bgt-info{
+					display: flex;
+					flex-direction: column;
+					
+					.bgt-info-name{
+						color: $inBlue;
+						font-weight: bolder;
+					}
+					.bgt-info-place{
+						color: $subtitle;
+						ul{
+							li{
+								float: left;
+								padding-right: .3rem;
+							}
+						}
+					}
+				}
 				
 			
 

+ 1 - 1
src/permission.js

@@ -8,7 +8,7 @@ import { isRelogin } from '@/utils/request'
 
 NProgress.configure({ showSpinner: false })
 
-const whiteList = ['/login', '/auth-redirect', '/bind', '/register','/integrated/index','/integrated/bigdata','/integrated/forest', '/integrated/fire-forest', '/integrated/monitor']
+const whiteList = ['/login', '/auth-redirect', '/bind', '/register','/integrated/index','/integrated/bigdata','/integrated/forest', '/integrated/fire-forest', '/integrated/monitor','/integrated/date']
 
 router.beforeEach((to, from, next) => {
   NProgress.start()

+ 16 - 0
src/router/index.js

@@ -97,6 +97,14 @@ export const constantRoutes = [{
 			title: '植树造林'
 		}
 	},
+	{
+		path: '/date',
+		name: 'date',
+		component: () => import('@/views/date'),
+		meta: {
+			title: '日历组件'
+		}
+	},
 ]
 
 
@@ -175,6 +183,14 @@ export const constantRoutesNew = [{
 		}
 	},
 	{
+		path: '/date',
+		name: 'date',
+		component: () => import('@/views/date'),
+		meta: {
+			title: '日历组件'
+		}
+	},
+	{
 		path: '/login',
 		component: () => import('@/views/system/login'),
 		hidden: true

+ 501 - 0
src/views/date.vue

@@ -0,0 +1,501 @@
+<template>
+  <div class="calendar-wrapper">
+    <!-- 月份变换区 -->
+    <div class="header rowJcAc" v-if="headerBar">
+      <div class="arrowIcon rowJcAc" @click="changeMonth('pre')" v-if="monthOpen">
+        <van-icon name="arrow-left" color="#9EA8BA" size="12px"/>
+      </div>
+      
+      <!-- <div class="pre " @click="changeMonth('pre')">上个月</div> -->
+      <div class="yearMonth">{{y+'-'+formatNum(m)}}</div>
+      <div class="arrowIcon rowJcAc" @click="changeMonth('next')" v-if="monthOpen">
+        <van-icon name="arrow" color="#9EA8BA" size="12px"/>
+      </div>
+      <!-- <div class="next" @click="changeMonth('next')">下个月</div> -->
+    </div>
+
+    <!-- 星期区 -->
+    <div class="week">
+      <div class="week-day" v-for="(item,index) in weekDay" :key="index">{{item}}</div>
+    </div>
+
+    <!-- 日历显示区 -->
+    <div :class="{hide : !monthOpen}" class="content">
+      <div :style="{top:positionTop + 'px'}" class="days">
+        <div class="item rowJcAc" v-for="(item,index) in dates" :key="index">
+          <div
+            class="day"
+            @click="selectOne(item,$event)"
+            :class="{
+              choose:choose==`${item.year}-${item.month}-${item.date}`,
+              todayChoose: isTodayChoose(item.year,item.month,item.date) ,
+              nolm:!item.isCurM,
+              today:isToday(item.year,item.month,item.date),
+          }"
+          >
+          <div class="markDay" v-if="isMarkDay(item.year,item.month,item.date)" 
+          :class="[choose==`${item.year}-${item.month}-${item.date}` ? 'markDayChoose':'markDayNoChoose']"></div>
+          {{Number(item.date)}}</div>
+          
+        </div>
+      </div>
+    </div>
+    <!-- 伸缩按钮:待定 -->
+    <div class="bottomLine rowJcAc" v-if="collapsible" @click="toggle">
+      <div></div>
+    </div>
+    <!-- 伸缩按钮:待定 -->
+    <!-- <img
+      src="https://i.loli.net/2020/07/16/2MmZsucVTlRjSwK.png"
+      mode="scaleToFill"
+      v-if="collapsible"
+      @click="toggle"
+      class="weektoggle"
+      :class="{ down: monthOpen }"
+    /> -->
+  </div>
+</template>
+
+<script>
+export default {
+  name: "ren-calendar",
+  props: {
+    // 星期几为第一天(0为星期日)
+    weekstart: {
+      type: Number,
+      default: 0,
+    },
+    // 标记的日期
+    markDays: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+    //是否展示月份切换按钮
+    headerBar: {
+      type: Boolean,
+      default: true,
+    },
+    // 是否展开
+    open: {
+      type: Boolean,
+      default: true,
+    },
+    //是否可收缩
+    collapsible: {
+      type: Boolean,
+      default: true,
+    },
+    //未来日期是否不可点击
+    disabledAfter: {
+      type: Boolean,
+      default: false,
+    },
+    // 默认选中日期
+    selectDate: {
+      type: String,
+      default: null
+    }
+  },
+  data() {
+    return {
+      weektext: ["日", "一", "二", "三", "四", "五", "六"],
+      y: new Date().getFullYear(), // 年
+      m: new Date().getMonth() + 1, // 月
+      dates: [], // 当前月的日期数据
+      positionTop: 0,
+      monthOpen: true,
+      choose: "",
+      isCurM: true,
+    };
+  },
+  created() {
+    this.dates = this.monthDay(this.y, this.m);
+    // !this.open && this.toggle();
+  },
+  watch: {
+    // 点击返回今天
+    selectDate() {
+      if(this.selectDate) {
+        this.choose = this.selectDate
+        this.y = Number(this.selectDate.split('-')[0])
+        this.m = Number(this.selectDate.split('-')[1])
+        this.dates = this.monthDay(this.y, this.m);
+        if(!this.monthOpen) {
+          let index = -1;
+          this.dates.forEach((i, x) => {
+            this.isChoose(i.year, i.month, i.date) && (index = x);
+          });
+          this.positionTop = -((Math.ceil((index + 1) / 7) || 1) - 1) * 42;
+        }
+      }
+      
+      
+    },
+    m() {
+      this.$emit('changeMonth',{year: this.y,month: this.m})
+    },
+    dates() {
+      this.$emit('changeDates',{dates: this.dates})
+    }
+  },
+  mounted() {
+    if(this.selectDate) {
+      this.choose = this.selectDate
+      this.y = this.selectDate.split('-')[0]
+      this.m = this.selectDate.split('-')[1]
+    }else {
+      this.choose = this.getToday().date;
+    }
+    this.toggle()
+    
+  },
+  computed: {
+    // 顶部星期栏
+    weekDay() {
+      return this.weektext
+        .slice(this.weekstart)
+        .concat(this.weektext.slice(0, this.weekstart));
+    },
+  },
+  methods: {
+    formatNum(num) {
+      let res = Number(num);
+      return res < 10 ? "0" + res : res;
+    },
+    getToday() {
+      let date = new Date();
+      let y = date.getFullYear();
+      let m = date.getMonth();
+      let d = date.getDate();
+      let week = new Date().getDay();
+      let weekText = ["日", "一", "二", "三", "四", "五", "六"];
+      let formatWeek = "星期" + weekText[week];
+      let today = {
+        date: y + "-" + this.formatNum(m + 1) + "-" + this.formatNum(d),
+        week: formatWeek,
+      };
+      return today;
+    },
+    // 获取当前月份数据
+    monthDay(y, month) {
+      let dates = [];
+      let m = Number(month);
+      let firstDayOfMonth = new Date(y, m - 1, 1).getDay(); // 当月第一天星期几
+      let lastDateOfMonth = new Date(y, m, 0).getDate(); // 当月最后一天
+      let lastDayOfLastMonth = new Date(y, m-1, 0).getDate(); // 上一月的最后一天
+      let weekstart = this.weekstart == 7 ? 0 : this.weekstart;
+      let startDay = (() => {
+        // 周初有几天是上个月的
+        if (firstDayOfMonth == weekstart) {
+          return 0;
+        } else if (firstDayOfMonth > weekstart) {
+          return firstDayOfMonth - weekstart;
+        } else {
+          return 7 - weekstart + firstDayOfMonth;
+        }
+      })();
+      let endDay = 7 - ((startDay + lastDateOfMonth) % 7); // 结束还有几天是下个月的
+      for (let i = 1; i <= startDay; i++) {
+        dates.push({
+          date: this.formatNum(lastDayOfLastMonth - startDay + i),
+          day: weekstart + i - 1 || 7,
+          month: m - 1 >= 1 ? this.formatNum(m - 1) : 12,
+          year: m - 1 >= 1 ? y : y - 1,
+          isCurM: false
+        });
+      }
+      for (let j = 1; j <= lastDateOfMonth; j++) {
+        dates.push({
+          date: this.formatNum(j),
+          day: (j % 7) + firstDayOfMonth - 1 || 7,
+          month: this.formatNum(m),
+          year: y,
+          isCurM: true, //是否当前月份
+        });
+      }
+      for (let k = 1; k <= endDay; k++) {
+        dates.push({
+          date: this.formatNum(k),
+          day: (lastDateOfMonth + startDay + weekstart + k - 1) % 7 || 7,
+          month: m + 1 <= 12 ? this.formatNum(m + 1) : 1,
+          year: m + 1 <= 12 ? y : y + 1,
+          isCurM: false
+        });
+      }
+      // console.log(dates);
+      return dates;
+    },
+    isFutureDay(y, m, d) {
+      //是否未来日期
+      let ymd = `${y}/${m}/${d}`;
+      let formatDY = new Date(ymd.replace(/-/g, "/"));
+      let showTime = formatDY.getTime();
+      let curTime = new Date().getTime();
+      if (showTime > curTime) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+    // 标记日期
+    isMarkDay(y, m, d) {
+      let flag = false;
+      for (let i = 0; i < this.markDays.length; i++) {
+        let dy = `${y}-${m}-${d}`;
+        if (this.markDays[i] == dy) {
+          flag = true;
+          break;
+        }
+      }
+      return flag;
+    },
+    isToday(y, m, d) {
+      let checkD = y + "-" + m + "-" + d;
+      let today = this.getToday().date;
+      if (checkD == today) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+    isTodayChoose(year,month,day) {
+      let checkD = year + "-" + month + "-" + day;
+      let today = this.getToday().date;
+      return this.choose == `${year}-${month}-${day}` && checkD == today
+    },
+    isChoose(y,m,d) {
+      let checkD = y + "-" + m + "-" + d;
+      return this.choose == checkD
+    },
+    // 展开收起
+    toggle() {
+      this.monthOpen = !this.monthOpen;
+      if (this.monthOpen) {
+        this.positionTop = 0;
+      } else {
+        let index = -1;
+        this.dates.forEach((i, x) => {
+          this.isChoose(i.year, i.month, i.date) && (index = x);
+        });
+        this.positionTop = -((Math.ceil((index + 1) / 7) || 1) - 1) * 42;
+      }
+    },
+    // 点击回调
+    selectOne(i) {
+      let markDay = this.isMarkDay(i.year, i.month, i.date);
+      let date = `${i.year}-${i.month}-${i.date}`;
+      let selectD = new Date(date).getTime();
+      let curTime = new Date().getTime();
+      let week = new Date(date).getDay();
+      let weekText = ["日", "一", "二", "三", "四", "五", "六"];
+      let formatWeek = "星期" + weekText[week];
+      let response = {
+        date: date,
+        week: formatWeek,
+      };
+      // if (!i.isCurM) {
+      //   // console.log('不在当前月范围内');
+      //   return false;
+      // }
+      if (selectD > curTime) {
+        if (this.disabledAfter) {
+          console.log("未来日期不可选");
+
+          return false;
+        } else {
+          this.choose = date;
+          if (markDay && i.isCurM) {
+            this.$emit("onDayClick", response);
+          }
+        }
+      } else {
+        this.choose = date;
+        if (i.isCurM) {
+          this.$emit("onDayClick", response);
+        }else {
+          this.y = i.year
+          this.m = i.month
+          this.dates = this.monthDay(this.y, this.m);
+          this.$emit("onDayClick", response);
+        }
+      }
+      this.$emit("setDate", response);
+      //   console.log(response);
+    },
+    //改变年月
+    changYearMonth(y, m) {
+      this.dates = this.monthDay(y, m);
+      this.y = y;
+      this.m = m;
+    },
+    changeMonth(type) {
+      this.y = parseInt(this.y)
+      this.m = parseInt(this.m)
+      if (type == "pre") {
+
+        if (this.m + 1 == 2) {
+          this.m = 12;
+          this.y = parseInt(this.y) - 1;
+        } else {
+          this.m = this.m - 1;
+        }
+      } else {
+        if (this.m + 1 == 13) {
+          this.m = 1;
+          this.y = this.y + 1;
+        } else {
+          this.m = this.m + 1;
+        }
+      }
+      this.dates = this.monthDay(this.y, this.m);
+      // this.$emit("changeMonth");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.bottomLine {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  >div {
+    width: 32px;
+    height: 3px;
+    background: #DADEF0;
+    border-radius: 2px;
+  }
+}
+.nolm {
+  color: #CFD4DB !important;
+}
+.calendar-wrapper {
+  text-align: center;
+  background-color: #fff;
+  box-shadow: 0px 6px 10px 0px rgba(131,134,163,0.12);
+  border-radius: 0px 0px 20px 20px;
+  .header {
+    .yearMonth {
+      font-size: 16px;
+      line-height: 23px;
+      color: #333843;
+      margin: 0 32px;
+    }
+
+    
+  }
+
+  .week {
+    display: flex;
+    justify-content: space-around;
+    width: 100%;
+    align-items: center;
+    height: 19px;
+    line-height: 19px;
+    font-size: 13px;
+    font-weight: 600;
+    margin-top: 20px;
+    color: #989DB3;
+  }
+
+  .content {
+    position: relative;
+    overflow: hidden;
+    transition: height 0.4s ease;
+
+    .days {
+      transition: top 0, 3s;
+      display: flex;
+      align-items: center;
+      flex-wrap: wrap;
+      position: relative;
+      font-size: 14px;
+      line-height: 19px;
+
+      .item {
+        position: relative;
+        display: block;
+        height: 42px;
+        line-height: 42px;
+        width: calc(100% / 7);
+
+        .day {
+          font-style: normal;
+          display: inline-block;
+          position: relative;
+          vertical-align: middle;
+          width: 36px;
+          font-weight: 500;
+          height: 36px;
+          line-height: 36px;
+          overflow: hidden;
+          border-radius: 50%;
+
+          &.choose {
+            background-color: #9EA8BA;
+            color: #fff;
+          }
+          &.todayChoose {
+            background-color: #1A7AF8 !important;
+            color: #fff;
+          }
+
+        }
+        
+
+        .notSigned {
+          font-style: normal;
+          width: 8rpx;
+          height: 8rpx;
+          background: #fa7268;
+          border-radius: 10rpx;
+          position: absolute;
+          left: 50%;
+          bottom: 0;
+          pointer-events: none;
+        }
+        .today {
+          color: #1A7AF8;
+          background-color: #fff;
+        }
+        .markDayNoChoose {
+          background: #1A7AF8;
+        }
+        .markDayChoose {
+          background: #fff;
+        }
+        .markDay {
+          width: 4px;
+          height: 4px;
+          border-radius: 50%;
+          position: absolute;
+          left: 16px;
+          bottom: 4px;
+          pointer-events: none;
+        }
+      }
+    }
+  }
+
+  .hide {
+    height: 42px !important;
+  }
+  .arrowIcon {
+    width: 50px;
+    height: 23px;
+  }
+  // .weektoggle {
+  //   width: 85px;
+  //   height: 32px;
+  //   position: relative;
+  //   left: 50%;
+  //   margin-left: -42px;
+  //   bottom: -42px;
+  //   &.down {
+  //     transform: rotate(180deg);
+  //     bottom: 0;
+  //   }
+  // }
+}
+</style>

+ 88 - 13
src/views/forest.vue

@@ -9,7 +9,7 @@
 			<div class="leftbar" :class="indentleft" ref="left">
 				<!-- 1 基本情况 -->
 				<div class="forthis">
-					<dv-border-box-13>
+					<dv-border-box-13 style="padding-bottom: 1rem;">
 						<img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;" />
 						<div class="this-title">
 							<span>基本情况</span>
@@ -26,9 +26,9 @@
 				</div>
 				<!-- 2 事件统计-->
 				<div class="forthis">
-					<dv-border-box-13>
+					<dv-border-box-13 style="padding-bottom: 1rem;">
 						<img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;" />
-						<div class="i-list-con h-20">
+						<div class="i-list-con h-29-5">
 							<div class="d-l-con">
 								<div class="event-count">
 									<div class="count-number">0</div>
@@ -78,9 +78,9 @@
 				</div>
 				<!-- 3 组织机构 -->
 				<div class="forthis">
-					<dv-border-box-13>
+					<dv-border-box-13 style="padding-bottom: 1rem;">
 						<img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;" />
-						<div class="i-list-con h-28" style="padding-left: 1rem;">
+						<div class="i-list-con h-27" style="padding-left: 1rem;">
 							<el-collapse accordion>
 								<el-collapse-item v-for="(item,index) in forestFarm" :key="index">
 									<!-- deptId -->
@@ -111,22 +111,96 @@
 					<div class="forthis">
 						<dv-border-box-13>
 							<img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;" />
-							<div class="i-list-con small-bottom-margin h-15">
+							<div class="i-list-con small-bottom-margin h-13">
+								<el-row :gutter="20">
+									<el-col :span="9">
+										<div class="weather-img">
+											<img src="../assets/images/integrated/weather/yin.png">
+											<span>阴</span>
+										</div>
+									</el-col>
+									<el-col :span="15">
+										<div class="weather-info">
+											<ul>
+												<li>风力:三级</li>
+												<li>低温:15</li>
+												<li>风向:东北</li>
+												<li>高温:26</li>
+												<li>火险:三级</li>
+												<li>湿度:30</li>
+											</ul>
+										</div>
+									</el-col>
+								</el-row>
+								<div class="firestate">
+									<div class="state-block1"></div>
+									<div class="state-block2"></div>
+									<div class="state-block3 state-on"></div>
+									<div class="state-block4"></div>
+									<div class="state-block5"></div>
+								</div>
 							</div>
 						</dv-border-box-13>
 					</div>
-					
+					<!-- 曝光台 -->
 					<div class="forthis">
-						<dv-border-box-13>
+						<dv-border-box-13 style="padding-bottom: 1rem;">
 							<img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;" />
-							<div class="i-list-con small-bottom-margin h-21">
+							<div class="this-title">
+								<span>曝光台</span>
+								<dv-decoration-3 style="width:150px;height:15px;margin-right: 1rem;" />
+							</div>
+							<div class="i-list-con small-bottom-margin h-18">
+								<div class="d-l-con padding-box" v-for="(item,index) in 5">
+									<div class="bgt-state">
+										<div class="bgt-state-frequency">3</div>
+										<div class="bgt-state-minute">3分钟</div>
+									</div>
+									<div class="bgt-info">
+										<div class="bgt-info-name">四平-梨树-三塔分场</div>
+										<div class="bgt-info-place">
+											<ul>
+												<li>四海乡</li>
+												<li>郭家店</li>
+												<li>梨树</li>
+											</ul>
+										</div>
+									</div>
+								</div>
 							</div>
 						</dv-border-box-13>
 					</div>
+					<!-- 事件列表 -->
 					<div class="forthis">
-						<dv-border-box-13>
+						<dv-border-box-13 style="padding-bottom: 1rem;">
 							<img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;" />
-							<div class="i-list-con small-bottom-margin h-43">
+							<div class="this-title">
+								<span>事件列表</span>
+								<dv-decoration-3 style="width:150px;height:15px;margin-right: 1rem;" />
+							</div>
+							<div class="i-list-con small-bottom-margin h-39">
+								<div class="event-list-search">
+									<el-input
+									    placeholder="请输入内容"
+									    prefix-icon="el-icon-search"
+									    v-model="eventSearch">
+									</el-input>
+								</div>
+								<div class="d-l-con padding-box" v-for="(item,index) in 5">
+									<div class="bgt-state">
+										<img src="../assets/images/integrated/event-img-sub.png" />
+									</div>
+									<div class="bgt-info">
+										<div class="bgt-info-name">四平-梨树-三塔分场</div>
+										<div class="bgt-info-place">
+											<ul>
+												<li>四海乡</li>
+												<li>郭家店</li>
+												<li>梨树</li>
+											</ul>
+										</div>
+									</div>
+								</div>
 							</div>
 						</dv-border-box-13>
 					</div>
@@ -158,10 +232,10 @@
 
 			</div>
 			<vBottomMenu ref="bottomMenu"></vBottomMenu>
-			<el-tooltip :content="indentText" placement="top" :disabled="indentdisabled">
+			<!-- <el-tooltip :content="indentText" placement="top" :disabled="indentdisabled">
 				<div class="mascot" ref="mascot" :class="indentStyle" @click="indent"><img
 						src="@/assets/images/mascot.png" /></div>
-			</el-tooltip>
+			</el-tooltip> -->
 		</div>
 		<!--事件弹层-->
 		<div class="event-info">
@@ -547,6 +621,7 @@
 		},
 		data() {
 			return {
+				eventSearch:'',//事件列表搜索
 				iconCurrentIndex0: '',
 				iconCurrentIndex1: '',
 				iconCurrentIndex2: '',