合并

src/layout/index/mainData.vue

@@ -1,26 +1,23 @@
-<template>
+6<template>
   <div id="mainData">
     <el-row>
       <el-col :span="24">
         <el-col :span="24" class="info">
-          <el-button type="primary">主要按钮</el-button>
+          <el-button type="primary">教师评分</el-button>
         </el-col>
-        <!-- <el-col :span="24">
-          <p>{{ lessionclassInfo.batch }}</p>
-          <el-col :span="24" v-for="(item, index) in lessionclassInfo.lessons" :key="index">
-            <p>{{ item.teaname }}</p>
-          </el-col>
-        </el-col> -->
-        <el-col :span="24" v-for="(item, index) in lessionclassInfo.lessons" :key="index">
-          <el-col :span="12" class="time">时间</el-col
-          ><el-col :span="12" class="time"
-            ><el-col>{{ item.date }}</el-col>
+        <el-col :span="24" class="beijing" v-for="(item, index) in lessionclassInfo.lessons" :key="index">
+          <el-col :span="24" class="top">
+            <el-col :span="12" class="time">时间</el-col
+            ><el-col :span="12" class="date"
+              ><el-col :span="24"> {{ item.date }}</el-col
+              ><el-col :span="24">{{ week }}</el-col>
+            </el-col>
           </el-col>
           <el-col :span="24" class="context">
             <el-col :span="12" class="contexttime"><span>8:30 — 11:30</span></el-col
             ><el-col :span="12" class="contextclass"
-              ><el-col :span="13">{{ item.subname }}</el-col>
-              <el-col :span="24">{{ item.teaname }}</el-col>
+              ><p>{{ item.subname }}</p>
+              <p>{{ item.teaname }}</p>
             </el-col>
             <el-col :span="24">
               <p></p>
@@ -28,14 +25,17 @@
           </el-col>
 
           <el-col :span="24" class="context">
-            <el-col :span="12" class="contexttime"><span>11:30—13：30</span></el-col
+            <el-col :span="12" class="contexttime"><span>11:30—13:30</span></el-col
             ><el-col :span="12" class="contextclass"><p>午餐+休息</p> </el-col>
           </el-col>
           <el-col :span="24" class="context">
-            <el-col :span="12" class="contexttime"><span>13：30 — 16:30</span></el-col
+            <el-col :span="12" class="contexttime"><span>11:30—4:30</span></el-col
             ><el-col :span="12" class="contextclass"
-              ><el-col :span="13">{{ item.subname }}</el-col>
-              <el-col :span="24">{{ item.teaname }}</el-col>
+              ><p>{{ item.subname }}</p>
+              <p>{{ item.teaname }}</p>
+            </el-col>
+            <el-col :span="24">
+              <p></p>
             </el-col>
           </el-col>
           <el-col :span="24" class="context">
@@ -45,7 +45,7 @@
           <el-col :span="24" class="context">
             <el-col :span="12" class="contexttime"><span>17:30 — 19:45</span></el-col
             ><el-col :span="12" class="contextclass">
-              <el-col :span="13">{{ item.lastLesson }}</el-col>
+              <p>{{ item.lastLesson }}</p>
             </el-col>
           </el-col>
         </el-col>
