应急可视化 隐患云图

src/api/forest.js

@@ -275,7 +275,7 @@ export function selectMessageById(messageId) {
 }
 
 
-// 右侧获取事件列表
+// 右侧获取隐患列表
 export function getAllDanger(param,loading) {
   return request({
     url: '/center-emergency/VisuEmergencyCloudMapController/getAllDanger',
@@ -286,3 +286,11 @@ export function getAllDanger(param,loading) {
     },
   })
 }
+
+// 右侧获取隐患详情
+export function getInfoView(dangerId) {
+  return request({
+    url: '/center-emergency/VisuEmergencyCloudMapController/getInfoView/'+dangerId,
+    method: 'get',
+  })
+}

src/components/v-header.vue

@@ -37,7 +37,7 @@
 
 		},
 		created(){
-      this.fontConfig()
+      this.fontConfig
 			this.navbar
 		},
 		data(){

src/views/bigdata/bigdata.vue

@@ -231,7 +231,7 @@ export default {
     }
   },
 created() {
-  this.fontConfig()
+  this.fontConfig
 },
   methods: {
     fontConfig(){

src/views/dangerdetailsdialog.vue

@@ -0,0 +1,683 @@
+<template>
+  <div class="visual-con">
+    <!--头部-->
+    <vheader></vheader>
+    <!--主体-->
+    <div class="visual-body">
+      <button @click="showDangerDialog"
+              style="position: absolute; left:50%;top: 50vh; transform: translateX(-50%);">触发隐患详情
+      </button>
+      <!-- 弹层 -->
+      <el-dialog title="隐患详情" :visible.sync="dangerDialog" customClass="customWidth" v-if="dangerDialog"
+                 @close="cancelEventShow()">
+        <div class="dia-event-info">
+          <el-row>
+            <!-- 左侧 -->
+            <el-col :span="18" class="dia-left">
+              <div ref="imageTofile" style="height: 75vh;">
+                <!-- 隐患详情 -->
+                <div class="e-left">
+                  <div class="dia-left-top-tit">隐患详情</div>
+                  <div class="forthis1-1">
+                      <div class="i-list-con">
+                        <div class="this-con">
+                          <tr>
+                            <th>企业名称：{{dangerView.enterpriseName}}</th>
+                          </tr>
+                          <tr>
+                            <th>隐患标题：{{dangerView.dangerTitle}}</th>
+                          </tr>
+                          <tr>
+                            <th>隐患内容：{{dangerView.dangerContent}}</th>
+                          </tr>
+                          <tr>
+                            <th>隐患经度：{{dangerView.latitude}}</th>
+                          </tr>
+                          <tr>
+                            <th>隐患纬度：{{dangerView.longitude}}</th>
+                          </tr>
+<!--                            <th>隐患图片：{{dangerView.longitude}}</th>-->
+                            <router-link to="#"
+                                         @click.native="clickFile(itemfile.attachPath,itemfile.fileName,itemfile.fileType)"
+                                         v-for="(itemfile,indexfile) in dangerView.attachs">
+                              <el-image :src="itemfile.attachPath" v-if="itemfile.fileType=='image'"
+                                        :preview-src-list="assetTypeAnImage(dangerView.attachs)"
+                                        style="width:3rem; height:3rem;margin: 2px;"
+                                        :title="itemfile.fileName">
+                              </el-image>
+                              <img v-else-if="itemfile.fileType=='video'"
+                                   style="width:3rem; height:3rem;margin: 2px;"
+                                   :src="require('@/assets/fileTypeImage/mp4.png')"
+                                   :title="itemfile.fileName">
+                              </img>
+                              <img v-else-if="itemfile.fileType=='word'"
+                                   style="width:3rem; height:3rem;margin: 2px;"
+                                   :src="require('@/assets/fileTypeImage/word.png')"
+                                   :title="itemfile.fileName">
+                              </img>
+                              <img v-else-if="itemfile.fileType=='excel'"
+                                   style="width:3rem; height:3rem;margin: 2px;"
+                                   :src="require('@/assets/fileTypeImage/excel.png')"
+                                   :title="itemfile.fileName">
+                              </img>
+                              <img v-else
+                                   style="width:3rem; height:3rem;margin: 2px;"
+                                   :src="require('@/assets/fileTypeImage/file.png')"
+                                   :title="itemfile.fileName">
+                              </img>
+                            </router-link>
+                        </div>
+                      </div>
+                  </div>
+                </div>
+                <!-- 应急预案end -->
+                <!-- 隐患详情end -->
+                <!-- 左侧资源 -->
+<!--                <div class="leftbar" style="width:fit-content !important;bottom:0rem;left: 1rem; top: unset;">-->
+<!--                  <div class="forthis">-->
+<!--                    <dv-border-box-7 backgroundColor="#040b1f" :color="['#25335d', '#5baffd']">-->
+<!--                      <div class="i-list-con">-->
+<!--                        <div class="d-l-con-icon" style="flex-direction:row;flex-wrap: nowrap;">-->
+<!--                          <div class="icon-con" style="width: fit-content !important;"-->
+<!--                               v-for="(item,index) in resourcesList" @click="listResourceByWz(item.type)">-->
+<!--                            <div class="iconfont icon icon-normal" :class="item.icon"></div>-->
+<!--                            <div class="icon-text">-->
+<!--                              <h5>{{ item.resourceName }}</h5>-->
+<!--                            </div>-->
+<!--                          </div>-->
+<!--                          <el-input type="number" v-model="radius" style="width: 80px;" placeholder="请输入搜索半径"/>-->
+<!--                        </div>-->
+<!--                      </div>-->
+
+<!--                    </dv-border-box-7>-->
+<!--                  </div>-->
+
+<!--                </div>-->
+                <!-- 地图 -->
+                <supermapDialog ref="supermapDialog"
+                                style="position: absolute; top:0;left: 0;"
+                                :mapDiv="'dangerSuperMap'"
+                                :mapSite="{zoom:12,doubleClickZoom:false,dragging:false,scrollWheelZoom:false}"
+                                :codes="['9fa5']"
+                                :isSideBySide="false"
+                                :isdynamicPlotting="false"/>
+                <!-- 地图end -->
+              </div>
+            </el-col>
+            <!-- 左侧end -->
+            <!-- 右侧 -->
+            <el-col :span="6" class="dia-right">
+              <div class="e-right">
+                <div class="forthis1-1">
+                  <dv-border-box-7 backgroundColor="#040b1f" :color="['#25335d', '#5baffd']"
+                                   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 dangerLogList">
+                              <el-card style="width: 40vh">
+                                <div class="z-info-list-con">
+                                  <div class="user-and-time flex-d">
+                                    <span>{{ item.userName }}</span>
+                                  </div>
+                                  <div class="z-info">
+                                    <div class="this-con-list-info">
+                                      {{ item.processDes }}
+                                    </div>
+<!--                                    <div>-->
+<!--                                      <router-link to="#"-->
+<!--                                                   @click.native="clickFile(itemfile.fileUrl,itemfile.fileName,itemfile.fileType)"-->
+<!--                                                   v-for="(itemfile,indexfile) in item.fileVOs">-->
+<!--                                        <el-image :src="itemfile.fileUrl" v-if="itemfile.fileType=='image'"-->
+<!--                                                  :preview-src-list="assetTypeAnImage(item.fileVOs)"-->
+<!--                                                  style="width:3rem; height:3rem;margin: 2px;"-->
+<!--                                                  :title="itemfile.fileName">-->
+<!--                                        </el-image>-->
+<!--                                        <img v-else-if="itemfile.fileType=='video'"-->
+<!--                                             style="width:3rem; height:3rem;margin: 2px;"-->
+<!--                                             :src="require('@/assets/fileTypeImage/mp4.png')"-->
+<!--                                             :title="itemfile.fileName">-->
+<!--                                        </img>-->
+<!--                                        <img v-else-if="itemfile.fileType=='word'"-->
+<!--                                             style="width:3rem; height:3rem;margin: 2px;"-->
+<!--                                             :src="require('@/assets/fileTypeImage/word.png')"-->
+<!--                                             :title="itemfile.fileName">-->
+<!--                                        </img>-->
+<!--                                        <img v-else-if="itemfile.fileType=='excel'"-->
+<!--                                             style="width:3rem; height:3rem;margin: 2px;"-->
+<!--                                             :src="require('@/assets/fileTypeImage/excel.png')"-->
+<!--                                             :title="itemfile.fileName">-->
+<!--                                        </img>-->
+<!--                                        <img v-else-->
+<!--                                             style="width:3rem; height:3rem;margin: 2px;"-->
+<!--                                             :src="require('@/assets/fileTypeImage/file.png')"-->
+<!--                                             :title="itemfile.fileName">-->
+<!--                                        </img>-->
+<!--                                      </router-link>-->
+<!--                                    </div>-->
+                                  </div>
+                                </div>
+                              </el-card>
+                            </el-timeline-item>
+                          </el-timeline>
+                        </div>
+                      </div>
+                    </div>
+                  </dv-border-box-7>
+                </div>
+              </div>
+
+            </el-col>
+            <!-- 左侧end -->
+          </el-row>
+        </div>
+      </el-dialog>
+    </div>
+    <vBottomMenu ref="bottomMenu"></vBottomMenu>
+    <!-- 图片，视频预览 -->
+    <el-dialog title="视频预览" :visible.sync="showTcPlayer" width="40%" customClass="customWidthMp4">
+      <TcPlayer ref="TcPlayer" :playVideo="playVideo" :widthHeigt="[100,100]"></TcPlayer>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import supermapDialog from '@/components/supermap' //超图
+import vheader from '@/components/v-header.vue' //一体化共用头部
+import vBottomMenu from '@/components/vBottomMenu.vue' //一体化公共底部菜单
+import TcPlayer from '@/components/TcPlayer' //视频预览
+import {
+  getInfoView,
+  // listResourceByWz,
+} from '@/api/forest'
+export default {
+  dicts: ['task_source'],
+  components: {
+    vheader,
+    vBottomMenu,
+    supermapDialog,
+    TcPlayer,
+  },
+  data() {
+    return {
+      playVideo: '',//视频预览地址
+      showTcPlayer: false,//视频预览弹窗
+      /** *****************事件流程***************************/
+      dangerId: null,
+      dangerView: null,
+      longitude: null,
+      latitude: null,
+      dangerLog: null,
+      dangerLogList: [],
+      dangerDialog: false,
+      radius: 50,//资源搜索半径
+      resourcesList: [
+        {
+          resourceName: '仓库',
+          type: 'centerdata_t_emergency_warehouse',
+          icon: 'icon-centerdata_t_emergency_warehouse'
+        },
+        {
+          resourceName: '应急队伍',
+          type: 'centerdata_t_emergency_team',
+          icon: 'icon-centerdata_t_emergency_team'
+        },
+        {
+          resourceName: '巡更点',
+          type: 'centerdata_t_emergency_patrolpoint',
+          icon: 'icon-centerdata_t_emergency_patrolpoint'
+        },
+      ],
+      resourcesListCheck: [],
+    }
+  },
+  props: {
+    calendarDay: null//首页日历选择
+  },
+  created() {
+
+  },
+  methods: {
+    showheatPlotting() {
+      this.dangerDialog = false;
+      this.$emit('getFirespread', this.dangerId);
+    },
+    // listResourceByWz(type) {
+    //   if (this.resourcesListCheck.indexOf(type) > -1) {
+    //     this.resourcesListCheck.splice(this.resourcesListCheck.indexOf(type), 1)
+    //     setTimeout(() => {
+    //       this.$refs.supermapDialog.clearMByType(type)
+    //     }, 1000)
+    //   } else {
+    //     //搜索物资
+    //     let param = { longitude: this.longitude, latitude: this.latitude, type: type, radius: this.radius }
+    //     listResourceByWz(param).then(res => {
+    //       if (res.data != null && res.data.length > 0) {
+    //         this.resourcesListCheck.push(type)
+    //         var markersList = []
+    //         for (let i = 0; i < res.data.length; i++) {
+    //           let markersMap = {
+    //             lng: 124.59,
+    //             lat: 43.02,
+    //             icon: 'marker',
+    //             bindPopupHtml: '',
+    //             click: '',
+    //             parameter: '',
+    //             keepBindPopup: false,
+    //             isAggregation: false
+    //           }
+    //           if (res.data.length > 50) {
+    //             markersMap.isAggregation = true
+    //           }
+    //           if (type == 'qsk') {
+    //             markersMap.icon = 'sj-icon-waterintake'
+    //           } else if (type == 'sh') {
+    //             markersMap.icon = 'sj-icon-watercrane'
+    //           } else if (type == 'xfs') {
+    //             markersMap.icon = 'sj-icon-firehydrant'
+    //           } else if (type == 'qjd') {
+    //             markersMap.icon = 'sj-icon-landing'
+    //           } else if (type == 'jcz') {
+    //             markersMap.icon = 'sj-icon-checkpoint'
+    //           } else if (type == 'fhd') {
+    //             markersMap.icon = 'sj-icon-fireteam'
+    //           } else if (type == 'zdqy') {
+    //             markersMap.icon = 'sj-icon-keyAreas'
+    //           } else if (type == 'sxt') {
+    //             markersMap.icon = 'camera'
+    //           }
+    //           markersMap.lng = res.data[i].longitude
+    //           markersMap.lat = res.data[i].latitude
+    //           markersMap.bindPopupHtml = '<div class="map-tip">' +
+    //             '<span>' +
+    //             '                  <div class="d-l-con">' +
+    //             '                  <div class="d-l-l-text">' +
+    //             '                  <h4>资源名称：' + res.data[i].name + '</h4>' +
+    //             '                </div>' +
+    //             '                </div>' +
+    //             '                </span>' +
+    //             '</div>'
+    //           markersList.push(markersMap)
+    //         }
+    //         setTimeout(() => {
+    //           this.$refs.supermapDialog.setMarkersByType(markersList, type)
+    //         }, 1000)
+    //       }
+    //     })
+    //   }
+    // },
+    // 返回图片列表
+    assetTypeAnImage(filePath) {
+      let imageList = []
+      if (filePath != null && filePath.length > 0) {
+        for (let i = 0; i < filePath.length; i++) {
+          if (filePath[i].fileType == 'image') {
+            imageList.push(filePath[i].attachPath)
+          }
+        }
+      }
+      return imageList
+    },
+    clickFile(fileUrl, fileName, fileType) {
+      if (fileType == 'image') {
+        return
+      } else if (fileType == 'video') {
+        this.showTcPlayer = true
+        setTimeout(() => {
+          this.playVideo = fileUrl
+        }, 500)
+      } else {
+        let a = document.createElement('a')
+        a.download = fileName
+        a.href = fileUrl
+        a.target = '_blank'
+        a.click()
+      }
+    },
+    cancelEventConfirm_mp4() {
+      //关闭视频窗口
+      this.playVideo = ''
+      this.$refs.TcPlayer.destroyed()
+    },
+    cancelEventShow() {
+      console.log('关闭事件弹窗')
+      this.dangerLogList = []
+    },
+    showDangerDialog(dangerId) {
+      this.dangerId = dangerId
+      let that = this
+      //获取隐患详情
+      getInfoView(dangerId).then(res => {
+        that.dangerDialog = true;
+        that.dangerLogList=res.data.process
+        that.dangerView=res.data.danger
+
+        let markersMap = {
+          lng: 124.59,
+          lat: 43.02,
+          icon: 'marker',
+          bindPopupHtml: '',
+          click: '',
+          parameter: '',
+          keepBindPopup: false,
+          isAggregation: false,
+          radius: 0
+        }
+        markersMap.lng = res.data.danger.longitude
+        markersMap.lat = res.data.danger.latitude
+        setTimeout(() => {
+          that.$refs.supermapDialog.clearM(false)
+          that.$refs.supermapDialog.setMarkersRadius([markersMap])
+          that.$refs.supermapDialog.dropLocation10(res.data.danger.latitude, res.data.danger.longitude)
+        }, 2000)
+      })
+    },
+  }
+}
+
+// 推送消息
+function cbIntegrationCallBack(oData) {
+  console.log(JSON.stringify(oData.responseMsg))
+}
+</script>
+
+
+<style lang="scss" scoped>
+@import '@/assets/styles/base.scss';
+
+//弹层样式
+//.customWidthMp4 {
+//  width: 70px !important;
+//  height: 70px !important;
+//}
+
+.tree-border {
+  border: 1px $barBorder;
+
+}
+
+button {
+  padding: .5rem;
+}
+
+/** 火灾报告**/
+//@font-face {
+//  font-family: 'fontnameRegular';
+//  src: url('../../../../assets/styles/FZYTJW_0.TTF');
+//}
+
+body,
+html,
+* {
+  padding: 0px;
+  margin: 0px;
+  font-family: "fontnameRegular";
+}
+
+.table-container {
+  width: 100%;
+}
+
+.txt_right {
+  text-align: right !important;
+}
+
+.txt_left {
+  text-align: left !important;
+}
+
+table {
+  border-spacing: 0;
+  border-collapse: collapse;
+  width: 99%;
+  margin: 0 auto;
+  color: $inBlue;
+}
+
+table input {
+  font-size: 1rem;
+  border: 0px;
+  outline: 0px;
+  font-family: "微软雅黑";
+  background: none;
+  color: $inBlue;
+
+}
+
+table th input:hover {
+  background: $eventBG;
+}
+
+
+table thead th {
+  font-size: 1rem;
+  font-family: "宋体";
+  height: 2rem;
+  border-top: 0px;
+  border-left: 0px;
+  border-right: 0px;
+  outline: 0px;
+}
+
+table tr td {
+  font-size: 1rem;
+  font-family: "fontnameRegular";
+  height: 2rem;
+  border: 1px $searchBorder;
+  text-align: center;
+
+}
+
+.font1 {
+  font-size: 1.7rem;
+  font-weight: bolder;
+}
+
+.border0 {
+  width: 100% !important;
+}
+
+.border0 tr td {
+  border: 0px !important;
+}
+
+table tr td input {
+  width: 100%;
+  /*    display: inline-block;*/
+  outline: 0px;
+  text-align: left;
+  height: 94%;
+  color: $inBlue;
+  background: none;
+  float: left;
+  padding: 0 .5rem;
+}
+
+table tr td input:hover {
+  background: $eventBG;
+}
+
+
+.int_tr td input {
+  text-align: center !important;
+}
+
+.table2 tr th {
+  font-size: 1.7rem;
+  padding: .5rem 0;
+  font-family: 'fontnameRegular';
+}
+
+.table2 tr td {
+  font-size: 1rem;
+}
+
+.table2 tr td select {
+  border: 0px !important;
+  outline: 0px;
+  width: 100%;
+  font-family: "微软雅黑";
+  font-size: 1rem;
+  padding-left: 1%;
+  color: $inBlue;
+  background: none;
+}
+
+.table2 tr td select:hover {
+  background: $eventBG;
+}
+
+.table2 tr td select option {
+  font-size: 1rem;
+  font-family: "微软雅黑";
+}
+
+.border_l0 {
+  // border-right: 1px solid #ececec !important;
+}
+
+.table2 tr td textarea {
+  border: 0px !important;
+  outline: 0px;
+  width: 98%;
+  padding: .5rem;
+  font-size: 1rem;
+  resize: none;
+  background: none;
+  color: $inBlue;
+
+}
+
+.table2 tr td textarea:hover {
+  background: $eventBG;
+}
+
+.tr_border td {
+  border-right: 0px !important;
+  border-left: 0px !important;
+  border-bottom: 0px !important;
+  font-size: 15px;
+}
+
+.btm-btn-group {
+  padding: 1rem 0;
+  width: 100%;
+  display: flex;
+
+  button {
+    padding: .5rem 2rem;
+  }
+}
+
+
+// 20220928
+.yatz_button {
+  padding: 0.5rem 0.5rem;
+  color: #409EFF;
+  background: none;
+  border-color: #409EFF;
+}
+
+.yatz_button:hover {
+  color: #fff;
+  background: #409EFF;
+  border-color: #409EFF;
+}
+
+.fr_button {
+  float: right;
+  padding: 0.5rem 1.5rem;
+}
+
+.bottom {
+  width: 100%;
+  height: calc(100% - 80px);
+  display: flex;
+
+  .bottomLeft {
+    width: 288px;
+    height: 500px;
+    overflow-y: auto;
+
+    .leftItem {
+      width: 100%;
+      height: 50px;
+      line-height: 50px;
+      text-align: center;
+      cursor: pointer;
+    }
+  }
+
+  .bottomRight {
+    width: calc(100% - 288px);
+    height: 500px;
+    box-sizing: border-box;
+    padding: 36px 36px 0 36px;
+    overflow-y: auto;
+
+    .bottomRightContent {
+      width: 100%;
+      box-sizing: border-box;
+      padding-bottom: 36px;
+
+      .bottomRightContentHead {
+        height: 25px;
+        font-family: PingFang SC;
+        font-style: normal;
+        font-weight: 600;
+        font-size: 24px;
+        line-height: 25px;
+        text-transform: capitalize;
+        color: rgba(0, 0, 0, 0.85);
+        margin-bottom: 32px;
+      }
+
+      .bottomRightContentBody {
+        .el-col {
+          position: relative;
+          margin-bottom: 18px;
+
+          .circle {
+            display: inline-block;
+            width: 6px;
+            height: 6px;
+            background: #4677f6;
+            border-radius: 50%;
+            position: absolute;
+            top: 8px;
+            left: 0;
+          }
+
+          .word {
+            margin-left: 12px;
+            font-family: PingFang SC;
+            font-style: normal;
+            font-weight: normal;
+            font-size: 14px;
+            color: #4677f6;
+            cursor: pointer;
+          }
+
+          .word:hover {
+            text-decoration: underline;
+          }
+
+          .topPlace {
+            position: absolute;
+            top: 1px;
+            margin-left: 8px;
+          }
+        }
+      }
+
+      .bottomRightContentFooter {
+        height: 1px;
+        width: 100%;
+        margin-top: 14px;
+      }
+    }
+  }
+}
+</style>

src/views/forestDanger.vue

@@ -5,38 +5,10 @@
     <vheader></vheader>
     <!--主体-->
     <div class="visual-body">
-<!--      &lt;!&ndash; 左侧 &ndash;&gt;-->
-<!--      <div class="leftbar" ref="left">-->
-<!--        &lt;!&ndash; 3 组织机构 &ndash;&gt;-->
-<!--        <div class="forthis">-->
-<!--          <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">-->
-<!--            <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>-->
-<!--            <div class="i-list-con h-80" style="padding-left: 1rem;">-->
-<!--              <el-collapse accordion>-->
-<!--                <el-collapse-item v-for="(item,index) in villageTypeXlList" :key="index">-->
-<!--                  <template slot="title">-->
-<!--                    <div class="d-l-con sj-collapse" :class="{on:listCurrentIndex1==item.id}"-->
-<!--                         v-on:click="getAllDanger(calendarDay,item.parentId,item.id)">-->
-<!--                      <div class="d-l-l-text">-->
-<!--                        <h4 class="collapse-title">{{ item.name }}</h4>-->
-<!--                      </div>-->
-<!--                      <div class="d-l-l-count">{{ item.value }}</div>-->
-<!--                    </div>-->
-<!--                  </template>-->
-<!--                </el-collapse-item>-->
-<!--              </el-collapse>-->
-<!--              <div class="i-list-con small-bottom-margin h-30">-->
-
-<!--              </div>-->
-<!--            </div>-->
-<!--          </dv-border-box-13>-->
-<!--        </div>-->
-<!--      </div>-->
-      <!-- 地图 -->
       <supermap ref="supermap" style="width: 100%;height: 100vh;" class="indexSupermapClass" :mapDiv="'forestMap'"
                 :dynamicPlotting="false"
                 :mapSite="{doubleClickZoom:false}" :codes="['9fa5']" :isSideBySide="false"
-                @showEventDialog="showEventDialog"/>
+                @showDangerDialog="showDangerDialog"/>
       <!-- 右侧 -->
       <div class="rightbar rightbar-index" ref="right">
         <div class="right-item1">
@@ -136,11 +108,11 @@
       <vBottomMenu ref="bottomMenu" @stopAudio="stopAudio" ></vBottomMenu>
     </div>
     <audio id="resource" ref="up" :src="audioSrc" controls style="display: none;"></audio>
-    <eventdetailsdialog ref="eventdetailsdialog" :calendarDay="calendarDay"
+    <dangerdetailsdialog ref="dangerdetailsdialog" :calendarDay="calendarDay"
                         :bigEventTypeId="bigEventTypeId" :smallEventTypeId="smallEventTypeId"
-                        @getAllDanger="getAllDanger"></eventdetailsdialog>
+                        @getAllDanger="getAllDanger"></dangerdetailsdialog>
 
-    <firespread ref="firespread" :calendarDay="calendarDay" @getAllDanger="getAllDanger" @showEventDialog="showEventDialog"></firespread>
+    <firespread ref="firespread" :calendarDay="calendarDay" @getAllDanger="getAllDanger" @showDangerDialog="showDangerDialog"></firespread>
     <eventLocation ref="eventLocation"></eventLocation>
     <TVWall ref="TVWall"></TVWall>
   </div>
@@ -164,10 +136,10 @@ import supermapNotProcessed from '@/components/supermap' //超图
 import supermapProcessed from '@/components/supermap' //超图
 import vheader from '@/components/v-header.vue' //一体化共用头部
 import vBottomMenu from '@/components/vBottomMenu.vue' //一体化公共底部菜单
-import eventLocation from '@/components/eventLocation.vue' //事件定位弹窗
+import eventLocation from '@/components/eventLocation.vue' //隐患定位弹窗
 import TVWall from '@/components/TVWall.vue' //电视墙弹窗
-import eventdetailsdialog from '@/views/eventdetailsdialog.vue' //事件详情弹窗
-import firespread from '@/views/firespread.vue' //事件详情弹窗
+import dangerdetailsdialog from '@/views/dangerdetailsdialog.vue' //隐患详情弹窗
+import firespread from '@/views/firespread.vue' //隐患详情弹窗
 
 /** ----------------------------------摄像头预览开始------------------------------------- */
 import {
@@ -188,7 +160,7 @@ export default {
     eventLocation,
     TVWall,
     dateChoose,
-    eventdetailsdialog,
+    dangerdetailsdialog,
     firespread
   },
   created() {
@@ -222,7 +194,7 @@ export default {
       //警报MP3文件
       audioSrc:require('@/assets/jingbao.mp3'),
       calendarDay: this.getCurrentDataStr(),
-      //左侧部门事件数量
+      //左侧部门隐患数量
       villageTypeXlList: [],
       //右侧隐患列表
       dangerList: [],
@@ -283,29 +255,23 @@ export default {
             keepBindPopup: false,
             isAggregation: false
           }
-          if (this.dangerList.length > 200) {
-            markersMap.isAggregation = true
-          }
+          markersMap.click = 'showDangerDialog'
+          markersMap.parameter = this.dangerList[i].id
+          markersMap.isAggregation = true
           if (this.dangerList[i].eventStatusValue == 'forest_event_status_1' && this.dangerList[i].urgeCount == 0) {
-            markersMap.click = 'showEventDialog'
             markersMap.icon = 'sj-icon-map-xinshangbao'
           }
           if (this.dangerList[i].eventStatusValue == 'forest_event_status_1' && this.dangerList[i].urgeCount > 0) {
-            markersMap.click = 'showEventDialog'
             markersMap.icon = 'sj-icon-map-cuiban'
           } else if (this.dangerList[i].eventStatusValue == 'forest_event_status_2') {
-            markersMap.click = 'showEventDialog'
             markersMap.icon = 'sj-icon-map-qianshou'
             markersMap.isAggregation = false
           } else if (this.dangerList[i].eventStatusValue == 'forest_event_status_5') {
-            markersMap.click = 'showEventDialog'
             markersMap.icon = 'sj-icon-map-banjie'
             markersMap.isAggregation = false
           } else if (this.dangerList[i].eventStatusValue == 'forest_event_status_6') {
-            markersMap.click = 'showEventDialog'
             markersMap.icon = 'sj-icon-map-guidang'
           }
-          markersMap.parameter = this.dangerList[i].eventCode
           markersMap.lng = this.dangerList[i].longitude
           markersMap.lat = this.dangerList[i].latitude
           markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -319,14 +285,14 @@ export default {
             '<span>' +
             '                  <div class="d-l-con">' +
             '                  <div class="d-l-l-text">' +
-            '                  <h4>事件名称：' + this.dangerList[i].eventName + '</h4>' +
+            '                  <h4>隐患名称：' + this.dangerList[i].eventName + '</h4>' +
             '                </div>' +
             '                </div>' +
             '                </span>' +
             '<span>' +
             '                  <div class="d-l-con">' +
             '                  <div class="d-l-l-text">' +
-            '                  <h4>事件时间：' + this.dangerList[i].createTime + '</h4>' +
+            '                  <h4>隐患时间：' + this.dangerList[i].createTime + '</h4>' +
             '                </div>' +
             '                </div>' +
             '                </span>'
@@ -357,12 +323,12 @@ export default {
     dropLocation(lat, lng) {
       this.$refs.supermap.dropLocation(lat, lng)
     },
-    showEventDialog(eventCode) {
-      //事件信息弹出
-      this.$refs.eventdetailsdialog.showEventDialog(eventCode)
+    showDangerDialog(dangerId) {
+      //隐患信息弹出
+      this.$refs.dangerdetailsdialog.showDangerDialog(dangerId)
     },
     getFirespread(eventCode){
-      this.$refs.firespread.showEventDialog(eventCode);
+      this.$refs.firespread.showDangerDialog(eventCode);
     },
     getCurrentDataStr() {
       let date = new Date()
@@ -384,7 +350,7 @@ export default {
     },
     // getEventByEventType(day,loading) {
     //   let that = this
-    //   //左侧获取事件部门数量
+    //   //左侧获取隐患部门数量
     //   getEventByEventType({ day: day },loading).then(res => {
     //     this.villageTypeXlList = res.data
     //   })
@@ -395,7 +361,7 @@ export default {
       this.dangerListAll = []
       //右侧获取隐患列表
       getAllDanger({
-        createTime: day+" 00:00:00"
+        createDate: day
       },loading).then(res => {
         this.dangerList = res.data
         this.dangerListAll = res.data
@@ -416,29 +382,23 @@ export default {
               keepBindPopup: false,
               isAggregation: false
             }
-            if (this.dangerList.length > 200) {
               markersMap.isAggregation = true
-            }
+            markersMap.click = 'showDangerDialog'
+            markersMap.parameter = this.dangerList[i].id
             if (this.dangerList[i].eventStatusValue == 'forest_event_status_1' && this.dangerList[i].urgeCount == 0) {
-              markersMap.click = 'showEventDialog'
               markersMap.icon = 'sj-icon-map-xinshangbao'
             }
             if (this.dangerList[i].eventStatusValue == 'forest_event_status_1' && this.dangerList[i].urgeCount > 0) {
-              markersMap.click = 'showEventDialog'
               markersMap.icon = 'sj-icon-map-cuiban'
             } else if (this.dangerList[i].eventStatusValue == 'forest_event_status_2') {
-              markersMap.click = 'showEventDialog'
               markersMap.icon = 'sj-icon-map-qianshou'
               markersMap.isAggregation = false
             } else if (this.dangerList[i].eventStatusValue == 'forest_event_status_5') {
-              markersMap.click = 'showEventDialog'
               markersMap.icon = 'sj-icon-map-banjie'
               markersMap.isAggregation = false
             } else if (this.dangerList[i].eventStatusValue == 'forest_event_status_6') {
-              markersMap.click = 'showEventDialog'
               markersMap.icon = 'sj-icon-map-guidang'
             }
-            markersMap.parameter = this.dangerList[i].eventCode
             markersMap.lng = this.dangerList[i].longitude
             markersMap.lat = this.dangerList[i].latitude
             markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -452,14 +412,28 @@ export default {
               '<span>' +
               '                  <div class="d-l-con">' +
               '                  <div class="d-l-l-text">' +
-              '                  <h4>事件名称：' + this.dangerList[i].eventName + '</h4>' +
+              '                  <h4>隐患名称：' + this.dangerList[i].dangerTitle + '</h4>' +
               '                </div>' +
               '                </div>' +
               '                </span>' +
               '<span>' +
               '                  <div class="d-l-con">' +
               '                  <div class="d-l-l-text">' +
-              '                  <h4>事件时间：' + this.dangerList[i].createTime + '</h4>' +
+              '                  <h4>隐患时间：' + this.dangerList[i].createTime + '</h4>' +
+              '                </div>' +
+              '                </div>' +
+              '                </span>'+
+              '<span>' +
+              '                  <div class="d-l-con">' +
+              '                  <div class="d-l-l-text">' +
+              '                  <h4>隐患状态：' + this.dangerList[i].dangerStatusLabel + '</h4>' +
+              '                </div>' +
+              '                </div>' +
+              '                </span>'+
+              '<span>' +
+              '                  <div class="d-l-con">' +
+              '                  <div class="d-l-l-text">' +
+              '                  <h4>隐患企业：' + this.dangerList[i].enterpriseName + '</h4>' +
               '                </div>' +
               '                </div>' +
               '                </span>'
@@ -606,11 +580,11 @@ export default {
     },
     /** ----------------------------------底部按钮公用组件结束------------------------------------- */
 
-    /** ----------------------------------事件弹窗开始------------------------------------- */
+    /** ----------------------------------隐患弹窗开始------------------------------------- */
 
 
 
-    /** ----------------------------------事件弹窗结束------------------------------------- */
+    /** ----------------------------------隐患弹窗结束------------------------------------- */
     /** ----------------------------------摄像头预览开始------------------------------------- */
     alertLogin: function() {
       this.$modal.msg('登录中....')