数据中心

src/views/event.vue

@@ -34,7 +34,7 @@
             <div class="d-tit">
               <h4>事件分布</h4>
             </div>
-            <div class="d-l-con" @click="" v-for="(item,index) in todayEventCountDeptList"
+            <div class="d-l-con"  v-for="(item,index) in todayEventCountDeptList"
                  v-on:click="todayEventByDeptIdList(item.deptId)">
               <div class="d-l-l-text">
                 <i class="i-small"></i>
@@ -46,7 +46,7 @@
               <h4>事件分类</h4>
             </div>
             <div id="event-chart" style="width: 100%;height:26.2vh;"></div>
-            <div class="d-l-con" @click="" v-for="(item,index) in todayEventCountTypeList"
+            <div class="d-l-con"  v-for="(item,index) in todayEventCountTypeList"
                  v-on:click="todayEventByTypeList(item.eventType)">
               <div class="d-l-l-text">
                 <i class="i-small"></i>
@@ -68,8 +68,8 @@
             <!-- <span>23</span> -->
           </div>
           <div class="i-list-con h-73">
-            <div class="d-l-con d-evnet-list-con" @click="" v-for="(item,index) in eventList" v-on:click="dropLocation(item.latitude,item.longitude)">
-              <img src="@/assets/images/visual/img-sample-1.jpg" :src="item.src" class="event-list-img">
+            <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="item.picturePath" class="event-list-img">
               <div class="event-list-text">
                 <h3>{{item.eventTitle}}</h3>
 <!--                <h4><span-->
@@ -107,7 +107,7 @@
                 <div class="forthis">
                   <div class="i-list-con h-35">
 										<span v-for="(information,index) in information" :key="index">
-											<div class="d-l-con" @click="">
+											<div class="d-l-con" >
 												<div class="d-l-l-text">
 													<i class="i-small"></i>
 													<h4>{{information.name}}：</h4>
@@ -123,7 +123,7 @@
                   </div>
                   <div class="i-list-con h-26">
 										<span v-for="(company,index) in listEventDept" :key="index">
-											<div class="d-l-con" @click="">
+											<div class="d-l-con" >
 												<div class="d-l-l-text">
 													<i class="i-small"></i>
 													<h4>{{company.deptName}}</h4>
@@ -257,7 +257,7 @@
                 <div class="forthis">
                   <div class="i-list-con h-35">
 										<span v-for="(information,index) in information" :key="index">
-											<div class="d-l-con" @click="">
+											<div class="d-l-con" >
 												<div class="d-l-l-text">
 													<i class="i-small"></i>
 													<h4>{{information.name}}：</h4>
@@ -273,7 +273,7 @@
                   </div>
                   <div class="i-list-con h-26">
 										<span v-for="(company,index) in listEventDept.allDept" :key="index">
-											<div class="d-l-con" @click="">
+											<div class="d-l-con" >
 												<div class="d-l-l-text">
 													<i class="i-small"></i>
 													<h4>{{company.deptName}}</h4>
@@ -490,72 +490,6 @@
             label: '归档'
           }
         ],
-        forestFarm: [
-          {
-            name: '双辽市',
-            id: '',
-            child: [{
-              name: '叶赫林场',
-              id: ''
-            },
-              {
-                name: '石岭子林场',
-                id: ''
-              }
-            ]
-
-          },
-          {
-            name: '梨树县',
-            id: ''
-          },
-          {
-            name: '伊通县',
-            id: ''
-          },
-          {
-            name: '铁东区',
-            id: ''
-          },
-          {
-            name: '铁西区',
-            id: ''
-          }
-        ],
-        equipment: [
-          {
-            name: '摄像头',
-            id: '',
-            num: 52,
-            child: [{
-              name: '1km云台',
-              id: '',
-              num: 12
-            },
-              {
-                name: '1.5km云台',
-                id: '',
-                num: 12
-              },
-              {
-                name: '3.5km云台',
-                id: '',
-                num: 12
-              },
-              {
-                name: '5km云台',
-                id: '',
-                num: 12
-              }
-            ]
-
-          },
-          {
-            name: '大喇叭',
-            id: '',
-            num: 12
-          }
-        ],
         // 弹出层 基本信息
         information: [
           {
@@ -596,32 +530,6 @@
           }
         ],
         // 弹出层 基本信息 涉事单位
