Merge remote-tracking branch 'origin/master'

src/api/disaster.js

@@ -9,10 +9,10 @@ export function getInit(year) {
   })
 }
 // 点击列表获取数据
-export function selectFireLoseByid(id,eventId) {
+export function selectFireLoseByid(id) {
   return request({
     url: '/center-fire/VisuForestFireLossController/selectFireLoseByid',
     method: 'post',
-    data:{"id":id,"eventId":eventId}
+    data:{"id":id}
   })
 }

src/api/event.js

@@ -64,14 +64,14 @@ export function getImgUrl(data) {
 //获取附近事件
 export function getNearEvent(longitude,latitude) {
   return request({
-    url: '/center-fire/VisuForestEventCenterController/getNearEvent?longitude='+longitude+"&latitude="+latitude,
+    url: '/center-fire/VisuForestEventCenterController/getNearEvent?longitude='+latitude+"&latitude="+latitude,
     method: 'get',
   })
 }
 //获取附近摄像头
 export function getNearCamera(longitude,latitude) {
   return request({
-    url: '/center-fire/VisuForestEventCenterController/getNearCamera?longitude='+longitude+"&latitude="+latitude,
+    url: '/center-fire/VisuForestEventCenterController/getNearCamera?longitude='+latitude+"&latitude="+latitude,
     method: 'get',
   })
 }

src/components/supermap.vue

@@ -37,8 +37,7 @@
         latLngGroup: [],
         isEditableLayers: false,//绘图控件
         drawControl: null,//绘图控件
-        deckglLayer: null,//图层Layer
-        deckglLayerLists: []//图层Layer(多图层)
+        deckglLayer: null//图层Layer
       }
     },
     watch: {
@@ -744,15 +743,12 @@
       },
       layerSwitching: function(url, isClear) {//图层切换  url 图层地址   isClear  是否清除图层
         if (isClear) {
-          if (this.deckglLayerLists != null) {
-            for (let i = 0; i < this.deckglLayerLists.length; i++) {
-              this.deckglLayerLists[i].remove()
-            }
+          if (this.deckglLayer != null) {
+            this.deckglLayer.remove()
           }
         }
         this.deckglLayer = window.L.supermap.tiledMapLayer(url, {})
         this.map.addLayer(this.deckglLayer)
-        this.deckglLayerLists.push(this.deckglLayer);
       }
     }
   }

src/components/v-header.vue

@@ -8,6 +8,7 @@
 			<h3><img class="logo" src="@/assets/images/integrated/logo-small.png" />态势感知监管平台 {{titlename}}
 			</h3><img src="@/assets/images/integrated/bigdata-header-nav-right2.png" />
 		</a>
+		
 		<!--中间导航-->
 		<div class="bignav">
 			<img src="@/assets/images/integrated/bigdata-header-nav-left2.png" />

src/components/vBottomMenu.vue

@@ -4,8 +4,8 @@
 			@click.stop="showDialog(fastMenu.click)">
 			<a><i :class="fastMenu.icon"></i>{{fastMenu.name}}
 				<div v-if="showChild && fastMenu.click == 'layerSwitching'" class="nav-child">
-					<el-button type="primary" plain @click.stop="choseLayerSwitching('http://121.37.83.100:8090/iserver/services/map-sipingshi/rest/maps/tiedong_lunkuo')" class="nav-child-btn">铁东</el-button>
-					<el-button type="primary" plain @click.stop="choseLayerSwitching('http://121.37.83.100:8090/iserver/services/map-sipingshi/rest/maps/tiexi_lunkuo')" class="nav-child-btn">铁西</el-button>
+					<el-button type="primary" @click.stop="choseLayerSwitching('http://121.37.83.100:8090/iserver/services/map-sipingshi/rest/maps/tiedong_lunkuo')" class="nav-child-btn" plain>铁东</el-button>
+					<el-button type="primary" @click.stop="choseLayerSwitching('http://121.37.83.100:8090/iserver/services/map-sipingshi/rest/maps/tiexi_lunkuo')" class="nav-child-btn" plain>铁西</el-button>
 <!--					<el-button type="danger" icon="el-icon-close" style="position: absolute;right: 0;top: 0;width: 1rem;height: 1rem;padding:0;"-->
 <!--						@click.stop="closeChild"></el-button>-->
 				</div>
