Compare commits

..

No commits in common. "5be2e5fb3a7bfbe317b242a3bd1d4c2cf0108604" and "e95e5fe60f62b8b5dae15dd4daf2a4ee00f54a01" have entirely different histories.

11 changed files with 16 additions and 20 deletions

View File

@ -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.53:8099
VUE_APP_API_URL=http://192.168.0.225:8099
VUE_APP_MAP_BASE_URL=/map
VUE_APP_MAP_URL=http://192.168.0.225:8090

View File

@ -1,4 +1,4 @@
NODE_ENV=production
VUE_APP_PREVIEW=true
VUE_APP_API_BASE_URL=/api
VUE_APP_API_URL=http://192.168.0.53:8099
VUE_APP_API_URL=http://192.168.0.225:8099

4
public/config.js vendored
View File

@ -19,7 +19,7 @@ window._CONFIG = {
evaluationSrc: 'http://192.168.0.53:8088/thirdLogin/thirdLoginPage?username=admin',
// 服务端地址
VUE_APP_API_URL: 'http://192.168.0.53:8099',
VUE_APP_API_URL: 'http://192.168.0.225:8099',
// websocket服务地址
VUE_APP_WEBSOCKET_URL: 'ws://192.168.0.53:8099',
VUE_APP_WEBSOCKET_URL: 'ws://192.168.0.225:8099',
}

View File

@ -5,7 +5,7 @@ window._CONFIG = {
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',
evaluationSrc: 'http://192.168.0.225:8088/thirdLogin/thirdLoginPage?username=admin',
VUE_APP_API_URL: 'http://192.168.0.225:8099',
VUE_APP_WEBSOCKET_URL: 'ws://192.168.0.225:8099',
}

2
public/index.html vendored
View File

@ -5,7 +5,7 @@
<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> -->

View File

@ -23,7 +23,7 @@ export default {
menu: {
locale: true
},
title: '基于大数据的智能化后装保障链仿真分析方法工具',
title: '中印边境自卫作战联合反击后装保障效能全业务全链路仿真系统',
pwa: false,
iconfontUrl: '',
production: process.env.NODE_ENV === 'production' && process.env.VUE_APP_PREVIEW !== 'true'

View File

@ -18,7 +18,7 @@ export const constantRouterMap = [
path: '/',
name: 'index',
component: RouteView,
meta: { title: '基于大数据的智能化后装保障链仿真分析方法工具' },
meta: { title: '中印边境自卫作战联合反击后装保障效能全业务全链路仿真系统' },
redirect: '/user/welcome',
},
{

View File

@ -36,7 +36,6 @@
<a-menu :selectedKeys="[]" mode="horizontal" theme="dark">
<a-menu-item @click="handleOpenStatisticPage()"> 统计分析 </a-menu-item>
</a-menu>
<el-button type="primary" @click="downloadExcel1" >支援保障仿真效果统计表</el-button>
</div>
<div
ref="scene-cesium-container"

View File

@ -1,6 +1,6 @@
<template>
<Flex class="user-login-page" fd="co" ai="c" jc="c" style="height: 100%">
<div class="user-login-title">基于大数据的智能化后装保障链仿真分析方法工具</div>
<div class="user-login-title">中印边境自卫作战联合反击后装保障效能全业务全链路仿真系统</div>
<Grid style="width: 917px; height: 445px" :columns="['524px', '329px', '0px']" gap="32px">
<div class="oh" style="grid-area: 1 / 1 / 2 / 4">
<img class="user-login-bg" :src="bgLogin" alt="" />

View File

@ -63,26 +63,24 @@ export default {
return this.isAdmin || this.isInstructor || this.isTrainer
},
},
created() {
async created() {
const searchParams = new URLSearchParams(window.location.search)
const searchCode = searchParams.get('code')
const localCode = window.localStorage.getItem('code')
console.log('----------',searchCode,localCode)
if (searchCode) {
window.localStorage.setItem('code', searchCode)
window.location.href = window.location.origin + window.location.pathname
} else if (localCode) {
try {
const tokenRes = this.$http({
const tokenRes = await this.$http({
url: '/oauth2/thirdLogin',
method: 'get',
params: { code: localCode },
})
console.log(tokenRes.data.token)
this.$store.commit('SET_TOKEN', '123')
storage.set(ACCESS_TOKEN, tokenRes.data.token, 7 * 24 * 60 * 60 * 1000)
console.log('--------')
this.$store.commit('SET_TOKEN', tokenRes.data.token)
const res = this.$http({
const res = await this.$http({
url: '/auth/userInfo',
method: 'get',
})
@ -95,7 +93,7 @@ export default {
}
} else {
try {
const res = this.$http({
const res = await this.$http({
url: '/auth/userInfo',
method: 'get',
})

View File

@ -56,7 +56,6 @@ const vueConfig = {
CESIUM_BASE_URL: JSON.stringify('./'),
}),
],
// en_US: `if prod, add externals`
// zh_CN: `这里是用来控制编译忽略外部依赖的,与 config.plugin('html') 配合可以编译时引入外部CDN文件依赖`
// externals: isProd ? assetsCDN.externals : {}