psycho 6 éve
szülő
commit
fed6136b58

BIN
TEAMModelOS.SmartClass/ClientApp/assets/image/lessonCover.png


+ 36 - 27
TEAMModelOS.SmartClass/ClientApp/static/observationList.json

@@ -2,120 +2,129 @@
   "list": [
     {
       "activityStatusTip": "已结束",
-      "categoryName": "历史",
+      "categoryName": "英语",
       "coverHash": "350.png",
-      "coverUri": "../assets/image/lessonCover.png",
-      "gradeName": "初一",
+      "coverUri": "../../assets/image/lessonCover.png",
+      "gradeName": "九年级",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
       "schoolName": "高新区教师发展中心",
-      "speaker": "钟源",
+      "speaker": "胡颖",
       "timeTip": "2018.12.14 10:00 - 12.14 10:47",
       "viewActivityId": 350,
-      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示",
+      "rowKey": 0
     },
     {
       "activityStatusTip": "已结束",
-      "categoryName": "数学",
+      "categoryName": "历史",
       "coverHash": "350.png",
-      "coverUri": "../assets/image/lessonCover2.png",
-      "gradeName": "六年级",
+      "coverUri": "../../assets/image/lessonCover2.png",
+      "gradeName": "初一",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
       "schoolName": "高新区教师发展中心",
-      "speaker": "杨悦婷",
+      "speaker": "钟源",
       "timeTip": "2018.12.14 10:00 - 12.14 10:47",
       "viewActivityId": 350,
-      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示",
+      "rowKey": 1
     },
     {
       "activityStatusTip": "已结束",
-      "categoryName": "英语",
+      "categoryName": "数学",
       "coverHash": "350.png",
-      "coverUri": "../assets/image/lessonCover3.png",
-      "gradeName": "年级",
+      "coverUri": "../../assets/image/lessonCover3.png",
+      "gradeName": "年级",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
       "schoolName": "高新区教师发展中心",
-      "speaker": "胡颖",
+      "speaker": "杨悦婷",
       "timeTip": "2018.12.14 10:00 - 12.14 10:47",
       "viewActivityId": 350,
-      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示",
+      "rowKey": 2
     },
     {
       "activityStatusTip": "已结束",
       "categoryName": "历史",
       "coverHash": "350.png",
-      "coverUri": "/upload/viewactivity/cover/350/350.png?_=1557818510234",
+      "coverUri": "../assets/image/lessonCover.png",
       "gradeName": "初一",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
       "schoolName": "高新区教师发展中心",
       "speaker": "钟源",
       "timeTip": "2018.12.14 10:00 - 12.14 10:47",
       "viewActivityId": 350,
-      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示",
+      "rowKey": 0
     },
     {
       "activityStatusTip": "已结束",
       "categoryName": "数学",
       "coverHash": "350.png",
-      "coverUri": "/upload/viewactivity/cover/350/350.png?_=1557818510234",
+      "coverUri": "../assets/image/lessonCover2.png",
       "gradeName": "六年级",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
       "schoolName": "高新区教师发展中心",
       "speaker": "杨悦婷",
       "timeTip": "2018.12.14 10:00 - 12.14 10:47",
       "viewActivityId": 350,
-      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示",
+      "rowKey": 1
     },
     {
       "activityStatusTip": "已结束",
       "categoryName": "英语",
       "coverHash": "350.png",
-      "coverUri": "/upload/viewactivity/cover/350/350.png?_=1557818510234",
+      "coverUri": "../assets/image/lessonCover3.png",
       "gradeName": "九年级",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
       "schoolName": "高新区教师发展中心",
       "speaker": "胡颖",
       "timeTip": "2018.12.14 10:00 - 12.14 10:47",
       "viewActivityId": 350,
-      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示",
+      "rowKey": 2
     },
     {
       "activityStatusTip": "已结束",
       "categoryName": "历史",
       "coverHash": "350.png",
-      "coverUri": "/upload/viewactivity/cover/350/350.png?_=1557818510234",
+      "coverUri": "../assets/image/lessonCover.png",
       "gradeName": "初一",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
       "schoolName": "高新区教师发展中心",
       "speaker": "钟源",
       "timeTip": "2018.12.14 10:00 - 12.14 10:47",
       "viewActivityId": 350,
-      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示",
+      "rowKey": 0
     },
     {
       "activityStatusTip": "已结束",
       "categoryName": "数学",
       "coverHash": "350.png",
-      "coverUri": "/upload/viewactivity/cover/350/350.png?_=1557818510234",
+      "coverUri": "../assets/image/lessonCover2.png",
       "gradeName": "六年级",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
       "schoolName": "高新区教师发展中心",
       "speaker": "杨悦婷",
       "timeTip": "2018.12.14 10:00 - 12.14 10:47",
       "viewActivityId": 350,
-      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示",
+      "rowKey": 1
     },
     {
       "activityStatusTip": "已结束",
       "categoryName": "英语",
       "coverHash": "350.png",
-      "coverUri": "/upload/viewactivity/cover/350/350.png?_=1557818510234",
+      "coverUri": "../assets/image/lessonCover3.png",
       "gradeName": "九年级",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
       "schoolName": "高新区教师发展中心",
       "speaker": "胡颖",
       "timeTip": "2018.12.14 10:00 - 12.14 10:47",
       "viewActivityId": 350,
-      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
+      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示",
+      "rowKey": 2
     }
   ]
 }

