Browse Source

应急可视化 隐患云图

彭宇 2 years ago
parent
commit
dd89ee9230
2 changed files with 17 additions and 67 deletions
  1. 2 3
      src/views/dangerdetailsdialog.vue
  2. 15 64
      src/views/forestDanger.vue

+ 2 - 3
src/views/dangerdetailsdialog.vue

@@ -16,7 +16,7 @@
             <el-col :span="18" class="dia-left">
               <div ref="imageTofile" style="height: 75vh;">
                 <!-- 隐患详情 -->
-                <div class="e-left">
+                <div class="e-left" style="z-index: 99999999;">
                   <div class="dia-left-top-tit">隐患详情</div>
                   <div class="forthis1-1">
                       <div class="i-list-con">
@@ -70,7 +70,6 @@
                       </div>
                   </div>
                 </div>
-                <!-- 应急预案end -->
                 <!-- 隐患详情end -->
                 <!-- 左侧资源 -->
 <!--                <div class="leftbar" style="width:fit-content !important;bottom:0rem;left: 1rem; top: unset;">-->
@@ -97,7 +96,7 @@
                 <supermapDialog ref="supermapDialog"
                                 style="position: absolute; top:0;left: 0;"
                                 :mapDiv="'dangerSuperMap'"
-                                :mapSite="{zoom:12,doubleClickZoom:false,dragging:false,scrollWheelZoom:false}"
+                                :mapSite="{zoom:12,doubleClickZoom:false,dragging:true,scrollWheelZoom:true}"
                                 :codes="['9fa5']"
                                 :isSideBySide="false"
                                 :isdynamicPlotting="false"/>

+ 15 - 64
src/views/forestDanger.vue

@@ -34,7 +34,7 @@
               <div class="i-list-con small-bottom-margin h-44">
                 <div class="event-list-search">
                   <el-input
-                    placeholder="请输入内容"
+                    placeholder="请输入搜索企业"
                     prefix-icon="el-icon-search"
                     v-model="eventSearch" @change="searchEvent(eventSearch)">
                   </el-input>
@@ -42,56 +42,25 @@
                 <div class="d-l-con padding-box nowrap" v-for="(item,index) in dangerList"
                      @click="dropLocation(item.latitude,item.longitude)" data-html2canvas-ignore>
                   <div class="bgt-img">
-                    <img v-if="item.picturePath!=null&&item.picturePath!='' && item.pictureType=='image'"
-                         :src="item.picturePath"
-                         style="width: 93px;height: 64px" loading="lazy"/>
-                    <img v-else src="../assets/images/integrated/event-img-sub.png" style="width: 93px;height: 64px"/>
+<!--                    <img v-if="item.picturePath!=null&&item.picturePath!='' && item.pictureType=='image'"-->
+<!--                         :src="item.picturePath"-->
+<!--                         style="width: 93px;height: 64px" loading="lazy"/>-->
+                    <img  src="../assets/images/integrated/event-img-sub.png" style="width: 93px;height: 64px"/>
                   </div>
                   <div class="bgt-info">
-                    <div v-if="item.eventStatusValue=='forest_event_status_1'&&item.urgeCount==0"
-                         class="event-state-sb">
-                      <i class="el-icon-caret-left"></i>
-                      <div class="event-list-state-sb">
-                        新上报
-                      </div>
-                    </div>
-                    <div v-if="item.eventStatusValue=='forest_event_status_1'&&item.urgeCount>0" class="event-state-cb">
+                    <div v-if="item.dangerStatus=='trouble_status_2'" class="event-state-cb">
                       <i class="el-icon-caret-left"></i>
                       <div class="event-list-state-cb">
-                        催办
+                        {{item.dangerStatusLabel}}
                       </div>
                     </div>
-                    <div v-if="item.eventStatusValue=='forest_event_status_2'" class="event-state-qs">
+                    <div v-if="item.dangerStatus=='trouble_status_3'" class="event-state-qs">
                       <i class="el-icon-caret-left"></i>
                       <div class="event-list-state-qs">
