瀏覽代碼

优课封面

psycho 6 年之前
父節點
當前提交
9f19a8b5fe

+ 60 - 389
TEAMModelOS.SmartClass/ClientApp/static/observationList.json

@@ -1,450 +1,121 @@
 {
-  "data": null,
-  "errorCode": null,
-  "html": null,
-  "key": null,
   "list": [
     {
-      "activityStatus": 2,
       "activityStatusTip": "已结束",
-      "categoryId": 18,
-      "categoryName": "化学",
-      "cover": "徐益敏.png",
+      "categoryName": "历史",
       "coverHash": "350.png",
-      "coverUri": "/upload/viewactivity/cover/350/350.png?_=1557818510234",
-      "endTime": {
-        "date": 14,
-        "day": 5,
-        "hours": 10,
-        "minutes": 47,
-        "month": 11,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1544755620000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "gradeId": 12,
-      "gradeName": "九年级",
-      "id": 176,
-      "mainActivityId": 27,
+      "coverUri": "../assets/image/lessonCover.png",
+      "gradeName": "初一",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
-      "school": null,
       "schoolName": "高新区教师发展中心",
-      "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
-      "speaker": "徐益敏",
-      "startTime": {
-        "date": 14,
-        "day": 5,
-        "hours": 10,
-        "minutes": 0,
-        "month": 11,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1544752800000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
+      "speaker": "钟源",
       "timeTip": "2018.12.14 10:00 - 12.14 10:47",
       "viewActivityId": 350,
       "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
     },
     {
-      "activityStatus": 2,
       "activityStatusTip": "已结束",
-      "categoryId": 9,
-      "categoryName": "语文",
-      "cover": "喻远鑫.png",
-      "coverHash": "351.png",
-      "coverUri": "/upload/viewactivity/cover/351/351.png?_=1557818510234",
-      "endTime": {
-        "date": 13,
-        "day": 4,
-        "hours": 9,
-        "minutes": 48,
-        "month": 11,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1544665680000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "gradeId": 12,
-      "gradeName": "九年级",
-      "id": 175,
-      "mainActivityId": 27,
+      "categoryName": "数学",
+      "coverHash": "350.png",
+      "coverUri": "../assets/image/lessonCover2.png",
+      "gradeName": "六年级",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
-      "school": null,
       "schoolName": "高新区教师发展中心",
-      "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
-      "speaker": "喻远鑫",
-      "startTime": {
-        "date": 13,
-        "day": 4,
-        "hours": 9,
-        "minutes": 0,
-        "month": 11,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1544662800000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "timeTip": "2018.12.13 09:00 - 12.13 09:48",
-      "viewActivityId": 351,
+      "speaker": "杨悦婷",
+      "timeTip": "2018.12.14 10:00 - 12.14 10:47",
+      "viewActivityId": 350,
       "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
     },
     {
-      "activityStatus": 2,
       "activityStatusTip": "已结束",
-      "categoryId": 1,
-      "categoryName": "语文",
-      "cover": "王淼燕.png",
-      "coverHash": "352.png",
-      "coverUri": "/upload/viewactivity/cover/352/352.png?_=1557818510234",
-      "endTime": {
-        "date": 14,
-        "day": 3,
-        "hours": 10,
-        "minutes": 0,
-        "month": 10,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1542160800000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "gradeId": 8,
-      "gradeName": "五年级",
-      "id": 174,
-      "mainActivityId": 27,
+      "categoryName": "英语",
+      "coverHash": "350.png",
+      "coverUri": "../assets/image/lessonCover3.png",
+      "gradeName": "九年级",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
-      "school": null,
       "schoolName": "高新区教师发展中心",
-      "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
-      "speaker": "王淼燕",
-      "startTime": {
-        "date": 14,
-        "day": 3,
-        "hours": 9,
-        "minutes": 15,
-        "month": 10,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1542158100000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "timeTip": "2018.11.14 09:15 - 11.14 10:00",
-      "viewActivityId": 352,
+      "speaker": "胡颖",
+      "timeTip": "2018.12.14 10:00 - 12.14 10:47",
+      "viewActivityId": 350,
       "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
     },
     {
-      "activityStatus": 2,
       "activityStatusTip": "已结束",
-      "categoryId": 2,
-      "categoryName": "数学",
-      "cover": "李甜.png",
-      "coverHash": "354.png",
-      "coverUri": "/upload/viewactivity/cover/354/354.png?_=1557818510234",
-      "endTime": {
-        "date": 14,
-        "day": 5,
-        "hours": 11,
-        "minutes": 0,
-        "month": 8,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1536894000000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "gradeId": 6,
-      "gradeName": "三年级",
-      "id": 173,
-      "mainActivityId": 27,
+      "categoryName": "历史",
+      "coverHash": "350.png",
+      "coverUri": "/upload/viewactivity/cover/350/350.png?_=1557818510234",
+      "gradeName": "初一",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
-      "school": null,
       "schoolName": "高新区教师发展中心",
-      "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
-      "speaker": "李甜",
-      "startTime": {
-        "date": 14,
-        "day": 5,
-        "hours": 10,
-        "minutes": 0,
-        "month": 8,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1536890400000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "timeTip": "2018.09.14 10:00 - 09.14 11:00",
-      "viewActivityId": 354,
+      "speaker": "钟源",
+      "timeTip": "2018.12.14 10:00 - 12.14 10:47",
+      "viewActivityId": 350,
       "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
     },
     {
-      "activityStatus": 2,
       "activityStatusTip": "已结束",
-      "categoryId": 1,
-      "categoryName": "语文",
-      "cover": "赵霞.png",
-      "coverHash": "355.png",
-      "coverUri": "/upload/viewactivity/cover/355/355.png?_=1557818510234",
-      "endTime": {
-        "date": 8,
-        "day": 5,
-        "hours": 10,
-        "minutes": 0,
-        "month": 5,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1528423200000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "gradeId": 5,
-      "gradeName": "二年级",
-      "id": 172,
-      "mainActivityId": 27,
+      "categoryName": "数学",
+      "coverHash": "350.png",
+      "coverUri": "/upload/viewactivity/cover/350/350.png?_=1557818510234",
+      "gradeName": "六年级",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
-      "school": null,
       "schoolName": "高新区教师发展中心",
-      "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
-      "speaker": "赵霞",
-      "startTime": {
-        "date": 8,
-        "day": 5,
-        "hours": 9,
-        "minutes": 0,
-        "month": 5,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1528419600000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "timeTip": "2018.06.08 09:00 - 06.08 10:00",
-      "viewActivityId": 355,
+      "speaker": "杨悦婷",
+      "timeTip": "2018.12.14 10:00 - 12.14 10:47",
+      "viewActivityId": 350,
       "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
     },
     {
-      "activityStatus": 2,
       "activityStatusTip": "已结束",
-      "categoryId": 2,
-      "categoryName": "数学",
-      "cover": "钱亚丽.png",
-      "coverHash": "356.png",
-      "coverUri": "/upload/viewactivity/cover/356/356.png?_=1557818510234",
-      "endTime": {
-        "date": 8,
-        "day": 2,
-        "hours": 10,
-        "minutes": 49,
-        "month": 4,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1525747740000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "gradeId": 4,
-      "gradeName": "一年级",
-      "id": 171,
-      "mainActivityId": 27,
+      "categoryName": "英语",
+      "coverHash": "350.png",
+      "coverUri": "/upload/viewactivity/cover/350/350.png?_=1557818510234",
+      "gradeName": "九年级",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
-      "school": null,
       "schoolName": "高新区教师发展中心",
-      "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
-      "speaker": "钱亚丽",
-      "startTime": {
-        "date": 8,
-        "day": 2,
-        "hours": 10,
-        "minutes": 0,
-        "month": 4,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1525744800000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "timeTip": "2018.05.08 10:00 - 05.08 10:49",
-      "viewActivityId": 356,
+      "speaker": "胡颖",
+      "timeTip": "2018.12.14 10:00 - 12.14 10:47",
+      "viewActivityId": 350,
       "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
     },
     {
-      "activityStatus": 2,
       "activityStatusTip": "已结束",
-      "categoryId": 7,
-      "categoryName": "数学",
-      "cover": "余旭红.png",
-      "coverHash": "349.png",
-      "coverUri": "/upload/viewactivity/cover/349/349.png?_=1557818510234",
-      "endTime": {
-        "date": 3,
-        "day": 4,
-        "hours": 10,
-        "minutes": 46,
-        "month": 4,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1525315560000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "gradeId": 12,
-      "gradeName": "九年级",
-      "id": 166,
-      "mainActivityId": 27,
+      "categoryName": "历史",
+      "coverHash": "350.png",
+      "coverUri": "/upload/viewactivity/cover/350/350.png?_=1557818510234",
+      "gradeName": "初一",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
-      "school": null,
       "schoolName": "高新区教师发展中心",
-      "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
-      "speaker": "余旭红",
-      "startTime": {
-        "date": 3,
-        "day": 4,
-        "hours": 10,
-        "minutes": 0,
-        "month": 4,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1525312800000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "timeTip": "2018.05.03 10:00 - 05.03 10:46",
-      "viewActivityId": 349,
+      "speaker": "钟源",
+      "timeTip": "2018.12.14 10:00 - 12.14 10:47",
+      "viewActivityId": 350,
       "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
     },
     {
-      "activityStatus": 2,
       "activityStatusTip": "已结束",
-      "categoryId": 2,
       "categoryName": "数学",
-      "cover": "潘旖.png",
-      "coverHash": "357.png",
-      "coverUri": "/upload/viewactivity/cover/357/357.png?_=1557818510234",
-      "endTime": {
-        "date": 9,
-        "day": 1,
-        "hours": 9,
-        "minutes": 50,
-        "month": 3,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1523238600000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "gradeId": 8,
-      "gradeName": "五年级",
-      "id": 170,
-      "mainActivityId": 27,
+      "coverHash": "350.png",
+      "coverUri": "/upload/viewactivity/cover/350/350.png?_=1557818510234",
+      "gradeName": "六年级",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
-      "school": null,
       "schoolName": "高新区教师发展中心",
-      "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
-      "speaker": "潘旖",
-      "startTime": {
-        "date": 9,
-        "day": 1,
-        "hours": 9,
-        "minutes": 0,
-        "month": 3,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1523235600000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "timeTip": "2018.04.09 09:00 - 04.09 09:50",
-      "viewActivityId": 357,
+      "speaker": "杨悦婷",
+      "timeTip": "2018.12.14 10:00 - 12.14 10:47",
+      "viewActivityId": 350,
       "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
     },
     {
-      "activityStatus": 2,
       "activityStatusTip": "已结束",
-      "categoryId": 10,
-      "categoryName": "科学",
-      "cover": "王珂慧.png",
-      "coverHash": "358.png",
-      "coverUri": "/upload/viewactivity/cover/358/358.png?_=1557818510234",
-      "endTime": {
-        "date": 23,
-        "day": 5,
-        "hours": 10,
-        "minutes": 40,
-        "month": 2,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1521772800000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "gradeId": 11,
-      "gradeName": "八年级",
-      "id": 169,
-      "mainActivityId": 27,
+      "categoryName": "英语",
+      "coverHash": "350.png",
+      "coverUri": "/upload/viewactivity/cover/350/350.png?_=1557818510234",
+      "gradeName": "九年级",
       "mainActivityName": "2018年高新区智慧课堂十佳优质课展示",
-      "school": null,
       "schoolName": "高新区教师发展中心",
-      "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
-      "speaker": "王珂慧",
-      "startTime": {
-        "date": 23,
-        "day": 5,
-        "hours": 10,
-        "minutes": 0,
-        "month": 2,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1521770400000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "timeTip": "2018.03.23 10:00 - 03.23 10:40",
-      "viewActivityId": 358,
+      "speaker": "胡颖",
+      "timeTip": "2018.12.14 10:00 - 12.14 10:47",
+      "viewActivityId": 350,
       "viewActivityName": "2018年高新区智慧课堂十佳优质课展示"
     }
-  ],
-  "message": null,
-  "query": {
-    "fields": [],
-    "orders": [
-      {
-        "asc": false,
-        "property": "-1"
-      },
-      {
-        "asc": true,
-        "property": "parentViewActivity.activityStatus"
-      },
-      {
-        "asc": false,
-        "property": "parentViewActivity.startTime"
-      }
-    ],
-    "pageCount": 2,
-    "pageIndex": 1,
-    "pageSize": 9,
-    "recordCount": 10,
-    "recordEnd": 9,
-    "recordStart": 1
-  },
-  "success": true,
-  "systemTime": {
-    "date": 14,
-    "day": 2,
-    "hours": 15,
-    "minutes": 21,
-    "month": 4,
-    "seconds": 50,
-    "time": 1557818510202,
-    "timezoneOffset": -480,
-    "year": 119
-  },
-  "uri": null
+  ]
 }

+ 1 - 48
TEAMModelOS.SmartClass/ClientApp/view/smart-class/CommentVideo.vue

@@ -4,7 +4,6 @@
       <h3 class="video-title-h3">12月03日直播</h3>
     </div>-->
     <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>
@@ -23,9 +22,7 @@
           <!--<Icon type="md-pulse" size="26" color="rgb(102, 205, 170)" style="margin:10px"/>-->
           专家点评分析图
         </div>
-
       </div>
-
       <div class="comment-video-detail-info">
         <Tabs value="name1">
           <TabPane label="观课评论" name="name1">
@@ -63,9 +60,7 @@
   </div>
 </template>
 <script>
-  import rewardList from '@/static/rewardList.json'
   import lessonDetails from '@/static/lessonDetails.json'
-  import CList from '@/static/commentList.json'
   import "videojs-contrib-hls.js/src/videojs.hlsjs"
   export default {
     data() {
@@ -97,17 +92,6 @@
       }
     },
     methods: {
-      showVideo(index) {
-        //alert(index);
-        this.$router.push(
-          {
-            name: 'video',
-            query: {
-              rewardIndex: index
-            }
-          }
-        );
-      },
       //时间转成秒数
       transferTime(time) {
         var s = '';
@@ -116,6 +100,7 @@
         s = Number(min * 60) + Number(sec);
         return s;
       },
+      //添加评论
       addComment() {
         let newComment = {
           employeeName: "admin",
@@ -173,7 +158,6 @@
       transferArr(arr) {
         let newArr = [];
         for (let i in arr) {
-          console.log(arr[i]);
           newArr.push([arr[i].per, arr[i].value, arr[i].contentList]);
         }
         return newArr;
@@ -181,34 +165,18 @@
     },
     mounted() {
       let that = this;
-      let index = this.$route.query.rewardIndex;
       this.commmentList = lessonDetails.commentList;
       this.expertComments = lessonDetails.expertComments;
-      this.rewardDatas = rewardList.data.list;
-      if (index == undefined) {
-        this.routerData = this.rewardDatas[0];
-      } else {
-        this.routerData = this.rewardDatas[index];
-      }
 
       let myChart = this.$echarts.init(document.getElementById('views'));
 
       let option = {
-
-        toolbox: {
-          show: true,
-          feature: {
-            //dataView : {show: true, readOnly: false},
-            //magicType : {show: true, type: ['line', 'bar']},
-          }
-        },
         calculable: true,
         xAxis: [
           {
             type: 'value',
             name: "视频进度",
             boundaryGap: false,
-            //data: ['0', '10', '20', '30', '40', '50', '60', '70', '80', '90', '100'],
             axisLabel: {
               formatter: '{value}%'
             }
@@ -233,7 +201,6 @@
             type: 'line',
             smooth: true,
             data: that.transferArr(that.expertComments),
-            //data: [[5,1],[15,2],[25,1],[35,0],[45,1],[55,0],[65,1],[73,2],[85,1]],
             itemStyle: {
               normal: {
                 color: '#66CDAA', //改变折线点的颜色
@@ -268,22 +235,8 @@
       myChart.on('click', function (params) {
         let totalSecond = document.getElementsByClassName('vjs-tech')[0].duration;
         that.$refs.videoPlayer.player.currentTime(totalSecond * parseInt(params.value[0]) * 0.01);
-
       });
-
     },
-
-    watch: {
-      $route() {
-        let index = this.$route.query.rewardIndex;
-        //alert(index);
-        if (index == undefined) {
-          this.routerData = this.rewardDatas[0];
-        } else {
-          this.routerData = this.rewardDatas[index];
-        }
-      }
-    }
   }
 </script>
 <style>

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

@@ -8,7 +8,7 @@
     <div class="activities">
       <div class="activity" v-for="(item,index) in lessons" @click="handleLessonClick()">
         <div>
-          <div class="img-box"><span class="state" style="background: rgb(130, 147, 166); visibility: visible;">{{item.activityStatusTip}}</span> <img src="../../assets/image/cover.png" alt=""></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="infos">
             <p></p>
               <p>名称:{{item.mainActivityName}}</p>