Merge branch 'master' of http://git.cc-lotus.info/new_train/train-student

src/layout/index/mainData.vue

@@ -1,56 +1,66 @@
 <template>
   <div id="mainData">
-    <el-row v-for="(item, index) in lessons" :key="index">
+    <el-row>
       <el-col :span="24">
         <el-col :span="24" class="beijing">
+          <el-row type="flex">
+            <el-col :span="4" v-for="(i, index) in arrange" :key="index" @click.native="changeLesson(i)">
+              <el-row>
+                <el-col :span="24">{{ i.date | getMD }}</el-col>
+                <el-col :span="24">{{ i.day }}</el-col>
+              </el-row>
+            </el-col>
+          </el-row>
           <el-col :span="24" class="top">
             <el-col :span="12" class="time">时间</el-col>
             <el-col :span="6" class="date">
-              <el-col :span="24"> {{ item.date }}</el-col>
-              <el-col :span="24">{{ week }}</el-col>
+              <el-col :span="24"> {{ today.date }}</el-col>
+              <el-col :span="24">{{ today.day }}</el-col>
             </el-col>
             <el-col :span="6" class="date">
               <el-col :span="24" class="info">
-                <el-button type="primary" @click="$router.push({ path: 'teacherscore/index', query: { teaid: item.teaid, lessonid: item._id } })"
+                <el-button type="primary" @click="$router.push({ path: 'teacherscore/index', query: { teaid: lesson.teaid, lessonid: lesson._id } })"
                   >教师评分</el-button
                 >
               </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"
-              ><p>{{ item.subname }}</p>
-              <p>{{ item.teaname }}</p>
+          <template v-if="lesson">
+            <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"
+                ><p>{{ lesson.subname }}</p>
+                <p>{{ lesson.teaname }}</p>
+              </el-col>
+              <el-col :span="24">
+                <p></p>
+              </el-col>
             </el-col>
-            <el-col :span="24">
-              <p></p>
+            <el-col :span="24" class="context" v-if="lesson.subname">
+              <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>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>11:30—4:30</span></el-col
-            ><el-col :span="12" class="contextclass"
-              ><p>{{ item.subname }}</p>
-              <p>{{ item.teaname }}</p>
+            <el-col :span="24" class="context">
+              <el-col :span="12" class="contexttime"><span>11:30—4:30</span></el-col
+              ><el-col :span="12" class="contextclass"
+                ><p>{{ lesson.subname }}</p>
+                <p>{{ lesson.teaname }}</p>
+              </el-col>
+              <el-col :span="24">
+                <p></p>
+              </el-col>
             </el-col>
-            <el-col :span="24">
-              <p></p>
+            <el-col :span="24" class="context" v-if="lesson.subname">
+              <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>
-          <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">
-              <p>{{ item.lastLesson }}</p>
+            <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">
+                <p>{{ lesson.lastLesson }}</p>
+              </el-col>
             </el-col>
-          </el-col>
+          </template>
         </el-col>
       </el-col>
     </el-row>
@@ -61,14 +71,25 @@
 export default {
   name: 'mainData',
   props: {
-    lessons: null,
-    week: null,
+    lesson: null,
+    today: null,
+    arrange: null,
   },
   components: {},
   data: () => ({}),
   created() {},
   computed: {},
-  methods: {},
+  methods: {
+    changeLesson(date) {
+      this.$emit('getLesson', date);
+    },
+  },
+  filters: {
+    getMD(date) {
+      let arr = date.split('-');
+      return `${arr[1]}-${arr[2]}`;
+    },
+  },
 };
 </script>
 

src/views/index.vue

@@ -6,7 +6,7 @@
           <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
         </el-col>
         <el-col :span="24" class="main">
-          <mainData :lessons="lessons" :week="week"></mainData>
+          <mainData :lesson="lesson" :today="today" :arrange="arrange" @getLesson="getLesson"></mainData>
         </el-col>
         <el-col :span="24" class="foot">
           <footInfo></footInfo>
@@ -33,15 +33,19 @@ export default {
     mainData, //课程安排主体
   },
   data: () => ({
-    lessons: [],
-    dates: '',
-    week: '',
+    lesson: {},
+    originLesson: [],
+    arrange: [],
+    today: {},
     title: '日程安排',
     isleftarrow: '',
     navShow: true,
   }),
   created() {
-    this.getDate();
+    let today = this.getDay();
+    let todate = this.getDate();
+    this.$set(this.today, `date`, todate);
+    this.$set(this.today, `day`, today);
     this.searchInfo();
   },
   computed: {
@@ -63,9 +67,7 @@ export default {
     // 查询课程详情
     async searchInfo() {
       const res = await this.classesInfo(this.user.classid);
-      console.log(res.data);
       const result = await this.lessionInfo(res.data.lessonid);
-      console.log(result.data);
       var ahh = result.data.lessons.map((i, index) => {
         let word = '';
         if (index == 1) word = '拓展交流';
@@ -76,16 +78,35 @@ export default {
         i.lastLesson = word;
         return i;
       });
-      var aee = result.data.lessons.filter(item => item.date === '2020-01-02');
-      this.$set(this, `lessons`, aee);
+      this.$set(this, `originLesson`, ahh);
+      var lesson = result.data.lessons.find(item => item.date === this.getDate());
+      this.$set(this, `lesson`, lesson);
+      // 获取课程开始-结束日期
+      let ltime = result.data.lessons.map(i => {
+        let object = { date: i.date, day: this.getDay(i.date) };
+        return object;
+      });
+      this.$set(this, `arrange`, ltime);
     },
     // 获取时间
-    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);
+    getDay(date = new Date()) {
+      var str = '星期' + '日一二三四五六'.charAt(new Date(date).getDay());
+      return str;
+    },
+    getDate(date = new Date()) {
+      let res = new Date(date)
+        .toLocaleDateString()
+        .replace('/', '-')
+        .replace('/', '-');
+      let arr = res.split('-');
+      arr[1] = arr[1] * 1 >= 10 ? `${arr[1]}` : `0${arr[1]}`;
+      arr[2] = arr[2] * 1 >= 10 ? `${arr[2]}` : `0${arr[2]}`;
+      return `${arr[0]}-${arr[1]}-${arr[2]}`;
+    },
+    //点击日期获取课程
+    getLesson(date) {
+      let res = this.originLesson.find(f => f.date === date.date);
+      this.$set(this, `lesson`, res);
     },
   },
 };