diff --git a/package.json b/package.json index bc9457a..b544cec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aix-win", - "version": "2.1.3", + "version": "2.1.5", "description": "", "main": "./out/main/index.js", "author": "example.com", diff --git a/src/main/index.js b/src/main/index.js index f6726b2..4dcd521 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -74,7 +74,7 @@ function createLoginWindow() { updateInit(loginWindow) } - // loginWindow.webContents.openDevTools() + loginWindow.webContents.openDevTools() loginWindow.once('ready-to-show', () => { loginWindow.show() }) @@ -128,7 +128,7 @@ function createMainWindow() { shell.openExternal(details.url) return { action: 'deny' } }) - // mainWindow.webContents.openDevTools() + mainWindow.webContents.openDevTools() if (is.dev && process.env['ELECTRON_RENDERER_URL']) { mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL']) diff --git a/src/renderer/src/api/classManage/index.js b/src/renderer/src/api/classManage/index.js index 6b82a81..a0f3d53 100644 --- a/src/renderer/src/api/classManage/index.js +++ b/src/renderer/src/api/classManage/index.js @@ -147,10 +147,11 @@ export function updateSmartClassReserv(data) { }) } //查询课程预约 -export function getSelfReserv() { +export function getSelfReserv(params) { return request({ url: '/smarttalk/classReserv/getSelfReserv', - method: 'get' + method: 'get', + params }) } export function deleteSmartReserv(id) { diff --git a/src/renderer/src/api/teaching/classcourse.js b/src/renderer/src/api/teaching/classcourse.js index 665489c..d312f85 100644 --- a/src/renderer/src/api/teaching/classcourse.js +++ b/src/renderer/src/api/teaching/classcourse.js @@ -9,6 +9,14 @@ export function listClasscourse(query) { }) } +export function listClasscourseNew(query) { + return request({ + url: '/education/classcourse/new/list', + method: 'get', + params: query + }) +} + // 查询classcourse详细 export function getClasscourse(id) { return request({ diff --git a/src/renderer/src/utils/tool.js b/src/renderer/src/utils/tool.js index d1a2869..3ab107b 100644 --- a/src/renderer/src/utils/tool.js +++ b/src/renderer/src/utils/tool.js @@ -138,7 +138,7 @@ export const createWindow = async (type, data) => { wins_tool.setIgnoreMouseEvents(true, {forward: true}) // 忽略鼠标事件但是事件继续传递给窗口 wins_tool.setAlwaysOnTop(true,'screen-saver') // 将窗口设置为顶层窗口 wins_tool.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见 - // wins_tool.webContents.openDevTools() // 打开调试工具 + wins_tool.webContents.openDevTools() // 打开调试工具 eventHandles(type, wins_tool) // 事件监听处理 return wins_tool } @@ -165,7 +165,7 @@ export const createWindow = async (type, data) => { win.type = type // 唯一标识 win.show() win.setFullScreen(true) // 设置窗口为全屏 - // win.webContents.openDevTools() // 打开调试工具 + win.webContents.openDevTools() // 打开调试工具 eventHandles(type, win) // 事件监听处理 winPdf=win break diff --git a/src/renderer/src/views/classManage/classReserv.vue b/src/renderer/src/views/classManage/classReserv.vue index 3414291..b5c6e53 100644 --- a/src/renderer/src/views/classManage/classReserv.vue +++ b/src/renderer/src/views/classManage/classReserv.vue @@ -1,25 +1,25 @@