diff --git a/src/main/index.js b/src/main/index.js index 0b84cd4..f6803fe 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -88,9 +88,10 @@ function createLoginWindow() { //主窗口 function createMainWindow() { mainWindow = new BrowserWindow({ - width: 1200, - minWidth: 1350, + width: 1350, + minWidth: 1200, height: 700, + minHeight: 700, show: false, frame: false, // 无边框 autoHideMenuBar: true, @@ -118,6 +119,11 @@ function createMainWindow() { }, 1000) // app.quit() // 主窗口关闭-结束所有进程 }) + mainWindow.on('resize', () => { + const { width, height } = mainWindow.getBounds(); + mainWindow.webContents.send('minWinResize', { width, height }); + }); + mainWindow.webContents.setWindowOpenHandler((details) => { shell.openExternal(details.url) return { action: 'deny' } @@ -129,6 +135,7 @@ function createMainWindow() { } else { mainWindow.loadFile(join(__dirname, '../renderer/index.html')) } + // mainWindow.setAlwaysOnTop(true, "screen-saver") // 将窗口设置为顶层窗口 // mainWindow.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见 // 第三步: 开启remote服务 diff --git a/src/renderer/src/layout/components/Header.vue b/src/renderer/src/layout/components/Header.vue index de4788c..31d79ea 100644 --- a/src/renderer/src/layout/components/Header.vue +++ b/src/renderer/src/layout/components/Header.vue @@ -70,10 +70,8 @@ import { ArrowDown } from '@element-plus/icons-vue' import WindowTools from '@/components/window-tools/index.vue' import useUserStore from '@/store/modules/user' import { updateUserInfo } from '@/api/system/user' -import outLink from '@/utils/linkConfig' import logoIco from '@/assets/images/logo.png' import { listEvaluation } from '@/api/classManage/index' -import { clearBookInfo } from '@/utils/ruoyi' import { sessionStore } from '@/utils/store' import { useToolState } from '@/store/modules/tool' diff --git a/src/renderer/src/views/desktop/container/work-trend.vue b/src/renderer/src/views/desktop/container/work-trend.vue index 2a0e70a..0f4a4ad 100644 --- a/src/renderer/src/views/desktop/container/work-trend.vue +++ b/src/renderer/src/views/desktop/container/work-trend.vue @@ -34,30 +34,15 @@ \ No newline at end of file