Merge branch 'master' of http://106.12.23.251:10080/CDHABOOK/TEAMModelOS

TEAMModelOS.SmartClass/ClientApp/app.js

@@ -18,39 +18,25 @@ require('video.js/dist/video-js.css');
 require('vue-video-player/src/custom-theme.css');
 Vue.use(VideoPlayer);
 
-//新添加的
 import vuescroll from 'vue-scroll'
 import echarts from 'echarts'
-//import FullCalendar from 'vue-full-calendar'
-//Vue.use(FullCalendar);
-//全局API请求
+
 Vue.prototype.$api = apiTools;
 Vue.prototype.$post = post;
 Vue.prototype.$get = fetch;
-
 Vue.prototype.$eventBus = new Vue()
-
 Vue.prototype.$jwtDecode = jwtDecode;
-
 Vue.use(vuescroll)
 Vue.prototype.$echarts = echarts
-
-//ZXJ
 Vue.prototype.common = commons;
 
 // Registration of global components
 Vue.component('icon', FontAwesomeIcon);
 
-//使用钩子函数对路由进行权限跳转
-//router.beforeEach((to, from, next) => {
-//const role = localStorage.getItem('token');
-//  if (!role && to.path !== '/') {
-//    next('/');
-//  } else {
-//    next();
-//  }
-//})
-//Vue.prototype.$http = axios
+router.beforeEach((to, from, next) => {
+  window.scroll(0, 0);
+  next();
+});
 
 Vue.use(iView, {
   i18n: (key, value) => i18n.t(key, value)

TEAMModelOS.SmartClass/ClientApp/static/lessons.json

@@ -14,7 +14,7 @@
       "name": "2018年高新区智慧课堂十佳优质课展示",
       "ownUnit": "高新区教师发展中心",
       "status": 1,
-      "timeTip": "2018.08.15 - 2018.09.31",
+      "timeTip": "2018.08.15 - 2018.09.30",
       "viewActivityCount": 10
     },
     {
@@ -27,7 +27,7 @@
       "name": "2018年高新区智慧课堂教学实践观摩互动一等奖课例",
       "ownUnit": "高新区教师发展中心",
       "status": 1,
-      "timeTip": "2018.10.15 - 2018.11.31",
+      "timeTip": "2018.10.15 - 2018.11.30",
       "viewActivityCount": 10
     },
     {
@@ -40,7 +40,7 @@
       "name": "2018年高新区综合优课汇聚",
       "ownUnit": "高新区教师发展中心",
       "status": 1,
-      "timeTip": "2018.12.15 - 2018.12.31",
+      "timeTip": "2018.12.15 - 2018.12.30",
       "viewActivityCount": 10
     }
 

TEAMModelOS.SmartClass/ClientApp/view/smart-class/ActivityDetails.vue

@@ -21,7 +21,7 @@
               </div>
               <div class="brief-info-left">
                 <div class="items"><p class="item">高新区教师发展中心</p> <span class="tips">主办方</span></div>
-                <div class="items"><p class="item2">0天 0小时 0分</p> <span class="tips">距离报名开始时间</span></div>
+                <!--<div class="items"><p class="item2">0天 0小时 0分</p> <span class="tips">距离报名开始时间</span></div>-->
               </div>
 
             </div>

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

@@ -88,12 +88,14 @@
 </template>
 <script>
   import lessonInfo from '@/static/lessonDetails.json'
+import { setTimeout } from 'core-js';
   export default {
     components: {
     },
     data() {
       return {
         reviewAcList: [],
+        isLoading: true,
         attachmentsList: [],
         commentList: [],
         rowKey:0,
@@ -102,6 +104,7 @@
     },
 
     created() {
+      this.$Spin.show();
       this.rowKey = sessionStorage.getItem('_lesson_rowKey');
       this.attachmentsList = lessonInfo[this.rowKey].attachments;
       this.activityInfo = lessonInfo[this.rowKey].data;
@@ -119,6 +122,9 @@
 
     },
     mounted() {
+      setTimeout(() => {
+          this.$Spin.hide();
+       }, 500);
       let myChart = this.$echarts.init(document.getElementById('views'));
       let schoolList = lessonInfo[this.rowKey ].views.map(a => a.schoolName);
       let viewsList = lessonInfo[this.rowKey ].views.map(a => a.viewCount);
@@ -176,7 +182,6 @@
         }]
       };
 
-      myChart.setOption(option);
 
       let comments = this.$echarts.init(document.getElementById('comments'));
       let commentList = lessonInfo[this.rowKey ].schoolComments.map(a => a.commentCount);
@@ -225,7 +230,11 @@
         }]
       };
 
-      comments.setOption(commentsOption);
+      setTimeout(() => {
+        myChart.setOption(option);
+        comments.setOption(commentsOption);
+      }, 1500);
+
     }
   }
 </script>

TEAMModelOS.SmartClass/ClientApp/view/smart-class/Lessons.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="container">
 
-    <div class="search">
+    <!--<div class="search">
       <Input v-model="values" placeholder="请输入优课主题 （如：小学语文）" style="width: 200px" />
       <Button>搜索</Button>
-    </div>
+    </div>-->
     <div class="activity-item" v-for="(item,index) in lessons" :key="index">
       <div class="activity-banner">
         <img :src="getThumb(index)" />

TEAMModelOS.SmartClass/ClientApp/view/smart-class/LiveBroadcast.vue

@@ -96,6 +96,7 @@
             console.log(jsEvent);
           },
           eventClick: () => {
+            sessionStorage.setItem('_lesson_rowKey', 1);
             this.$router.push({ path: 'lessonDetails' });
           },
           eventMouseover: function (event, jsEvent, view) {

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

@@ -25,11 +25,7 @@
     },
 
     created() {
-      //根据跳转参数获取通知详情
-      //let noticeId = this.$route.query.id;
-      //this.$get('http://ttkt.sxedu.org:70/webservice/bizNoticeItem.action?id=' + noticeId + '&nocache=1&_=1557315901157').then(res => {
-      //  console.log(res.data.noticeTypeName);
-      //})
+      this.$Spin.show();
 
       this.noticeContent = noticeDetails.data.content;
     },
@@ -40,6 +36,9 @@
 
     },
     mounted() {
+       setTimeout(() => {
+          this.$Spin.hide();
+       }, 500);
     }
   }
 </script>

TEAMModelOS.SmartClass/ClientApp/view/smart-class/Video.vue

@@ -78,7 +78,7 @@
             type: 'application/x-mpegURL',
             src: 'https://teammodelstorage.blob.core.chinacloudapi.cn/teammodelcontest/20190517/demo/2019.m3u8'
           }],
-          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无法播放媒体源时显示的默认信息。
         },

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

@@ -30,7 +30,6 @@
         <div class="header-line">
           <h3>评审活动</h3> <span>ACTIVITY</span> <div class="more">
             <a class="view-more" @click="goActivity">查看更多</a> <span class="count">
-              <b style="color: rgb(83, 199, 102);">2</b>个活动进行中
             </span>
           </div>
         </div>
@@ -62,7 +61,6 @@
           <div class="more">
             <a href="./activity.html" class="view-more">查看更多</a>
           <span class="count">
-              <b style="color: rgb(83, 199, 102);">18</b>个活动
             </span>
           </div>
         </div>