Merge remote-tracking branch 'origin/visu_firecontrol_01_siping_2.5d' into visu_firecontrol_01_siping_2.5d

src/components/vBottomMenu.vue

@@ -526,7 +526,7 @@
         selectConfigKey(wsurl).then(res => {
           //初始化weosocket
           //const wsuri = 'ws://127.0.0.1:10003/eventPush/' + userId + '/' + eventTypeDl + '/' + eventType
-          const wsuri = res.data + userId +postName+ userId
+          const wsuri = res.data+postName+ userId
           // const wsuri = 'ws://172.28.20.82:10012/taskPush/'+userId
           this.websock = new WebSocket(wsuri)
           //console.log('建立websocket连接' + wsuri)
@@ -826,7 +826,7 @@
           this.messageList = response.data
           this.messageCount = response.data.length
         });
-        this.initWebSocket('MESSAGE_SOCKET', '/messagePush/', this.websockSid.userId)
+        this.initWebSopcket('MESSAGE_SOCKET', '/messagePush/', this.websockSid.userId)
       },
 			handleCheckedCitiesChangeBan(value) {
 				this.choseLayerSwitchingList(this.banCheckList)

src/router/index.js

@@ -32,7 +32,7 @@ import Layout from '@/layout'
 export const constantRoutes = [
   {
 		path: '/',
-		redirect: 'datacenter',
+		redirect: 'forest',
 		// redirect: 'forest',
 	},
 	{
@@ -87,7 +87,7 @@ export const constantRoutes = [
 // 公共路由
 export const constantRoutesNew = [{
 		path: '/',
-		redirect: 'datacenter',
+		redirect: 'forest',
 		// redirect: 'forest',
 	},
 	{

src/views/eventdetailsdialog.vue

@@ -1,7 +1,5 @@
 <template>
   <div class="visual-con">
-    <!--头部-->
-    <vheader></vheader>
     <!--主体-->
     <div class="visual-body">
       <button @click="showEventDialog"
@@ -1072,7 +1070,6 @@
 <script>
 import html2canvas from 'html2canvas'//截图组件
 import supermapDialog from '@/components/supermap' //超图
-import vheader from '@/components/v-header.vue' //一体化共用头部
 import TVWall from '@/components/TVWall.vue' //电视墙弹窗
 import vBottomMenu from '@/components/vBottomMenu.vue' //一体化公共底部菜单
 import eventLogUpload from '@/views/eventLogUpload.vue' //日志上传文件
@@ -1125,7 +1122,6 @@ export default {
     }
   },
   components: {
-    vheader,
     TVWall,
     vBottomMenu,
     supermapDialog,

src/views/firespread.vue

@@ -1,7 +1,5 @@
 <template>
   <div class="visual-con">
-    <!--头部-->
-    <vheader></vheader>
     <!--主体-->
     <div class="visual-body">
       <button @click="showEventDialog"
@@ -146,7 +144,6 @@
 <script>
   import html2canvas from 'html2canvas'//截图组件
   import supermapDialog1 from '@/components/supermap' //超图
-  import vheader from '@/components/v-header.vue' //一体化共用头部
   import vBottomMenu from '@/components/vBottomMenu.vue' //一体化公共底部菜单
   import eventLogUpload from '@/views/eventLogUpload.vue' //日志上传文件
   import areaSupermap from '@/components/supermap'//区域标记地图
@@ -190,7 +187,6 @@
       }
     },
     components: {
-      vheader,
       vBottomMenu,
       supermapDialog1,
       eventLogUpload,