Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/simulationScene/database/modules/infoData.vue
#	src/views/simulationScene/database/zbsjk.vue

.env.development

@@ -2,5 +2,3 @@ NODE_ENV=development
 VUE_APP_PREVIEW=true
 VUE_APP_API_BASE_URL=/api
 VUE_APP_API_URL=http://192.168.0.189:8099
-VUE_APP_WEBSOCKET_URL=ws://192.168.0.96:9001
-VUE_APP_MAPVIEW_URL = ws://192.168.0.189:8099

.env.production

@@ -2,4 +2,3 @@ NODE_ENV=production
 VUE_APP_PREVIEW=true
 VUE_APP_API_BASE_URL=/api
 VUE_APP_API_URL=http://192.168.0.189:8099
-VUE_APP_WEBSOCKET_URL=ws://192.168.0.96:9001

public/config.js

@@ -1,10 +1,11 @@
+// @ts-ignore
 window._CONFIG = {
   ImageryProviderUrl: '/map/mapWX/{z}/{x}/{y}.jpg',
   RoadProviderUrl: '',
-  TerrainProviderUrl: '/map/mapDem/',
+  TerrainProviderUrl: '/map/mapTerrain/',
   thirdLoginUrl: 'http://127.0.0.1:8080/thirdLogin',
   clientId: '0123456789',
-  evaluationSrc: 'http://127.0.0.1:8000',
+  evaluationSrc: 'http://192.168.0.189:8088/thirdLogin/thirdLoginPage?username=admin',
   VUE_APP_API_URL: 'http://192.168.0.189:8099',
-  VUE_APP_MAPVIEW_URL:'ws://192.168.0.189:8099'
+  VUE_APP_WEBSOCKET_URL: 'ws://192.168.0.189:8099',
 }

public/simulationScene/trainerSystem/Assets/Textures/NaturalEarthII/tilemapresource.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-    <TileMap version="1.0.0" tilemapservice="http://tms.osgeo.org/1.0.0">
-      <Title>NE2_HR_LC_SR_W_DR_recolored.tif</Title>
-      <Abstract></Abstract>
-      <SRS>EPSG:4326</SRS>
-      <BoundingBox miny="-90.00000000000000" minx="-180.00000000000000" maxy="90.00000000000000" maxx="180.00000000000000"/>
-      <Origin y="-90.00000000000000" x="-180.00000000000000"/>
-      <TileFormat width="256" height="256" mime-type="image/jpg" extension="jpg"/>
-      <TileSets profile="geodetic">
-        <TileSet href="0" units-per-pixel="0.70312500000000" order="0"/>
-        <TileSet href="1" units-per-pixel="0.35156250000000" order="1"/>
-        <TileSet href="2" units-per-pixel="0.17578125000000" order="2"/>
-      </TileSets>
-    </TileMap>