diff --git a/package.json b/package.json index b7e98a4..71aafb4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aix-win", - "version": "1.1.0", + "version": "1.1.1", "description": "An Electron application with Vue", "main": "./out/main/index.js", "author": "example.com", diff --git a/src/main/index.js b/src/main/index.js index 9a64088..aff4dde 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -62,10 +62,12 @@ function createLoginWindow() { function createMainWindow() { mainWindow = new BrowserWindow({ width: 1200, + minWidth: 1200, height: 700, show: false, frame: false, // 无边框 autoHideMenuBar: true, + maximizable: false, icon: join(__dirname, '../../resources/logo2.ico'), ...(process.platform === 'linux' ? { icon } : {}), webPreferences: { diff --git a/src/renderer/src/api/system/user.js b/src/renderer/src/api/system/user.js index b7e9e23..f8b74f0 100644 --- a/src/renderer/src/api/system/user.js +++ b/src/renderer/src/api/system/user.js @@ -50,3 +50,9 @@ export function updateUserInfo(data) { data: data }) } +export function getUserInfo(userId) { + return request({ + url: '/system/user/' + userId, + method: 'get' + }) +} diff --git a/src/renderer/src/components/select-subject/index.vue b/src/renderer/src/components/select-subject/index.vue index 52f306a..4c7cd97 100644 --- a/src/renderer/src/components/select-subject/index.vue +++ b/src/renderer/src/components/select-subject/index.vue @@ -1,5 +1,5 @@