Compare commits

..

No commits in common. "7545e68a625fa32b2b4b80ea78ec909cadc92a69" and "c1325db9e7d12e7fd5667d9d06ac1c32cceff6cd" have entirely different histories.

8 changed files with 38 additions and 14 deletions

View File

@ -44,9 +44,9 @@ const breadList = ref([])
watch(
() => router.currentRoute.value,
(newValue) => {
console.log(newValue)
const { showBread } = newValue.meta
if (showBread) {
let path = newValue.path
if (path.includes('/model') && path !== ('/model/index')) {
isShowBack.value = true
breadList.value = newValue.matched.map(item => item.meta)
let data = sessionStore.get('subject.curNode')

View File

@ -8,8 +8,8 @@
<el-header>
<Header/>
</el-header>
<el-main style="padding-top : 20px">
<!-- <template v-if="isShowBread">
<el-main :style="{ 'padding-top' : isShowBread ? 0 : '20px'}">
<template v-if="isShowBread">
<div class="bread-row">
<div class="back" @click="onBack">
<i class="iconfont icon-fanhui"></i>
@ -19,8 +19,8 @@
<el-breadcrumb-item v-for="item in breadList"> {{ item.title }} </el-breadcrumb-item>
</el-breadcrumb>
</div>
</template> -->
<AppMain />
</template>
<AppMain :style="{ height: isShowBread ? 'calc(100% - 45px)' : '100%' }" />
</el-main>
</el-container>
<Uploader v-if="uploaderStore.uploadList && uploaderStore.uploadList.length > 0" />

View File

@ -47,19 +47,19 @@ export const constantRoutes = [
path: 'curriculum',
component: () => import('@/views/curriculum-standards/index.vue'),
name: 'curriculum-standard',
meta: { title: '课标研读', showBread: true }
meta: { title: '课标研读' }
},
{
path: 'teaching',
component: () => import('@/views/teaching-material/index.vue'),
name: 'teaching-material',
meta: { title: '教材研读', showBread: true }
meta: { title: '教材研读' }
},
{
path: 'examination',
component: () => import('@/views/examination-analysis/index.vue'),
name: 'examination-analysis',
meta: { title: '考试分析', showBread: true }
meta: { title: '考试分析' }
},
{
path: 'management',
@ -71,13 +71,13 @@ export const constantRoutes = [
path: 'design',
component: () => import('@/views/teachingDesign/index.vue'),
name: 'teaching-design',
meta: { title: '教学框架设计' , showBread: true},
meta: { title: '教学框架设计' },
},
{
path: 'newClassTaskAssign',
component: () => import('@/views/classTask/newClassTaskAssign/index.vue'),
name: 'newClassTaskAssign',
meta: { title: '作业设计', showBread: true }
meta: { title: '作业管理' }
},
{
path: 'questionUpload',
@ -89,7 +89,7 @@ export const constantRoutes = [
path: 'aiKolors',
component: () => import('@/components/ai-kolors/index.vue'),
name: 'aiKolors',
meta: { title: '文生图片', showBread: true }
meta: { title: '文生图片' }
},
]
},
@ -132,7 +132,7 @@ const dynamicRoutes = [
path: 'prepare',
component: () => import('@/views/prepare/index.vue'),
name: 'prepare',
meta: { title: '教学实践' }
meta: { title: '教学实践', showBread: true }
},
{
path: 'newClassTask',
@ -152,6 +152,13 @@ const dynamicRoutes = [
name: 'classCorrect',
meta: { title: '作业批改', showBread: true }
},
{
path: '/teach',
component: () => import('@/views/teach/index.vue'),
name: 'teach',
meta: { title: '授课' }
},
{
path: '/profile',
component: () => import('@/views/profile/index.vue'),

View File

@ -461,6 +461,7 @@ watch(tabActive, (newVal,oldVal)=>{
height: 100%;
display: flex;
flex-direction: column;
padding: 15px 30px;
.class-reserv-tabs {
width: 30%;
text-align: left;

View File

@ -134,6 +134,7 @@ onMounted(() => {
<style lang="scss" scoped>
.page-newcalsetask {
padding-top: 10px;
height: 100%;
overflow: hidden;

View File

@ -0,0 +1,13 @@
<template>
<div>
授课Page
</div>
</template>
<script setup>
</script>
<style lang="scss" scoped>
</style>

View File

@ -346,6 +346,7 @@ onMounted(async () => {
</script>
<style scoped lang="scss">
.page-con {
padding-top: 20px;
height: 100%;
&-left{
width: 300px;

View File

@ -362,6 +362,7 @@ onMounted(async () => {
</script>
<style scoped lang="scss">
.page-con {
padding-top: 20px;
height: 100%;
&-left{
width: 300px;