Selaa lähdekoodia

视频点播评论分析

psycho 6 vuotta sitten
vanhempi
commit
155a2fbd87

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


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


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 13 - 2406
TEAMModelOS.SmartClass/ClientApp/static/commentList.json


+ 104 - 163
TEAMModelOS.SmartClass/ClientApp/static/lessonDetails.json

@@ -1,76 +1,31 @@
 {
   "data": {
-    "activityStatus": 2,
     "activityStatusTip": "已结束",
-    "autoChangeViewActivityStatus": true,
     "commentCount": 52,
-    "cover": "1胡建良.png",
-    "coverHash": "127.png",
     "coverUri": "../assets/image/lessonCover.png",
     "description": "<br>",
-    "dianZanCount": 0,
     "employeeName": "吴雁",
-    "employeeNo": "41489",
-    "endTime": {
-      "date": 18,
-      "day": 5,
-      "hours": 16,
-      "minutes": 5,
-      "month": 4,
-      "nanos": 0,
-      "seconds": 0,
-      "time": 1526630700000,
-      "timezoneOffset": -480,
-      "year": 118
-    },
-    "id": 127,
-    "joinWay": 0,
     "liveHls": "http://jpkt.sxedu.org:6080/hls/13CA5E3AD6DB4DF5865839BB47C134F8.m3u8",
     "liveRtmp": "rtmp://jpkt.sxedu.org:1935/hls/13CA5E3AD6DB4DF5865839BB47C134F8",
     "name": "创新实验室(学科教室)课例20180518直播",
     "notice": "<br>",
     "ownUnit": "高新区教师发展中心",
-    "parentCategoryId": 24,
     "parentCategoryName": "创客",
-    "parentGradeId": 13,
     "parentGradeName": "初一",
-    "parentGradeSectionId": 3,
     "parentGradeSectionName": "初中",
-    "parentProjectId": 103,
     "parentProjectName": "简易冠啸机器人搭建",
-    "parentTeachePlateId": 19,
     "parentTeachePlateName": "冠啸创新实验室",
-    "reviewContent": "本次直播总点击量: 68 评论数: 44 今日直播只推PC端,采用移动录播设备直播,直播视频推送画面清晰,播放过程流畅无锯齿拖影,声音干净。上课学校设备保障充分,教师教学过程实施完整。直播过程网络通畅,没有出现画面中断停顿现象。",
-    "school": null,
     "schoolName": "成都市高新区益民学校",
-    "schoolNo": "11AFC704D0A5FE66E050A8C027277C89",
     "score": 87.67,
     "speaker": "胡建良",
-    "startTime": {
-      "date": 18,
-      "day": 5,
-      "hours": 15,
-      "minutes": 20,
-      "month": 4,
-      "nanos": 0,
-      "seconds": 0,
-      "time": 1526628000000,
-      "timezoneOffset": -480,
-      "year": 118
-    },
     "timeRangeTip": "2018.05.18 15:20 - 05.18 16:05",
     "timeRangeTipHHmm": "15:20 - 16:05",
-    "videoHls": null,
-    "videoRtmp": null,
     "viewActivityAwardSetList": [],
     "viewCount": 97,
     "viewType": 0,
-    "viwActivityType": 1,
-    "viwActivityTypeTip": "创新实验室",
-    "workHonor": null,
-    "yearNo": 2018
+    "viwActivityTypeTip": "创新实验室"
   },
-  "comments": [
+  "schoolComments": [
     {
       "commentCount": 30,
       "school": "成都高新区西芯小学",
@@ -297,124 +252,110 @@
   ],
   "commentList": [
     {
-      "employeeName": "刘彬",
-      "employeeNo": "a1e4165d47704fd0b19416a91375b8fd",
-      "employeeSchool": "成都高新区东华育才学校",
-      "employeeSchoolName": "成都高新区东华育才学校",
-      "employeeSchoolNo": "126d15f2d1474cf4b4774ca083d45cf9",
-      "id": 224,
-      "parentCategoryId": 9,
-      "parentCategoryName": "语文",
-      "reviewContent": "喻老师执教的本节课师生互动很成功,整节课,学生始终处于一种探求氛围之中,阅读课文、分析人物形象、探讨、提问、回答问题、纠正错误等处理得很棒。科技的运用到达了实质性利用的层次,不再是为用多媒体而用多媒体,而是作为课堂教学的一个必要补充,尤其是科技聚焦核心知识,生成反馈有效促进了对文本的解读。",
-      "reviewTime": {
-        "date": 15,
-        "day": 2,
-        "hours": 13,
-        "minutes": 18,
-        "month": 0,
-        "nanos": 0,
-        "seconds": 47,
-        "time": 1547529527000,
-        "timezoneOffset": -480,
-        "year": 119
-      },
-      "school": null,
-      "schoolName": "高新区教师发展中心",
-      "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
-      "score": null,
-      "viewActivityActivityStatus": 2,
-      "viewActivityActivityStatusTip": "已结束",
-      "viewActivityCover": "喻远鑫.png",
-      "viewActivityCoverHash": "351.png",
-      "viewActivityCoverUri": "/upload/viewactivity/cover/351/351.png?_=1557820590437",
-      "viewActivityEndTime": {
-        "date": 13,
-        "day": 4,
-        "hours": 9,
-        "minutes": 48,
-        "month": 11,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1544665680000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "viewActivityId": 351,
-      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示",
-      "viewActivitySpeaker": "喻远鑫",
-      "viewActivityStartTime": {
-        "date": 13,
-        "day": 4,
-        "hours": 9,
-        "minutes": 0,
-        "month": 11,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1544662800000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "viewActivityTimeRangeTip": "2018.12.13 09:00 - 12.13 09:48"
+      "activityCommentId": 0,
+      "content": "老师教学技术运用合理,实验过程中用录像的形式,学生能观察到实验成果,值得推广",
+      "createTimeTempTip": "2019年05月08日13:35",
+      "createTimeTip": "2019.05.08 13:35",
+      "employeeName": "伍旺胜",
+      "viewActivityName": "2019050802直播",
+      "viewActivityTimeTip": "2019.05.08 13:30 - 05.08 14:10"
     },
     {
-      "employeeName": "张立新",
-      "employeeNo": "551c927cf05d4b9cb9244b5b741d2774",
-      "employeeSchool": "kqedu2018",
-      "employeeSchoolName": "kqedu2018",
-      "employeeSchoolNo": "9cfc6f6b2eb643aba8b86d6c04efe843",
-      "id": 225,
-      "parentCategoryId": 9,
-      "parentCategoryName": "语文",
-      "reviewContent": "本节课中,教师通过一系列 问题引导学生深度解读课文文本,分析人物特征和心理,基本达到了教学目标。建议:1.提高问题的有效性;2.发挥学生PAD支持自主学习的作用。",
-      "reviewTime": {
-        "date": 20,
-        "day": 0,
-        "hours": 19,
-        "minutes": 45,
-        "month": 0,
-        "nanos": 0,
-        "seconds": 48,
-        "time": 1547984748000,
-        "timezoneOffset": -480,
-        "year": 119
-      },
-      "school": null,
-      "schoolName": "高新区教师发展中心",
-      "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
-      "score": null,
-      "viewActivityActivityStatus": 2,
-      "viewActivityActivityStatusTip": "已结束",
-      "viewActivityCover": "喻远鑫.png",
-      "viewActivityCoverHash": "351.png",
-      "viewActivityCoverUri": "/upload/viewactivity/cover/351/351.png?_=1557820590437",
-      "viewActivityEndTime": {
-        "date": 13,
-        "day": 4,
-        "hours": 9,
-        "minutes": 48,
-        "month": 11,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1544665680000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "viewActivityId": 351,
-      "viewActivityName": "2018年高新区智慧课堂十佳优质课展示",
-      "viewActivitySpeaker": "喻远鑫",
-      "viewActivityStartTime": {
-        "date": 13,
-        "day": 4,
-        "hours": 9,
-        "minutes": 0,
-        "month": 11,
-        "nanos": 0,
-        "seconds": 0,
-        "time": 1544662800000,
-        "timezoneOffset": -480,
-        "year": 118
-      },
-      "viewActivityTimeRangeTip": "2018.12.13 09:00 - 12.13 09:48"
+      "activityCommentId": 0,
+      "content": "教态轻松老练。用亲切自然的语言带领孩子们走进了反比例函数的抽象概念。循循善诱的教学方式很适合与孩子们一起交流。值得我们同行借鉴学习。",
+      "createTimeTempTip": "2019年05月08日13:35",
+      "createTimeTip": "2019.05.08 13:35",
+      "employeeName": "王天月",
+      "viewActivityName": "2019050802直播",
+      "viewActivityTimeTip": "2019.05.08 13:30 - 05.08 14:10"
+    },
+    {
+      "activityCommentId": 0,
+      "content": "开课娓娓导入,给学生以平静而实在感。注重方法指导,给学生以方向感。能因材施教,充分调动学生积极性,师生互动,学生参与度高",
+      "createTimeTempTip": "2019年05月08日13:35",
+      "createTimeTip": "2019.05.08 13:35",
+      "employeeName": "叶萍 ",
+      "viewActivityName": "2019050802直播",
+      "viewActivityTimeTip": "2019.05.08 13:30 - 05.08 14:10"
+    },
+    {
+      "activityCommentId": 0,
+      "content": "教师能合理组织学生自主学习、合作探究,对学生的即时评价具有发展性和激励性。在课堂上教师不仅解放学生的耳,还解放学生的脑、口、手。倡导学生主动参与、乐于探究、勤于动手的学习方式。",
+      "createTimeTempTip": "2019年05月08日13:35",
+      "createTimeTip": "2019.05.08 13:35",
+      "employeeName": "孙小峰 ",
+      "viewActivityName": "2019050802直播",
+      "viewActivityTimeTip": "2019.05.08 13:30 - 05.08 14:10"
+    }
+  ],
+  "expertComments": [
+    {
+      "per": 10,
+      "time": "00:04:33",
+      "value": 1,
+      "contentList": [
+        {
+          "name": "陈海霞",
+          "content": "学习了"
+        }
+      ]
+    },
+    {
+      "per": 22,
+      "time": "00:09:54",
+      "value": 2,
+      "contentList": [
+        {
+          "name": "陈海霞",
+          "content": "讲的很不错啊"
+        },
+        {
+          "name": "蒋小娟",
+          "content": "林老师讲的很棒"
+        }
+      ]
+    },
+    {
+      "per": 30,
+      "time": "00:13:33",
+      "value": 2,
+      "contentList": [
+        {
+          "name": "陈海霞",
+          "content": "循循善诱的教学方式很适合与孩子们一起交流"
+        },
+        {
+          "name": "蒋小娟",
+          "content": "教态轻松老练,用亲切自然的语言带领孩子们走进了反比例函数的抽象概念"
+        }
+      ]
+    },
+    {
+      "per": 45,
+      "time": "00:20:33",
+      "value": 1,
+      "contentList": [
+        {
+          "name": "陈海霞",
+          "content": "循循善诱的教学方式很适合与孩子们一起交流"
+        }
+      ]
+    },
+    {
+      "per": 90,
+      "time": "00:40:33",
+      "value": 3,
+      "contentList": [
+        {
+          "name": "陈海霞",
+          "content": "讲的很不错啊"
+        },
+        {
+          "name": "陈海",
+          "content": "讲的很不错"
+        }
+      ]
     }
+
   ]
 }

+ 1 - 1
TEAMModelOS.SmartClass/ClientApp/view/app.vue

@@ -32,7 +32,7 @@
 </script>
 <style scoped>
   html, body, #app {
-    height: 100% !important;
+    /*height: 100% !important;*/
     user-select: none;
     background:rgb(241,242,243);
   }

+ 242 - 78
TEAMModelOS.SmartClass/ClientApp/view/smart-class/CommentVideo.vue

@@ -12,9 +12,18 @@
         <video-player class="video-player-box" style="width:800px;"
                       ref="videoPlayer"
                       :options="playerOptions"
-                      :playsinline="true">
+                      :playsinline="true"
+                      @playing="onPlayerPlaying($event)"
+                      @ready="playerReadied">
         </video-player>
-        <p class="average-score">作品当前平均分 : <span>未评</span></p>
+        <!--<p class="average-score">作品当前平均分 : <span>未评</span></p>-->
+
+        <div id="views" style="width:840px; height:350px;"></div>
+        <div style="background:#fff;text-align:center;display:block;font-size:18px;font-weight:bolder;width:840px; color:#333">
+          <!--<Icon type="md-pulse" size="26" color="rgb(102, 205, 170)" style="margin:10px"/>-->
+          专家点评分析图
+        </div>
+
       </div>
 
       <div class="comment-video-detail-info">
@@ -27,27 +36,37 @@
                 </span> <span class="reviewlist-content"><span>{{item.content}}</span> <span class="reviewlist-time">({{item.createTimeTip}})</span> <!----></span>
               </div>
             </div>
-            <div style="position: relative; padding-top: 20px;"><div class="lastest-comment" style="display: none;">查看最新评论</div> <textarea placeholder="发表您的评论" maxlength="250" class="publish-review"></textarea> <span class="submit-review">提交</span></div>
+            <div style="position: relative; padding-top:40px;">
+              <div class="lastest-comment" style="display: none;">查看最新评论</div>
+              <textarea placeholder="发表您的评论" v-model="newComment" maxlength="250" class="publish-review"></textarea>
+              <span class="submit-review" @click="addComment">提交</span>
+            </div>
+          </TabPane>
+          <TabPane label="专家点评" name="name2">
+            <div class="review-pane">
+              <div v-for="(item,index) in expertComments">
+                <div class="review-list" v-for="(comment,index) in item.contentList"  :key="index">
+                  <span class="reviewlist-title">
+                    {{comment.name}} :&nbsp;
+                  </span>
+                  <span class="reviewlist-content">
+                    <span>{{comment.content}}</span>
+                    <span class="reviewlist-time">({{item.time}})</span>
+                  </span>
+                </div>
+              </div>
+            </div>
           </TabPane>
-          <TabPane label="专家点评" name="name2">专家点评</TabPane>
         </Tabs>
       </div>
     </div>
-    <div class="video-other" style="display:none;">
-      <h3 class="video-title-h3">推荐作品</h3>
-    </div>
-    <div class="videos-wrap" style="display:none;">
-      <div class="video-item" v-for="(item , index) in videos" @click="showVideo(index)">
-        <img src="../../assets/image/default-act.png" width="95%" />
-        <p>{{item.title}}</p>
-      </div>
-    </div>
   </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"
+  import "videojs-contrib-hls.js/src/videojs.hlsjs"
   export default {
     data() {
       return {
@@ -71,33 +90,10 @@
         },
         routerData: {},
         rewardDatas: [],
-        commmentList:[],
-        videos: [
-          {
-            title:'12月14日直播'
-          },
-          {
-            title:'12月14日直播'
-          },
-          {
-            title:'12月14日直播'
-          },
-          {
-            title:'12月14日直播'
-          },
-          {
-            title:'12月14日直播'
-          },
-          {
-            title:'12月14日直播'
-          },
-          {
-            title:'12月14日直播'
-          },
-          {
-            title:'12月14日直播'
-          }
-        ]
+        commmentList: [],
+        expertComments:[],
+        newComment: "",
+        player: {},
       }
     },
     methods: {
@@ -111,21 +107,172 @@
             }
           }
         );
+      },
+      //时间转成秒数
+      transferTime(time) {
+        var s = '';
+        var min = time.split(':')[0];
+        var sec = time.split(':')[1];
+        s = Number(min * 60) + Number(sec);
+        return s;
+      },
+      addComment() {
+        let newComment = {
+          employeeName: "admin",
+          content: this.newComment,
+          createTimeTip: new Date().toLocaleDateString() + ' ' + new Date().toLocaleTimeString()
+        }
+        if (newComment.content) {
+          this.commmentList.unshift(newComment);
+        } else {
+          this.$Message.warning("评论内容不能为空!");
+        }
+        this.newComment = "";
+      },
+      //秒数转成时间格式
+      transferSecond(s) {
+        var t;
+        if (s > -1) {
+          var hour = Math.floor(s / 3600);
+          var min = Math.floor(s / 60) % 60;
+          var sec = s % 60;
+          if (hour < 10) {
+            t = '0' + hour + ":";
+          } else {
+            t = hour + ":";
+          }
+
+          if (min < 10) { t += "0"; }
+          t += min + ":";
+          if (sec < 10) { t += "0"; }
+          t += sec.toFixed(0);
+        }
+        return t;
+      },
+      onPlayerPlay(player) {
+        console.log('player play!', player)
+      },
+      onPlayerPause(player) {
+        console.log('player pause!', player)
+      },
+      onPlayerPlaying(player) {
+        let current = this.transferTime(player.controlBar.currentTimeDisplay.formattedTime_);
+        let totalSecond = document.getElementsByClassName('vjs-tech')[0].duration;
+      },
+      playerReadied(player) {
+        player.currentTime(120);
+      },
+      getPercent(num, total) {
+        num = parseFloat(num);
+        total = parseFloat(total);
+        if (isNaN(num) || isNaN(total)) {
+          return "-";
+        }
+        return total <= 0 ? "0%" : (Math.round(num / total * 10000) / 100.00) + "%";
+      },
+      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;
       }
     },
     mounted() {
+      let that = this;
       let index = this.$route.query.rewardIndex;
-      //alert(index);
-      this.commmentList = CList.list;
+      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}%'
+            }
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value',
+            name: "专家点评数",
+            nameGap: 30,
+            minInterval:1,
+            axisLabel: {
+            },
+            splitLine: {    // gird 区域中的分割线
+              show: false,   // 是否显示
+            },
+          }
+        ],
+        series: [
+          {
+            name: '评论数',
+            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', //改变折线点的颜色
+                borderWidth: 5
+              }
+            },
+            lineStyle: {
+              color: '#66CDAA', //改变折线颜色
+              width: 3,
+            },
+
+          }
+        ],
+        tooltip: {
+          formatter: function (point) {
+            let totalSecond = document.getElementsByClassName('vjs-tech')[0].duration;
+            let time = "点评时间 : " + that.transferSecond(point.value[0] * totalSecond * 0.01) + '</br>';
+            let list = point.value[2];
+            let str = "评论内容:</br>"
+            let content = "";
+            for (let i in list) {
+               content = content + list[i].name + ' : ' + list[i].content + '</br>';
+            }
+            return time + content
+             
+          }
+        }
+      };
+
+      myChart.setOption(option);
+
+      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;
@@ -143,7 +290,6 @@
   .video-page {
     width: 1200px;
     margin: 100px auto;
-    font-family:none;
   }
 
   .video-title {
@@ -151,50 +297,56 @@
     height: 20px;
   }
 
