Merge branch 'mh' of http://124.70.32.114:3100/woka/cesium-map-object into lbj

# Conflicts:
#	ruoyi-ui/src/views/childRoom/index.vue

ruoyi-admin/src/main/resources/application-druid.yml

@@ -8,7 +8,7 @@ spring:
             master:
                 url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: A20040303ctw!
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-ui/src/views/childRoom/RightPanel.vue

@@ -18,13 +18,12 @@
           <div class="section-header">
             <div class="section-title">航线列表</div>
             <el-button
-              type="text"
-              icon="el-icon-plus"
+              type="primary"
               size="mini"
-              class="header-action-btn"
               @click="handleCreateRoute"
+              class="create-route-btn-new"
             >
-              新建
+              新建航线
             </el-button>
           </div>
 
@@ -76,6 +75,7 @@
             </div>
           </div>
         </div>
+
         <div class="action-buttons">
           <el-button type="primary" size="mini" icon="el-icon-circle-plus" class="blue-btn" @click="handleAddWaypoint">
             添加航点
@@ -85,6 +85,7 @@
           </el-button>
         </div>
       </div>
+
       <div v-if="activeTab === 'conflict'" class="tab-content conflict-content">
         <div v-if="conflicts.length > 0" class="conflict-list">
           <div
@@ -129,6 +130,7 @@
           </el-button>
         </div>
       </div>
+
       <div v-if="activeTab === 'platform'" class="tab-content platform-content">
         <div class="platform-categories">
           <el-tabs v-model="activePlatformTab" type="card" size="mini" class="blue-tabs">
@@ -153,6 +155,7 @@
                 </div>
               </div>
             </el-tab-pane>
+
             <el-tab-pane label="海上" name="sea">
               <div class="platform-list">
                 <div
@@ -174,6 +177,7 @@
                 </div>
               </div>
             </el-tab-pane>
+
             <el-tab-pane label="地面" name="ground">
               <div class="platform-list">
                 <div
@@ -377,25 +381,30 @@ export default {
   justify-content: space-between;
   align-items: center;
   border-bottom: 2px solid rgba(0, 138, 255, 0.2);
-  margin-bottom: 10px;
-  padding-bottom: 8px;
+  margin-bottom: 15px;
+  padding-bottom: 10px;
+  padding-top: 10px;
 }
 
-/* 修改：移除了原有的 border-bottom，改在 section-header 中统一定义 */
 .section-title {
   font-size: 14px;
   font-weight: 600;
   color: #008aff;
 }
 
-/* 新增：头部按钮样式 */
-.header-action-btn {
-  padding: 0;
-  color: #008aff;
+.create-route-btn-new {
+  background-color: #3370ff !important;
+  border-color: #3370ff !important;
+  color: #ffffff !important;
+  padding: 4px 10px;
+  font-size: 12px;
+  border-radius: 4px;
 }
 
-.header-action-btn:hover {
-  color: #0066cc;
+.create-route-btn-new:hover {
+  background-color: #285fd9 !important;
+  border-color: #285fd9 !important;
+  opacity: 0.9;
 }
 
 .route-list {
@@ -476,7 +485,6 @@ export default {
   padding: 10px;
   background: rgba(255, 255, 255, 0.8);
   border-radius: 6px;
-  /* 移除 cursor: pointer 因为不再整行可点 */
   transition: all 0.3s;
   border: 1px solid rgba(0, 138, 255, 0.1);
 }

ruoyi-ui/src/views/childRoom/index.vue

@@ -1,7 +1,6 @@
 <template>
   <!-- 以地图为绝对定位背景，所有组件浮动其上 -->
   <div class="mission-planning-container">
-    <div id="gis-map-background" class="map-background">
     <!-- 地图背景 -->
     <div id="gis-map-background" class="map-background">
       <!-- cesiummap组件 -->
@@ -681,9 +680,9 @@ export default {
           this.isRightPanelHidden = false;
         }
       } else if(item.id === 'modify'){
-          this.drawDom = !this.drawDom
-          console.log(this.drawDom,999999)
-        }
+        this.drawDom = !this.drawDom
+        console.log(this.drawDom,999999)
+      }
       if (item.id === 'deduction') {
         // 点击推演按钮，显示/隐藏K时弹出框
         this.showKTimePopup = !this.showKTimePopup;
@@ -779,7 +778,7 @@ export default {
       return `K+${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:00`;
     },
 
-    // 航线操作
+    // 航线操作：点击列表项只展示详情，不弹窗
     selectRoute(route) {
       this.selectedRouteId = route.id;
       // 模拟获取航点数据
@@ -845,6 +844,7 @@ export default {
 </script>
 
 <style scoped>
+/* 保持原有样式不变，仅修复背景图语法的注释部分 */
 .mission-planning-container {
   position: relative;
   width: 100vw;
@@ -866,7 +866,7 @@ background: url('~@/assets/map-background.png');
   background-position: center;
   z-index: 1;
 }
-
+/* ...其余样式省略，保持不变... */
 .map-overlay-text {
   position: absolute;
   top: 50%;
@@ -907,7 +907,6 @@ background: url('~@/assets/map-background.png');
   display: none;
 }
 
-/* 左侧红点 */
 .left-red-dot {
   left: 20px;
   transform: translateY(-50%);
@@ -939,7 +938,6 @@ background: url('~@/assets/map-background.png');
   }
 }
 
-/* 蓝色主题通用类 */
 .blue-theme {
   background: rgba(255, 255, 255, 0.3);
   backdrop-filter: blur(10px);
@@ -1027,7 +1025,6 @@ background: url('~@/assets/map-background.png');
   background-color: rgba(0, 138, 255, 0.3);
 }
 
-/* 底部时间轴（最初版本的样式）- 蓝色主题 */
 .floating-timeline {
   position: absolute;
   bottom: 20px;
@@ -1198,7 +1195,6 @@ background: url('~@/assets/map-background.png');
   font-weight: 500;
 }
 
-/* 滚动条样式 */
 ::-webkit-scrollbar {
   width: 6px;
 }