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

TEAMModelOS.SmartClass/ClientApp/app.js

@@ -27,6 +27,7 @@ Vue.prototype.$api = apiTools;
 Vue.prototype.$post = post;
 Vue.prototype.$get = fetch;
 
+Vue.prototype.$eventBus = new Vue()
 
 Vue.prototype.$jwtDecode = jwtDecode;
 

TEAMModelOS.SmartClass/ClientApp/components/smart-class/headers.vue

@@ -3,12 +3,12 @@
     <div class="header center-row">
       <img src="http://ttkt.sxedu.org:70/upload/setting/0/0.png?_=1557194799800" />
       <ul>
-        <li :class="activeIndex == 0 ? 'li-active':''" @click="handleMenuClick(0,'index')">首页</li>
-        <li :class="activeIndex == 1 ? 'li-active':''" @click="handleMenuClick(1,'notice')">通知公告</li>
-        <li :class="activeIndex == 2 ? 'li-active':''" @click="handleMenuClick(2,'reviewActivity')">评审活动</li> 
-        <li :class="activeIndex == 3 ? 'li-active':''" @click="handleMenuClick(3,'PastReview')">往届回顾</li>
-        <li :class="activeIndex == 4 ? 'li-active':''" @click="handleMenuClick(4,'LiveBroadcast')">天天直播</li>
-        <li :class="activeIndex == 5 ? 'li-active':''" @click="handleMenuClick(5,'Lessons')">优课汇聚</li>
+        <li :class="this.$route.path ==  '/index' || activeIndex == 0 ? 'li-active':''" @click="handleMenuClick(0,'index')">首页</li>
+        <li :class="this.$route.path ==  '/notice' || activeIndex == 1? 'li-active':''" @click="handleMenuClick(1,'notice')">通知公告</li>
+        <li :class="this.$route.path ==  '/reviewActivity' || activeIndex == 2? 'li-active':''" @click="handleMenuClick(2,'reviewActivity')">评审活动</li> 
+        <li :class="this.$route.path ==  '/PastReview' || activeIndex == 3? 'li-active':''" @click="handleMenuClick(3,'PastReview')">往届回顾</li>
+        <li :class="this.$route.path ==  '/LiveBroadcast' || activeIndex == 4? 'li-active':''" @click="handleMenuClick(4,'LiveBroadcast')">天天直播</li>
+        <li :class="this.$route.path ==  '/Lessons' || activeIndex == 5? 'li-active':''" @click="handleMenuClick(5,'Lessons')">优课汇聚</li>
       </ul>
       <span class="btn-login">登录</span>
     </div>
@@ -18,12 +18,12 @@
 <script>
   export default {
     name: "headers",
-    props: ['parentToChild', 'identityselect'],
     data() {
       return {
         activeIndex: sessionStorage.getItem('_activeIndex') || 0
       }
     },
+
     created() {
 
     },
@@ -34,6 +34,11 @@
         this.$router.push(route);
       }
     },
+    mounted() {
+      this.$eventBus.$on('activeIndex', (index) => {
+        this.activeIndex = index;
+      })
+    }
   }
 </script>
 <style scoped>

TEAMModelOS.SmartClass/ClientApp/router/routes.js

@@ -48,6 +48,16 @@ export const routes = [
         name: 'noticeDetails',
         path: '/noticeDetails',
         component: resolve => require(['@/view/smart-class/NoticeDetails'], resolve), //路由懒加载
+      },
+      {
+        name: 'rewardDetails',
+        path: '/rewardDetails',
+        component: resolve => require(['@/view/smart-class/RewardDetails'], resolve), //路由懒加载
+      },
+      {
+        name: 'lessons',
+        path: '/lessons',
+        component: resolve => require(['@/view/smart-class/Lessons'], resolve), //路由懒加载
       }
     ]
   }

TEAMModelOS.SmartClass/ClientApp/static/lessons.json

