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

public/index.html

@@ -276,6 +276,13 @@
 <!--<script src="h5player/h5player.min.js"></script>-->
 
 
+<script type="text/javascript" src="./SuperMap3D/Build/Cesium/Cesium.js"></script>
+<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/tooltip.js"></script>
+<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/bubble/popup.js"></script>
+<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/jquery.min.js"></script>
+<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/config.js"></script>
+<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/bootstrap-select.min.js"></script>
+<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/supermap/SuperMap.Include.js"></script>
 
 <!--  <link rel="stylesheet" href="./supermap/libs/plotting/leaflet/10.2.1/iclient-plot-leaflet.css">-->
 <script type="text/javascript"
@@ -288,13 +295,6 @@
 <script type="text/javascript" include="PlotPanel,StylePanel,SMLInfosPanel,iPortalStylePanel"
         src="./supermap/examples/js/plottingPanel/PlottingPanel.Include.js"></script>
 
-<script type="text/javascript" src="./SuperMap3D/Build/Cesium/Cesium.js"></script>
-<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/tooltip.js"></script>
-<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/bubble/popup.js"></script>
-<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/jquery.min.js"></script>
-<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/config.js"></script>
-<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/bootstrap-select.min.js"></script>
-<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/supermap/SuperMap.Include.js"></script>
 <div id="app">
   <div class="loading">
     <div><span></span></div>

src/router/index.js

@@ -31,7 +31,7 @@ import Layout from '@/layout'
 // 公共路由（可视化首页头部链接）
 export const constantRoutes = [{
 		path: '/',
-		redirect: 'datacenter',
+		redirect: 'forest',
 	},
 	{
 		path: '/forest',
@@ -88,7 +88,7 @@ export const constantRoutes = [{
 // 公共路由
 export const constantRoutesNew = [{
 		path: '/',
-		redirect: 'datacenter',
+		redirect: 'forest',
 	},
 	{
 		path: '/forest',

src/views/eventdetailsdialog.vue

@@ -1,7 +1,5 @@
 <template>
   <div class="visual-con">
-    <!--头部-->
-    <vheader></vheader>
     <!--主体-->
     <div class="visual-body">
       <button @click="showEventDialog"
@@ -1049,7 +1047,6 @@
 <script>
 import html2canvas from 'html2canvas'//截图组件
 import supermapDialog 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'//区域标记地图
@@ -1100,7 +1097,6 @@ export default {
     }
   },
   components: {
-    vheader,
     vBottomMenu,
     supermapDialog,
     eventLogUpload,

src/views/firespread.vue

@@ -1,7 +1,5 @@
 <template>
   <div class="visual-con">
-    <!--头部-->
-    <vheader></vheader>
     <!--主体-->
     <div class="visual-body">
       <button @click="showEventDialog"
@@ -947,7 +945,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'//区域标记地图
@@ -991,7 +988,6 @@
       }
     },
     components: {
-      vheader,
       vBottomMenu,
       supermapDialog1,
       eventLogUpload,