更新首页

src/layout/index/mainData.vue

@@ -5,53 +5,50 @@
         <el-col :span="24" class="info">
           <el-button type="primary">主要按钮</el-button>
         </el-col>
-        <el-col :span="24">
+        <!-- <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="12" class="time">时间</el-col
-        ><el-col :span="12" class="time"
-          ><el-col>{{ lessons.date }}</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">{{ lessons.subname }}</el-col>
-            <el-col :span="24">{{ lessons.teaname }}</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>
-          <el-col :span="24">
-            <p></p>
+          <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>
+            </el-col>
+            <el-col :span="24">
+              <p></p>
+            </el-col>
           </el-col>
-        </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="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="contextclass"
-            ><el-col :span="13">{{ lessons.subname }}</el-col>
-            <el-col :span="24">{{ lessons.teaname }}</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="contextclass"><p>午餐+休息</p> </el-col>
           </el-col>
-        </el-col>
-        <el-col :span="24" class="context">
-          <el-col :span="12" class="contexttime"><span>16:30—17: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>17:30 — 19:45</span></el-col
-          ><el-col :span="12" class="contextclass">
-            <el-col :span="13" :v-if="lessons.subname === '拓展训练'">拓展交流</el-col>
-            <el-col :span="13" :v-else-if="lessons.subname == '职业探索'">课程作业小组展示</el-col>
-            <el-col :span="13" :v-else-if="lessons.subname == '优势挖掘'">课程作业</el-col>
-            <el-col :span="13" :v-else-if="lessons.subname == '简历制作'">礼仪课 小组面试</el-col>
-            <el-col :span="13" :v-else-if="lessons.subname == '模拟面试'">结业仪式(11:30-12:00)</el-col>
-            <el-col :span="13" else>xx</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="contextclass"
+              ><el-col :span="13">{{ item.subname }}</el-col>
+              <el-col :span="24">{{ item.teaname }}</el-col>
+            </el-col>
           </el-col>
-        </el-col> -->
+          <el-col :span="24" class="context">
+            <el-col :span="12" class="contexttime"><span>16:30—17: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>17:30 — 19:45</span></el-col
+            ><el-col :span="12" class="contextclass">
+              <el-col :span="13">{{ item.lastLesson }}</el-col>
+            </el-col>
+          </el-col>
+        </el-col>
       </el-col>
     </el-row>
   </div>

src/views/index.vue

@@ -6,7 +6,7 @@
           <topInfo></topInfo>
         </el-col>
         <el-col :span="24" class="main">
-          <mainData :lessionclassInfo="lessionclassInfo.lessons"></mainData>
+          <mainData :lessionclassInfo="lessionclassInfo"></mainData>
         </el-col>
         <el-col :span="24" class="foot">
           <footInfo></footInfo>
@@ -54,17 +54,68 @@ export default {
       const res = await this.lessionlist({ ...info });
       for (const val of res.data) {
         var arr = res.data.filter(item => item.class === '5e4df0c93ffa245d6065f526');
-        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);
-          // }
+        var aff = res.data[0].lessons;
+        var ahh = aff.map(function(currentValue, index) {
+          return index;
+        });
+        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('没有课');
+          }
         }
+
+        // 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]);