Merge branch 'master' of http://121.37.83.100:3000/sooka_onest/sooka_onest_forestfire_vue2_visualization

src/components/vBottomMenu.vue

@@ -23,11 +23,11 @@
 						icon: 'sj-icon-clgj'
 					},
 					{
-						name: '林班资源',
+						name: '林班',
 						icon: 'sj-icon-lbzy'
 					},
 					{
-						name: '林场资源',
+						name: '林场',
 						icon: 'sj-icon-lczy'
 					},
 				]
@@ -38,7 +38,7 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 	@import '@/assets/styles/base.scss';
-	
+
 	.bottom-menu-normal {
 		max-width: 90%;
 		padding: 0 3rem;
@@ -54,7 +54,7 @@
 		background: url(../assets/images/integrated/btm-menu.png) center no-repeat;
 		background-size: cover;
 		overflow: hidden;
-	
+
 		.btm-m-con {
 			position: relative;
 			color: $inBlue;
@@ -67,8 +67,8 @@
 			transform: translateY(0);
 			transition: all 0.2s ease-in-out;
 			cursor: pointer;
-			white-space:nowrap; 
-	
+			white-space:nowrap;
+
 			i {
 				font-size: 1rem;
 				color: $inBlue;
@@ -76,19 +76,19 @@
 				margin-right: 0.2rem;
 			}
 		}
-	
+
 		.btm-m-con:hover {
 			text-shadow: 0 0 20px rgba($color: $inBlueHover, $alpha: 1.0);
 			filter: brightness(2.3);
 			-webkit-transform: translateX(0.2rem);
 			transform: translateX(0.2rem);
 			transition: all 0.2s ease-in-out;
-	
+
 			i {
 				color: $inBlueHover;
 				text-shadow: 0 0 20px rgba($color: $inBlueHover, $alpha: 1.0);
 			}
 		}
-	
+
 	}
-</style>
+</style>

src/views/forest.vue

@@ -293,6 +293,7 @@
           <el-tab-pane label="实时画面" name="frame">
           </el-tab-pane>
           <el-tab-pane label="地理位置" name="point" style="height: 1000px;">
+            视频联动  矢量标记 测面 测距
           </el-tab-pane>
           <supermapNotProcessed ref="supermapNotProcessed"  style="width: 1000px;height: 1000px;" :mapDiv="'forestWarmSuperMap'" :mapSite="{doubleClickZoom:false}" :codes="['9fa5']" @preview="preview" :isSideBySide="false"></supermapNotProcessed>
         </el-tabs>
@@ -1308,13 +1309,13 @@
 						that.$set(that.todayEventCountList[0], 'icon', 'sj-icon-wcl');
 						that.$set(that.todayEventCountList[1], 'icon', 'sj-icon-clz');
 						that.$set(that.todayEventCountList[2], 'icon', 'sj-icon-ywc');
-					
+
 					});
 					res.data.eventcountSource.forEach(function(data, index) {
 						that.$set(that.todayEventSourcetList[0], 'icon', 'sj-icon-rg');
 						that.$set(that.todayEventSourcetList[1], 'icon', 'sj-icon-hx');
 						that.$set(that.todayEventSourcetList[2], 'icon', 'sj-icon-kk');
-					
+
 					});
           //  事件分布
           that.todayEventCountDeptList = res.data.eventcountDept

src/views/monitor.vue

@@ -282,7 +282,12 @@
               if (res.data.visuForestCloudCameraBOList.length > 500) {
                 markersMap.isAggregation = true
               }
-              markersMap.parameter = res.data.visuForestCloudCameraBOList[i].channelCode.split(',')
+              if(res.data.visuForestCloudCameraBOList[i].channelCode!=null){
+                markersMap.parameter = res.data.visuForestCloudCameraBOList[i].channelCode.split(',')
+              }else{
+                markersMap.parameter = [];
+              }
+
               markersMap.lng = res.data.visuForestCloudCameraBOList[i].longitude
               markersMap.lat = res.data.visuForestCloudCameraBOList[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -353,7 +358,12 @@
               if (res.data.length > 500) {
                 markersMap.isAggregation = true
               }
-              markersMap.parameter = res.data[i].channelCode.split(',')
+              if(res.data[i].channelCode!=null){
+                markersMap.parameter = res.data[i].channelCode.split(',')
+              }else{
+                markersMap.parameter = []
+              }
+
               markersMap.lng = res.data[i].longitude
               markersMap.lat = res.data[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +