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] 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() } diff --git a/src/renderer/src/router/index.js b/src/renderer/src/router/index.js index 7bc8424..948b7d8 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', 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') { // 创建群-监听