@@ -60,6 +60,7 @@ export default {
   props: {
     lessionclassInfo: null,
     lessons: null,
+    week: null,
   },
   components: {},
   data: () => ({}),
@@ -74,25 +75,46 @@ export default {
   text-align: center;
   padding: 25px 0;
 }
+.beijing {
+  background-color: #eee;
+  min-height: 640px;
+}
+.top {
+  margin: 20px 0 0 0;
+}
 /deep/.el-button {
   border-radius: 11px;
   padding: 15px 21px 15px 20px;
 }
 .time {
-  height: 60px;
+  background-color: #ffffff;
+  height: 70px;
+  font-size: 16px;
+  padding: 0px 0px 0 50px;
+  line-height: 60px;
+  color: #222222;
+}
+.date {
+  background-color: #ffffff;
+  height: 70px;
   font-size: 16px;
   padding: 0px 0px 0 20px;
   line-height: 30px;
+  color: #222222;
 }
 .context {
-  height: 80px;
+  background-color: #ffffff;
+  height: 90px;
+  width: 92%;
+  margin: 15px 15px 0 15px;
+  color: #bbbbbb;
 }
 
 .contexttime {
   padding: 15px 20px 0 20px;
 }
 .contextclass {
+  background-color: #ffffff;
   padding: 0 20px 0 20px;
-  line-height: 25px;
 }
 </style>

src/views/index.vue

@@ -7,7 +7,7 @@
           <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
         </el-col>
         <el-col :span="24" class="main">
-          <mainData :lessionclassInfo="lessionclassInfo"></mainData>
+          <mainData :lessionclassInfo="lessionclassInfo" :week="week"></mainData>
         </el-col>
         <el-col :span="24" class="foot">
           <footInfo></footInfo>
@@ -35,6 +35,7 @@ export default {
   data: () => ({
     lessionclassInfo: { lessons: [] },
     dates: '',
+    week: '',
     title: '日程安排',
     isleftarrow: '',
     transitionName: 'fade',
@@ -68,76 +69,29 @@ export default {
       for (const val of res.data) {
         var arr = res.data.filter(item => item.class === '5e4df0c93ffa245d6065f526');
         var aff = res.data[0].lessons;
-        var ahh = aff.map(function(currentValue, index) {
-          return index;
+        console.log(aff);
+        var ahh = aff.map((i, index) => {
+          let word = '';
+          if (index == 1) word = '拓展交流';
+          if (index == 2) word = '课程作业小组展示';
+          if (index == 3) word = '课程作业';
+          if (index == 4) word = '礼仪课小组面试';
+          if (index == 5) word = '结业仪式';
+          i.lastLesson = word;
+          return i;
         });
-        for (const all of ahh) {
-          if (all == 0) {
-            let lastclass = '拓展交流';
-            for (const aqq of aff) {
-              aqq.lastLesson = lastclass;
-              var aee = aff.filter(item => item.date === '2020-01-02');
-              console.log(aee);
-              this.$set(this.lessionclassInfo, `lessons`, aee);
-            }
-          } else if (ahh == 1) {
-            lastclass = '课程作业小组展示';
-            for (const aqq of aff) {
-              aqq.lastLesson = lastclass;
-              var aee = aff.filter(item => item.date === '2020-01-02');
-              console.log(aee);
-              this.$set(this.lessionclassInfo, `lessons`, aee);
-            }
-          } else if (ahh == 2) {
-            lastclass = ' 课程作业';
-            for (const aqq of aff) {
-              aqq.lastLesson = lastclass;
-              var aee = aff.filter(item => item.date === '2020-01-02');
-              console.log(aee);
-              this.$set(this.lessionclassInfo, `lessons`, aee);
-            }
-          } else if (ahh == 3) {
-            lastclass = '礼仪课小组面试';
-            for (const aqq of aff) {
-              aqq.lastLesson = lastclass;
-              var aee = aff.filter(item => item.date === '2020-01-02');
-              console.log(aee);
-              this.$set(this.lessionclassInfo, `lessons`, aee);
-            }
-          } else if (ahh == 4) {
-            lastclass = '结业仪式（11:30—12:00）';
-            for (const aqq of aff) {
-              aqq.lastLesson = lastclass;
-              var aee = aff.filter(item => item.date === '2020-01-02');
-              console.log(aee);
-              this.$set(this.lessionclassInfo, `lessons`, aee);
-            }
-          } else {
-            // console.log('没有课');
-          }
+        for (const aqq of aff) {
+          var aee = aff.filter(item => item.date === '2020-01-04');
+          this.$set(this.lessionclassInfo, `lessons`, aee);
         }
-
-        // console.log(aff);
-        // for (const acc of arr) {
-        //   // console.log(att);
-        //   var aee = acc.lessons.filter(item => item.date === '2020-01-02');
-        //   console.log(aee);
-        //   this.$set(this, `lessionclassInfo`, aee);
-        //   console.log(aee);
-        //   this.$set(this, `lessons`, aee);
-        //   for (const aww of aee) {
-        //     this.$set(this, `lessons`, aww);
-        //   }
-        // }
       }
-      // this.$set(this, `lessionclassInfo`, res.data[0]);
-
-      // console.log(res.data[0]);
     },
     getDate() {
       var adate = new Date();
       this.value = adate.getFullYear() + '-' + (adate.getMonth() + 1) + '-' + adate.getDate();
       this.$set(this, `dates`, this.value);
+      var str = '星期' + '日一二三四五六'.charAt(new Date().getDay());
+      this.$set(this, `week`, str);
     },
   },
 };