Merge branch 'master' of http://121.4.203.192:9000/mingxue/front

src/layout/index.vue

@@ -32,7 +32,7 @@
       <app-main
         :class="
           (!this.sidebarRouters || this.sidebarRouters.length == 0) &&
-          !isWideScreen
+          isWideScreen
             ? 'max-mainWidth'
             : ''
         "
@@ -63,6 +63,9 @@ export default {
     TagsView,
   },
   mixins: [ResizeMixin],
+  created() {
+    console.log('isWideScreen',this.isWideScreen)
+  },
   computed: {
     ...mapState({
       theme: (state) => state.settings.theme,

src/permission.js

@@ -15,7 +15,6 @@ const uaWhiteList = ['/question/preview']
 router.beforeEach((to, from, next) => {
   NProgress.start()
   if (auth.getToken()) {
-    console.log(to, 'to')
     if (typeof (to.meta) == "object" && to.meta.hasOwnProperty("isWideScreen")) {
       store.commit('SET_IS_WIDESCREEN', to.meta.isWideScreen)
     } else {

src/router/index.js

@@ -463,15 +463,6 @@ export const constantRoutes = [{
           title: '课程详情页'
         }
       },
-      {
-        path: '/question-center/main',
-        // component: Layout,
-        hidden: true,
-        component: (resolve) => require(['@/views/questioncenter/main'], resolve),
-        meta: {
-          title: '题库中心首页'
-        }
-      },
       {
         path: '/question-center/smartExercise/practice',
         // component: Layout,
@@ -490,33 +481,6 @@ export const constantRoutes = [{
           title: '题库中心-智能练习-试卷结果'
         }
       },
-      {
-        path: '/question-center/learningAssitant',
-        // component: Layout,
-        hidden: true,
-        component: (resolve) => require(['@/views/questioncenter/LearnHelper'], resolve),
-        meta: {
-          title: '题库中心'
-        }
-      },
-      {
-        path: '/question-center/smartExercise',
-        // component: Layout,
-        hidden: true,
-        component: (resolve) => require(['@/views/questioncenter/smart'], resolve),
-        meta: {
-          title: '题库中心智能练习'
-        }
-      },
-      {
-        path: '/question-center/bestPaper',
-        // component: Layout,
-        hidden: true,
-        component: (resolve) => require(['@/views/questioncenter/bestpaper'], resolve),
-        meta: {
-          title: '题库中心精品试卷'
-        }
-      },
       {
         path: '/question-center/bestPaper/preview',
         // component: Layout,
@@ -526,15 +490,6 @@ export const constantRoutes = [{
           title: '题库中心精品试卷-预览'
         }
       },
-      {
-        path: '/question-center/generatingPaperCenter',
-        // component: Layout,
-        hidden: true,
-        component: (resolve) => require(['@/views/questioncenter/generating'], resolve),
-        meta: {
-          title: '题库中心组卷中心'
-        }
-      },
       {
         path: '/question-center/generatingPaperCenter/paper',
         // component: Layout,
@@ -646,14 +601,6 @@ export const constantRoutes = [{
           title: '职业性格测评-评测列表'
         }
       },
-      // {
-      //   path: '/career/plan/MajorLib',
-      //   component: (resolve) => require(['@/views/career/plan/new-major-lib'], resolve),
-      //   name: 'ProfessLib',
-      //   meta: {
-      //     title: '专业库'
-      //   }
-      // },
       {
         path: '/career/plan/MajorDetail',
         component: (resolve) => require(['@/views/career/plan/new-major-detail'], resolve),
@@ -695,14 +642,6 @@ export const constantRoutes = [{
           title: '由科目选专业'
         }
       },
-      {
-        path: '/career/plan/UniversitiesColleges',
-        component: (resolve) => require(['@/views/career/plan/UniversitiesColleges'], resolve),
-        name: 'UniversitiesColleges',
-        meta: {
-          title: '生涯评测-院校库'
-        }
-      },
       {
         path: '/career/plan/UniversityDetail',
         component: (resolve) => require(['@/views/career/plan/UniversitiesDetail'], resolve),
@@ -711,15 +650,6 @@ export const constantRoutes = [{
           title: '生涯评测-院校详情'
         }
       },
-      // {
-      //   path: '/career/zhiyuan/index',
-      //   // component: (resolve) => require(['@/views/career/zhiyuan/index'], resolve),
-      //   component: (resolve) => require(['@/views/career/zhiyuan/SimulatedVolunteer'], resolve),
-      //   name: 'FillIn',
-      //   meta: {
-      //     title: '志愿模拟填报'
-      //   }
-      // },
       {
         path: '/career/subjectSign/index',
         component: (resolve) => require(['@/views/career/subjectSign/index'], resolve),
@@ -728,14 +658,6 @@ export const constantRoutes = [{
           title: '选科报名'
         }
       },
-      // {
-      //   path: '/career/vocation/index',
-      //   component: (resolve) => require(['@/views/career/vocation/new-index'], resolve),
-      //   name: 'Vocation',
-      //   meta: {
-      //     title: '职业库'
-      //   }
-      // },
       {
         path: '/career/vocation/Detail',
         component: (resolve) => require(['@/views/career/vocation/new-detail'], resolve),

src/views/accurateTeaching/main.vue

@@ -0,0 +1,117 @@
+<template>
+  <!-- 题库中心首页 -->
+  <div class="container">
+    <div class="banner">
+      <el-image style="width: 100vw" :src="require('@/assets/images/personal_database.png')" fit="none"></el-image>
+    </div>
+    <div class="content">
+      <index-card title="班级任务" class="mb20">
+        <el-row :gutter="20">
+          <el-col class="relative "   :span="4" v-for="item in plan" >
+            <div class="plan_item pointer" @click="$router.push(item.path)">
+              <div class="img-wrap">
+                <img  :src="item.img"/>
+              </div>
+            </div>
+            <p class="bold text-center" >{{ item.title }}</p>
+          </el-col>
+        </el-row>
+      </index-card>
+      <index-card title="资源库" class="mb20">
+        <mx-image-wrap :list="library" titleClass="text-white" titlePostion="left"></mx-image-wrap>
+      </index-card>
+    </div>
+  </div>
+</template>
+<script>
+import IndexCard from '@/views/index/components/index-card.vue'
+import MxImageWrap from '@/views/questioncenter/components/main-card/mx-image-wrap.vue'
+import { mapGetters } from 'vuex'
+import store from '@/store'
+export default {
+  components: { IndexCard, MxImageWrap },
+  data() {
+    return {
+      plan: [
+        {
+          title: '微课视频',
+          img: require('@/assets/images/micro_video.png'),
+          path: '/personalDatabase/class-task/micro-video'
+        },
+        {
+          title: '作业视频',
+          img: require('@/assets/images/homework_video.png'),
+          path: '/personalDatabase/class-task/homework-video'
+        },
+        {
+          title: '作业任务',
+          img: require('@/assets/images/paper_work.png'),
+          path: '/personalDatabase/class-task/paper-work'
+        },
+        {
+          title: '学校通知',
+          img: require('@/assets/images/school_notice.png'),
+          path: '/personalDatabase/class-task/school-notice'
+        },
+        {
+          title: '班级通知',
+          img: require('@/assets/images/class_notice.png'),
+          path: '/personalDatabase/class-task/class-notice'
+        },
+        {
+          title: '系统通知',
+          img: require('@/assets/images/system_notice.png'),
+          path: '/personalDatabase/class-task/system-notice'
+        },
+      ],
+      library: [
+        {
+          title: '个人资源库',
+          img: require('@/assets/images/personal_library.png'),
+          path: '/personalDatabase/personalResources/index'
+        },
+        {
+          title: '校本资源库',
+          img: require('@/assets/images/school_library.png'),
+          path: '/personalDatabase/schoolResources/index'
+        },
+        {
+          title: '云库',
+          img: require('@/assets/images/cloud_library.png'),
+          path: '/personalDatabase/cloudTank/index'
+        },
+      ],
+    }
+  },
+  methods: {
+  }
+}
+</script>
+<style scoped lang="scss">
+.content {
+  width: 70%;
+  margin: 0 auto;
+  padding-bottom: 20px;
+  margin-top: 20px;
+}
+
+.container {
+  background: #f5f4f9;
+}
+.plan_item{
+  padding: 20px;
+  border: 1px solid #C5C5C5;
+  margin-bottom: 20px;
+  border-radius: 4px;
+  height: 134px;
+  .img-wrap{
+    width: 100%;
+    height: 100%;
+    text-align: center;
+  }
+  &:hover{
+    background: #00CCB4;
+    border: 1px solid #00CCB4;
+  }
+}
+</style>

src/views/questioncenter/components/main-card/mx-image-wrap.vue

@@ -1,8 +1,9 @@
 <template>
   <el-row :gutter="20">
-    <el-col class="relative pointer" :span="24/list.length" v-for="item in list" @click.native="navigator(item.path)">
+    <el-col class="relative" :class="item.path ? 'pointer' : ''" :span="24/list.length" v-for="item in list" @click.native="navigator(item.path)">
       <img  style="width:100%" :src="item.img"/>
-      <p class="absolute bold" :class="[item.titleAlign,titleClass]">{{ item.title }}</p>
+      <p class="bold" v-if="titlePostion == 'other'" :class="[titlePostion]">{{ item.title }}</p>
+      <p class="absolute bold" v-else :class="[titlePostion,titleClass]">{{ item.title }}</p>
     </el-col>
   </el-row>
 </template>
@@ -13,6 +14,10 @@ export default {
       type:Array,
       default:[]
     },
+    titlePostion:{
+      type:String,
+      default: 'other' // 可选值 left center other
+    },
     titleClass:{
       type:String,
       default: ''
@@ -40,4 +45,8 @@ export default {
   left: 20px;
   bottom: 20px;
 }
+.other{
+  margin-top: 10px;
+  text-align: center;
+}
 </style>

src/views/questioncenter/main.vue

@@ -6,7 +6,7 @@
     </div>
     <div class="content">
       <index-card title="智能练习" class="mb20">
-        <mx-image-wrap :list="zhineng"></mx-image-wrap>
+        <mx-image-wrap titlePostion="center" :list="zhineng"></mx-image-wrap>
       </index-card>
       <index-card title="精品试卷" class="mb20" more-text="更多" @more="more('/question-center/bestPaper')">
         <el-tabs type="card">
@@ -27,7 +27,7 @@
         </el-tabs>
       </index-card>
       <index-card title="组卷中心" class="mb20">
-        <mx-image-wrap :list="zujuan" titleClass="text-white"></mx-image-wrap>
+        <mx-image-wrap titlePostion="left" :list="zujuan" titleClass="text-white"></mx-image-wrap>
       </index-card>
       <index-card title="视频课程" more-text="更多" @more="more('/question-center/video_course')">
         <el-tabs type="card">
@@ -69,13 +69,11 @@ export default {
         {
           title: '同步练习',
           img: require('@/assets/images/tongbuzaixian.png'),
-          titleAlign: 'center',
           path: '/question-center/smartExercise?tabActive=0'
         },
         {
           title: '知识点练习',
           img: require('@/assets/images/zhishidianzaixian.png'),
-          titleAlign: 'center',
           path: '/question-center/smartExercise?tabActive=1'
 
         }
@@ -84,19 +82,16 @@ export default {
         {
           title: '智能组卷',
           img: require('@/assets/images/smart_volume.png'),
-          titleAlign: 'left',
           path: '/question-center/generatingPaperCenter?tabActive=0'
         },
         {
           title: '手动组卷',
           img: require('@/assets/images/manually.png'),
-          titleAlign: 'left',
           path: '/question-center/generatingPaperCenter?tabActive=1'
         },
         {
           title: '组卷记录',
           img: require('@/assets/images/smart_record.png'),
-          titleAlign: 'left',
           path: '/question-center/generatingPaperCenter?tabActive=2'
         }
       ],
@@ -114,11 +109,7 @@ export default {
       gkVideoList: [] // 高考课程
     }
   },
-  computed: {
-    ...mapGetters(['isWideScreen'])
-  },
   created() {
-    store.commit('SET_IS_WIDESCREEN', true)
     this.getPaperList()
     this.getPaperListByYear()
     this.getVideoList(0)