-        company: [
-          {
-            name: '沈洋镇',
-            id: '',
-            state: 0
-
-          },
-          {
-            name: '小宽镇',
-            id: '',
-            state: 1
-          },
-          {
-            name: '四棵树',
-            id: '',
-            state: 1
-
-          }
-
-        ],
-        url01: require('@/assets/images/visual/img-sample-1.jpg'),
-        url02: require('@/assets/images/visual/img-sample-2.jpg'),
-        url03: require('@/assets/images/visual/img-sample-3.jpg'),
-        url1: require('@/assets/images/visual/林业病虫害抓拍2.png'),
-        url2: require('@/assets/images/visual/林业病虫害松墨天牛抓拍.png'),
-        url3: require('@/assets/images/visual/img-sample-3.jpg'),
         srcList: [
           require('@/assets/images/visual/img-sample-3.jpg'),
           require('@/assets/images/visual/img-sample-2.jpg'),
@@ -633,11 +541,6 @@
           require('@/assets/images/visual/img-sample-3.jpg')
         ],
 
-        interval: '',
-        websocketURL: '',
-        yjCount: 0,
-        sxtObject: {},
-
         //左右缩进
         indentStyle: '',
         indentleft: '',
@@ -1057,30 +960,31 @@
         getEventStatusList(eventStatus).then(res => {
           that.$refs.supermap.clearM(false)
           that.$refs.supermap.clearM(true)
-          that.eventList=res.data.eventList;
           that.markersList = [];
-          let markersMap = {
-            lng: 124.59,
-            lat: 43.02,
-            icon: 'marker',
-            bindPopupHtml: '',
-            click: '',
-            parameter: '',
-            keepBindPopup: false,
-            isAggregation: false
-          }
+          that.eventList = [];
           if(res.data.eventList!=null&&res.data.eventList.length>0){
-            if(res.data.eventList.length>500){
-              markersMap.isAggregation = true
-            }
-            if(eventStatus=="event_event_status_1_2_6"){
-              markersMap.click = "showEventInfo_Processed"
-            }else if(eventStatus=="event_event_status_4"){
-              markersMap.click = "showEventInfo_notProcessed"
-            }else{
-              markersMap.click = "showEventInfo_Processed"
-            }
             for (let i = 0; i < res.data.eventList.length; i++) {
+              res.data.eventList[i].picturePath=res.data.attach[i].attachPath
+              let markersMap = {
+                lng: 124.59,
+                lat: 43.02,
+                icon: 'marker',
+                bindPopupHtml: '',
+                click: '',
+                parameter: '',
+                keepBindPopup: false,
+                isAggregation: false
+              }
+              if(res.data.eventList.length>500){
+                markersMap.isAggregation = true
+              }
+              if(eventStatus=="event_event_status_1_2_6"){
+                markersMap.click = "showEventInfo_Processed"
+              }else if(eventStatus=="event_event_status_4"){
+                markersMap.click = "showEventInfo_notProcessed"
+              }else{
+                markersMap.click = "showEventInfo_Processed"
+              }
               markersMap.parameter = res.data.eventList[i].id
               markersMap.lng = res.data.eventList[i].longitude
               markersMap.lat =res.data.eventList[i].latitude
@@ -1110,6 +1014,7 @@
                 '</div>';
               that.markersList.push(markersMap)
             }
+            that.eventList=res.data.eventList;
             that.$refs.supermap.setMarkers(that.markersList)
           }
           // eventCode: "718b040cf1f747eb8ab4ffc6db643ca0"
@@ -1130,7 +1035,7 @@
         getEventSourceList(eventSource).then(res => {
           that.$refs.supermap.clearM(true)
           that.$refs.supermap.clearM(false)
-          that.eventList=res.data.eventList;
+          that.eventList = [];
           that.markersList = [];
           let markersMap = {
             lng: 124.59,
@@ -1146,6 +1051,8 @@
               markersMap.isAggregation = true
             }
             for (let i = 0; i < res.data.eventList.length; i++) {
+              res.data.eventList[i].picturePath=res.data.attach[i].attachPath
+
               if(res.data.eventList[i].eventStatus=="event_event_status_1"||res.data.eventList[i].eventStatus=="event_event_status_2"||res.data.eventList[i].eventStatus=="event_event_status_6"){
                 markersMap.click = "showEventInfo_Processed"
               }else if(res.data.eventList[i].eventStatus=="event_event_status_4"){
@@ -1181,6 +1088,7 @@
                 '</div>';
               that.markersList.push(markersMap)
             }
+            that.eventList=res.data.eventList;
             that.$refs.supermap.setMarkers(that.markersList)
           }
           // eventCode: "718b040cf1f747eb8ab4ffc6db643ca0"
@@ -1201,8 +1109,8 @@
         getEventListByDeptIdList(deptId).then(res => {
           that.$refs.supermap.clearM(true)
           that.$refs.supermap.clearM(false)
-          that.eventList=res.data.eventList;
           that.markersList = [];
+          that.eventList = [];
           let markersMap = {
             lng: 124.59,
             lat: 43.02,
@@ -1217,6 +1125,7 @@
               markersMap.isAggregation = true
             }
             for (let i = 0; i < res.data.eventList.length; i++) {
+              res.data.eventList[i].picturePath=res.data.attach[i].attachPath
               markersMap.lng = res.data.eventList[i].longitude
               markersMap.lat =res.data.eventList[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -1245,6 +1154,7 @@
                 '</div>';
               that.markersList.push(markersMap)
             }
+            that.eventList=res.data.eventList;
             that.$refs.supermap.setMarkers(that.markersList)
           }
           // eventCode: "718b040cf1f747eb8ab4ffc6db643ca0"
@@ -1265,22 +1175,23 @@
         getEventListByTypeList(eventType).then(res => {
           that.$refs.supermap.clearM(true)
           that.$refs.supermap.clearM(false)
-          that.eventList=res.data.eventList;
           that.markersList = [];
-          let markersMap = {
-            lng: 124.59,
-            lat: 43.02,
-            icon: 'marker',
-            bindPopupHtml: '',
-            click: '',
-            keepBindPopup: false,
-            isAggregation: false
-          }
+          that.eventList = [];
           if(res.data.eventList!=null&&res.data.eventList.length>0){
-            if(res.data.eventList.length>500){
-              markersMap.isAggregation = true
-            }
             for (let i = 0; i < res.data.eventList.length; i++) {
+              res.data.eventList[i].picturePath=res.data.attach[i].attachPath
+              let markersMap = {
+                lng: 124.59,
+                lat: 43.02,
+                icon: 'marker',
+                bindPopupHtml: '',
+                click: '',
+                keepBindPopup: false,
+                isAggregation: false
+              }
+              if(res.data.eventList.length>500){
+                markersMap.isAggregation = true
+              }
               markersMap.lng = res.data.eventList[i].longitude
               markersMap.lat =res.data.eventList[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -1311,6 +1222,7 @@
             }
             that.$refs.supermap.setMarkers(that.markersList)
           }
+          that.eventList=res.data.eventList;
           // eventCode: "718b040cf1f747eb8ab4ffc6db643ca0"
           // eventContent: "集安-东明-可见光2022-06-27 02:42:04烟雾报警"
           // eventSource: "event_source_2"

src/views/forest.vue

@@ -12,7 +12,7 @@
 						<span>基本情况</span>
 					</div>
 					<div class="i-list-con h-9">
-						<div class="d-l-con" @click="">
+						<div class="d-l-con" >
 							<div class="d-l-l-text w-100p">
 								<h4 class="line-h-1 w-100p">{{forestInfo}}</h4>
 							</div>
@@ -91,7 +91,7 @@
 							<h4>事件分布</h4>
 						</div>
             <div id="event-chart" style="width: 100%;height:26.2vh;"></div>
-            <div class="d-l-con" @click="" v-for="(item,index) in todayEventCountDeptList"
+            <div class="d-l-con"  v-for="(item,index) in todayEventCountDeptList"
                  v-on:click="todayEventByDeptIdList(item.deptId)">
               <div class="d-l-l-text">
                 <i class="i-small"></i>
@@ -154,7 +154,7 @@
                 <div class="forthis">
                   <div class="i-list-con h-35">
 										<span v-for="(information,index) in information" :key="index">
-											<div class="d-l-con" @click="">
+											<div class="d-l-con" >
 												<div class="d-l-l-text">
 													<i class="i-small"></i>
 													<h4>{{information.name}}：</h4>
@@ -170,7 +170,7 @@
                   </div>
                   <div class="i-list-con h-26">
 										<span v-for="(company,index) in listEventDept" :key="index">
-											<div class="d-l-con" @click="">
+											<div class="d-l-con" >
 												<div class="d-l-l-text">
 													<i class="i-small"></i>
 													<h4>{{company.deptName}}</h4>
@@ -304,7 +304,7 @@
                 <div class="forthis">
                   <div class="i-list-con h-35">
 										<span v-for="(information,index) in information" :key="index">
-											<div class="d-l-con" @click="">
+											<div class="d-l-con" >
 												<div class="d-l-l-text">
 													<i class="i-small"></i>
 													<h4>{{information.name}}：</h4>
@@ -320,7 +320,7 @@
                   </div>
                   <div class="i-list-con h-26">
 										<span v-for="(company,index) in listEventDept.allDept" :key="index">
-											<div class="d-l-con" @click="">
+											<div class="d-l-con" >
 												<div class="d-l-l-text">
 													<i class="i-small"></i>
 													<h4>{{company.deptName}}</h4>
@@ -575,39 +575,6 @@
 						id: ''
 					}
 				],
-				equipment: [{
-						name: '摄像头',
-						id: '',
-						num: 52,
-						child: [{
-								name: '1km云台',
-								id: '',
-								num: 12
-							},
-							{
-								name: '1.5km云台',
-								id: '',
-								num: 12
-							},
-							{
-								name: '3.5km云台',
-								id: '',
-								num: 12
-							},
-							{
-								name: '5km云台',
-								id: '',
-								num: 12
-							}
-						]
-
-					},
-					{
-						name: '大喇叭',
-						id: '',
-						num: 12
-					}
-				],
 				// 弹出层 基本信息
         information: [
           {
@@ -648,31 +615,6 @@
           },
         ],
 				// 弹出层 基本信息 涉事单位
-				company: [{
-						name: '沈洋镇',
-						id: '',
-						state: 0
-
-					},
-					{
-						name: '小宽镇',
-						id: '',
-						state: 1
-					},
-					{
-						name: '四棵树',
-						id: '',
-						state: 1
-
-					}
-
-				],
-				url01: require('@/assets/images/visual/img-sample-1.jpg'),
-				url02: require('@/assets/images/visual/img-sample-2.jpg'),
-				url03: require('@/assets/images/visual/img-sample-3.jpg'),
-				url1: require('@/assets/images/visual/林业病虫害抓拍2.png'),
-				url2: require('@/assets/images/visual/林业病虫害松墨天牛抓拍.png'),
-				url3: require('@/assets/images/visual/img-sample-3.jpg'),
 				srcList: [
 					require('@/assets/images/visual/img-sample-3.jpg'),
 					require('@/assets/images/visual/img-sample-2.jpg'),
@@ -684,11 +626,6 @@
 					require('@/assets/images/visual/img-sample-3.jpg')
 				],
 
-				interval: '',
-				websocketURL: '',
-				yjCount: 0,
-				sxtObject: {},
-
 				//左右缩进
 				indentStyle:'',
 				indentleft:'',
@@ -1265,27 +1202,27 @@
 
           if (res.data.VisuForestCloudTodaySjfbBO!=null&&res.data.VisuForestCloudTodaySjfbBO.length>0){
             for (let i = 0; i < res.data.VisuForestCloudTodaySjfbBO.length; i++) {
-              let aa=[res.data.VisuForestCloudTodaySjfbBO[i].deptName,res.data.VisuForestCloudTodaySjfbBO[i].deptCount];
+              let aa=[res.data.VisuForestCloudTodaySjfbBO[i].deptName,Number(res.data.VisuForestCloudTodaySjfbBO[i].deptCount)];
               that.sourceData.push(aa);
             }
           }
 
           that.markersList = [];
-          let markersMap = {
-            lng: 124.59,
-            lat: 43.02,
-            icon: 'marker',
-            bindPopupHtml: '',
-            click: '',
-            parameter: '',
-            keepBindPopup: false,
-            isAggregation: false
-          }
           if(res.data.visuForestVgdEventBOList!=null&&res.data.visuForestVgdEventBOList.length>0){
-            if(res.data.visuForestVgdEventBOList.length>500){
-              markersMap.isAggregation = true
-            }
             for (let i = 0; i < res.data.visuForestVgdEventBOList.length; i++) {
+              let markersMap = {
+                lng: 124.59,
+                lat: 43.02,
+                icon: 'marker',
+                bindPopupHtml: '',
+                click: '',
+                parameter: '',
+                keepBindPopup: false,
+                isAggregation: false
+              }
+              if(res.data.visuForestVgdEventBOList.length>500){
+                markersMap.isAggregation = true
+              }
               if(res.data.visuForestVgdEventBOList[i].eventStatus=="event_event_status_1"||res.data.visuForestVgdEventBOList[i].eventStatus=="event_event_status_2"||res.data.visuForestVgdEventBOList[i].eventStatus=="event_event_status_6"){
                 markersMap.click = "showEventInfo_Processed"
               }else if(res.data.visuForestVgdEventBOList[i].eventStatus=="event_event_status_4"){
@@ -1369,28 +1306,28 @@
           that.$refs.supermap.clearM(true)
           that.eventList=res.data.eventList;
           that.markersList = [];
-          let markersMap = {
-            lng: 124.59,
-            lat: 43.02,
-            icon: 'marker',
-            bindPopupHtml: '',
-            click: '',
-            parameter: '',
-            keepBindPopup: false,
-            isAggregation: false
-          }
           if(res.data.eventList!=null&&res.data.eventList.length>0){
-            if(res.data.eventList.length>500){
-              markersMap.isAggregation = true
-            }
-            if(eventStatus=="event_event_status_1_2_6"){
-              markersMap.click = "showEventInfo_Processed"
-            }else if(eventStatus=="event_event_status_4"){
-              markersMap.click = "showEventInfo_notProcessed"
-            }else{
-              markersMap.click = "showEventInfo_Processed"
-            }
             for (let i = 0; i < res.data.eventList.length; i++) {
+              let markersMap = {
+                lng: 124.59,
+                lat: 43.02,
+                icon: 'marker',
+                bindPopupHtml: '',
+                click: '',
+                parameter: '',
+                keepBindPopup: false,
+                isAggregation: false
+              }
+              if(res.data.eventList.length>500){
+                markersMap.isAggregation = true
+              }
+              if(eventStatus=="event_event_status_1_2_6"){
+                markersMap.click = "showEventInfo_Processed"
+              }else if(eventStatus=="event_event_status_4"){
+                markersMap.click = "showEventInfo_notProcessed"
+              }else{
+                markersMap.click = "showEventInfo_Processed"
+              }
               markersMap.parameter = res.data.eventList[i].id
               markersMap.lng = res.data.eventList[i].longitude
               markersMap.lat =res.data.eventList[i].latitude
@@ -1441,20 +1378,21 @@
           that.$refs.supermap.clearM(true)
           that.$refs.supermap.clearM(false)
           that.markersList = [];
-          let markersMap = {
-            lng: 124.59,
-            lat: 43.02,
-            icon: 'marker',
-            bindPopupHtml: '',
-            click: '',
-            keepBindPopup: false,
-            isAggregation: false
-          }
           if(res.data.eventList!=null&&res.data.eventList.length>0){
-            if(res.data.eventList.length>500){
-              markersMap.isAggregation = true
-            }
+
             for (let i = 0; i < res.data.eventList.length; i++) {
+              let markersMap = {
+                lng: 124.59,
+                lat: 43.02,
+                icon: 'marker',
+                bindPopupHtml: '',
+                click: '',
+                keepBindPopup: false,
+                isAggregation: false
+              }
+              if(res.data.eventList.length>500){
+                markersMap.isAggregation = true
+              }
               if(res.data.eventList[i].eventStatus=="event_event_status_1"||res.data.eventList[i].eventStatus=="event_event_status_2"||res.data.eventList[i].eventStatus=="event_event_status_6"){
                 markersMap.click = "showEventInfo_Processed"
               }else if(res.data.eventList[i].eventStatus=="event_event_status_4"){
@@ -1513,20 +1451,21 @@
           that.$refs.supermap.clearM(false)
           that.eventList=res.data.eventList;
           that.markersList = [];
-          let markersMap = {
-            lng: 124.59,
-            lat: 43.02,
-            icon: 'marker',
-            bindPopupHtml: '',
-            click: '',
-            keepBindPopup: false,
-            isAggregation: false
-          }
+
           if(res.data.eventList!=null&&res.data.eventList.length>0){
-            if(res.data.eventList.length>500){
-              markersMap.isAggregation = true
-            }
             for (let i = 0; i < res.data.eventList.length; i++) {
+              let markersMap = {
+                lng: 124.59,
+                lat: 43.02,
+                icon: 'marker',
+                bindPopupHtml: '',
+                click: '',
+                keepBindPopup: false,
+                isAggregation: false
+              }
+              if(res.data.eventList.length>500){
+                markersMap.isAggregation = true
+              }
               markersMap.lng = res.data.eventList[i].longitude
               markersMap.lat =res.data.eventList[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -1574,21 +1513,22 @@
 			  if(deviceType=="sxt"){
           this.$refs.supermap.clearM(true)
           this.$refs.supermap.clearM(false)
-          let markersMap = {
-            lng: 124.59,
-            lat: 43.02,
-            icon: 'camera',
-            bindPopupHtml: '',
-            click: 'preview',
-            parameter: '',
-            keepBindPopup: false,
-            isAggregation: false
-          }
 			    if(this.cameraList!=null&&this.cameraList.length>0){
-            if(this.cameraList.length>500){
-              markersMap.isAggregation = true
-            }
+
             for (let i = 0; i < this.cameraList.length; i++) {
+              let markersMap = {
+                lng: 124.59,
+                lat: 43.02,
+                icon: 'camera',
+                bindPopupHtml: '',
+                click: 'preview',
+                parameter: '',
+                keepBindPopup: false,
+                isAggregation: false
+              }
+              if(this.cameraList.length>500){
+                markersMap.isAggregation = true
+              }
               markersMap.parameter=this.cameraList[i].channelCode.split(",");
               markersMap.lng=this.cameraList[i].longitude;
               markersMap.lat=this.cameraList[i].latitude;