-    .video-title-h3 {
-      height: 20px;
-      font-size: 20px;
-      line-height: 20px;
-      border-left: 6px solid #37b1fa;
-      padding-left: 12px;
-    }
+  .video-title-h3 {
+    height: 20px;
+    font-size: 20px;
+    line-height: 20px;
+    border-left: 6px solid #37b1fa;
+    padding-left: 12px;
+  }
 
   .video-info {
     width: 100%;
     display: table;
   }
+
   .comment-video-detail-info {
-    width:400px;
-    background:#ffffff;
-    display:table-cell;
-    vertical-align:top;
-    padding:20px 10px 20px 30px;
-    position:relative;
-    border-left: 15px solid rgb(252,252,252);
+    width: 400px;
+    background: #ffffff;
+    display: table-cell;
+    vertical-align: top;
+    padding: 20px 10px 20px 30px;
+    position: relative;
+    border-left: 15px solid rgb(241,242,243);
   }
+
     .comment-video-detail-info .ivu-form-item {
-      margin-bottom:8px;
+      margin-bottom: 8px;
     }
+
     .comment-video-detail-info .ivu-form .ivu-form-item-label {
-      font-size:14px;
-      color:#999999;
+      font-size: 14px;
+      color: #999999;
     }
+
     .comment-video-detail-info .ivu-form-item-content {
       font-size: 14px;
       color: #ffffff;
     }
