From f449ed201d387cd5b4366880409c672f7247e9fb Mon Sep 17 00:00:00 2001
From: ctw <1051735452@qq.com>
Date: Mon, 9 Feb 2026 16:32:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=9E=E6=9C=BA=E6=A0=87=E7=89=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E6=88=BF=E9=97=B4=E5=86=85=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=88=BF=E9=97=B4=E8=B7=AF=E7=94=B1=EF=BC=8C?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=88=BF=E9=97=B4=E8=BF=94=E5=9B=9E=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/lang/en.js                        |  1 +
 ruoyi-ui/src/lang/zh.js                        |  1 +
 ruoyi-ui/src/views/cesiumMap/index.vue         |  1 -
 ruoyi-ui/src/views/childRoom/TopHeader.vue     | 25 ++++++++++++++++---
 ruoyi-ui/src/views/childRoom/index.vue         | 22 ++++++++++++++---
 ruoyi-ui/src/views/dialogs/RouteEditDialog.vue |  5 ++--
 ruoyi-ui/src/views/selectRoom/index.vue        | 34 ++++++++++++++++++++++++++
 7 files changed, 79 insertions(+), 10 deletions(-)

diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js
index fbe062f..57a7351 100644
--- a/ruoyi-ui/src/lang/en.js
+++ b/ruoyi-ui/src/lang/en.js
@@ -77,6 +77,7 @@ export default {
     },
     info: {
       roomCode: 'Room Code',
+      roomName: 'Room Name',
       onlineCount: 'Online Count',
       combatTime: 'Combat Time',
       astroTime: 'Astro Time',
diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js
index 4e1cd4d..ece9c1f 100644
--- a/ruoyi-ui/src/lang/zh.js
+++ b/ruoyi-ui/src/lang/zh.js
@@ -77,6 +77,7 @@ export default {
     },
     info: {
       roomCode: '房间编号',
+      roomName: '房间名称',
       onlineCount: '在线人数',
       combatTime: '作战时间',
       astroTime: '天文时间',
diff --git a/ruoyi-ui/src/views/cesiumMap/index.vue b/ruoyi-ui/src/views/cesiumMap/index.vue
index 8e8170c..aa317d2 100644
--- a/ruoyi-ui/src/views/cesiumMap/index.vue
+++ b/ruoyi-ui/src/views/cesiumMap/index.vue
@@ -4065,7 +4065,6 @@ export default {
       }
       this.contextMenu.visible = false
       if (this.viewer.scene.requestRenderMode) this.viewer.scene.requestRender()
-      this.$message && this.$message.success(nextVisible ? '已显示标牌' : '已隐藏标牌')
     },
     // 从右键菜单删除实体
     deleteEntityFromContextMenu() {
diff --git a/ruoyi-ui/src/views/childRoom/TopHeader.vue b/ruoyi-ui/src/views/childRoom/TopHeader.vue
index d6ec506..456b03a 100644
--- a/ruoyi-ui/src/views/childRoom/TopHeader.vue
+++ b/ruoyi-ui/src/views/childRoom/TopHeader.vue
@@ -217,11 +217,14 @@
       <div class="header-right">
         <!-- 作战信息区域 -->
         <div class="combat-info-group">
-          <div class="info-box">
+          <div
+            class="info-box room-name-box clickable"
+            @click="handleBackToSelectRoom"
+          >
             <i class="el-icon-office-building info-icon"></i>
             <div class="info-content">
-              <div class="info-label">{{ $t('topHeader.info.roomCode') }}</div>
-              <div class="info-value">{{ roomCode }}</div>
+              <div class="info-label">{{ $t('topHeader.info.roomName') }}</div>
+              <div class="info-value">{{ roomDisplayName }}</div>
             </div>
           </div>
 
@@ -363,6 +366,11 @@ export default {
     }
   },
   computed: {
+    /** 显示数据库房间名，无则回退为房间编号 */
+    roomDisplayName() {
+      if (this.roomDetail && this.roomDetail.name) return this.roomDetail.name;
+      return this.roomCode;
+    },
     topNavItems() {
       return [
         { id: 'file', name: this.$t('topHeader.nav.file'), icon: 'el-icon-document' },
@@ -387,6 +395,17 @@ export default {
     }
   },
   methods: {
+    /** 点击房间名称：弹窗确认是否回到选择房间页面 */
+    handleBackToSelectRoom() {
+      this.$confirm('是否返回选择房间页面？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'info'
+      }).then(() => {
+        this.$router.push({ path: '/selectRoom' }).catch(() => {})
+      }).catch(() => {})
+    },
+
     selectTopNav(item) {
       this.$emit('select-nav', item)
     },
diff --git a/ruoyi-ui/src/views/childRoom/index.vue b/ruoyi-ui/src/views/childRoom/index.vue
index af1e4f3..9d1aacf 100644
--- a/ruoyi-ui/src/views/childRoom/index.vue
+++ b/ruoyi-ui/src/views/childRoom/index.vue
@@ -872,6 +872,14 @@ export default {
       // 关闭弹窗
       this.showPlatformDialog = false;
     },
+    /** 新建航线时写入数据库的默认样式（与地图默认显示一致：紫色实线线宽3） */
+    getDefaultRouteAttributes() {
+      const defaultAttrs = {
+        waypointStyle: { pixelSize: 7, color: '#ffffff', outlineColor: '#0078FF', outlineWidth: 2 },
+        lineStyle: { style: 'solid', width: 3, color: '#800080', gapColor: '#000000', dashLength: 20 }
+      };
+      return JSON.stringify(defaultAttrs);
+    },
     /** 从航线 attributes JSON 解析出地图渲染用的样式对象 */
     parseRouteStyle(attributes) {
       if (attributes == null || attributes === '') return null;
@@ -1088,25 +1096,31 @@ export default {
       }
 
       // 2. 构造数据（含盘旋航点的 pointType、holdParams；地图标签默认字号 14、颜色 #333333）
-      const finalWaypoints = this.tempMapPoints.map((p, index) => ({
+      // 新建航线时：首尾航点转弯坡度固定为 0，中间可编辑航点默认 45°
+      const wpCount = this.tempMapPoints.length;
+      const finalWaypoints = this.tempMapPoints.map((p, index) => {
+        const isFirstOrLast = index === 0 || index === wpCount - 1;
+        const defaultTurnAngle = isFirstOrLast ? 0.0 : 45.0;
+        return {
         name: p.name || `WP${index + 1}`,
         lat: p.lat,
         lng: p.lng,
         alt: p.alt != null ? p.alt : 5000.0,
         speed: p.speed != null ? p.speed : 800.0,
         startTime: p.startTime || 'K+00:00:00',
-        turnAngle: p.turnAngle != null ? p.turnAngle : 0.0,
+        turnAngle: p.turnAngle != null ? p.turnAngle : defaultTurnAngle,
         labelFontSize: p.labelFontSize != null ? p.labelFontSize : 14,
         labelColor: p.labelColor || '#333333',
         ...(p.pointType && { pointType: p.pointType }),
         ...(p.holdParams != null && { holdParams: typeof p.holdParams === 'string' ? p.holdParams : JSON.stringify(p.holdParams) })
-      }));
+        };
+      });
 
       const routeData = {
         callSign: this.newRouteName,
         scenarioId: currentScenarioId,
         platformId: 1,
-        attributes: "{}",
+        attributes: this.getDefaultRouteAttributes(),
         waypoints: finalWaypoints
       };
 
diff --git a/ruoyi-ui/src/views/dialogs/RouteEditDialog.vue b/ruoyi-ui/src/views/dialogs/RouteEditDialog.vue
index 5385869..5b1c818 100644
--- a/ruoyi-ui/src/views/dialogs/RouteEditDialog.vue
+++ b/ruoyi-ui/src/views/dialogs/RouteEditDialog.vue
@@ -221,13 +221,14 @@ export default {
         id: '',
         name: ''
       },
+      // 与地图默认、新建航线入库一致：紫色实线线宽3；仅当 attributes 为空时用于表单回退
       defaultStyle: {
         waypoint: { pixelSize: 7, color: '#ffffff', outlineColor: '#0078FF', outlineWidth: 2 },
-        line: { style: 'dash', width: 4, color: '#ffffff', gapColor: '#000000', dashLength: 20 }
+        line: { style: 'solid', width: 3, color: '#800080', gapColor: '#000000', dashLength: 20 }
       },
       styleForm: {
         waypoint: { pixelSize: 7, color: '#ffffff', outlineColor: '#0078FF', outlineWidth: 2 },
-        line: { style: 'dash', width: 4, color: '#ffffff', gapColor: '#000000', dashLength: 20 }
+        line: { style: 'solid', width: 3, color: '#800080', gapColor: '#000000', dashLength: 20 }
       },
       presetColors: [
         '#ffffff', '#000000', '#0078FF', '#409EFF', '#67C23A', '#E6A23C', '#F56C6C',
diff --git a/ruoyi-ui/src/views/selectRoom/index.vue b/ruoyi-ui/src/views/selectRoom/index.vue
index 6740b94..92f172d 100644
--- a/ruoyi-ui/src/views/selectRoom/index.vue
+++ b/ruoyi-ui/src/views/selectRoom/index.vue
@@ -5,6 +5,9 @@
     <div class="main-content">
       <div class="room-panel">
         <div class="panel-header">
+          <a href="javascript:;" class="back-login" @click="backToLogin">
+            <i class="el-icon-back"></i> 返回登录
+          </a>
           <h2>房间选择</h2>
           <p>选择或创建您要加入的协作房间</p>
         </div>
@@ -169,6 +172,18 @@ export default {
     }
   },
   methods: {
+    /** 返回登录页：登出并跳转到登录界面 */
+    backToLogin() {
+      this.$confirm('确定退出当前账号并返回登录页吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$store.dispatch('LogOut').then(() => {
+          this.$router.push({ path: '/login' }).catch(() => {})
+        }).catch(() => {})
+      }).catch(() => {})
+    },
     getList() {
       listRooms().then(response => {
         this.rooms = response.rows || response;
@@ -309,6 +324,25 @@ export default {
   padding: 20px 24px 16px;
   border-bottom: 1px solid #e2e8f0;
   text-align: center;
+  position: relative;
+}
+
+.back-login {
+  position: absolute;
+  left: 24px;
+  top: 50%;
+  transform: translateY(-50%);
+  font-size: 14px;
+  color: #64748b;
+  text-decoration: none;
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  transition: color 0.2s;
+}
+
+.back-login:hover {
+  color: #165DFF;
 }
 
 .panel-header h2 {