Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/App.vue

@@ -133,6 +133,12 @@ body,
 .el-drawer__wrapper .drawerTop .icon-guanbi{
     display: none !important;
 }
+.el-tabs__item.is-active{
+    color:var(--q-color-primary) !important;
+}
+.el-tabs__active-bar{
+    background-color:var(--q-color-primary) !important;
+}
 .page-body{
     padding:15px !important;
     min-height: calc(100% - 30px);

src/pages/Index.vue

 <template>
-  <div class="home" >
+  <div class="home flex column " style="height:calc(100vh - 101px);margin:0px !important;flex-wrap: nowrap">
     <!-- <img alt="Quasar logo" src="~assets/quasar-logo-full.svg"> -->
     <div class="box" v-if="AccountType==2 || ispower==true">
       <div style="margin: 0 auto;width: 130px;">
@@ -7,12 +7,11 @@
           <el-tab-pane :label="item.label" :name="item.value" :key="item.value" v-for="(item, index) in options"></el-tab-pane>
         </el-tabs>
       </div>
-
     </div>
-    <div v-if="model=='one'" class="flex flex-center" style="flex: 1;min-height: 750px">
+    <div v-if="model=='one'" class="flex flex-center col" style="flex: 1;min-height: 750px">
           <img style="width:250px;" alt="Quasar logo" src="../assets/images/logo.png" />
     </div>
-    <div v-if="model=='two'" style="height: 750px;overflow: auto">
+    <div v-if="model=='two'" class="col" style="overflow: auto">
       <teachplan></teachplan>
     </div>
   </div>
@@ -76,12 +75,12 @@
 
 </script>
 <style>
-  .home .box{
+  .homebx .box{
     width: 100%;
     height: 50px;
 
   }
-  .home {
+  .homebx {
     margin: 0;
   }
   ::-webkit-scrollbar {

src/pages/course/lessonPreparation.vue

 <style>
-  .lessTop {
+  .lessonPreparation .lessTop {
     color: #000000;
     font-weight: bold;
     font-size: 14px;
   }
 
-  .Less_LeftIcon {
+  .lessonPreparation .Less_LeftIcon {
     background-color: #3FC4FF;
     width: 2px;
     height: 10px;
   }
 
-  .w260 {
+  .lessonPreparation .w260 {
     width: 260px !important;
   }
 
-  .w180 {
+  .lessonPreparation .w180 {
     width: 180px !important;
   }
 
-  .less_Time {
+  .lessonPreparation .less_Time {
     color: #999999;
     font-size: 13px;
   }
 
-  .teach_Content {
+  .lessonPreparation .teach_Content {
     color: #111111;
     font-size: 14px;
     margin: 20px 0;
     font-weight: bold;
   }
 
-  .add_Lesson {
+  .lessonPreparation .add_Lesson {
     width: 30px;
     height: 30px;
     background-color: #2961FE;
@@ -64,7 +64,7 @@
     border: 1px solid #A1AAB2;
   }
 
-  .teach_Lessback {
+  .lessonPreparation .teach_Lessback {
     width: 64.5%;
     height: 50px;
     min-width: 908px;
@@ -73,7 +73,7 @@
     padding-right: 20px;
     background-color: #F0F5FB;
   }
-  .Less_Delete{
+  .lessonPreparation .Less_Delete{
     width: 30px;
     height: 30px;
     background-color: red;
@@ -89,10 +89,10 @@
     top: -10px;
     display: none;
   }
-  .Less_Delete:hover{
+  .lessonPreparation .Less_Delete:hover{
     opacity: 0.6;
   }
-  .w60{
+  .lessonPreparation .w60{
     width:60px!important;
   }
   .lessonPreparation .addbtn{

src/pages/course/teacherLesson.vue

@@ -197,6 +197,10 @@
  .Cal_Content .beike3{
     background: var(--q-color-dark);
   }
+  .teacherLesson .TeacherName{
+    color:var(--q-color-primary);
+    margin-left:10px;
+  }
 </style>
 <template>
   <div class="page-body teacherLesson">
@@ -207,13 +211,13 @@
           {{tMonth}}
         </div>
       </div>
-      <div class="Cal_List">
+      <div class="Cal_List flex">
         <div class="Cal_Qiehuan" @click="getBeforeMonth()">
           <div class="Cal_Icon">
             <i class="el-icon-arrow-left"></i></div> <div>上个月
           </div>
         </div>
-        <div class="Cal_Content">
+        <div class="Cal_Content col">
           <div class="Cal_Inner" v-for="(item,index) in dataNum" :class="{'checkedPlan':ckedIndex==item}" @click="getItem(item)">
               {{item}}
             <div class="beikeStatus beike1"  v-if="getLessonStatus(item)=='未备课'">
@@ -247,6 +251,7 @@
           <div class="record_List">
             <div class="TeacherNameList">
               {{item.ClassName}}
+              <span class="TeacherName">{{item.TeacherName}}</span>
               <li class="cicle1">
                 {{item.ClassName.substr(0,1)}}
               </li>