From 6cb58b26910d6973c3592e972166c765cfb5adcf Mon Sep 17 00:00:00 2001
From: wangwenhua <12345678>
Date: Mon, 20 Oct 2025 20:51:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/subsystem/scene/index.vue | 12 ++++++++----
 src/views/user/ThirdLogin.vue       | 12 +++++++-----
 vue.config.js                       |  1 +
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/views/subsystem/scene/index.vue b/src/views/subsystem/scene/index.vue
index 639c196..dc38f46 100644
--- a/src/views/subsystem/scene/index.vue
+++ b/src/views/subsystem/scene/index.vue
@@ -21,7 +21,9 @@
             </div>
           </template>
           <a-button type="text-primary" icon="exclamation-circle"></a-button>
+
         </a-popover>
+
       </div>
       <div class="page-scene-title">
         <span v-if="roomInfo.mag">{{ roomInfo.mag }}倍速</span>&nbsp;
@@ -32,12 +34,13 @@
       </div>
     </Flex>
     <Grid class="page-scene-main flex-1 oh" :columns="['320px', 1, '320px']" :rows="['30px', 1]" gap="0px">
-      <div class="tool-wrapper" style="grid-area: 1 / 1 / 2 / 4">
+<!--      <div class="tool-wrapper" style="grid-area: 1 / 1 / 2 / 4">
         <a-menu :selectedKeys="[]" mode="horizontal" theme="dark">
           <a-menu-item @click="handleOpenStatisticPage()"> 统计分析 </a-menu-item>
+          <a-menu-item @click="handleOpenStatisticPage()"> 统计分析 </a-menu-item>
         </a-menu>
-        <el-button type="primary" @click="downloadExcel1" >支援保障仿真效果统计表</el-button>
-      </div>
+
+      </div>-->
       <div
         ref="scene-cesium-container"
         class="scene-cesium-container"
@@ -57,6 +60,7 @@
             </a-tree>
           </div>
         </ModuleWrapper>
+        <ModuleWrapper title="统计报表" height="25%"><div> <a-button type="primary" @click="downloadExcel1" >支援保障仿真效果统计表</a-button></div></ModuleWrapper>
         <ModuleWrapper title="天气预设" height="25%">
           <div>
             <a-button type="primary" @click="handleAdd" icon="plus">新增</a-button>
@@ -330,7 +334,7 @@ export default {
   },
   methods: {
     downloadExcel1() {
-      this.$axios({
+      this.$http({
         method: 'get',
         url: '/scenario/battleConsume/statistic/downloadExcel1',
         responseType: 'blob'
diff --git a/src/views/user/ThirdLogin.vue b/src/views/user/ThirdLogin.vue
index 9092932..be360ba 100644
--- a/src/views/user/ThirdLogin.vue
+++ b/src/views/user/ThirdLogin.vue
@@ -63,24 +63,26 @@ export default {
       return this.isAdmin || this.isInstructor || this.isTrainer
     },
   },
-  async created() {
+  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 = await this.$http({
+        const tokenRes = this.$http({
           url: '/oauth2/thirdLogin',
           method: 'get',
           params: { code: localCode },
         })
-        this.$store.commit('SET_TOKEN', '123')
+        console.log(tokenRes.data.token)
         storage.set(ACCESS_TOKEN, tokenRes.data.token, 7 * 24 * 60 * 60 * 1000)
+        console.log('--------')
         this.$store.commit('SET_TOKEN', tokenRes.data.token)
-        const res = await this.$http({
+        const res = this.$http({
           url: '/auth/userInfo',
           method: 'get',
         })
@@ -93,7 +95,7 @@ export default {
       }
     } else {
       try {
-        const res = await this.$http({
+        const res = this.$http({
           url: '/auth/userInfo',
           method: 'get',
         })
diff --git a/vue.config.js b/vue.config.js
index 8e4913a..ff82e17 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -56,6 +56,7 @@ const vueConfig = {
         CESIUM_BASE_URL: JSON.stringify('./'),
       }),
     ],
+
     // en_US: `if prod, add externals`
     // zh_CN: `这里是用来控制编译忽略外部依赖的，与 config.plugin('html') 配合可以编译时引入外部CDN文件依赖`
     // externals: isProd ? assetsCDN.externals : {}