Browse Source

最新版

lbj
ctw 2 months ago
parent
commit
c0e0b63d8d
  1. 4
      ruoyi-admin/src/main/resources/application-druid.yml
  2. 6
      ruoyi-ui/src/views/childRoom/RightPanel.vue
  3. 2
      ruoyi-ui/src/views/childRoom/index.vue

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

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

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

@ -46,7 +46,6 @@
</div>
</div>
</div>
<div v-if="selectedRouteDetails" class="section">
<div class="section-title">航点列表</div>
<div class="waypoint-list">
@ -68,7 +67,6 @@
</div>
</div>
</div>
<div class="action-buttons">
<el-button type="primary" size="mini" icon="el-icon-circle-plus" class="blue-btn" @click="handleAddWaypoint">
添加航点
@ -78,7 +76,6 @@
</el-button>
</div>
</div>
<!-- 冲突内容 -->
<div v-if="activeTab === 'conflict'" class="tab-content conflict-content">
<div v-if="conflicts.length > 0" class="conflict-list">
@ -124,7 +121,6 @@
</el-button>
</div>
</div>
<!-- 平台内容 -->
<div v-if="activeTab === 'platform'" class="tab-content platform-content">
<div class="platform-categories">
@ -150,7 +146,6 @@
</div>
</div>
</el-tab-pane>
<el-tab-pane label="海上" name="sea">
<div class="platform-list">
<div
@ -172,7 +167,6 @@
</div>
</div>
</el-tab-pane>
<el-tab-pane label="地面" name="ground">
<div class="platform-list">
<div

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

@ -508,7 +508,7 @@ import OnlineMembersDialog from '@/views/dialogs/OnlineMembersDialog'
import PlatformEditDialog from '@/views/dialogs/PlatformEditDialog'
import RouteEditDialog from '@/views/dialogs/RouteEditDialog'
import WaypointEditDialog from '@/views/dialogs/WaypointEditDialog'
import LeftMenu from './LeftMenu'
import LeftMenu from './LeftMenu.vue'
import RightPanel from './RightPanel'
import BottomLeftPanel from './BottomLeftPanel'
export default {

Loading…
Cancel
Save