Merge remote-tracking branch 'origin/main'

src/renderer/src/layout/components/Header.vue

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

src/renderer/src/layout/index.vue

@@ -8,8 +8,8 @@
         <el-header>
           <Header/>
         </el-header>
-        <el-main :style="{ 'padding-top' : isShowBread ? 0 : '20px'}">
-          <template v-if="isShowBread">
+        <el-main style="padding-top : 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 :style="{ height: isShowBread ? 'calc(100% - 45px)' : '100%' }" />
+          </template> -->
+          <AppMain  />
         </el-main>
       </el-container>
       <Uploader v-if="uploaderStore.uploadList && uploaderStore.uploadList.length > 0" />

src/renderer/src/router/index.js

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

src/renderer/src/views/classTask/classTask.vue

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

src/renderer/src/views/classTask/newClassTask.vue

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

src/renderer/src/views/teach/index.vue

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

src/renderer/src/views/teach/standardAnalysis/index.vue

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

src/renderer/src/views/textbookAnalysis/index.vue

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