@@ -41,7 +41,7 @@
 						icon: 'iconfont sj-icon-lbzy',
 						click: ''
 					},
-
+					
 					{
 						name: '林场',
 						icon: 'iconfont sj-icon-lczy',

src/views/disaster.vue

@@ -167,9 +167,8 @@
             <span>列表</span>
           </div>
           <div class="i-list-con h-19">
-            <div class="d-l-con" :class="{on:listCurrentIndex==index}" v-for="(item,index) in fireList" :key="index"
-                 @click="choseFireList(item.id,item.eventId,index)">
-              <div class="d-l-l-text">
+            <div class="d-l-con" :class="{on:listCurrentIndex==index}" v-for="(item,index) in fireList" :key="index"   @click="choseFireList(item.id,index)">
+              <div class="d-l-l-text" >
                 <i class="i-small"></i>
                 <h4>{{pickYear.getYear()+1900}}年第{{index+1}}场火灾</h4>
               </div>
@@ -340,8 +339,8 @@
     },
     created() {
       /** ----------------------------------底部按钮公用组件开始------------------------------------- */
-      window.showDialog = this.showDialog
-      window.choseLayerSwitching = this.choseLayerSwitching
+      window.showDialog=this.showDialog
+      window.choseLayerSwitching=this.choseLayerSwitching
       /** ----------------------------------底部按钮公用组件结束------------------------------------- */
     },
     mounted() {
@@ -349,7 +348,7 @@
     },
     data() {
       return {
-        listCurrentIndex: 0,
+		listCurrentIndex:0,
         numberFiresYear: 0,
         forestFireLossTotal: 0,
         fireLossTotalYear: 0,
@@ -475,14 +474,14 @@
       },
       //选择图层
       choseLayerSwitching(url) {
-        this.$refs.supermap.layerSwitching(url, true)
+        this.$refs.supermap.layerSwitching(url, true);
       },
       /** ----------------------------------底部按钮公用组件结束------------------------------------- */
-      choseFireList(id,eventId, index) {
-        this.listCurrentIndex = index
+      choseFireList(id,index) {
+		this.listCurrentIndex = index
         let that = this
-        selectFireLoseByid(id,eventId).then(res => {
-          this.graphicsList = []
+        selectFireLoseByid(id).then(res => {
+          this.graphicsList=[]
           //地图标记
           if (res.data.regionalFlagBOList != null && res.data.regionalFlagBOList.length > 0) {
             for (let i = 0; i < res.data.regionalFlagBOList.length; i++) {
@@ -496,7 +495,7 @@
               that.$refs.supermap.clearG()
               that.$refs.supermap.setGraphicsList(this.graphicsList, 'red')
             }, 1000)
-          } else {
+          }else{
             that.$refs.supermap.clearG()
           }
           //右侧
@@ -526,7 +525,7 @@
           this.otherFireCosts[0].elseBlazesPrice = res.data.visuForestFireLossBO.elseBlazesPrice != null ? res.data.visuForestFireLossBO.elseBlazesPrice : 0
         })
       },
-
+	  
       getInit() {
         let that = this
         setTimeout(() => {
@@ -557,7 +556,7 @@
           if (res.data.visuForestFireLossTimeBOList != null && res.data.visuForestFireLossTimeBOList.length > 0) {
             this.numberFiresYear = res.data.visuForestFireLossTimeBOList.length
             this.fireList = res.data.visuForestFireLossTimeBOList
-          } else {
+          }else{
             this.numberFiresYear = 0
           }
 

src/views/forest.vue

@@ -1484,7 +1484,6 @@
 			},
 			todayEventCountSetMarkers(eventStatus) {
 				this.iconCurrentIndex1 = eventStatus
-				this.iconCurrentIndex2 = ''
 				// if (eventStatus == "event_event_status_3") {
 				// 	return
 				// }
@@ -1559,7 +1558,6 @@
 			},
 			todayEventSourcetSetMarkers(eventSource) {
 				this.iconCurrentIndex2 = eventSource
-        this.iconCurrentIndex1 = ''
 				//点击今日事件后三个按钮列表
 				let that = this
 				getEventSourceList(eventSource).then(res => {