事件定位

src/components/eventLocation.vue

@@ -24,18 +24,65 @@
 							<el-tab-pane label="周边事件" name="event">
 								<div class="forthis">
 									<div class="i-list-con overflow-y" style="height: 50vh;">
-										<div class="d-l-con d-evnet-list-con" v-for="(item,index) in eventList"
-											v-on:click="dropLocation(item.latitude,item.longitude)">
-											<!-- <img :src="" v-if="item.picturePath!=null&&item.picturePath!=''" class="event-list-img"> -->
-											<img :src="item.picturePath"
-												v-if="item.picturePath!=null&&item.picturePath!=''"
-												class="event-list-img">
-											<img src="@/assets/images/visual/img-sample.png" v-else
-												class="event-list-img">
-											<div class="event-list-text">
-												<h3>{{item.eventTitle}}</h3>
-											</div>
-										</div>
+                    <div class="d-l-con padding-box nowrap" v-for="(item,index) in eventList"
+                         @click="dropLocation(item.latitude,item.longitude)">
+                      <div class="bgt-img">
+                        <img v-if="item.picturePath!=null&&item.picturePath!=''" :src="item.picturePath"
+                             style="width: 93px;height: 64px"/>
+                        <img v-else 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">
+                          <i class="el-icon-caret-left"></i>
+                          <div class="event-list-state-cb">
+                            催办
+                          </div>
+                        </div>
+                        <div v-if="item.eventStatusValue=='forest_event_status_2'" 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">
+                            重复
+                          </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-place">
+                          <ul>
+                            <li>{{ item.reportTime }}</li>
+                          </ul>
+                        </div>
+                      </div>
+                    </div>
 									</div>
 								</div>
 							</el-tab-pane>
@@ -531,7 +578,7 @@
 				this.markersList = []
 				this.cameraList = []
 				this.cameraMarkersList = []
