Browse Source

优化左右菜单栏显示隐藏逻辑

master
ctw 2 months ago
parent
commit
1838c436f3
  1. 2
      ruoyi-admin/src/main/resources/application-druid.yml
  2. 1
      ruoyi-ui/src/store/getters.js
  3. 7
      ruoyi-ui/src/store/modules/user.js
  4. 2
      ruoyi-ui/src/views/childRoom/RightPanel.vue
  5. 26
      ruoyi-ui/src/views/childRoom/index.vue
  6. 6
      ruoyi-ui/src/views/selectRoom/index.vue
  7. 2
      ruoyi-ui/vue.config.js

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

@ -8,7 +8,7 @@ spring:
master: master:
url: jdbc:mysql://localhost:3306/ry?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 username: root
password: A20040303ctw! password: 123456
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭

1
ruoyi-ui/src/store/getters.js

@ -13,6 +13,7 @@ const getters = {
introduction: state => state.user.introduction, introduction: state => state.user.introduction,
roles: state => state.user.roles, roles: state => state.user.roles,
permissions: state => state.user.permissions, permissions: state => state.user.permissions,
userLevel: state => state.user.userLevel,
permission_routes: state => state.permission.routes, permission_routes: state => state.permission.routes,
topbarRouters: state => state.permission.topbarRouters, topbarRouters: state => state.permission.topbarRouters,
defaultRoutes: state => state.permission.defaultRoutes, defaultRoutes: state => state.permission.defaultRoutes,

7
ruoyi-ui/src/store/modules/user.js

@ -13,7 +13,8 @@ const user = {
nickName: '', nickName: '',
avatar: '', avatar: '',
roles: [], roles: [],
permissions: [] permissions: [],
userLevel: ''
}, },
mutations: { mutations: {
@ -37,6 +38,9 @@ const user = {
}, },
SET_PERMISSIONS: (state, permissions) => { SET_PERMISSIONS: (state, permissions) => {
state.permissions = permissions state.permissions = permissions
},
SET_USER_LEVEL: (state, userLevel) => {
state.userLevel = userLevel
} }
}, },
@ -77,6 +81,7 @@ const user = {
commit('SET_NAME', user.userName) commit('SET_NAME', user.userName)
commit('SET_NICK_NAME', user.nickName) commit('SET_NICK_NAME', user.nickName)
commit('SET_AVATAR', avatar) commit('SET_AVATAR', avatar)
commit('SET_USER_LEVEL', user.userLevel || '')
/* 初始密码提示 */ /* 初始密码提示 */
if(res.isDefaultModifyPwd) { if(res.isDefaultModifyPwd) {
MessageBox.confirm('您的密码还是初始密码,请修改密码!', '安全提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { MessageBox.confirm('您的密码还是初始密码,请修改密码!', '安全提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => {

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

@ -27,7 +27,6 @@
新建 新建
</el-button> </el-button>
</div> </div>
<div class="route-list"> <div class="route-list">
<div <div
v-for="route in routes" v-for="route in routes"
@ -55,7 +54,6 @@
</div> </div>
</div> </div>
</div> </div>
<div v-if="selectedRouteDetails" class="section"> <div v-if="selectedRouteDetails" class="section">
<div class="section-title">航点列表</div> <div class="section-title">航点列表</div>
<div class="waypoint-list"> <div class="waypoint-list">

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

@ -135,7 +135,6 @@
class="compact-slider blue-slider" class="compact-slider blue-slider"
/> />
</div> </div>
<div class="playback-controls"> <div class="playback-controls">
<button <button
class="control-btn blue-control-btn" class="control-btn blue-control-btn"
@ -144,7 +143,6 @@
> >
<i :class="isPlaying ? 'el-icon-video-pause' : 'el-icon-video-play'"></i> <i :class="isPlaying ? 'el-icon-video-pause' : 'el-icon-video-play'"></i>
</button> </button>
<div class="speed-control"> <div class="speed-control">
<button <button
class="control-btn blue-control-btn" class="control-btn blue-control-btn"
@ -246,7 +244,6 @@ export default {
// //
isRightPanelHidden: true, // isRightPanelHidden: true, //
// K // K
showKTimePopup: false, showKTimePopup: false,
@ -352,7 +349,6 @@ export default {
}, },
methods: { methods: {
// 线 // 线
// //
openPlatformDialog(platform) { openPlatformDialog(platform) {
this.selectedPlatform = platform; this.selectedPlatform = platform;
@ -463,6 +459,11 @@ export default {
this.$message.info('显示右侧面板'); this.$message.info('显示右侧面板');
}, },
//
selectTopNav(item) {
this.activeMenu = item.id;
},
// //
savePlan() { savePlan() {
this.$message.success('保存计划'); this.$message.success('保存计划');
@ -653,6 +654,11 @@ export default {
selectMenu(item) { selectMenu(item) {
this.activeMenu = item.id; this.activeMenu = item.id;
//
if (item.id === 'file' || item.id === 'start' || item.id === 'insert') {
this.drawDom = false;
}
// //
if (item.id === 'file') { if (item.id === 'file') {
// //
@ -680,11 +686,19 @@ export default {
} }
} else if(item.id === 'modify'){ } else if(item.id === 'modify'){
this.drawDom = !this.drawDom this.drawDom = !this.drawDom
//
this.isRightPanelHidden = true;
console.log(this.drawDom,999999) console.log(this.drawDom,999999)
} } else if (item.id === 'deduction') {
if (item.id === 'deduction') {
// /K // /K
this.showKTimePopup = !this.showKTimePopup; this.showKTimePopup = !this.showKTimePopup;
//
this.drawDom = false;
} else {
//
this.isRightPanelHidden = true;
//
this.drawDom = false;
} }
}, },

6
ruoyi-ui/src/views/selectRoom/index.vue

@ -46,7 +46,6 @@
</div> </div>
</div> </div>
</div> </div>
<div v-if="expandedRooms.includes(room.id)" class="child-rooms"> <div v-if="expandedRooms.includes(room.id)" class="child-rooms">
<div <div
v-for="childRoom in getChildRooms(room.id)" v-for="childRoom in getChildRooms(room.id)"
@ -75,14 +74,12 @@
</div> </div>
</div> </div>
</div> </div>
<div v-if="getParentRooms.length === 0" class="empty-state"> <div v-if="getParentRooms.length === 0" class="empty-state">
<i class="fa fa-sitemap"></i> <i class="fa fa-sitemap"></i>
<h3>暂无房间</h3> <h3>暂无房间</h3>
<p>点击下方按钮创建您的第一个房间</p> <p>点击下方按钮创建您的第一个房间</p>
</div> </div>
</div> </div>
<div class="action-buttons"> <div class="action-buttons">
<button @click="showAddRoomDialog" class="btn-secondary"> <button @click="showAddRoomDialog" class="btn-secondary">
<i class="fa fa-plus"></i> 新增大房间 <i class="fa fa-plus"></i> 新增大房间
@ -97,12 +94,10 @@
</button> </button>
</div> </div>
</div> </div>
<div class="footer-info"> <div class="footer-info">
<p>© 2026 网络化任务规划系统 | 支持Windows/国产化系统互通</p> <p>© 2026 网络化任务规划系统 | 支持Windows/国产化系统互通</p>
</div> </div>
</div> </div>
<div <div
v-if="contextMenu.visible" v-if="contextMenu.visible"
:style="{ left: contextMenu.x + 'px', top: contextMenu.y + 'px' }" :style="{ left: contextMenu.x + 'px', top: contextMenu.y + 'px' }"
@ -117,7 +112,6 @@
<span>删除房间</span> <span>删除房间</span>
</div> </div>
</div> </div>
<el-dialog <el-dialog
:title="dialog.mode === 'add' ? '新增房间' : '修改房间'" :title="dialog.mode === 'add' ? '新增房间' : '修改房间'"
:visible.sync="dialog.visible" :visible.sync="dialog.visible"

2
ruoyi-ui/vue.config.js

@ -10,7 +10,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
const CopyWebpackPlugin = require('copy-webpack-plugin') const CopyWebpackPlugin = require('copy-webpack-plugin')
const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题 const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
const baseUrl = 'http://192.168.50.30:8080' // 后端接口 const baseUrl = 'http://192.168.50.145:8080' // 后端接口
const port = process.env.port || process.env.npm_config_port || 80 // 端口 const port = process.env.port || process.env.npm_config_port || 80 // 端口
// 定义 Cesium 源码路径 // 定义 Cesium 源码路径

Loading…
Cancel
Save