@@ -0,0 +1,714 @@
+{
+  "data": null,
+  "errorCode": null,
+  "html": null,
+  "key": null,
+  "list": [
+    {
+      "autoChangeMainActivityStatus": true,
+      "banner": "十佳优质课.jpg",
+      "bannerHash": "27.jpg",
+      "bannerUri": "/upload/mainactivity/banner/27/27.jpg?_=1557404688351",
+      "cover": null,
+      "coverHash": null,
+      "coverUri": null,
+      "employeeName": "楼宽",
+      "employeeNo": "31050",
+      "endTime": {
+        "date": 31,
+        "day": 1,
+        "hours": 0,
+        "minutes": 0,
+        "month": 11,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1546185600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "gradeSectionId": 6,
+      "gradeSectionName": "全年段",
+      "id": 27,
+      "mainActivityStatus": 2,
+      "mainActivityStatusTip": "已结束",
+      "name": "2018年柯桥区天天智慧课堂十佳优质课展示",
+      "ownUnit": "柯桥区教师发展中心",
+      "startTime": {
+        "date": 15,
+        "day": 6,
+        "hours": 0,
+        "minutes": 0,
+        "month": 11,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1544803200000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "status": 1,
+      "timeTip": "2018.12.15 - 2018.12.31",
+      "viewActivityCount": 10
+    },
+    {
+      "autoChangeMainActivityStatus": true,
+      "banner": "全国创新比赛.jpg",
+      "bannerHash": "26.jpg",
+      "bannerUri": "/upload/mainactivity/banner/26/26.jpg?_=1557404688351",
+      "cover": null,
+      "coverHash": null,
+      "coverUri": null,
+      "employeeName": "楼宽",
+      "employeeNo": "31050",
+      "endTime": {
+        "date": 31,
+        "day": 1,
+        "hours": 0,
+        "minutes": 0,
+        "month": 11,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1546185600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "gradeSectionId": 6,
+      "gradeSectionName": "全年段",
+      "id": 26,
+      "mainActivityStatus": 2,
+      "mainActivityStatusTip": "已结束",
+      "name": "全国中小学创新课堂教学实践观摩活动一等奖课例（柯桥区部分）",
+      "ownUnit": "柯桥区教师发展中心",
+      "startTime": {
+        "date": 14,
+        "day": 5,
+        "hours": 0,
+        "minutes": 0,
+        "month": 11,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1544716800000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "status": 1,
+      "timeTip": "2018.12.14 - 2018.12.31",
+      "viewActivityCount": 22
+    },
+    {
+      "autoChangeMainActivityStatus": true,
+      "banner": "创新实验室一等奖.jpg",
+      "bannerHash": "25.jpg",
+      "bannerUri": "/upload/mainactivity/banner/25/25.jpg?_=1557404688351",
+      "cover": null,
+      "coverHash": null,
+      "coverUri": null,
+      "employeeName": "楼宽",
+      "employeeNo": "31050",
+      "endTime": {
+        "date": 31,
+        "day": 1,
+        "hours": 0,
+        "minutes": 0,
+        "month": 11,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1546185600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "gradeSectionId": 6,
+      "gradeSectionName": "全年段",
+      "id": 25,
+      "mainActivityStatus": 2,
+      "mainActivityStatusTip": "已结束",
+      "name": "柯桥区创新实验室（学科教室）一等奖课例",
+      "ownUnit": "柯桥区教师发展中心",
+      "startTime": {
+        "date": 13,
+        "day": 4,
+        "hours": 0,
+        "minutes": 0,
+        "month": 11,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1544630400000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "status": 1,
+      "timeTip": "2018.12.13 - 2018.12.31",
+      "viewActivityCount": 8
+    },
+    {
+      "autoChangeMainActivityStatus": true,
+      "banner": "小学语文.jpg",
+      "bannerHash": "2.jpg",
+      "bannerUri": "/upload/mainactivity/banner/2/2.jpg?_=1557404688352",
+      "cover": null,
+      "coverHash": null,
+      "coverUri": null,
+      "employeeName": "楼宽",
+      "employeeNo": "31050",
+      "endTime": {
+        "date": 31,
+        "day": 1,
+        "hours": 0,
+        "minutes": 0,
+        "month": 11,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1546185600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "gradeSectionId": 1,
+      "gradeSectionName": "小学",
+      "id": 2,
+      "mainActivityStatus": 2,
+      "mainActivityStatusTip": "已结束",
+      "name": "柯桥区小学语文优课汇聚",
+      "ownUnit": "柯桥区教师发展中心",
+      "startTime": {
+        "date": 1,
+        "day": 4,
+        "hours": 0,
+        "minutes": 0,
+        "month": 2,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1519833600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "status": 1,
+      "timeTip": "2018.03.01 - 2018.12.31",
+      "viewActivityCount": 19
+    },
+    {
+      "autoChangeMainActivityStatus": true,
+      "banner": "小学数学.jpg",
+      "bannerHash": "3.jpg",
+      "bannerUri": "/upload/mainactivity/banner/3/3.jpg?_=1557404688352",
+      "cover": null,
+      "coverHash": null,
+      "coverUri": null,
+      "employeeName": "楼宽",
+      "employeeNo": "31050",
+      "endTime": {
+        "date": 31,
+        "day": 1,
+        "hours": 0,
+        "minutes": 0,
+        "month": 11,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1546185600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "gradeSectionId": 1,
+      "gradeSectionName": "小学",
+      "id": 3,
+      "mainActivityStatus": 2,
+      "mainActivityStatusTip": "已结束",
+      "name": "柯桥区小学数学优课汇聚",
+      "ownUnit": "柯桥区教师发展中心",
+      "startTime": {
+        "date": 1,
+        "day": 4,
+        "hours": 0,
+        "minutes": 0,
+        "month": 2,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1519833600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "status": 1,
+      "timeTip": "2018.03.01 - 2018.12.31",
+      "viewActivityCount": 23
+    },
+    {
+      "autoChangeMainActivityStatus": true,
+      "banner": "小学英语.jpg",
+      "bannerHash": "4.jpg",
+      "bannerUri": "/upload/mainactivity/banner/4/4.jpg?_=1557404688352",
+      "cover": null,
+      "coverHash": null,
+      "coverUri": null,
+      "employeeName": "楼宽",
+      "employeeNo": "31050",
+      "endTime": {
+        "date": 31,
+        "day": 1,
+        "hours": 0,
+        "minutes": 0,
+        "month": 11,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1546185600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "gradeSectionId": 1,
+      "gradeSectionName": "小学",
+      "id": 4,
+      "mainActivityStatus": 2,
+      "mainActivityStatusTip": "已结束",
+      "name": "柯桥区小学英语优课汇聚",
+      "ownUnit": "柯桥区教师发展中心",
+      "startTime": {
+        "date": 1,
+        "day": 4,
+        "hours": 0,
+        "minutes": 0,
+        "month": 2,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1519833600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "status": 1,
+      "timeTip": "2018.03.01 - 2018.12.31",
+      "viewActivityCount": 13
+    },
+    {
+      "autoChangeMainActivityStatus": true,
+      "banner": "小学科学.jpg",
+      "bannerHash": "6.jpg",
+      "bannerUri": "/upload/mainactivity/banner/6/6.jpg?_=1557404688352",
+      "cover": null,
+      "coverHash": null,
+      "coverUri": null,
+      "employeeName": "楼宽",
+      "employeeNo": "31050",
+      "endTime": {
+        "date": 31,
+        "day": 1,
+        "hours": 0,
+        "minutes": 0,
+        "month": 11,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1546185600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "gradeSectionId": 1,
+      "gradeSectionName": "小学",
+      "id": 6,
+      "mainActivityStatus": 2,
+      "mainActivityStatusTip": "已结束",
+      "name": "柯桥区小学科学优课汇聚",
+      "ownUnit": "柯桥区教师发展中心",
+      "startTime": {
+        "date": 1,
+        "day": 4,
+        "hours": 0,
+        "minutes": 0,
+        "month": 2,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1519833600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "status": 1,
+      "timeTip": "2018.03.01 - 2018.12.31",
+      "viewActivityCount": 7
+    },
+    {
+      "autoChangeMainActivityStatus": true,
+      "banner": "小学综合.jpg",
+      "bannerHash": "7.jpg",
+      "bannerUri": "/upload/mainactivity/banner/7/7.jpg?_=1557404688352",
+      "cover": null,
+      "coverHash": null,
+      "coverUri": null,
+      "employeeName": "楼宽",
+      "employeeNo": "31050",
+      "endTime": {
+        "date": 31,
+        "day": 1,
+        "hours": 0,
+        "minutes": 0,
+        "month": 11,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1546185600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "gradeSectionId": 1,
+      "gradeSectionName": "小学",
+      "id": 7,
+      "mainActivityStatus": 2,
+      "mainActivityStatusTip": "已结束",
+      "name": "柯桥区小学综合优课汇聚",
+      "ownUnit": "柯桥区教师发展中心",
+      "startTime": {
+        "date": 1,
+        "day": 4,
+        "hours": 0,
+        "minutes": 0,
+        "month": 2,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1519833600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "status": 1,
+      "timeTip": "2018.03.01 - 2018.12.31",
+      "viewActivityCount": 9
+    },
+    {
+      "autoChangeMainActivityStatus": true,
+      "banner": "初中语文.jpg",
+      "bannerHash": "8.jpg",
+      "bannerUri": "/upload/mainactivity/banner/8/8.jpg?_=1557404688352",
+      "cover": null,
+      "coverHash": null,
+      "coverUri": null,
+      "employeeName": "楼宽",
+      "employeeNo": "31050",
+      "endTime": {
+        "date": 31,
+        "day": 1,
+        "hours": 0,
+        "minutes": 0,
+        "month": 11,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1546185600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "gradeSectionId": 1,
+      "gradeSectionName": "小学",
+      "id": 8,
+      "mainActivityStatus": 2,
+      "mainActivityStatusTip": "已结束",
+      "name": "柯桥区初中语文优课汇聚",
+      "ownUnit": "柯桥区教师发展中心",
+      "startTime": {
+        "date": 1,
+        "day": 4,
+        "hours": 0,
+        "minutes": 0,
+        "month": 2,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1519833600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "status": 1,
+      "timeTip": "2018.03.01 - 2018.12.31",
+      "viewActivityCount": 9
+    },
+    {
+      "autoChangeMainActivityStatus": true,
+      "banner": "初中数学1.jpg",
+      "bannerHash": "9.jpg",
+      "bannerUri": "/upload/mainactivity/banner/9/9.jpg?_=1557404688352",
+      "cover": null,
+      "coverHash": null,
+      "coverUri": null,
+      "employeeName": "楼宽",
+      "employeeNo": "31050",
+      "endTime": {
+        "date": 31,
+        "day": 1,
+        "hours": 0,
+        "minutes": 0,
+        "month": 11,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1546185600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "gradeSectionId": 1,
+      "gradeSectionName": "小学",
+      "id": 9,
+      "mainActivityStatus": 2,
+      "mainActivityStatusTip": "已结束",
+      "name": "柯桥区初中数学优课汇聚",
+      "ownUnit": "柯桥区教师发展中心",
+      "startTime": {
+        "date": 1,
+        "day": 4,
+        "hours": 0,
+        "minutes": 0,
+        "month": 2,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1519833600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "status": 1,
+      "timeTip": "2018.03.01 - 2018.12.31",
+      "viewActivityCount": 11
+    },
+    {
+      "autoChangeMainActivityStatus": true,
+      "banner": "初中英语.jpg",
+      "bannerHash": "10.jpg",
+      "bannerUri": "/upload/mainactivity/banner/10/10.jpg?_=1557404688352",
+      "cover": null,
+      "coverHash": null,
+      "coverUri": null,
+      "employeeName": "楼宽",
+      "employeeNo": "31050",
+      "endTime": {
+        "date": 31,
+        "day": 1,
+        "hours": 0,
+        "minutes": 0,
+        "month": 11,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1546185600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "gradeSectionId": 2,
+      "gradeSectionName": "初中",
+      "id": 10,
+      "mainActivityStatus": 2,
+      "mainActivityStatusTip": "已结束",
+      "name": "柯桥区初中英语优课汇聚",
+      "ownUnit": "柯桥区教师发展中心",
+      "startTime": {
+        "date": 1,
+        "day": 4,
+        "hours": 0,
+        "minutes": 0,
+        "month": 2,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1519833600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "status": 1,
+      "timeTip": "2018.03.01 - 2018.12.31",
+      "viewActivityCount": 8
+    },
+    {
+      "autoChangeMainActivityStatus": true,
+      "banner": "初中科学1.jpg",
+      "bannerHash": "11.jpg",
+      "bannerUri": "/upload/mainactivity/banner/11/11.jpg?_=1557404688352",
+      "cover": null,
+      "coverHash": null,
+      "coverUri": null,
+      "employeeName": "楼宽",
+      "employeeNo": "31050",
+      "endTime": {
+        "date": 31,
+        "day": 1,
+        "hours": 0,
+        "minutes": 0,
+        "month": 11,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1546185600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "gradeSectionId": 2,
+      "gradeSectionName": "初中",
+      "id": 11,
+      "mainActivityStatus": 2,
+      "mainActivityStatusTip": "已结束",
+      "name": "柯桥区初中科学优课汇聚",
+      "ownUnit": "柯桥区教师发展中心",
+      "startTime": {
+        "date": 1,
+        "day": 4,
+        "hours": 0,
+        "minutes": 0,
+        "month": 2,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1519833600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "status": 1,
+      "timeTip": "2018.03.01 - 2018.12.31",
+      "viewActivityCount": 8
+    },
+    {
+      "autoChangeMainActivityStatus": true,
+      "banner": "初中历史与社会.jpg",
+      "bannerHash": "12.jpg",
+      "bannerUri": "/upload/mainactivity/banner/12/12.jpg?_=1557404688353",
+      "cover": null,
+      "coverHash": null,
+      "coverUri": null,
+      "employeeName": "楼宽",
+      "employeeNo": "31050",
+      "endTime": {
+        "date": 31,
+        "day": 1,
+        "hours": 0,
+        "minutes": 0,
+        "month": 11,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1546185600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "gradeSectionId": 2,
+      "gradeSectionName": "初中",
+      "id": 12,
+      "mainActivityStatus": 2,
+      "mainActivityStatusTip": "已结束",
+      "name": "柯桥区初中历史与社会优课汇聚",
+      "ownUnit": "柯桥区教师发展中心",
+      "startTime": {
+        "date": 1,
+        "day": 4,
+        "hours": 0,
+        "minutes": 0,
+        "month": 2,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1519833600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "status": 1,
+      "timeTip": "2018.03.01 - 2018.12.31",
+      "viewActivityCount": 4
+    },
+    {
+      "autoChangeMainActivityStatus": true,
+      "banner": "初中综合.jpg",
+      "bannerHash": "13.jpg",
+      "bannerUri": "/upload/mainactivity/banner/13/13.jpg?_=1557404688353",
+      "cover": null,
+      "coverHash": null,
+      "coverUri": null,
+      "employeeName": "楼宽",
+      "employeeNo": "31050",
+      "endTime": {
+        "date": 31,
+        "day": 1,
+        "hours": 0,
+        "minutes": 0,
+        "month": 11,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1546185600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "gradeSectionId": 2,
+      "gradeSectionName": "初中",
+      "id": 13,
+      "mainActivityStatus": 2,
+      "mainActivityStatusTip": "已结束",
+      "name": "柯桥区初中综合优课汇聚",
+      "ownUnit": "柯桥区教师发展中心",
+      "startTime": {
+        "date": 1,
+        "day": 4,
+        "hours": 0,
+        "minutes": 0,
+        "month": 2,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1519833600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "status": 1,
+      "timeTip": "2018.03.01 - 2018.12.31",
+      "viewActivityCount": 1
+    },
+    {
+      "autoChangeMainActivityStatus": true,
+      "banner": "高中.jpg",
+      "bannerHash": "23.jpg",
+      "bannerUri": "/upload/mainactivity/banner/23/23.jpg?_=1557404688353",
+      "cover": null,
+      "coverHash": null,
+      "coverUri": null,
+      "employeeName": "楼宽",
+      "employeeNo": "31050",
+      "endTime": {
+        "date": 31,
+        "day": 1,
+        "hours": 0,
+        "minutes": 0,
+        "month": 11,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1546185600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "gradeSectionId": 3,
+      "gradeSectionName": "高中",
+      "id": 23,
+      "mainActivityStatus": 2,
+      "mainActivityStatusTip": "已结束",
+      "name": "柯桥区高中优课汇聚",
+      "ownUnit": "柯桥区教师发展中心",
+      "startTime": {
+        "date": 1,
+        "day": 4,
+        "hours": 0,
+        "minutes": 0,
+        "month": 2,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1519833600000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "status": 1,
+      "timeTip": "2018.03.01 - 2018.12.31",
+      "viewActivityCount": 4
+    }
+  ],
+  "message": null,
+  "query": {
+    "fields": [
+
+    ],
+    "orders": [
+      {
+        "asc": false,
+        "property": "startTime"
+      }
+    ],
+    "pageCount": 1,
+    "pageIndex": 1,
+    "pageSize": 10000,
+    "recordCount": 15,
+    "recordEnd": 15,
+    "recordStart": 1
+  },
+  "success": true,
+  "systemTime": {
+    "date": 9,
+    "day": 4,
+    "hours": 20,
+    "minutes": 24,
+    "month": 4,
+    "seconds": 48,
+    "time": 1557404688298,
+    "timezoneOffset": -480,
+    "year": 119
+  },
+  "uri": null
+}

TEAMModelOS.SmartClass/ClientApp/static/rewardList.json

@@ -0,0 +1,231 @@
+{
+  "data": {
+    "data": null,
+    "errorCode": null,
+    "html": null,
+    "key": null,
+    "list": [
+      {
+        "activityAwardId": 46,
+        "activityAwardName": "月冠军",
+        "applyId": 900,
+        "applyIsPush": false,
+        "applyName": "12月13日直播",
+        "categoryId": 1,
+        "categoryName": "语文",
+        "employeeName": "喻远鑫",
+        "employeeNo": "298380",
+        "employeeSchool": "湖塘中学",
+        "employeeSchoolName": "绍兴市柯桥区湖塘中学",
+        "employeeSchoolNo": "3133005945",
+        "gradeId": 12,
+        "gradeName": "九年级",
+        "id": 590,
+        "score": 92
+      },
+      {
+        "activityAwardId": 47,
+        "activityAwardName": "月亚军",
+        "applyId": 894,
+        "applyIsPush": false,
+        "applyName": "12月11日直播",
+        "categoryId": 1,
+        "categoryName": "语文",
+        "employeeName": "林丽",
+        "employeeNo": "34181",
+        "employeeSchool": "柯桥小学",
+        "employeeSchoolName": "绍兴市柯桥区柯桥小学",
+        "employeeSchoolNo": "2133006474",
+        "gradeId": 9,
+        "gradeName": "六年级",
+        "id": 591,
+        "score": 91
+      },
+      {
+        "activityAwardId": 48,
+        "activityAwardName": "月季军",
+        "applyId": 902,
+        "applyIsPush": false,
+        "applyName": "12月14日直播",
+        "categoryId": 18,
+        "categoryName": "化学",
+        "employeeName": "徐益敏",
+        "employeeNo": "shixun_xym235782",
+        "employeeSchool": "西藏民族中学",
+        "employeeSchoolName": "绍兴市柯桥区西藏民族中学",
+        "employeeSchoolNo": "3133005932",
+        "gradeId": 12,
+        "gradeName": "九年级",
+        "id": 592,
+        "score": 90
+      },
+      {
+        "activityAwardId": 49,
+        "activityAwardName": "优课",
+        "applyId": 885,
+        "applyIsPush": false,
+        "applyName": "12月05日直播",
+        "categoryId": 4,
+        "categoryName": "科学",
+        "employeeName": "王利芳",
+        "employeeNo": "37878",
+        "employeeSchool": "夏履镇中学",
+        "employeeSchoolName": "绍兴市柯桥区夏履镇中学",
+        "employeeSchoolNo": "3133005940",
+        "gradeId": 11,
+        "gradeName": "八年级",
+        "id": 593,
+        "score": 87
+      },
+      {
+        "activityAwardId": 49,
+        "activityAwardName": "优课",
+        "applyId": 892,
+        "applyIsPush": false,
+        "applyName": "12月10日直播",
+        "categoryId": 4,
+        "categoryName": "科学",
+        "employeeName": "徐飞",
+        "employeeNo": "138828",
+        "employeeSchool": "柯岩中学",
+        "employeeSchoolName": "绍兴市柯桥区柯岩中学",
+        "employeeSchoolNo": "3133005935",
+        "gradeId": 10,
+        "gradeName": "七年级",
+        "id": 594,
+        "score": 87
+      },
+      {
+        "activityAwardId": 49,
+        "activityAwardName": "优课",
+        "applyId": 888,
+        "applyIsPush": false,
+        "applyName": "12月06日直播",
+        "categoryId": 3,
+        "categoryName": "英语",
+        "employeeName": "章晓瑛",
+        "employeeNo": "134567",
+        "employeeSchool": "柯桥区秋瑾小学",
+        "employeeSchoolName": "绍兴市柯桥区秋瑾小学金三角校区",
+        "employeeSchoolNo": "2133006434",
+        "gradeId": 9,
+        "gradeName": "六年级",
+        "id": 595,
+        "score": 84
+      },
+      {
+        "activityAwardId": 49,
+        "activityAwardName": "优课",
+        "applyId": 896,
+        "applyIsPush": false,
+        "applyName": "12月12日直播",
+        "categoryId": 3,
+        "categoryName": "英语",
+        "employeeName": "王超",
+        "employeeNo": "702091",
+        "employeeSchool": "王坛镇中心小学",
+        "employeeSchoolName": "绍兴市柯桥区王坛镇中心小学",
+        "employeeSchoolNo": "2133006457",
+        "gradeId": 8,
+        "gradeName": "五年级",
+        "id": 596,
+        "score": 83
+      },
+      {
+        "activityAwardId": 49,
+        "activityAwardName": "优课",
+        "applyId": 884,
+        "applyIsPush": false,
+        "applyName": "12月04日直播",
+        "categoryId": 7,
+        "categoryName": "数学",
+        "employeeName": "倪丽红",
+        "employeeNo": "653800",
+        "employeeSchool": "齐贤中学",
+        "employeeSchoolName": "绍兴市柯桥区齐贤中学",
+        "employeeSchoolNo": "3133005938",
+        "gradeId": 10,
+        "gradeName": "七年级",
+        "id": 597,
+        "score": 82
+      },
+      {
+        "activityAwardId": 49,
+        "activityAwardName": "优课",
+        "applyId": 883,
+        "applyIsPush": false,
+        "applyName": "12月03日直播",
+        "categoryId": 5,
+        "categoryName": "历史与社会",
+        "employeeName": "张圣凯",
+        "employeeNo": "shixun_zsk060031",
+        "employeeSchool": "柯桥区稽东镇中学",
+        "employeeSchoolName": "绍兴市柯桥区稽东镇中学",
+        "employeeSchoolNo": "3133005937",
+        "gradeId": 11,
+        "gradeName": "八年级",
+        "id": 598,
+        "score": 81
+      },
+      {
+        "activityAwardId": 49,
+        "activityAwardName": "优课",
+        "applyId": 899,
+        "applyIsPush": false,
+        "applyName": "12月14日直播",
+        "categoryId": 1,
+        "categoryName": "语文",
+        "employeeName": "沈若芬",
+        "employeeNo": "31994",
+        "employeeSchool": "柯桥区稽东镇中心小学",
+        "employeeSchoolName": "绍兴市柯桥区稽东镇中心小学",
+        "employeeSchoolNo": "2133006478",
+        "gradeId": 9,
+        "gradeName": "六年级",
+        "id": 599,
+        "score": 81
+      }
+    ],
+    "message": null,
+    "query": {
+      "fields": [],
+      "orders": [],
+      "pageCount": 1,
+      "pageIndex": 1,
+      "pageSize": 10,
+      "recordCount": 10,
+      "recordEnd": 10,
+      "recordStart": 1
+    },
+    "success": true,
+    "systemTime": {
+      "date": 9,
+      "day": 4,
+      "hours": 19,
+      "minutes": 5,
+      "month": 4,
+      "seconds": 29,
+      "time": 1557399929083,
+      "timezoneOffset": -480,
+      "year": 119
+    },
+    "uri": null
+  },
+  "errorCode": null,
+  "html": null,
+  "key": null,
+  "message": null,
+  "success": true,
+  "systemTime": {
+    "date": 9,
+    "day": 4,
+    "hours": 19,
+    "minutes": 5,
+    "month": 4,
+    "seconds": 29,
+    "time": 1557399929101,
+    "timezoneOffset": -480,
+    "year": 119
+  },
+  "uri": null
+}

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

@@ -129,7 +129,7 @@
   .details-container {
     position:relative;
     width: 1200px;
-    margin: 280px auto;
+    margin: 80px auto;
     margin-top:-50px;
     z-index:999;
     display: flex;

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

@@ -1,20 +1,65 @@
 <template>
   <div class="container">
-    <h1>往届回顾</h1>
-      <div class="left-box"></div>
-      <div class="right-box"></div>
+
+    <div class="search">
+      <Input v-model="value" placeholder="请输入优课主题 （如：小学语文）" style="width: 200px" />
+      <Button>搜索</Button>
+    </div>
+    <div class="activity-item" v-for="(item,index) in lessons" :key="index">
+      <div class="activity-banner">
+        <img :src="'http://ttkt.sxedu.org:70'+item.bannerUri" />
+      </div>
+      <div class="activity-brief">
+        <div class="left">
+          <div class="line">
+            <span class="tips">优课主题：</span>
+            <span class="items">{{item.name}}</span>
+            <span class="status" style="background: #999;">已结束</span>
+          </div>
+          <div class="line"><span class="tips">起止时间：</span> <span class="items2">{{item.timeTip}}</span></div>
+          <div class="line"><span class="tips">优课数：</span> <span class="items2">{{item.viewActivityCount}}</span></div>
+
+        </div>
+        <div class="right">
+          <Button type="primary" size="large" @click="goDetails">查看详情</Button>
+        </div>
+      </div>
+    </div>
+
   </div>
 </template>
 <script>
+    import lessons from '@/static/lessons.json'
   export default {
     components: {
     },
     data() {
       return {
+        lessons: []
       }
     },
+
+    created() {
+      this.lessons = lessons.list;
+    },
     methods: {
+      getList(type) {
+        let list = noticeList.list;
+        var newArray = list.filter(function(item){
+            return item.noticeTypeId == type;
+        });
+        this.noticeList = newArray;
+      },
 
+      handleMenuClick(index,typeId,name) {
+        this.activeIndex = index;
+        this.typeName = name;
+        this.getList(typeId);
+      },
+
+      goDetails() {
+        this.$router.push('/activityDetails')
+      }
 
 
     },
@@ -29,30 +74,68 @@
   }
 
   .main-content {
-    background:rgb(248,248,248) !important;
+    background: rgb(248,248,248) !important;
   }
+
   .container {
     width: 1200px;
     margin: 100px auto;
-    display:flex;
-    flex-direction:row;
-    justify-content:space-between;
+    display: flex;
+    flex-direction: column;
   }
 
-    .container .left-box {
-      width:25%;
-      height:600px;
+    .container .activity-item {
+      width:100%;
+      padding-bottom:50px;
       background:#fff;
+      margin-top:40px;
     }
 
-    .container .right-box {
-      width:73%;
-      height:600px;
-      background:#fff;
+    .container .activity-item .activity-banner img {
+      width:100%;
     }
 
-  .center-col {
+    .container .activity-brief {
+      width:100%;
+      padding:15px 40px;
+      display:flex;
+      flex-direction:row;
+      justify-content:space-between;
+      align-items:center;
+    }
+
+      .container .activity-brief .line {
+        font-size:16px;
+        margin-top:10px;
+      }
+
+      .container .activity-brief .status {
+        font-size:14px;
+        padding:2px 8px;
+        margin-left:8px;
+        border-radius:5px;
+        color:#fff;
+       }
+
+      .container .activity-brief .line .tips{
+        font-weight:bold;
+        color:#999;
+      }
+
+    .container .time-count {
+      font-size:16px;
+      margin-bottom:20px;
+    }
+
+      .container .time-count .count-down {
+        color:orange;
+      }
+
+    .container .right .ivu-btn {
+      width:180px;
+      height:48px;
+      font-size:16px;
+    }
 
-  }
 
 </style>

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

@@ -16,7 +16,7 @@
           <Button size="large">返回今天</Button>
         </div>
       </div>
-      <full-calendar :events="fcEvents" lang="zh" @dayClick ="getDay"></full-calendar>
+      <full-calendar :events="fcEvents" lang="zh" @dayClick ="getDay" :config="config" ></full-calendar>
     </div>
   </div>
 </template>
@@ -59,12 +59,24 @@
           '12月',
         ],
         fcEvents: [
-          {
-            title: 'Sunny Out of Office',
-            start: '2019-05-5',
-            end: '2019-05-5'
-          }
-        ]
+        ],
+        config: {
+          firstDay: '0',//以周日为每周的第一天
+          // weekends: true,//是否在日历中显示周末
+          locale: 'zh-cn',//语言
+          defaultView: 'month',//默认按月显示
+          height: 'auto',//高度
+          fixedWeekCount: false,//是否固定显示六周
+          // weekMode:"liquid",//周数不定，每周的高度可变，整个日历高度不变
+          allDaySlot: false,
+          // allDay:true,
+          header: {//表头信息
+            left: 'prev, next, today',
+            center: 'title',
+            right: 'hide, custom'
+          },
+        },
+        lessonList:[]
       }
     },
     methods: {
@@ -76,6 +88,48 @@
 
     },
     mounted() {
+      this.lessonList = require("@/static/lessonList.json");
+      for (let i = 0; i < this.lessonList.length; i++) {
+        var sdate = new Date(this.lessonList[i].startTime.time);
+        let sY = sdate.getFullYear() + '-';
+        let sM = (sdate.getMonth() + 1 < 10 ? '0' + (sdate.getMonth() + 1) : sdate.getMonth() + 1) + '-';
+        let sD = sdate.getDate() + ' ';
+        var edate = new Date(this.lessonList[i].endTime.time);
+        let eY = edate.getFullYear() + '-';
+        let eM = (edate.getMonth() + 1 < 10 ? '0' + (edate.getMonth() + 1) : edate.getMonth() + 1) + '-';
+        let eD = edate.getDate() + ' ';
+        this.fcEvents.push({
+          title:'名称：'+this.lessonList[i].viwActivityTypeTip,
+          start: sY + sM + sD,
+          end: eY + eM + eD
+        });
+        this.fcEvents.push({
+          title:'学校：'+this.lessonList[i].schoolName,
+          start: sY + sM + sD,
+          end: eY + eM + eD
+        });
+        this.fcEvents.push({
+          title:'主讲人：'+this.lessonList[i].employeeName,
+          start: sY + sM + sD,
+          end: eY + eM + eD
+        });
+        this.fcEvents.push({
+          title:'学科：'+this.lessonList[i].parentCategoryName,
+          start: sY + sM + sD,
+          end: eY + eM + eD
+        });
+        this.fcEvents.push({
+          title:'课题：'+this.lessonList[i].parentProjectName,
+          start: sY + sM + sD,
+          end: eY + eM + eD
+        });
+        this.fcEvents.push({
+          title:'时间：'+this.lessonList[i].timeRangeTipHHmm,
+          start: sY + sM + sD,
+          end: eY + eM + eD
+        });
+      }
+      console.log(this.lessonList);
     }
   }
 </script>
@@ -128,7 +182,12 @@
     .review-main /deep/ .events-week {
       height:140px;
     }
-    
+    .review-main /deep/ .full-calendar-body .dates .dates-events .events-week .events-day .event-box .event-item {
+      background:none;
+    }
+    /*.review-main /deep/ .full-calendar-body .dates .dates-events .events-week .events-day .event-box .more-link {
+      display:none;
+    }*/
    .condition-wrap {
     display:flex;
     flex-direction:row;

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

@@ -29,7 +29,7 @@
         </div>
         <div style="clear:both;"></div>
         <div class="activities">
-          <div class="activity" v-for="(item,index) in activities">
+          <div class="activity" v-for="(item,index) in activities" @click="activityClick">
             <div>
               <div class="img-box"><span class="state" style="background: rgb(19, 206, 102); visibility: visible; display:none;">{{item.status}}</span> <img :src="item.img" alt=""></div> <div class="infos">
                 <p class="actName">{{item.name}}</p>
@@ -114,7 +114,9 @@
       }
     },
     methods: {
-
+      activityClick() {
+        this.$router.push('/rewardDetails');
+      }
 
 
     },

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

@@ -0,0 +1,381 @@
+<template>
+  <div id="app">
+    <div class="details-container">
+        <div class="activity-brief center-row">
+          <div class="activity-brief-left">
+            <img src="http://ttkt.sxedu.org:70/upload/activity/cover/40/40.jpg?_=1557306525954"/>
+          </div>
+          <div class="activity-brief-right">
+            <div class="activity-brief-title">
+              <span>2019年柯桥区天天智慧课堂 5月份 优课评比 </span>
+              <span class="status" style="background: rgb(182, 182, 182);">活动结束</span>
+            </div>
+            <div class="activity-brief-info center-row">
+              <div class="brief-info-left">
+                <div class="items"><p class="item">2019.05.01-06.08</p> <span class="tips">活动时间</span></div>
+                <div class="items"><p class="item">20</p> <span class="tips">数量</span></div>
+              </div>
+              <div class="brief-info-left">
+                <div class="items"><p class="item">柯桥区教师发展中心</p> <span class="tips">主办方</span></div>
+              </div>
+
+            </div>
+          </div>
+        </div>
+        <div class="activity-details center-row">
+          <div class="details-left center-col">
+            <div class="title-tip">
+              <p class="title">奖项设置<span>FORMAT</span></p>
+              <div class="award" v-for="(item,index) in rewardSettings" :key="index">
+                <p class="award-name">{{item.name}}</p>
+                <p class="award-tip">{{item.ratioTip}}</p>
+              </div>
+            </div>
+            <div class="review-attachment">
+            <p class="title">活动附件<span>ATTACHMENT</span></p>
+            <div class="content">
+              <div class="attach attachicon-2" v-for="(item,index) in attachmentsList" :key="index">
+                <a :href="item.fileNameUri" :download="item.fileName" :title="item.fileName">{{item.fileName}}</a>
+                <span style="float: right; font-size: 13px;">&nbsp;{{item.fileSizeTip}}</span>
+              </div>
+          </div>
+          </div>
+          </div>
+          <div class="details-right center-col">
+            <div class="review-awards" style="margin-top:0">
+              <Tabs value="获奖作品" @on-click="tabClick">
+                <TabPane label="获奖作品" name="获奖作品"></TabPane>
+                <TabPane label="月冠军" name="月冠军"></TabPane>
+                <TabPane label="月亚军" name="月亚军"></TabPane>
+                <TabPane label="月季军" name="月季军"></TabPane>
+                <TabPane label="优课" name="优课"></TabPane>
+              </Tabs>
+              <Table :columns="columns1" :data="rewardDatas"></Table>
+            </div>
+              <div class="description title-tip">
+                <p class="title">
+                  活动介绍
+                  <span>INTRODUCE</span>
+                </p>
+                <div class="content" style="overflow: hidden;" v-html="activityInfo.description">
+                </div>
+              </div>
+              <div class="guide title-tip">
+                <p class="title">
+                  参赛指南
+                  <span>GUIDE</span>
+                </p>
+                <div class="content" v-html="activityInfo.guide"></div>
+              </div>
+              <div class="faq title-tip">
+                <p class="title">
+                  常见问题
+                  <span>FAQ</span>
+                </p>
+                <div class="content" v-html="activityInfo.faq"></div>
+            </div>
+          </div>
+        </div>
+    </div>
+  </div>
+</template>
+<script>
+    import attachmentsList from '@/static/attachmentsList.json'
+    import activityInfo from '@/static/activityDetails.json'
+    import rewardList from '@/static/rewardList.json'
+  export default {
+    components: {
+    },
+    data() {
+      return {
+        reviewAcList: [],
+        attachmentsList: [],
+        rewardSettings:[
+            {
+                "activityId":16,
+                "activityName":"2018年柯桥区天天智慧课堂 12月份 优课评比",
+                "applyCount":20,
+                "id":46,
+                "name":"月冠军",
+                "ratio":1,
+                "ratioTip":"5.00%/1人",
+                "sortNumber":1,
+                "type":2
+            },
+            {
+                "activityId":16,
+                "activityName":"2018年柯桥区天天智慧课堂 12月份 优课评比",
+                "applyCount":20,
+                "id":47,
+                "name":"月亚军",
+                "ratio":1,
+                "ratioTip":"5.00%/1人",
+                "sortNumber":2,
+                "type":2
+            },
+            {
+                "activityId":16,
+                "activityName":"2018年柯桥区天天智慧课堂 12月份 优课评比",
+                "applyCount":20,
+                "id":48,
+                "name":"月季军",
+                "ratio":1,
+                "ratioTip":"5.00%/1人",
+                "sortNumber":3,
+                "type":2
+            },
+            {
+                "activityId":16,
+                "activityName":"2018年柯桥区天天智慧课堂 12月份 优课评比",
+                "applyCount":20,
+                "id":49,
+                "name":"优课",
+                "ratio":7,
+                "ratioTip":"35.00%/7人",
+                "sortNumber":4,
+                "type":2
+            }
+        ],
+        activityInfo: {},
+        columns1: [
+            {
+                title: '作品名称',
+                key: 'applyName'
+            },
+            {
+                title: '作者',
+                key: 'employeeName'
+            },
+            {
+                title: '学校',
+                key: 'employeeSchoolName'
+            },
+            {
+                title: '年级',
+                key: 'gradeName'
+           },
+            {
+                title: '学科',
+                key: 'categoryName'
+           },
+           {
+                title: '奖项',
+                key: 'activityAwardName'
+            }
+        ],
+        rewardDatas: []
+      }
+    },
+
+    created() {
+      this.attachmentsList = attachmentsList.data.list;
+      this.activityInfo = activityInfo.data;
+      this.rewardDatas = rewardList.data.list;
+    },
+    methods: {
+      tabClick(name) {
+        this.rewardDatas = name == "获奖作品" ? rewardList.data.list : rewardList.data.list.filter(item => item.activityAwardName == name);
+      }
+    },
+    mounted() {
+    }
+  }
+</script>
+<style scoped>
+  html, body, #app {
+    height: 100% !important;
+    user-select: none;
+  }
+
+  .main-content {
+    background: rgb(248,248,248) !important;
+  }
+
+  .center-row {
+    display:flex;
+    flex-direction:row;
+  }
+
+  .center-col {
+    display:flex;
+    flex-direction:column;
+  }
+
+  .banner {
+    width:100%;
+    margin-top:80px;
+  }
+
+    .banner img {
+        width: 100%;
+        min-width: 1280px;
+    }
+
+  .details-container {
+    position:relative;
+    width: 1200px;
+    margin: 120px auto;
+    z-index:999;
+    display: flex;
+    flex-direction: column;
+  }
+
+    .details-container .activity-brief {
+      width:100%;
+      background:#fff;
+      border-top-left-radius: 8px;
+      border-top-right-radius: 8px;
+    }
+    .details-container .activity-brief .activity-brief-left {
+      width:30%;
+      height:100%;
+      padding:20px;
+     }
+
+    .details-container .activity-brief .activity-brief-right {
+      width:70%;
+      height:100%;
+      padding:20px;
+     }
+
+    .details-container .activity-brief-title {
+      font-size:26px;
+      font-weight:bolder;
+      color:#333;
+      padding:5px 20px;
+      margin-left:10px;
+      border-bottom:1px solid #f6f6f6;
+    }
+
+    .details-container .activity-brief-title .status {
+      display: inline-block;
+      margin-left: 10px;
+      font-size: 14px;
+      color: #fff;
+      padding: 1px 6px;
+      vertical-align: top;
+      margin-top: 6px;
+      background-color: #53c766;
+      border-radius: 3px;
+    }
+    .details-container .activity-brief-title .ivu-btn {
+      width:120px;
+      height:38px;
+      margin-left:20px;
+      margin-bottom:10px;
+    }
+
+    .details-container .brief-info-left {
+      width:50%;
+    }
+
+      .details-container .brief-info-left .items {
+        margin:30px;
+      }
+
+      .details-container .brief-info-left .items .item {
+        font-size:20px;
+        color:#666;
+      }
+      .details-container .brief-info-left .items .item2 {
+        font-size:20px;
+        color:#ffa853;
+      }
+      .details-container .brief-info-left .items .tips {
+        font-size:14px;
+        color:#bbb;
+      }
+
+    .details-container .activity-details {
+      width:100%;
+      margin-top:20px;
+    }
+
+      .details-container .activity-details .details-left {
+        width:30%;
+        height:100%;
+      }
+
+      .details-container .activity-details .details-right {
+        width:70%;
+        height:100%;
+        margin-left:20px;
+      }
+
+      .details-container .activity-details .details-right .title-tip {
+        margin-top:20px;
+      }
+
+    .details-container .title-tip{
+        padding: 20px;
+        background: #fff;
+    }
+    .details-container  .review-attachment{
+        padding: 20px;
+        margin-top: 20px;
+        background: #fff;
+    }
+
+    .details-container  .title {
+        color: #33aafe;
+        font-size: 16px;
+        padding-bottom: 15px;
+        border-bottom: 1px solid #f6f6f6;
+    }
+    .details-container  .title span {
+        color: #ccc;
+        font-size: 14px;
+        margin-left: 8px;
+    }
+    .details-container  .title-tip .content {
+        color: #999;
+        font-size: 14px;
+        margin-top: 15px;
+    }
+
+    .details-container .details-left .review-attachment .attach {
+        height: 40px;
+        line-height: 40px;
+        padding-left: 40px;
+        margin-bottom: 14px;
+        margin-top:10px;
+    }
+    .details-container .details-left .review-attachment .attach a {
+        display: inline-block;
+        text-decoration: none;
+        font-size: 13px;
+        color: #555;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        width: 160px;
+        text-decoration: underline;
+    }
+    .details-container .details-left .review-attachment .attachicon-2 {
+        background:url("http://hystkj-oss.oss-cn-shenzhen.aliyuncs.com/icon.png") no-repeat;
+    }
+
+    .details-container .review-awards {
+      background:#fff;
+      padding:20px;
+    }
+
+    .details-container .review-awards /deep/ .ivu-tabs {
+      font-weight:bold;
+    }
+
+    .details-container .details-left .award {
+      margin:15px;
+      letter-spacing:1px;
+    }
+
+    .details-container .details-left .award-name {
+      font-size:16px;
+      color:#666;
+      font-weight:bolder;
+      margin-bottom:5px;
+    }
+
+
+
+</style>

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

@@ -8,7 +8,7 @@
       <div class="header-line">
         <h3>通知公告</h3>
         <span>NOTICE</span>
-        <a href="./notices.html" class="view-more">查看更多</a>
+        <a class="view-more" @click="goNotice">查看更多</a>
       </div>
 
       <div class="notices-box">
@@ -29,7 +29,7 @@
       <div class="container">
         <div class="header-line">
           <h3>评审活动</h3> <span>ACTIVITY</span> <div class="more">
-            <a href="./activity.html" class="view-more">查看更多</a> <span class="count">
+            <a class="view-more" @click="goActivity">查看更多</a> <span class="count">
               <b style="color: rgb(83, 199, 102);">2</b>个活动进行中
             </span>
           </div>
@@ -101,9 +101,19 @@
     methods: {
       handleNoticeClick() {
         this.$router.push('/noticeDetails');
+        this.$eventBus.$emit("activeIndex", 1);
       },
       handleActivityClick() {
         this.$router.push('/activityDetails');
+        this.$eventBus.$emit("activeIndex", 2);
+      },
+      goNotice() {
+        this.$router.push('/notice');
+        this.$eventBus.$emit("activeIndex", 1);
+      },
+      goActivity() {
+        this.$router.push('/reviewActivity');
+        this.$eventBus.$emit("activeIndex", 2);
       }
 
     },

TEAMModelOS.SmartClass/TEAMModelOS.SmartClass.csproj

@@ -19,6 +19,7 @@
   <ItemGroup>
     <!-- Files not to show in IDE -->
     <None Remove="ClientApp\utils\.editorconfig" />
+    <None Remove="ClientApp\utils\bus.js" />
     <None Remove="ClientApp\view\syllabus\login.vue" />
     <None Remove="yarn.lock" />
 

TEAMModelOS.SmartTeach/ClientApp/common/footer.vue

@@ -95,4 +95,13 @@
       padding-left: 50px;
       line-height: 24px;
     }
+  .fr {
+    float: right;
+  }
+  .w_footer .bot-nav dl dd a {
+    color: #777;
+  }
+  a, a:visited {
+    text-decoration: none;
+  }
 </style>

TEAMModelOS.SmartTeach/ClientApp/components/resource/activitycommon.vue

@@ -0,0 +1,162 @@
+<template>
+  <div class="activitycommon_box">
+    <div class="banner_img"><img src="../../assets/image/resource/activity_banner.png" /></div>
+    <div class="nav_list_box">
+      <div class="nav_list">
+        <ul class="activity_navlist">
+          <li class="nav_name" v-for="item in navname"><a href="" style="color:#fff">{{item.title}}</a></li>
+        </ul>
+        <div class="join">
+          <img src="../../assets/image/resource/btn_join.png" />
+        </div>
+      </div>
+    </div>
+    <div class="information_box">
+      <ul class="information_list">
+        <li class="information">
+          <div class="information_list_data">
+            <Icon type="md-paper" size="28" class="information_icon" /><div class="information_title">已有作品</div><div class="information_num"><DigitRoll :rollDigits="digits1" /></div>
+          </div>
+        </li>
+        <li class="informatio_two">
+          <div class="information_list_data">
+            <Icon type="md-contacts" size="28" class="information_icon" /><div class="information_title">参与人数</div><div class="information_num"><DigitRoll :rollDigits="digits2" /></div>
+          </div>
+        </li>
+        <li class="informatio_three">
+          <div class="information_list_data">
+            <Icon type="md-desktop" size="28" class="information_icon" /><div class="information_title">访问人数</div><div class="information_num"><DigitRoll :rollDigits="digits3" /></div>
+          </div>
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+<script>
+  import DigitRoll from '@huoyu/vue-digitroll';
+  export default {
+    components: { DigitRoll },
+    data() {
+      return {
+        digits1:11053,
+        digits2:9835,
+        digits3:23156,
+        navname: [
+          { "id": 1, "title": '活动首页', "url": '', },
+          { "id": 2, "title": '活动指南', "url": '', },
+          { "id": 3, "title": '作品展示', "url": '', },
+          { "id": 4, "title": '活动排行', "url": '', },
+          { "id": 5, "title": '活动奖项', "url": '', },
+          { "id": 6, "title": '课题证书', "url": '', }
+        ],
+      }
+    }
+  }
+</script>
+<style>
+  .activitycommon_box {
+    width:100%;
+    height:auto;
+  }
+  .banner_img {
+    width: 100%;
+    height:330px;
+  }
+    .banner_img img {
+      width:100%;
+    }
+    .nav_list_box {
+      width: 100%;
+      height: 54px;
+      padding: 0px 2px 2px 2px;
+      background: #309aeb;
+    }
+  .nav_list {
+    width:1200px;
+    height:54px;
+    margin:0 auto;
+  }
+  .activity_navlist {
+    width:80%;
+    height:54px;
+    float:left;
+  }
+  .nav_name {
+    width: 10%;
+    height: 54px;
+    line-height:54px;
+    color:#fff;
+  }
+  .join {
+    width:20%;
+    float:left;
+  }
+    .join img {
+      width:48%;
+      margin-top:4px;
+    }
+  .information_box {
+    width:1200px;
+    height:90px;
+    margin:0 auto;
+  }
+  .information_list {
+    width:100%;
+    height:90px;
+    list-style:none;
+  }
+  .information {
+    width: 25%;
+    height: 70px;
+    line-height: 70px;
+    margin: 8px;
+    float: left;
+    background-color: #f0f8fe;
+    margin-left:2%;
+  }
+  .informatio_two {
+    width: 25%;
+    height: 70px;
+    line-height: 70px;
+    margin: 8px;
+    float: left;
+    background-color: #f7f3fe;
+    margin-left:8%;
+  }
+  .informatio_three {
+    width: 25%;
+    height: 70px;
+    line-height: 70px;
+    margin: 8px;
+    float: left;
+    background-color: #edfcfd;
+    margin-left: 10%;
+  }
+  .information_list_data {
+    float: left;
+    width: 100%;
+    height: 70px;
+    line-height: 70px;
+  }
+  .information_title, .information_icon {
+    float: left;
+  }
+  .information_icon {
+    margin-top:20px;
+    margin-left:30px;
+  }
+  .information_title {
+    font-size:16px;
+    color:#555;
+    padding-left:15px;
+    padding-right:20px;
+  }
+  .information_num {
+    font-size: 32px;
+    color: #248dde;
+    height:70px;
+  }
+  .d-roll-item > .d-roll-bar > div {
+    line-height:0.95 !important;
+  }
+</style>

TEAMModelOS.SmartTeach/ClientApp/components/resource/activityindex.vue

@@ -0,0 +1,151 @@
+<template>
+  <div class="index_box">
+    <div class="index_top">
+      <div class="index_top_left">
+        <Carousel autoplay v-model="value2" loop>
+          <CarouselItem>
+            <div class="demo-carousel"><img src="../../assets/image/resource/activity_banner_01.jpg" /></div>
+          </CarouselItem>
+          <CarouselItem>
+            <div class="demo-carousel"><img src="../../assets/image/resource/activity_banner_02.png" /></div>
+          </CarouselItem>
+        </Carousel>
+        <span class="tit">
+          <em class="bg"></em>
+          <p>2018年创新杯首届全国信息化教学创新大赛正式启动</p>
+        </span>
+      </div>
+      <div class="index_top_right">
+        <div class="index_top_title"><div class="right_title">活动报道</div></div>
+        <ul class="index_top_list">
+          <li class="index_top_data" v-for="item in listdata"><a href="" style="color:#555"><div class="index_top_data_title"><Icon type="ios-ribbon" size="24" />{{item.title}}</div><div class="index_top_data_time">{{item.time}}</div></a></li>
+        </ul>
+      </div>
+      <div class="activity_img"><img src="../../assets/image/resource/flow_img.png" /></div>
+      <div class="production_box">
+        <div class="production_box_title"><div class="production_box_name">作品样例</div></div>
+        <ul>
+          <li></li>
+        </ul>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  export default {
+    data() {
+      return {
+        value2: 0,
+        listdata: [
+          { "id": 1, "title": '成都市小学数学“高效课堂”教学研讨活动', "time": '2018-09-16' },
+          { "id": 2, "title": '在看、说、读、演中感悟“博爱”', "time": '2018-09-02' },
+          { "id": 3, "title": '幸福课堂，让学生真正享受语文学习的快乐', "time": '2018-08-20' },
+          { "id": 4, "title": '成都市小学语文阅读教学中信息技术运用研讨', "time": '2018-05-12' },
+          { "id": 5, "title": 'IPAD进课堂，华科附小美术课堂新体验', "time": '2018-02-19' },
+          { "id": 6, "title": '在看、说、读、演中感悟“博爱”', "time": '2018-01-02' },
+          { "id": 7, "title": '幸福课堂，让学生真正享受语文学习的快乐', "time": '2018-01-07' },
+          { "id": 8, "title": '成都市小学语文阅读教学中信息技术运用研讨', "time": '2017-12-25' },
+        ],
+      }
+    }
+  }
+</script>
+<style>
+  .index_box {
+    width:100%;
+    height:auto;
+  }
+  .index_top {
+    width:1200px;
+    height:350px;
+    margin:0 auto;
+    padding-top:20px;
+  }
+  .index_top_left {
+    width:405px;
+    height:288px;
+    float:left;
+    position:relative
+  }
+  .index_top_right{
+    width: 750px;
+    height: 290px;
+    float: left;
+    margin-left:30px;
+  }
+  .tit {
+    position: absolute;
+    width: 100%;
+    height: 40px;
+    line-height: 40px;
+    font-size: 15px;
+    color: #fff;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    text-align: center;
+  }
+  .bg {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: #000;
+    opacity: .1;
+    filter: alpha(opacity=10);
+    z-index: 0;
+  }
+  .index_top_title {
+    width: 100%;
+    height: 37px;
+    border-bottom: 1px solid #e3e3e3;
+  }
+  .right_title {
+    width:13%;
+    font-size: 24px;
+    color: #288add;
+    border-bottom: 1px solid #288add;
+  }
+  .index_top_list {
+    width:100%;
+    height:250px;
+    list-style:none;
+  }
+  .index_top_data {
+    width:100%;
+    padding:1%  3% 3% 0%;
+  }
+  .index_top_data_title {
+    width: 70%;
+    float: left;
+    font-size: 14px;
+  }
+  .index_top_data_time {
+    width:20%;
+    float:right;
+    font-size:12px;
+  }
+  .activity_img {
+    width:1200px;
+    margin-top:7%;
+    float:left;
+  }
+  .production_box {
+    width: 1200px;
+    float: left;
+    margin: 0 auto;
+    margin-top: 5%;
+  }
+  .production_box_title {
+    width: 100%;
+    padding:1%;
+  }
+  .production_box_name {
+    width:8.5%;
+    font-size: 24px;
+    color: #288add;
+    border-bottom:1px solid #288add;
+    margin-left:1%;
+  }
+</style>

TEAMModelOS.SmartTeach/ClientApp/router/routes.js

@@ -2,12 +2,14 @@
 //import ServerSideLogin from '@/view/serverside/login'
 // import HTTP404 from '@/view/404'
 import Index from '@/view/resource/index'
+import Activity from '@/view/resource/activity'
 import HomePage from '@/view/resource/HomePage'
 import Teacher from '@/view/resource/Teacher'
 import { resolve } from 'url';
 
 export const routes = [  
   { name: 'index', path: '', component: Index },
+  { name: 'activity', path: '/activity', component: Activity},
   { name: 'HomePage', path: '/HomePage', component: HomePage },
   { name: 'Teacher', path: '/Teacher', component: Teacher },
 ]

TEAMModelOS.SmartTeach/ClientApp/view/resource/activity.vue

@@ -0,0 +1,35 @@
+<template>
+  <div class="activity_container">
+    <Header></Header>
+    <Activitycommon></Activitycommon>
+    <Activityindex></Activityindex>
+    <Footer></Footer>
+  </div>
+</template>
+<script>
+import Header from '@/common/headers.vue'
+  import Footer from '@/common/footer.vue'
+  import Activitycommon from '@/components/resource/activitycommon.vue'
+  import Activityindex from '@/components/resource/activityindex.vue'
+  export default {
+    components: {
+      Header,
+      Footer,
+      Activitycommon,
+      Activityindex
+    },
+    data() {
+      return {
+
+      }
+    }
+  }
+</script>
+<style>
+  .activity_container {
+    width: 100%;
+    height: auto;
+    background-color: #fff;
+  }
+
+</style>

TEAMModelOS.SmartTeach/package.json

@@ -17,6 +17,7 @@
     "update-packages": "npx npm-check -u"
   },
   "dependencies": {
+    "@huoyu/vue-digitroll": "^1.0.4",
     "animate.css": "^3.7.0",
     "axios": "^0.18.0",
     "bcryptjs": "^2.4.3",