+
   .comment-video-src {
-    display:table-cell;
-    width:780px;
-    box-sizing:border-box;
-    padding:20px 20px;
-    background:#FFFFFF;
+    display: table-cell;
+    width: 780px;
+    box-sizing: border-box;
+    padding: 20px 20px;
+    background: #FFFFFF;
   }
+
     .comment-video-src .video-js .vjs-big-play-button {
       top: 50%;
       left: 50%;
       margin-left: -40px;
-      margin-top:-20px;
+      margin-top: -20px;
     }
 
   .download-video {
@@ -204,18 +356,21 @@
     bottom: 20px;
     left: 0;
   }
+
   .video-other {
-    margin-top:20px;
+    margin-top: 20px;
   }
+
   .videos-wrap {
-    margin:0px -10px 0px -10px;
+    margin: 0px -10px 0px -10px;
   }
+
   .video-item {
     width: 25%;
     display: inline-block;
     padding: 0px 10px;
-    margin-top:20px;
-    cursor:pointer;
+    margin-top: 20px;
+    cursor: pointer;
   }
 
     .video-item p {
@@ -225,22 +380,25 @@
       text-decoration: none;
       text-indent: 8px;
     }
+
   .title-header {
     color: #666;
     margin-right: 30px;
     display: inline-block;
   }