+ 9 - 7
TEAMModelOS.SmartClass/ClientApp/view/smart-class/CommentVideo.vue

@@ -6,7 +6,7 @@
     <div class="video-info">
       <div class="comment-video-src">
         <div>
-          <p style=" font-size: 14px; margin-bottom: 20px;"><span class="title-header">标题 : <span class="title-content">创新实验室(学科教室)课例20190508直播</span></span> <span class="title-header">主讲人 : 林燕<span class="title-content"></span></span> <span class="liveStatus">播放成功</span></p>
+          <p style=" font-size: 14px; margin-bottom: 20px;"><span class="title-header">标题 : <span class="title-content">{{lessonInfo.name}}</span></span> <span class="title-header">主讲人 : {{lessonInfo.speaker}}<span class="title-content"></span></span> <span class="liveStatus">播放成功</span></p>
         </div>
         <video-player class="video-player-box" style="width:800px;"
                       ref="videoPlayer"
@@ -77,18 +77,20 @@
           fluid: true, // 当true时,Video.js player将拥有流体大小。换句话说,它将按比例缩放以适应其容器。
           sources: [{
             type: 'application/x-mpegURL',
-            src: 'https://teammodelstorage.blob.core.chinacloudapi.cn/teammodelcontest/20190517/demo/2019.m3u8'
+            src: lessonDetails[sessionStorage.getItem('_lesson_rowKey')].data.liveHls
           }],
-          poster: "http://static.smartisanos.cn/pr/img/video/video_03_cc87ce5bdb.jpg", //你的封面地址
+          //poster: "http://static.smartisanos.cn/pr/img/video/video_03_cc87ce5bdb.jpg", //你的封面地址
           width: document.documentElement.clientWidth,
           notSupportedMessage: '此视频暂无法播放,请稍后再试' //允许覆盖Video.js无法播放媒体源时显示的默认信息。
         },
         routerData: {},
         rewardDatas: [],
         commmentList: [],
-        expertComments:[],
+        expertComments: [],
         newComment: "",
         player: {},
