系统名称

# Conflicts:
#	src/views/subsystem/scene/index.vue

.env.development

@@ -1,6 +1,6 @@
 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
+VUE_APP_API_URL=http://192.168.0.53:8099
+VUE_APP_MAP_BASE_URL=/map
+VUE_APP_MAP_URL=http://192.168.0.225:8090

.env.one

@@ -0,0 +1,7 @@
+NODE_ENV=one
+VUE_APP_PREVIEW=true
+VUE_APP_PORT=8001
+VUE_APP_API_BASE_URL=/api
+VUE_APP_API_URL=http://192.168.0.225:8099
+VUE_APP_MAP_BASE_URL=/map
+VUE_APP_MAP_URL=http://127.0.0.1:8090

.env.production

@@ -1,5 +1,4 @@
 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
+VUE_APP_API_URL=http://192.168.0.53:8099

.env.two

@@ -0,0 +1,7 @@
+NODE_ENV=two
+VUE_APP_PREVIEW=true
+VUE_APP_PORT=8002
+VUE_APP_API_BASE_URL=/api
+VUE_APP_API_URL=http://192.168.0.80:8099
+VUE_APP_MAP_BASE_URL=/map
+VUE_APP_MAP_URL=http://127.0.0.1:8090

package.json

@@ -4,6 +4,8 @@
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
+    "serve:8001": "vue-cli-service serve --mode=one",
+    "serve:8002": "vue-cli-service serve --mode=two",
     "build": "vue-cli-service build",
     "test:unit": "vue-cli-service test:unit",
     "lint": "vue-cli-service lint",
@@ -16,6 +18,7 @@
   "dependencies": {
     "@ant-design-vue/pro-layout": "^1.0.11",
     "@antv/data-set": "^0.10.2",
+    "@mermaid-js/parser": "^0.6.1",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^1.0.2",
     "ant-design-vue": "^1.7.8",
@@ -29,6 +32,7 @@
     "lodash.get": "^4.4.2",
     "lodash.pick": "^4.4.0",
     "md5": "^2.3.0",
+    "mermaid": "^10.2.4",
     "mockjs2": "1.0.8",
     "moment": "^2.29.2",
     "nprogress": "^0.2.0",

public/config.js

@@ -1,10 +1,25 @@
+// @ts-ignore
 window._CONFIG = {
+  // 地图用图片资源地址
   ImageryProviderUrl: '/map/mapWX/{z}/{x}/{y}.jpg',
   RoadProviderUrl: '',
-  TerrainProviderUrl: '/map/mapDem/',
+  TerrainProviderUrl: '/map/mapTerrain/',
+
+  // 显示系统菜单
+  showSystemMenu: true,
+
+  // 使用第三方登录
+  useThirdLogin: false,
+  // 第三方登录地址
   thirdLoginUrl: 'http://127.0.0.1:8080/thirdLogin',
+  // 第三方注册AppId
   clientId: '0123456789',
-  evaluationSrc: 'http://127.0.0.1:8000',
-  VUE_APP_API_URL: 'http://192.168.0.189:8099',
-  VUE_APP_MAPVIEW_URL:'ws://192.168.0.189:8099'
+
+  // 评估子系统 内嵌iframe地址
+  evaluationSrc: 'http://192.168.0.53:8088/thirdLogin/thirdLoginPage?username=admin',
+
+  // 服务端地址
+  VUE_APP_API_URL: 'http://192.168.0.53:8099',
+  // websocket服务地址
+  VUE_APP_WEBSOCKET_URL: 'ws://192.168.0.53:8099',
 }

public/config.one.js

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

public/config.two.js

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

public/index.html

@@ -5,10 +5,10 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>App.ico">
-    <title>某仿真分析方法工具</title>
+    <title>基于大数据的智能化后装保障链仿真分析方法工具</title>
     <style>.first-loading-wrp{display:flex;justify-content:center;align-items:center;flex-direction:column;min-height:420px;height:100%}.first-loading-wrp>h1{font-size:128px}.first-loading-wrp .loading-wrp{padding:98px;display:flex;justify-content:center;align-items:center}.dot{animation:antRotate 1.2s infinite linear;transform:rotate(45deg);position:relative;display:inline-block;font-size:32px;width:32px;height:32px;box-sizing:border-box}.dot i{width:14px;height:14px;position:absolute;display:block;background-color:#1890ff;border-radius:100%;transform:scale(.75);transform-origin:50% 50%;opacity:.3;animation:antSpinMove 1s infinite linear alternate}.dot i:nth-child(1){top:0;left:0}.dot i:nth-child(2){top:0;right:0;-webkit-animation-delay:.4s;animation-delay:.4s}.dot i:nth-child(3){right:0;bottom:0;-webkit-animation-delay:.8s;animation-delay:.8s}.dot i:nth-child(4){bottom:0;left:0;-webkit-animation-delay:1.2s;animation-delay:1.2s}@keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@-webkit-keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@keyframes antSpinMove{to{opacity:1}}@-webkit-keyframes antSpinMove{to{opacity:1}}</style>
     <script src="/jquery.min.js"></script>
-    <script src="https://files.worldwind.arc.nasa.gov/artifactory/web/0.9.0/worldwind.min.js"></script>
+    <!-- <script src="https://files.worldwind.arc.nasa.gov/artifactory/web/0.9.0/worldwind.min.js"></script> -->
     <script src="/map_load.js"></script>
     <script src="/bmap_offline_api_v3.0_min.js"></script>
     <script src="/map_city.js"></script>
@@ -19,6 +19,11 @@
     <script src="/qt-helper.js"></script>
     <script src="/qwebchannel.js"></script>
     <script src="/config.js"></script>
+    <% if (process.env.NODE_ENV === 'one') { %>
+        <script src="/config.one.js"></script>
+    <% } else if (process.env.NODE_ENV === 'two') { %>
+        <script src="/config.two.js"></script>
+    <% } %>
     <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %>
     <link rel="stylesheet" href="<%= htmlWebpackPlugin.options.cdn.css[i] %>" />
     <% } %>

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>