-                        签收
-                      </div>
-                    </div>
-                    <div v-if="item.eventStatusValue=='forest_event_status_3'" class="event-state-wb">
-                      <i class="el-icon-caret-left"></i>
-                      <div class="event-list-state-wb">
-                        误报
-                      </div>
-                    </div>
-                    <div v-if="item.eventStatusValue=='forest_event_status_4'" class="event-state-cf">
-                      <i class="el-icon-caret-left"></i>
-                      <div class="event-list-state-cf">
-                        重复
+                        {{item.dangerStatusLabel}}
                       </div>
                     </div>
-                    <div v-if="item.eventStatusValue=='forest_event_status_5'" class="event-state-bj">
-                      <i class="el-icon-caret-left"></i>
-                      <div class="event-list-state-bj">
-                        办结
-                      </div>
-                    </div>
-                    <div v-if="item.eventStatusValue=='forest_event_status_6'" class="event-state-gd">
-                      <i class="el-icon-caret-left"></i>
-                      <div class="event-list-state-gd">
-                        归档
-                      </div>
-                    </div>
-                    <div class="bgt-info-name">{{ item.reportor }} {{ item.eventName }}</div>
+                    <div class="bgt-info-name">{{ item.enterpriseName }} {{ item.dangerTitle }}</div>
                     <div class="bgt-info-place">
                       <ul>
                         <li>{{ item.createTime }}</li>
@@ -235,7 +204,7 @@ export default {
       this.dangerListnew = []
       if (eventSearch != null && eventSearch != '') {
         for (var i = 0; i < this.dangerListAll.length; i++) {
-          if (this.dangerListAll[i].reportor.indexOf(eventSearch) > -1) {
+          if (this.dangerListAll[i].enterpriseName.indexOf(eventSearch) > -1) {
             this.dangerListnew.push(this.dangerListAll[i])
           }
         }
@@ -258,19 +227,10 @@ export default {
           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.icon = 'sj-icon-map-xinshangbao'
-          }
-          if (this.dangerList[i].eventStatusValue == 'forest_event_status_1' && this.dangerList[i].urgeCount > 0) {
-            markersMap.icon = 'sj-icon-map-cuiban'
-          } else if (this.dangerList[i].eventStatusValue == 'forest_event_status_2') {
+          if (this.dangerList[i].dangerStatus == 'trouble_status_2') {
             markersMap.icon = 'sj-icon-map-qianshou'
-            markersMap.isAggregation = false
-          } else if (this.dangerList[i].eventStatusValue == 'forest_event_status_5') {
+          } else if (this.dangerList[i].dangerStatus == 'trouble_status_3') {
             markersMap.icon = 'sj-icon-map-banjie'
-            markersMap.isAggregation = false
-          } else if (this.dangerList[i].eventStatusValue == 'forest_event_status_6') {
-            markersMap.icon = 'sj-icon-map-guidang'
           }
           markersMap.lng = this.dangerList[i].longitude
           markersMap.lat = this.dangerList[i].latitude
@@ -385,19 +345,10 @@ export default {
               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.icon = 'sj-icon-map-xinshangbao'
-            }
-            if (this.dangerList[i].eventStatusValue == 'forest_event_status_1' && this.dangerList[i].urgeCount > 0) {
-              markersMap.icon = 'sj-icon-map-cuiban'
-            } else if (this.dangerList[i].eventStatusValue == 'forest_event_status_2') {
+            if (this.dangerList[i].dangerStatus == 'trouble_status_2') {
               markersMap.icon = 'sj-icon-map-qianshou'
-              markersMap.isAggregation = false
-            } else if (this.dangerList[i].eventStatusValue == 'forest_event_status_5') {
+            } else if (this.dangerList[i].dangerStatus == 'trouble_status_3') {
               markersMap.icon = 'sj-icon-map-banjie'
-              markersMap.isAggregation = false
-            } else if (this.dangerList[i].eventStatusValue == 'forest_event_status_6') {
-              markersMap.icon = 'sj-icon-map-guidang'
             }
             markersMap.lng = this.dangerList[i].longitude
             markersMap.lat = this.dangerList[i].latitude