From ce8b2e6ab0683875795f7a9dde4668588c0d0df3 Mon Sep 17 00:00:00 2001 From: lyc Date: Thu, 19 Sep 2024 15:55:19 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B7=AF=E7=94=B1title?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/router/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/renderer/src/router/index.js b/src/renderer/src/router/index.js index 6bdcac9..16c3677 100644 --- a/src/renderer/src/router/index.js +++ b/src/renderer/src/router/index.js @@ -36,13 +36,13 @@ export const constantRoutes = [ path: '/resource', component: () => import('@/views/resource/index.vue'), name: 'resource', - meta: {title: '资源'} + meta: {title: '资源库'} }, { path: '/prepare', component: () => import('@/views/prepare/index.vue'), name: 'prepare', - meta: {title: '备课'} + meta: {title: '教学实践'} }, { path: '/teach', From 893be27671e75550f2e29da7931dcd306029a0eb Mon Sep 17 00:00:00 2001 From: lyc Date: Thu, 19 Sep 2024 16:02:42 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=AD=A6=E7=A7=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/layout/components/Header.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/renderer/src/layout/components/Header.vue b/src/renderer/src/layout/components/Header.vue index 253fab4..e9b53c6 100644 --- a/src/renderer/src/layout/components/Header.vue +++ b/src/renderer/src/layout/components/Header.vue @@ -200,6 +200,8 @@ const changeSubject = async (command) =>{ await updateUserInfo(data) await userStore.login({username: phonenumber, password: plainpwd}) await userStore.getInfo() + localStorage.removeItem('subjectList') + localStorage.removeItem('evaluationList') router.go() } From 746cb150c45c3bea5970b10be71b2537bf4d876a Mon Sep 17 00:00:00 2001 From: yangws <1607839436@qq.com> Date: Thu, 19 Sep 2024 16:02:56 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E7=A9=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9A=84=E5=88=A4=E6=96=AD;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/components/choose-textbook/third.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/renderer/src/components/choose-textbook/third.vue b/src/renderer/src/components/choose-textbook/third.vue index 554a6f5..ca8f65d 100644 --- a/src/renderer/src/components/choose-textbook/third.vue +++ b/src/renderer/src/components/choose-textbook/third.vue @@ -64,6 +64,8 @@ const getVertion = (data) => { childs: [] } }) + //判断是否存在该教材，有则展示第一项 + if(treeData.value.length === 0) return nextTick(() => { defaultExpandedKeys.value = [treeData.value[0].id] node.currentNode.data = treeData.value[0] From 02a25db5e2ecb858f242bb2f8577e9e27878dda6 Mon Sep 17 00:00:00 2001 From: zdg Date: Thu, 19 Sep 2024 16:35:36 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/views/prepare/index.vue | 2 +- src/renderer/src/views/tool/directive/drag.js | 3 +++ src/renderer/src/views/tool/sphere.vue | 13 +++++++++---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue index ca2b197..9b7592e 100644 --- a/src/renderer/src/views/prepare/index.vue +++ b/src/renderer/src/views/prepare/index.vue @@ -308,7 +308,7 @@ export default { if(item.fileFlag === '课件') { // 关闭状态，打开上课相关功能(已打开，忽略) const id = sessionStore.has('activeClass.id') ? sessionStore.get('activeClass.id') : null - if (id && id == item.id) return ElMessage.warning('当前正在上课，请勿重复操作') + // if (id && id == item.id) return ElMessage.warning('当前正在上课，请勿重复操作') this.openReserv() } if(item.fileFlag === 'apt') { diff --git a/src/renderer/src/views/tool/directive/drag.js b/src/renderer/src/views/tool/directive/drag.js index 5565441..9751fde 100644 --- a/src/renderer/src/views/tool/directive/drag.js +++ b/src/renderer/src/views/tool/directive/drag.js @@ -57,6 +57,8 @@ class Drag { document.removeEventListener('mouseup', this.up); document.addEventListener('touchmove', this.move); document.addEventListener('touchend', this.up); + // 手动-触发事件 v-drag-start + this.el.dispatchEvent(new CustomEvent('v-drag-end', {detail:{drag: this}})) } // 业务逻辑 updatePosition(e) { @@ -108,6 +110,7 @@ export default { // const { style } = binding.value const drag = new Drag(el, binding) const dragStart = (e) => { + // console.log('start', e) drag.down(e) document.addEventListener('mousemove', drag.move); document.addEventListener('mouseup', drag.up); diff --git a/src/renderer/src/views/tool/sphere.vue b/src/renderer/src/views/tool/sphere.vue index 09be0e0..a2f69a9 100644 --- a/src/renderer/src/views/tool/sphere.vue +++ b/src/renderer/src/views/tool/sphere.vue @@ -13,9 +13,11 @@ -
+
+ @v-drag-start="dragtime = Date.now()" + @v-drag-end="mouseChange(1)"> @@ -106,7 +108,7 @@ const getClassInfo = async () => { const tabChange = (val) => { const bool = !toolStore.isPdfWin && !toolStore.showBoardAll if(bool) toolStore.showBoardAll = true - console.log('tabChange:', val, bool) + // console.log('tabChange:', val, bool) toolStore.model = val // 存储当前tab } // logo 点击-事件 折叠|展开 @@ -143,9 +145,12 @@ const mouseChange = (bool) => { const isPdf = !resBool && toolStore.isPdfWin if (isPdf) resBool = true } - // console.log('mouseChange:', bool, resBool) + console.log('mouseChange:', bool, resBool) setIgnore(resBool) } +const touchChange = (e) => { + console.log(e) +} // im-chat: 聊天事件 {type, data} const chatChange = (type, data, ...args) => { if (type == 'createGroup') { // 创建群-监听 From c5075af2fc26961c0e8a69ec88956369206a6486 Mon Sep 17 00:00:00 2001 From: zdg Date: Thu, 19 Sep 2024 16:37:07 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=B7=B2=E4=B8=8A=E8=AF=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/views/prepare/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue index 9b7592e..ca2b197 100644 --- a/src/renderer/src/views/prepare/index.vue +++ b/src/renderer/src/views/prepare/index.vue @@ -308,7 +308,7 @@ export default { if(item.fileFlag === '课件') { // 关闭状态，打开上课相关功能(已打开，忽略) const id = sessionStore.has('activeClass.id') ? sessionStore.get('activeClass.id') : null - // if (id && id == item.id) return ElMessage.warning('当前正在上课，请勿重复操作') + if (id && id == item.id) return ElMessage.warning('当前正在上课，请勿重复操作') this.openReserv() } if(item.fileFlag === 'apt') {