diff --git a/.env.development b/.env.development index b10b50c..d4989df 100644 --- a/.env.development +++ b/.env.development @@ -9,7 +9,7 @@ VITE_APP_BASE_API = '/dev-api' VITE_APP_DOMAIN = 'file.ysaix.com' -VITE_APP_UPLOAD_API = 'http://192.168.2.52:7863' +VITE_APP_UPLOAD_API = 'https://file.ysaix.com:7868/prod-api' VITE_APP_RES_FILE_PATH = 'https://file.ysaix.com:7868/src/assets/textbook/booktxt/' diff --git a/package.json b/package.json index 5c5797a..1bdad80 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aix-win", - "version": "1.0.7", + "version": "1.1.0", "description": "An Electron application with Vue", "main": "./out/main/index.js", "author": "example.com", diff --git a/src/renderer/src/api/classManage/index.js b/src/renderer/src/api/classManage/index.js index 6db5913..923c722 100644 --- a/src/renderer/src/api/classManage/index.js +++ b/src/renderer/src/api/classManage/index.js @@ -159,11 +159,11 @@ export function deleteSmartReserv(id) { method: 'delete' }) } -export function startClass(id) { +export function startClass(id, ex3) { return request({ url: '/smarttalk/classReserv/startClass', method: 'get', - params: {id} + params: {id, ex3} }) } export function endClass(id) { diff --git a/src/renderer/src/plugins/shareStore.js b/src/renderer/src/plugins/shareStore.js index 3db1486..4857cc4 100644 --- a/src/renderer/src/plugins/shareStore.js +++ b/src/renderer/src/plugins/shareStore.js @@ -20,7 +20,6 @@ export function shareStorePlugin({store}) { function stateSync(store) { const storeName = store.$id const jsonStr = circularSafeStringify(store.$state) - console.log('state-change', jsonStr, storeName) // 通知主线程更新 ipcRenderer?.invoke('pinia-state-change', storeName, jsonStr) } diff --git a/src/renderer/src/utils/tool.js b/src/renderer/src/utils/tool.js index c9c91f1..28c7902 100644 --- a/src/renderer/src/utils/tool.js +++ b/src/renderer/src/utils/tool.js @@ -82,7 +82,9 @@ export function ipcHandle(fn,key, cb) { * @param {*} data 参数 * @returns */ +let wins_tool = null export const createWindow = async (type, data) => { + if (wins_tool) return console.error('createWindow: win is have') if (!type) return console.error('createWindow: type is null') switch(type) { case 'tool-sphere': { // 创建-悬浮球 @@ -97,16 +99,16 @@ export const createWindow = async (type, data) => { } data.isConsole = true // 是否开启控制台 data.option = {...defOption, ...option} - const win = await toolWindow(data) - win.type = type // 唯一标识 - win.show() - win.setFullScreen(true) // 设置窗口为全屏 - win.setIgnoreMouseEvents(true, {forward: true}) // 忽略鼠标事件但是事件继续传递给窗口 - win.setAlwaysOnTop(true,'screen-saver') // 将窗口设置为顶层窗口 - win.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见 + wins_tool = await toolWindow(data) + wins_tool.type = type // 唯一标识 + wins_tool.show() + wins_tool.setFullScreen(true) // 设置窗口为全屏 + wins_tool.setIgnoreMouseEvents(true, {forward: true}) // 忽略鼠标事件但是事件继续传递给窗口 + wins_tool.setAlwaysOnTop(true,'screen-saver') // 将窗口设置为顶层窗口 + wins_tool.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见 // win.webContents.openDevTools() // 打开调试工具 - eventHandles(type, win) // 事件监听处理 - return win + eventHandles(type, wins_tool) // 事件监听处理 + return wins_tool } case 'open-PDF': { //课本展示-pdf const option = data.option||{} @@ -193,6 +195,7 @@ const eventHandles = (type, win) => { win.on('closed', () => { if(onClosed) onClosed() // 自定义关闭事件 win = null + wins_tool = null }) // 新窗口-创建事件(如:主进程加载远程服务) ipcRenderer.send('new-window', {id:win.id, type}) diff --git a/src/renderer/src/views/classManage/classReserv.vue b/src/renderer/src/views/classManage/classReserv.vue index 8983269..11529c1 100644 --- a/src/renderer/src/views/classManage/classReserv.vue +++ b/src/renderer/src/views/classManage/classReserv.vue @@ -17,6 +17,8 @@ v-show="tabActive === '已结束'" :key="index" :item="item" + @open-edit="reservDialog.openDialog(item)" + @delete-reserv="deleteReserv(item)" > @@ -51,8 +53,8 @@ const doneDataList = computed(() => { }) const toolStore = useToolState() watch( - () => toolStore.isToolWin, - (newD, oldD) => { + () => [dataList,toolStore.isToolWin], + () => { getSelfReserv().then((res) => { dataList.value = [...res.data] }) diff --git a/src/renderer/src/views/classManage/reserv-item.vue b/src/renderer/src/views/classManage/reserv-item.vue index 685d03a..76d2726 100644 --- a/src/renderer/src/views/classManage/reserv-item.vue +++ b/src/renderer/src/views/classManage/reserv-item.vue @@ -68,18 +68,18 @@ const startClassR = (item) => { } }) } -const toolStore = useToolState() +// const toolStore = useToolState() +let wins = null; // 上课-工具类悬浮 const openLesson = () => { - if (toolStore.isToolWin) return ElMessage.error('您当前已开始上课，请勿重复操作') startClass(props.item.id) listEntpcourse({ evalid: props.item.ex2, edituserid: useUserStore().user.userId, pageSize: 500 - }).then(res=>{ + }).then(async res=>{ if (res.rows[0].id) { - createWindow('tool-sphere', { url: '/tool/sphere?entpcourseid=' + res.rows[0].id + "&reservId=" + props.item.id }) + wins = await createWindow('tool-sphere', { url: '/tool/sphere?entpcourseid=' + res.rows[0].id + "&reservId=" + props.item.id }) } }) } diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue index 61e57ca..1a6e7c3 100644 --- a/src/renderer/src/views/prepare/index.vue +++ b/src/renderer/src/views/prepare/index.vue @@ -234,7 +234,7 @@ export default { this.isOpenHomework = false }) - + }, // activated() { // if (this.uploadData.textbookId !== null) { @@ -429,7 +429,7 @@ export default { await this.asyncAllFile() }, async initHomeWork() { - + if (this.uploadData.levelSecondId) { // 获取作业列表所需ID 可能存在没有 let { rows } = await this.getChapterId() @@ -605,10 +605,8 @@ export default { }) }, // 上课-工具类悬浮 - openLesson() { - const toolStore = useToolState() - if (toolStore.isToolWin) return this.$message.error('您当前已开始上课，请勿重复操作') - startClass(this.curClassReserv.id) + async openLesson() { + await startClass(this.curClassReserv.id) createWindow('tool-sphere', { url: '/tool/sphere?entpcourseid=' + diff --git a/src/renderer/src/views/profile/index.vue b/src/renderer/src/views/profile/index.vue index c70b229..db29e01 100644 --- a/src/renderer/src/views/profile/index.vue +++ b/src/renderer/src/views/profile/index.vue @@ -1,7 +1,7 @@