+
   .liveStatus {
     color: #33aafe;
     float: right;
   }
 
   .review-pane {
-    height: 300px;
+    height: 700px;
     background-color: #fff;
     overflow-y: auto;
     position: relative;
   }
+
   .review-list {
     overflow: hidden;
     font-size: 14px;
@@ -251,7 +409,7 @@
 
   .reviewlist-title {
     float: left;
-    width: 22%;
+    /*width: 22%;*/
     color: #999;
     text-align: right;
     padding-right: 5px;
@@ -260,7 +418,7 @@
   .reviewlist-content {
     float: left;
     color: #444;
-    width: 76%;
+    /*width: 76%;*/
     font-size: 14px;
     word-break: break-all;
   }
@@ -308,13 +466,19 @@
     font-size: 12px;
     color: #ccc;
   }
+
   .average-score {
     margin-top: 20px;
     color: #666;
     font-size: 14px;
   }
 
-  .average-score span {
-    color: #fd8f45;
+    .average-score span {
+      color: #fd8f45;
+    }
+
+  #views {
+    background: #fff;
+    padding-top: 30px;
   }
 </style>

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

@@ -68,7 +68,7 @@
               <span>REVIEW</span>
             </p>
             <div class="content">
-              <p class="comment-item" v-for="item in commentList" ><span style="color:#666">{{item.employeeName}}</span> : {{item.reviewContent}}</p>
+              <p class="comment-item" v-for="item in commentList"><span style="color:#666">{{item.employeeName}}</span> : {{item.content}}</p>
             </div>
           </div>
         </div>
@@ -166,7 +166,7 @@
       myChart.setOption(option);
 
       let comments = this.$echarts.init(document.getElementById('comments'));
-      let commentList = lessonInfo.comments.map(a => a.commentCount);
+      let commentList = lessonInfo.schoolComments.map(a => a.commentCount);
 
       let commentsOption = {
         color: ['#ff8745'],

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

@@ -1,10 +1,10 @@
 <template>
   <div class="container">
 
-    <div class="search">
+    <!--<div class="search">
       <DatePicker type="daterange" placement="bottom-end" placeholder="选择起止时间" style="width: 200px"></DatePicker>
       <Button>搜索</Button>
-    </div>
+    </div>-->
     <div class="activities">
       <div class="activity" v-for="(item,index) in lessons" @click="handleLessonClick()">
         <div>

+ 3 - 2
TEAMModelOS.SmartClass/ClientApp/view/smart-class/Lessons.vue

@@ -2,7 +2,7 @@
   <div class="container">
 
     <div class="search">
-      <Input v-model="value" placeholder="请输入优课主题 (如:小学语文)" style="width: 200px" />
+      <Input v-model="values" placeholder="请输入优课主题 (如:小学语文)" style="width: 200px" />
       <Button>搜索</Button>
     </div>
     <div class="activity-item" v-for="(item,index) in lessons" :key="index">
@@ -35,7 +35,8 @@
     },
     data() {
       return {
-        lessons: []
+        lessons: [],
+        values:""
       }
     },
 

+ 3 - 2
TEAMModelOS.SmartClass/ClientApp/view/smart-class/MainPage.vue

@@ -32,9 +32,9 @@
 </script>
 <style scoped>
   html, body, #app {
-    height: 100% !important;
+    /*height: 100% !important;*/
     user-select: none;
-    background: rgb(241,242,243);
+    background: rgb(241,242,243);  
   }
 
   .main-content {
@@ -45,6 +45,7 @@
     display: flex;
     flex-direction: column;
     align-items: center;
+    background: rgb(241,242,243);
   }
 
   .content {

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

@@ -3,7 +3,7 @@
     <div class="notice-header">
       <p class="title">
       <span class="content-title">关于开展2019年高新区智慧课堂第二次研讨活动的通知</span></p>
-      <p class="sub">2019-04-11&nbsp;&nbsp;&nbsp;月月研讨&nbsp;&nbsp;&nbsp;点击量:0</p>
+      <p class="sub">2019-04-11&nbsp;&nbsp;&nbsp;月月研讨&nbsp;&nbsp;&nbsp;点击量:96</p>
     </div>
     <div class="content" v-html="noticeContent">
 

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

@@ -112,7 +112,7 @@
         this.$eventBus.$emit("activeIndex", 2);
       },
       goNotice() {
-        this.$router.push('/notice');
+        this.$router.push('notice');
         this.$eventBus.$emit("activeIndex", 1);
       },
       goActivity() {