-				
+
 			},
 			getNearEvent() {
 				if (this.longitude == null || this.longitude == "" || this.latitude == null || this.latitude == "") {
@@ -552,69 +599,88 @@
 				let that = this
 				getNearEvent(this.longitude, this.latitude).then(res => {
 					that.markersList = []
-					that.eventList = []
-					if (res.data != null && res.data.length > 0) {
-						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 (res.data[i].eventStatus == "event_event_status_1" || res.data[i].eventStatus ==
-								"event_event_status_2" || res.data[i].eventStatus == "event_event_status_6") {
-								markersMap.click = "showEventInfo_Processed"
-								markersMap.icon = "sj-icon-map-clz"
-							} else if (res.data[i].eventStatus == "event_event_status_4") {
-								markersMap.click = "showEventInfo_notProcessed"
-								markersMap.icon = "sj-icon-map-wcl"
-							} else {
-								markersMap.icon = "sj-icon-map-ywc"
-							}
-							markersMap.parameter = res.data[i].id
-							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].longitude + ',' + res.data[i]
-								.latitude + '</h4>' +
-								'                </div>' +
-								'                </div>' +
-								'                </span>' +
-								'<span>' +
-								'                  <div class="d-l-con">' +
-								'                  <div class="d-l-l-text">' +
-								'                  <h4>事件名称：' + res.data[i].eventTitle + '</h4>' +
-								'                </div>' +
-								'                </div>' +
-								'                </span>' +
-								'<span>' +
-								'                  <div class="d-l-con">' +
-								'                  <div class="d-l-l-text">' +
-								'                  <h4>事件时间：' + res.data[i].reportTime + '</h4>' +
-								'                </div>' +
-								'                </div>' +
-								'                </span>' +
-								'</div>'
-							that.markersList.push(markersMap)
-						}
-						that.eventList = res.data
-						setTimeout(() => {
-							that.$refs.eventLocationSupermap.clearM(true)
-							that.$refs.eventLocationSupermap.clearM(false)
-							that.$refs.eventLocationSupermap.setMarkers(that.markersList)
-							that.$refs.eventLocationSupermap.setMarkers(marker)
-						}, 1000)
-					}
+          that.eventList=res.data
+            if (this.eventList != null && this.eventList.length > 0) {
+              for (let i = 0; i < this.eventList.length; i++) {
+                let markersMap = {
+                  lng: 124.59,
+                  lat: 43.02,
+                  icon: 'marker',
+                  bindPopupHtml: '',
+                  click: '',
+                  parameter: '',
+                  keepBindPopup: false,
+                  isAggregation: false
+                }
+                if (this.eventList.length > 50) {
+                  markersMap.isAggregation = true
+                }
+                if (this.eventList[i].eventStatusValue == 'forest_event_status_1'&&this.eventList[i].urgeCount==0) {
+                  markersMap.click = 'showEventDialog'
+                  markersMap.icon = 'sj-icon-map-xinshangbao'
+                  markersMap.isAggregation = false
+                }if (this.eventList[i].eventStatusValue == 'forest_event_status_1'&&this.eventList[i].urgeCount>0) {
+                  markersMap.click = 'showEventDialog'
+                  markersMap.icon = 'sj-icon-map-cuiban'
+                  markersMap.isAggregation = false
+                } else if (this.eventList[i].eventStatusValue == 'forest_event_status_2') {
+                  markersMap.click = 'showEventDialog'
+                  markersMap.icon = 'sj-icon-map-qianshou'
+                }else if (this.eventList[i].eventStatusValue == 'forest_event_status_5') {
+                  markersMap.click = 'showEventDialog'
+                  markersMap.icon = 'sj-icon-map-banjie'
+                } else if (this.eventList[i].eventStatusValue == 'forest_event_status_6') {
+                  markersMap.click = 'showEventDialog'
+                  markersMap.icon = 'sj-icon-map-guidnag'
+                }
+                markersMap.parameter = this.eventList[i].eventCode
+                markersMap.lng = this.eventList[i].longitude
+                markersMap.lat = this.eventList[i].latitude
+                markersMap.bindPopupHtml = '<div class="map-tip">' +
+                  '<span>' +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  '                  <h4>经纬度：' + this.eventList[i].longitude + ',' + this.eventList[i].latitude + '</h4>' +
+                  '                </div>' +
+                  '                </div>' +
+                  '                </span>' +
+                  '<span>' +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  '                  <h4>事件名称：' + this.eventList[i].eventName + '</h4>' +
+                  '                </div>' +
+                  '                </div>' +
+                  '                </span>' +
+                  '<span>' +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  '                  <h4>事件时间：' + this.eventList[i].reportTime + '</h4>' +
+                  '                </div>' +
+                  '                </div>' +
+                  '                </span>'
+                if (this.eventList[i].picturePath != null && this.eventList[i].picturePath != '') {
+                  markersMap.bindPopupHtml += '<span>' +
+                    '                  <div class="d-l-con">' +
+                    '                  <div class="d-l-l-text">' +
+                    '<img src="' + this.eventList[i].picturePath + '" style="width: 150px;height: 100px"/>' +
+                    '                </div>' +
+                    '                </div>' +
+                    '                </span>'
+                }
+                markersMap.bindPopupHtml += '</div>'
+                that.markersList.push(markersMap)
+              }
+              setTimeout(() => {
+                that.$refs.eventLocationSupermap.clearM(false)
+                that.$refs.eventLocationSupermap.clearM(true)
+                that.$refs.eventLocationSupermap.setMarkers(that.markersList)
+              }, 2000)
+            } else {
+              setTimeout(() => {
+                that.$refs.eventLocationSupermap.clearM(false)
+                that.$refs.eventLocationSupermap.clearM(true)
+              }, 2000)
+            }
 				})
 			},
 			handleClick(tab, event) {

src/views/eventdetailsdialog.vue

@@ -1154,6 +1154,21 @@ export default {
       this.eventStatusButton = null//流程按钮标识
       this.eventConfirmTitle = null//流程按钮标识
     },
+    cancelEventConfirm_send() {
+      //清空表单数据
+      this.sendDeptId = null
+      this.sendDeptName = null
+      this.sendEventType = null
+      this.sendHuoZaiBanJing = null
+      this.sendGuanLianYuAn = null
+      this.sendTaskTitle = null
+      this.sendTaskContent = null
+      this.sendLianDongDept = []
+      this.eventTypeList = []//事件类型列表
+      this.guanLianYuAnList = []//关联预案列表
+      this.deptOptions = []//签收部门
+      this.deptOptionsLiandong = []//联动部门
+    },
     cancelEventConfirm_gd() {
       //关闭事件火险报告窗口
       this.resetTable1()
@@ -1374,6 +1389,7 @@ export default {
             if (res.code == 200) {
               this.$message.success(`处理成功!`)
               this.refreshEvent(this.eventCode)
+              this.cancelEventConfirm_send()
               this.showEventConfirm_gd = false
               this.$emit('getEventList', this.calendarDay)
               this.$emit('getTodayEvents', this.calendarDay)
@@ -1396,6 +1412,7 @@ export default {
             if (res.code == 200) {
               this.$message.success(`处理成功!`)
               this.refreshEvent(this.eventCode)
+              this.cancelEventConfirm_send()
               this.showEventConfirm = false
               this.$emit('getEventList', this.calendarDay)
               this.$emit('getTodayEvents', this.calendarDay)
@@ -1507,7 +1524,7 @@ export default {
             that.$refs.supermapDialog.clearM(false)
             that.$refs.supermapDialog.setMarkersRadius([markersMap])
             that.$refs.supermapDialog.dropLocation(res.data.catalogue[0].latitude, res.data.catalogue[0].longitude)
-          }, 1000)
+          }, 2000)
         }
       })
     },
@@ -1562,7 +1579,7 @@ export default {
               that.$refs.supermapDialog.setMarkers([markersMap])
             }
             that.$refs.supermapDialog.dropLocation(res.data.catalogue[0].latitude, res.data.catalogue[0].longitude)
-          }, 1000)
+          }, 2000)
         }
       })
     },

src/views/forest.vue

@@ -598,12 +598,12 @@ export default {
           that.$refs.supermap.clearM(false)
           that.$refs.supermap.clearM(true)
           that.$refs.supermap.setMarkers(that.markersList)
-        }, 1000)
+        }, 2000)
       } else {
         setTimeout(() => {
           that.$refs.supermap.clearM(false)
           that.$refs.supermap.clearM(true)
-        }, 1000)
+        }, 2000)
       }
     },
     dropLocation(lat, lng) {
@@ -956,12 +956,12 @@ export default {
             that.$refs.supermap.clearM(false)
             that.$refs.supermap.clearM(true)
             that.$refs.supermap.setMarkers(that.markersList)
-          }, 1000)
+          }, 2000)
         } else {
           setTimeout(() => {
             that.$refs.supermap.clearM(false)
             that.$refs.supermap.clearM(true)
-          }, 1000)
+          }, 2000)
         }
       })
     },