+        rowKey: sessionStorage.getItem('_lesson_rowKey'),
+        lessonInfo:lessonDetails[sessionStorage.getItem('_lesson_rowKey')].data
       }
     },
     methods: {
@@ -145,7 +147,7 @@
         let totalSecond = document.getElementsByClassName('vjs-tech')[0].duration;
       },
       playerReadied(player) {
-        player.currentTime(120);
+        //player.currentTime(120);
       },
       getPercent(num, total) {
         num = parseFloat(num);
@@ -165,8 +167,8 @@
     },
     mounted() {
       let that = this;
-      this.commmentList = lessonDetails.commentList;
-      this.expertComments = lessonDetails.expertComments;
+      this.commmentList = lessonDetails[this.rowKey].commentList;
+      this.expertComments = lessonDetails[this.rowKey].expertComments;
 
       let myChart = this.$echarts.init(document.getElementById('views'));
 

+ 11 - 9
TEAMModelOS.SmartClass/ClientApp/view/smart-class/LessonDetails.vue

@@ -26,7 +26,6 @@
             <div class="brief-info-left">
               <div class="items"><p class="item">活动时间:<span style="font-weight:bold;color:#000">{{activityInfo.timeRangeTip}}</span></p></div>
               <div class="items"><p class="item">授课平台:<span style="font-weight:bold;color:#000">{{activityInfo.parentTeachePlateName}}</span></p></div>
-              <div class="items"><p class="item">业务荣誉:<span style="font-weight:bold;color:#000">{{activityInfo.workHonor}}</span></p></div>
             </div>
 
           </div>
@@ -37,7 +36,7 @@
           <div class="title-tip">
             <p class="title">观课用户<span>VIEW CLASS USER</span></p>
             <div class="content">
-              <p style="margin:15px">专家:刘斌</p>
+              <!--<p style="margin:15px">专家:刘斌</p>-->
               <p style="margin:15px">成员:公开参与</p>
             </div>
           </div>
@@ -85,15 +84,18 @@
       return {
         reviewAcList: [],
         attachmentsList: [],
-        commentList:[],
+        commentList: [],
+        rowKey:0,
         activityInfo: {}
       }
     },
 
     created() {
-      this.attachmentsList = lessonInfo.attachments;
-      this.activityInfo = lessonInfo.data;
-      this.commentList = lessonInfo.commentList;
+      this.rowKey = sessionStorage.getItem('_lesson_rowKey');
+      this.attachmentsList = lessonInfo[this.rowKey].attachments;
+      this.activityInfo = lessonInfo[this.rowKey].data;
+      this.commentList = lessonInfo[this.rowKey].commentList;
+      console.log(lessonInfo[this.rowKey].data);
 
     },
     methods: {
@@ -107,8 +109,8 @@
     },
     mounted() {
       let myChart = this.$echarts.init(document.getElementById('views'));
-      let schoolList = lessonInfo.views.map(a => a.schoolName);
-      let viewsList = lessonInfo.views.map(a => a.viewCount);
+      let schoolList = lessonInfo[this.rowKey ].views.map(a => a.schoolName);
+      let viewsList = lessonInfo[this.rowKey ].views.map(a => a.viewCount);
 
       let option = {
         color: ['#ff8745'],
@@ -166,7 +168,7 @@
       myChart.setOption(option);
 
       let comments = this.$echarts.init(document.getElementById('comments'));
-      let commentList = lessonInfo.schoolComments.map(a => a.commentCount);
+      let commentList = lessonInfo[this.rowKey ].schoolComments.map(a => a.commentCount);
 
       let commentsOption = {
         color: ['#ff8745'],

+ 14 - 4
TEAMModelOS.SmartClass/ClientApp/view/smart-class/LessonList.vue

@@ -6,9 +6,9 @@
       <Button>搜索</Button>
     </div>-->
     <div class="activities">
-      <div class="activity" v-for="(item,index) in lessons" @click="handleLessonClick()">
+      <div class="activity" v-for="(item,index) in lessons" @click="handleLessonClick(item.rowKey)">
         <div>
-          <div class="img-box"><span class="state" style="background: rgb(130, 147, 166); visibility: visible;">{{item.activityStatusTip}}</span> <img src="../../assets/image/lessonCover2.png" alt=""></div>
+          <div class="img-box"><span class="state" style="background: rgb(130, 147, 166); visibility: visible;">{{item.activityStatusTip}}</span> <img :src="getThumb(item.rowKey)" alt=""></div>
           <div class="infos">
             <p></p>
               <p>名称:{{item.mainActivityName}}</p>
@@ -50,8 +50,18 @@
         this.typeName = name;
         this.getList(typeId);
       },
-
-      handleLessonClick() {
+      getThumb(type) {
+        let thumb = {
+          "0": require("../../assets/image/lessonCover.png"),
+          "1": require("../../assets/image/lessonCover2.png"),
+          "2": require("../../assets/image/lessonCover3.png"),
+         };
+         return thumb[type];
+        },
+
+
+      handleLessonClick(rowKey) {
+        sessionStorage.setItem('_lesson_rowKey', rowKey);
         this.$router.push('lessonDetails')
       },