diff --git a/src/renderer/src/components/choose-textbook/experimentBook.vue b/src/renderer/src/components/choose-textbook/experimentBook.vue new file mode 100644 index 0000000..cf14940 --- /dev/null +++ b/src/renderer/src/components/choose-textbook/experimentBook.vue @@ -0,0 +1,333 @@ + + + + + + \ No newline at end of file diff --git a/src/renderer/src/layout/components/Aside.vue b/src/renderer/src/layout/components/Aside.vue index 7a421c6..3c6456f 100644 --- a/src/renderer/src/layout/components/Aside.vue +++ b/src/renderer/src/layout/components/Aside.vue @@ -182,9 +182,9 @@ watch( const logout = () => { - const hasClass = sessionStore.has('activeClass.id') - const hasTool = sessionStore.get('isToolWin') - if (hasClass || hasTool) return ElMessage.warning('当前正在上课,请先结束上课') + + if(!!sessionstore.get('curr.classcourse'))return ElMessage.warning('当前正在上课,请先结束上课') + ElMessageBox.confirm('确认退出系统吗?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -212,7 +212,7 @@ onMounted(() => { \ No newline at end of file diff --git a/src/renderer/src/views/resource/container/exper-list.vue b/src/renderer/src/views/resource/container/exper-list.vue new file mode 100644 index 0000000..96ce1ca --- /dev/null +++ b/src/renderer/src/views/resource/container/exper-list.vue @@ -0,0 +1,214 @@ + + + + + \ No newline at end of file diff --git a/src/renderer/src/views/resource/container/resoure-search.vue b/src/renderer/src/views/resource/container/resoure-search.vue index 97c3bf2..a74fbbb 100644 --- a/src/renderer/src/views/resource/container/resoure-search.vue +++ b/src/renderer/src/views/resource/container/resoure-search.vue @@ -3,19 +3,21 @@ {{ item.label + :type="sourceStore.activeIndex == item.id ? 'primary' : ''" + @click="sourceStore.changeType(item)" :disabled="item.disabled">{{ item.label }} - - - - - - + @@ -34,22 +36,24 @@
- - - +
@@ -63,7 +67,10 @@ import {watch,ref,onMounted} from 'vue' import useResoureStore from '../store' import {coursewareTypeList} from '@/utils/resourceDict' +// 是否是第三方资源 const isThird = ref(false) +//判断是不是进入实验室 +const isExper = ref(false) const sourceStore = useResoureStore() // 防抖函数 const debounce = (fn, t) => { @@ -85,6 +92,9 @@ onMounted(() => { watch(() => sourceStore.query.fileSource,() => { sourceStore.query.fileSource === '第三方'?isThird.value = true:isThird.value = false }) +watch(() => sourceStore.query.orderByColumn,() => { + sourceStore.query.orderByColumn === 'uploadTime'?isExper.value = true:isExper.value = false +})