From de1e0c5a2e1ef8cf6abbe995d249a8831ea46a83 Mon Sep 17 00:00:00 2001 From: lyc Date: Mon, 22 Jul 2024 11:24:36 +0800 Subject: [PATCH 01/20] window-tools --- .../src/components/window-tools/index.vue | 61 +++++++++++++++++++ src/renderer/src/layout/components/Header.vue | 45 +------------- src/renderer/src/views/login/index.vue | 7 +-- 3 files changed, 67 insertions(+), 46 deletions(-) create mode 100644 src/renderer/src/components/window-tools/index.vue diff --git a/src/renderer/src/components/window-tools/index.vue b/src/renderer/src/components/window-tools/index.vue new file mode 100644 index 0000000..f32fe27 --- /dev/null +++ b/src/renderer/src/components/window-tools/index.vue @@ -0,0 +1,61 @@ + + + + + \ No newline at end of file diff --git a/src/renderer/src/layout/components/Header.vue b/src/renderer/src/layout/components/Header.vue index 4e4b31b..54c773e 100644 --- a/src/renderer/src/layout/components/Header.vue +++ b/src/renderer/src/layout/components/Header.vue @@ -14,12 +14,7 @@
-
- - {{ isMaxSize ? '' : - '' }} - -
+
@@ -46,11 +41,11 @@ import { ref, watch } from 'vue' import { useRouter } from 'vue-router' import { ElMessageBox } from 'element-plus' +import WindowTools from '@/components/window-tools/index.vue' import useUserStore from '@/store/modules/user' + const userStore = useUserStore() -const { ipcRenderer } = window.electron || {} -const isMaxSize = ref(false) const router = useRouter() const currentRoute = ref('') @@ -81,19 +76,6 @@ watch( { immediate: true } ) -// 最小化 -const minimizeWindow = () => { - ipcRenderer.send('minimize-window') -} -//最大化 -const maximizeWindow = () => { - ipcRenderer?.send('maximize-window') - isMaxSize.value = !isMaxSize.value -} -//关闭 -const closeWindow = () => { - ipcRenderer.send('close-window') -} const changePage = (url) => { router.push(url) @@ -118,11 +100,9 @@ function logout() { type: 'warning' }).then(() => { userStore.logOut().then(() => { - // location.href = '/index#/login'; router.replace('/login') }).catch(()=>{ router.replace('/login') - // location.href = '/index#/login'; }) }).catch(() => { }); } @@ -213,25 +193,6 @@ watch(()=> userStore.avatar,() => { padding-bottom: 5px; flex-direction: column; - .header-tool { - -webkit-app-region: no-drag; - span { - border-radius: 3px; - cursor: pointer; - padding: 2px 10px; - &:hover { - background-color: #c4c4c4; - } - } - .close{ - &:hover{ - background-color: #fb4a3e; - .iconfont{ - color: #fff; - } - } - } - } .user { .user-info { diff --git a/src/renderer/src/views/login/index.vue b/src/renderer/src/views/login/index.vue index 9478a18..ffabd98 100644 --- a/src/renderer/src/views/login/index.vue +++ b/src/renderer/src/views/login/index.vue @@ -7,10 +7,7 @@
- 布置作业 + 布置作业 上传资料 新建课件
@@ -73,8 +73,8 @@ import { toTimeText } from '@/utils/date' import { ElMessage } from 'element-plus' import { parseCataByNode, creatPPT, asyncLocalFile } from '@/utils/talkFile' import FileOperBatch from '@/views/prepare/container/file-oper-batch.vue' -import useUserStore from '@/store/modules/user' -import { homeWorkConfig } from '@/utils/config' + +import outLink from '@/utils/linkConfig' const { ipcRenderer } = window.electron || {} export default { @@ -102,7 +102,6 @@ export default { }, // 当前教材封面图 curBookImg: '', - userStore: '' } }, computed: { @@ -118,7 +117,7 @@ export default { this.callback(param) }) this.lastAsyncAllTime = localStorage.getItem('lastAsyncAllTime') - this.userStore = useUserStore() + }, mounted() { }, @@ -251,15 +250,14 @@ export default { this.uploadData.textbookId = data.textBook.curBookId this.asyncAllFile() }, - // 布置组后也 - handleHomeWork(){ - ipcRenderer.send('openWork',{ - fullPath: homeWorkConfig.fullPath, - cookieData: { - url: homeWorkConfig.host, - name: homeWorkConfig.name, - value: this.userStore.token - } + // 打开外部链接 + handleOutLink(key){ + // key 对应的 linkConfig.js 外部链接配置 + let configObj = outLink[key] + // 通知主进程 + ipcRenderer.send('openWindow', { + fullPath: configObj.fullPath, + cookieData: {...(configObj.data)} }) }, } From 4e9c93da1585ea1db0d8ee97407664c348f357d1 Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Wed, 24 Jul 2024 14:48:18 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E4=BA=8C=E6=9C=9F=EF=BC=9A=E5=A4=B4?= =?UTF-8?q?=E5=83=8F=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- electron.vite.config.mjs | 7 +------ src/renderer/src/layout/components/Header.vue | 3 --- src/renderer/src/store/modules/user.js | 7 ++++--- src/renderer/src/views/profile/index.vue | 1 + src/renderer/src/views/profile/userAvatar.vue | 4 ++-- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/electron.vite.config.mjs b/electron.vite.config.mjs index af2f6ab..7add6c4 100644 --- a/electron.vite.config.mjs +++ b/electron.vite.config.mjs @@ -26,12 +26,7 @@ export default defineConfig({ target: 'http://192.168.2.52:7863', changeOrigin: true, rewrite: (p) => p.replace(/^\/dev-api/, '') - }, - '/profile': { - target: 'http://192.168.2.52:7863', - ws: true, - changeOrigin: true - }, + } }, }, plugins: [vue(), WindiCSS()], diff --git a/src/renderer/src/layout/components/Header.vue b/src/renderer/src/layout/components/Header.vue index 9bdb708..e4642b3 100644 --- a/src/renderer/src/layout/components/Header.vue +++ b/src/renderer/src/layout/components/Header.vue @@ -113,9 +113,6 @@ const emits = defineEmits(['setLayout']) function setLayout() { emits('setLayout'); } -watch(()=> userStore.avatar,() => { - userImg.value = userStore.avatar; -},{deep:true}) diff --git a/src/renderer/src/views/resource/index.vue b/src/renderer/src/views/resource/index.vue index 8550e42..6720e26 100644 --- a/src/renderer/src/views/resource/index.vue +++ b/src/renderer/src/views/resource/index.vue @@ -71,7 +71,6 @@ const submitFile = (data) => { item.fileData = fileData item.callback = fileCallBack }) - // console.log(fileList) uploaderState().pushFile(fileList) }