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

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

@@ -21,7 +21,7 @@
     props: ['parentToChild', 'identityselect'],
     data() {
       return {
-        activeIndex:0
+        activeIndex: sessionStorage.getItem('_activeIndex') || 0
       }
     },
     created() {
@@ -30,17 +30,20 @@
     methods: {
       handleMenuClick(index, route) {
         this.activeIndex = index;
+        sessionStorage.setItem('_activeIndex', index);
         this.$router.push(route);
       }
     },
   }
 </script>
-<style>
+<style scoped>
 
   .headerContainer {
     background-color: #1f2d3d;
     height: 80px;
     position: absolute;
+    left:0;
+    top:0;
     min-width: 100%
   }
 

TEAMModelOS.SmartClass/ClientApp/router/routes.js

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

TEAMModelOS.SmartClass/ClientApp/static/attachmentsList.json

@@ -0,0 +1,153 @@
+{
+  "data": {
+    "data": null,
+    "errorCode": null,
+    "html": null,
+    "key": null,
+    "list": [
+      {
+        "activityId": 40,
+        "activityName": "2019年柯桥区天天智慧课堂 5月份 优课评比",
+        "fileName": "柯桥区天天智慧课堂教学设计表.docx",
+        "fileNameHash": "73.docx",
+        "fileNameUri": "/upload/activity/attachment/73/73.docx?_=1557313944956",
+        "fileSize": 21981,
+        "fileSizeTip": "21.47KB",
+        "fileType": 2,
+        "htmName": "73.htm",
+        "htmRemark": "成功:2019-04-25 15:05:51",
+        "id": 73,
+        "pdfName": "73.pdf",
+        "pdfRemark": "成功:2019-04-25 15:05:50",
+        "swfName": "73.swf",
+        "swfRemark": "成功:2019-04-25 15:05:51"
+      },
+      {
+        "activityId": 40,
+        "activityName": "2019年柯桥区天天智慧课堂 5月份 优课评比",
+        "fileName": "柯桥区天天智慧课堂教学反思表.docx",
+        "fileNameHash": "74.docx",
+        "fileNameUri": "/upload/activity/attachment/74/74.docx?_=1557313944957",
+        "fileSize": 21772,
+        "fileSizeTip": "21.26KB",
+        "fileType": 2,
+        "htmName": "74.htm",
+        "htmRemark": "成功:2019-04-25 15:06:11",
+        "id": 74,
+        "pdfName": "74.pdf",
+        "pdfRemark": "成功:2019-04-25 15:06:10",
+        "swfName": "74.swf",
+        "swfRemark": "成功:2019-04-25 15:06:12"
+      },
+      {
+        "activityId": 40,
+        "activityName": "2019年柯桥区天天智慧课堂 5月份 优课评比",
+        "fileName": "天天智慧课堂课例封面（模版）.ppt",
+        "fileNameHash": "75.ppt",
+        "fileNameUri": "/upload/activity/attachment/75/75.ppt?_=1557313944957",
+        "fileSize": 55808,
+        "fileSizeTip": "54.50KB",
+        "fileType": 2,
+        "htmName": "75.htm",
+        "htmRemark": "成功:2019-04-25 15:06:13",
+        "id": 75,
+        "pdfName": "75.pdf",
+        "pdfRemark": "成功:2019-04-25 15:06:13",
+        "swfName": "75.swf",
+        "swfRemark": "成功:2019-04-25 15:06:14"
+      },
+      {
+        "activityId": 40,
+        "activityName": "2019年柯桥区天天智慧课堂 5月份 优课评比",
+        "fileName": "天天智慧课堂评课封面（模版）.ppt",
+        "fileNameHash": "76.ppt",
+        "fileNameUri": "/upload/activity/attachment/76/76.ppt?_=1557313944957",
+        "fileSize": 45568,
+        "fileSizeTip": "44.50KB",
+        "fileType": 2,
+        "htmName": "76.htm",
+        "htmRemark": "成功:2019-04-25 15:06:15",
+        "id": 76,
+        "pdfName": "76.pdf",
+        "pdfRemark": "成功:2019-04-25 15:06:14",
+        "swfName": "76.swf",
+        "swfRemark": "成功:2019-04-25 15:06:15"
+      },
+      {
+        "activityId": 40,
+        "activityName": "2019年柯桥区天天智慧课堂 5月份 优课评比",
+        "fileName": "柯桥区天天智慧课堂课例评选指标.xls",
+        "fileNameHash": "77.xls",
+        "fileNameUri": "/upload/activity/attachment/77/77.xls?_=1557313944957",
+        "fileSize": 27648,
+        "fileSizeTip": "27.00KB",
+        "fileType": 2,
+        "htmName": "77.htm",
+        "htmRemark": "成功:2019-04-25 15:06:32",
+        "id": 77,
+        "pdfName": "77.pdf",
+        "pdfRemark": "成功:2019-04-25 15:06:31",
+        "swfName": "77.swf",
+        "swfRemark": "成功:2019-04-25 15:06:32"
+      },
+      {
+        "activityId": 40,
+        "activityName": "2019年柯桥区天天智慧课堂 5月份 优课评比",
+        "fileName": "2019年柯桥区天天智慧课堂5月份排课安排表.docx",
+        "fileNameHash": "78.docx",
+        "fileNameUri": "/upload/activity/attachment/78/78.docx?_=1557313944957",
+        "fileSize": 25472,
+        "fileSizeTip": "24.88KB",
+        "fileType": 2,
+        "htmName": "78.htm",
+        "htmRemark": "成功:2019-04-28 15:46:32",
+        "id": 78,
+        "pdfName": "78.pdf",
+        "pdfRemark": "成功:2019-04-28 15:46:31",
+        "swfName": "78.swf",
+        "swfRemark": "成功:2019-04-28 15:46:32"
+      }
+    ],
+    "message": null,
+    "query": {
+      "fields": [],
+      "orders": [],
+      "pageCount": 0,
+      "pageIndex": 1,
+      "pageSize": 2147483647,
+      "recordCount": -1,
+      "recordEnd": 6,
+      "recordStart": 1
+    },
+    "success": true,
+    "systemTime": {
+      "date": 8,
+      "day": 3,
+      "hours": 19,
+      "minutes": 12,
+      "month": 4,
+      "seconds": 24,
+      "time": 1557313944956,
+      "timezoneOffset": -480,
+      "year": 119
+    },
+    "uri": null
+  },
+  "errorCode": null,
+  "html": null,
+  "key": null,
+  "message": null,
+  "success": true,
+  "systemTime": {
+    "date": 8,
+    "day": 3,
+    "hours": 19,
+    "minutes": 12,
+    "month": 4,
+    "seconds": 24,
+    "time": 1557313944956,
+    "timezoneOffset": -480,
+    "year": 119
+  },
+  "uri": null
+}

TEAMModelOS.SmartClass/ClientApp/static/indexNoticeList.json

@@ -0,0 +1,259 @@
+{
+  "data": null,
+  "errorCode": null,
+  "html": null,
+  "key": null,
+  "list": [
+    {
+      "coverUri": "",
+      "createTime": {
+        "date": 28,
+        "day": 0,
+        "hours": 15,
+        "minutes": 43,
+        "month": 3,
+        "nanos": 0,
+        "seconds": 7,
+        "time": 1556437387000,
+        "timezoneOffset": -480,
+        "year": 119
+      },
+      "endTime": null,
+      "id": 125,
+      "next": false,
+      "noticeTypeId": 1,
+      "noticeTypeName": "天天展示",
+      "prev": false,
+      "startTime": {
+        "date": 28,
+        "day": 0,
+        "hours": 0,
+        "minutes": 0,
+        "month": 3,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1556380800000,
+        "timezoneOffset": -480,
+        "year": 119
+      },
+      "startTimeTip": "2019-04-28",
+      "status": 1,
+      "title": "2019年柯桥区天天智慧课堂5月份排课安排表",
+      "viewCount": 4
+    },
+    {
+      "coverUri": "",
+      "createTime": {
+        "date": 25,
+        "day": 4,
+        "hours": 8,
+        "minutes": 6,
+        "month": 3,
+        "nanos": 0,
+        "seconds": 38,
+        "time": 1556150798000,
+        "timezoneOffset": -480,
+        "year": 119
+      },
+      "endTime": null,
+      "id": 124,
+      "next": false,
+      "noticeTypeId": 12,
+      "noticeTypeName": "获奖信息",
+      "prev": false,
+      "startTime": {
+        "date": 22,
+        "day": 1,
+        "hours": 0,
+        "minutes": 0,
+        "month": 3,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1555862400000,
+        "timezoneOffset": -480,
+        "year": 119
+      },
+      "startTimeTip": "2019-04-22",
+      "status": 1,
+      "title": "柯桥区教师在2019年全国中小学互动课堂课例比赛中再创佳绩",
+      "viewCount": 1
+    },
+    {
+      "coverUri": "",
+      "createTime": {
+        "date": 18,
+        "day": 4,
+        "hours": 12,
+        "minutes": 6,
+        "month": 3,
+        "nanos": 0,
+        "seconds": 16,
+        "time": 1555560376000,
+        "timezoneOffset": -480,
+        "year": 119
+      },
+      "endTime": null,
+      "id": 123,
+      "next": false,
+      "noticeTypeId": 1,
+      "noticeTypeName": "天天展示",
+      "prev": false,
+      "startTime": {
+        "date": 18,
+        "day": 4,
+        "hours": 0,
+        "minutes": 0,
+        "month": 3,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1555516800000,
+        "timezoneOffset": -480,
+        "year": 119
+      },
+      "startTimeTip": "2019-04-18",
+      "status": 1,
+      "title": "关于公布2019年柯桥区天天智慧课堂3月份优课评比结果的通知",
+      "viewCount": 2
+    },
+    {
+      "coverUri": "",
+      "createTime": {
+        "date": 17,
+        "day": 3,
+        "hours": 14,
+        "minutes": 9,
+        "month": 3,
+        "nanos": 0,
+        "seconds": 6,
+        "time": 1555481346000,
+        "timezoneOffset": -480,
+        "year": 119
+      },
+      "endTime": null,
+      "id": 122,
+      "next": false,
+      "noticeTypeId": 4,
+      "noticeTypeName": "月月研讨",
+      "prev": false,
+      "startTime": {
+        "date": 16,
+        "day": 2,
+        "hours": 0,
+        "minutes": 0,
+        "month": 3,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1555344000000,
+        "timezoneOffset": -480,
+        "year": 119
+      },
+      "startTimeTip": "2019-04-16",
+      "status": 1,
+      "title": "2019年柯桥区智慧课堂第二次研讨活动在实验中学举行",
+      "viewCount": 1
+    },
+    {
+      "coverUri": "",
+      "createTime": {
+        "date": 15,
+        "day": 1,
+        "hours": 13,
+        "minutes": 46,
+        "month": 3,
+        "nanos": 0,
+        "seconds": 18,
+        "time": 1555307178000,
+        "timezoneOffset": -480,
+        "year": 119
+      },
+      "endTime": null,
+      "id": 121,
+      "next": false,
+      "noticeTypeId": 4,
+      "noticeTypeName": "月月研讨",
+      "prev": false,
+      "startTime": {
+        "date": 11,
+        "day": 4,
+        "hours": 0,
+        "minutes": 0,
+        "month": 3,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1554912000000,
+        "timezoneOffset": -480,
+        "year": 119
+      },
+      "startTimeTip": "2019-04-11",
+      "status": 1,
+      "title": "关于开展2019年柯桥区智慧课堂第二次研讨活动的通知",
+      "viewCount": 2
+    },
+    {
+      "coverUri": "",
+      "createTime": {
+        "date": 3,
+        "day": 3,
+        "hours": 15,
+        "minutes": 19,
+        "month": 3,
+        "nanos": 0,
+        "seconds": 50,
+        "time": 1554275990000,
+        "timezoneOffset": -480,
+        "year": 119
+      },
+      "endTime": null,
+      "id": 120,
+      "next": false,
+      "noticeTypeId": 1,
+      "noticeTypeName": "天天展示",
+      "prev": false,
+      "startTime": {
+        "date": 1,
+        "day": 1,
+        "hours": 0,
+        "minutes": 0,
+        "month": 3,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1554048000000,
+        "timezoneOffset": -480,
+        "year": 119
+      },
+      "startTimeTip": "2019-04-01",
+      "status": 1,
+      "title": "2019年柯桥区天天智慧课堂4月份排课安排表",
+      "viewCount": 0
+    }
+  ],
+  "message": null,
+  "query": {
+    "fields": [],
+    "orders": [
+      {
+        "asc": false,
+        "property": "startTime"
+      }
+    ],
+    "pageCount": 20,
+    "pageIndex": 1,
+    "pageSize": 6,
+    "recordCount": 117,
+    "recordEnd": 6,
+    "recordStart": 1
+  },
+  "success": true,
+  "systemTime": {
+    "date": 8,
+    "day": 3,
+    "hours": 20,
+    "minutes": 12,
+    "month": 4,
+    "seconds": 36,
+    "time": 1557317556824,
+    "timezoneOffset": -480,
+    "year": 119
+  },
+  "uri": null
+}

TEAMModelOS.SmartClass/ClientApp/static/reviewAcList.json

@@ -0,0 +1,388 @@
+{
+  "data": {
+    "data": null,
+    "errorCode": null,
+    "html": null,
+    "key": null,
+    "list": [
+      {
+        "activityCover": null,
+        "activityCoverHash": null,
+        "activityCoverUri": null,
+        "activityId": null,
+        "activityName": null,
+        "applyCount": 0,
+        "autoChangeStatus": false,
+        "banner": "优课评比banner.jpg",
+        "bannerHash": "40.jpg",
+        "bannerUri": "/upload/activity/banner/40/40.jpg?_=1557301765646",
+        "cover": "天天智慧课堂5月.jpg",
+        "coverHash": "40.jpg",
+        "coverUri": "/upload/activity/cover/40/40.jpg?_=1557301765646",
+        "employeeName": "楼宽",
+        "employeeNo": "31050",
+        "enjoinType": 3,
+        "hasDelNoGetAwardRes": false,
+        "hideAttachmentAfterEnd": false,
+        "hideAwardAfterEnd": false,
+        "id": 40,
+        "name": "2019年柯桥区天天智慧课堂 5月份 优课评比",
+        "nameMaxLength": null,
+        "numberOfProduction": 1,
+        "organizer": "柯桥区教师发展中心",
+        "publicity": false,
+        "reviewEndTime": {
+          "date": 8,
+          "day": 6,
+          "hours": 0,
+          "minutes": 0,
+          "month": 5,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1559923200000,
+          "timezoneOffset": -480,
+          "year": 119
+        },
+        "reviewTimeTip": "2019.05.31-06.08",
+        "showApplyScore": false,
+        "state": 1,
+        "stateTip": "有效 ",
+        "status": 1,
+        "statusTip": "筹备阶段",
+        "subActivityApplyCount": null,
+        "subActivityApplyPushCount": 0,
+        "subPushEndTime": null,
+        "subPushEndTimeLimitTip": "",
+        "subPushEndTimeTip": "",
+        "submitEndTime": {
+          "date": 31,
+          "day": 5,
+          "hours": 0,
+          "minutes": 0,
+          "month": 4,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1559232000000,
+          "timezoneOffset": -480,
+          "year": 119
+        },
+        "submitEndTimeTip": "2019.05.31",
+        "submitStartTime": {
+          "date": 1,
+          "day": 3,
+          "hours": 0,
+          "minutes": 0,
+          "month": 4,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1556640000000,
+          "timezoneOffset": -480,
+          "year": 119
+        },
+        "submitTimeTip": "2019.05.01-05.31",
+        "timeTip": "2019.05.01-06.08",
+        "videoMaxLength": null,
+        "videoMaxSize": 500,
+        "view": true,
+        "weikeMaxLength": null,
+        "weikeMaxSize": null
+      },
+      {
+        "activityCover": null,
+        "activityCoverHash": null,
+        "activityCoverUri": null,
+        "activityId": null,
+        "activityName": null,
+        "applyCount": 0,
+        "autoChangeStatus": false,
+        "banner": "优课评比banner.jpg",
+        "bannerHash": "39.jpg",
+        "bannerUri": "/upload/activity/banner/39/39.jpg?_=1557301765647",
+        "cover": "天天智慧课堂4月.jpg",
+        "coverHash": "39.jpg",
+        "coverUri": "/upload/activity/cover/39/39.jpg?_=1557301765647",
+        "employeeName": "楼宽",
+        "employeeNo": "31050",
+        "enjoinType": 3,
+        "hasDelNoGetAwardRes": false,
+        "hideAttachmentAfterEnd": false,
+        "hideAwardAfterEnd": false,
+        "id": 39,
+        "name": "2019年柯桥区天天智慧课堂 4月份 优课评比",
+        "nameMaxLength": null,
+        "numberOfProduction": 1,
+        "organizer": "柯桥区教师发展中心",
+        "publicity": false,
+        "reviewEndTime": {
+          "date": 10,
+          "day": 5,
+          "hours": 0,
+          "minutes": 0,
+          "month": 4,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1557417600000,
+          "timezoneOffset": -480,
+          "year": 119
+        },
+        "reviewTimeTip": "2019.04.30-05.10",
+        "showApplyScore": false,
+        "state": 1,
+        "stateTip": "有效 ",
+        "status": 2,
+        "statusTip": "报名阶段",
+        "subActivityApplyCount": null,
+        "subActivityApplyPushCount": 0,
+        "subPushEndTime": null,
+        "subPushEndTimeLimitTip": "",
+        "subPushEndTimeTip": "",
+        "submitEndTime": {
+          "date": 30,
+          "day": 2,
+          "hours": 0,
+          "minutes": 0,
+          "month": 3,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1556553600000,
+          "timezoneOffset": -480,
+          "year": 119
+        },
+        "submitEndTimeTip": "2019.04.30",
+        "submitStartTime": {
+          "date": 1,
+          "day": 1,
+          "hours": 0,
+          "minutes": 0,
+          "month": 3,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1554048000000,
+          "timezoneOffset": -480,
+          "year": 119
+        },
+        "submitTimeTip": "2019.04.01-04.30",
+        "timeTip": "2019.04.01-05.10",
+        "videoMaxLength": null,
+        "videoMaxSize": null,
+        "view": true,
+        "weikeMaxLength": null,
+        "weikeMaxSize": null
+      },
+      {
+        "activityCover": null,
+        "activityCoverHash": null,
+        "activityCoverUri": null,
+        "activityId": null,
+        "activityName": null,
+        "applyCount": 0,
+        "autoChangeStatus": false,
+        "banner": "优课评比banner.jpg",
+        "bannerHash": "39.jpg",
+        "bannerUri": "/upload/activity/banner/39/39.jpg?_=1557301765647",
+        "cover": "天天智慧课堂4月.jpg",
+        "coverHash": "39.jpg",
+        "coverUri": "/upload/activity/cover/39/39.jpg?_=1557301765647",
+        "employeeName": "楼宽",
+        "employeeNo": "31050",
+        "enjoinType": 3,
+        "hasDelNoGetAwardRes": false,
+        "hideAttachmentAfterEnd": false,
+        "hideAwardAfterEnd": false,
+        "id": 39,
+        "name": "2019年柯桥区天天智慧课堂 4月份 优课评比",
+        "nameMaxLength": null,
+        "numberOfProduction": 1,
+        "organizer": "柯桥区教师发展中心",
+        "publicity": false,
+        "reviewEndTime": {
+          "date": 10,
+          "day": 5,
+          "hours": 0,
+          "minutes": 0,
+          "month": 4,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1557417600000,
+          "timezoneOffset": -480,
+          "year": 119
+        },
+        "reviewTimeTip": "2019.04.30-05.10",
+        "showApplyScore": false,
+        "state": 1,
+        "stateTip": "有效 ",
+        "status": 2,
+        "statusTip": "报名阶段",
+        "subActivityApplyCount": null,
+        "subActivityApplyPushCount": 0,
+        "subPushEndTime": null,
+        "subPushEndTimeLimitTip": "",
+        "subPushEndTimeTip": "",
+        "submitEndTime": {
+          "date": 30,
+          "day": 2,
+          "hours": 0,
+          "minutes": 0,
+          "month": 3,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1556553600000,
+          "timezoneOffset": -480,
+          "year": 119
+        },
+        "submitEndTimeTip": "2019.04.30",
+        "submitStartTime": {
+          "date": 1,
+          "day": 1,
+          "hours": 0,
+          "minutes": 0,
+          "month": 3,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1554048000000,
+          "timezoneOffset": -480,
+          "year": 119
+        },
+        "submitTimeTip": "2019.04.01-04.30",
+        "timeTip": "2019.04.01-05.10",
+        "videoMaxLength": null,
+        "videoMaxSize": null,
+        "view": true,
+        "weikeMaxLength": null,
+        "weikeMaxSize": null
+      },
+      {
+        "activityCover": null,
+        "activityCoverHash": null,
+        "activityCoverUri": null,
+        "activityId": null,
+        "activityName": null,
+        "applyCount": 0,
+        "autoChangeStatus": false,
+        "banner": "优课评比banner.jpg",
+        "bannerHash": "39.jpg",
+        "bannerUri": "/upload/activity/banner/39/39.jpg?_=1557301765647",
+        "cover": "天天智慧课堂4月.jpg",
+        "coverHash": "39.jpg",
+        "coverUri": "/upload/activity/cover/39/39.jpg?_=1557301765647",
+        "employeeName": "楼宽",
+        "employeeNo": "31050",
+        "enjoinType": 3,
+        "hasDelNoGetAwardRes": false,
+        "hideAttachmentAfterEnd": false,
+        "hideAwardAfterEnd": false,
+        "id": 39,
+        "name": "2019年柯桥区天天智慧课堂 4月份 优课评比",
+        "nameMaxLength": null,
+        "numberOfProduction": 1,
+        "organizer": "柯桥区教师发展中心",
+        "publicity": false,
+        "reviewEndTime": {
+          "date": 10,
+          "day": 5,
+          "hours": 0,
+          "minutes": 0,
+          "month": 4,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1557417600000,
+          "timezoneOffset": -480,
+          "year": 119
+        },
+        "reviewTimeTip": "2019.04.30-05.10",
+        "showApplyScore": false,
+        "state": 1,
+        "stateTip": "有效 ",
+        "status": 2,
+        "statusTip": "报名阶段",
+        "subActivityApplyCount": null,
+        "subActivityApplyPushCount": 0,
+        "subPushEndTime": null,
+        "subPushEndTimeLimitTip": "",
+        "subPushEndTimeTip": "",
+        "submitEndTime": {
+          "date": 30,
+          "day": 2,
+          "hours": 0,
+          "minutes": 0,
+          "month": 3,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1556553600000,
+          "timezoneOffset": -480,
+          "year": 119
+        },
+        "submitEndTimeTip": "2019.04.30",
+        "submitStartTime": {
+          "date": 1,
+          "day": 1,
+          "hours": 0,
+          "minutes": 0,
+          "month": 3,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1554048000000,
+          "timezoneOffset": -480,
+          "year": 119
+        },
+        "submitTimeTip": "2019.04.01-04.30",
+        "timeTip": "2019.04.01-05.10",
+        "videoMaxLength": null,
+        "videoMaxSize": null,
+        "view": true,
+        "weikeMaxLength": null,
+        "weikeMaxSize": null
+      }
+    ],
+    "message": null,
+    "query": {
+      "fields": [],
+      "orders": [
+        {
+          "asc": false,
+          "property": "-1"
+        },
+        {
+          "asc": false,
+          "property": "submitStartTime"
+        }
+      ],
+      "pageCount": 1,
+      "pageIndex": 1,
+      "pageSize": 100,
+      "recordCount": 2,
+      "recordEnd": 2,
+      "recordStart": 1
+    },
+    "success": true,
+    "systemTime": {
+      "date": 8,
+      "day": 3,
+      "hours": 15,
+      "minutes": 49,
+      "month": 4,
+      "seconds": 25,
+      "time": 1557301765644,
+      "timezoneOffset": -480,
+      "year": 119
+    },
+    "uri": null
+  },
+  "errorCode": null,
+  "html": null,
+  "key": null,
+  "message": null,
+  "success": true,
+  "systemTime": {
+    "date": 8,
+    "day": 3,
+    "hours": 15,
+    "minutes": 49,
+    "month": 4,
+    "seconds": 25,
+    "time": 1557301765646,
+    "timezoneOffset": -480,
+    "year": 119
+  },
+  "uri": null
+}

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

@@ -0,0 +1,277 @@
+<template>
+  <div id="app">
+    <div class="banner">
+      <img src="http://ttkt.sxedu.org:70/upload/activity/banner/40/40.jpg?_=1557306525954" />
+    </div>
+    <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(19, 206, 102);">筹备阶段</span>
+              <Button type="primary" size="large">参加活动</Button>
+            </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">征集中</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 class="items"><p class="item2">0天 0小时 0分</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="content" v-html="activityInfo.requirement"></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="description title-tip" style="margin-top:0">
+                <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'
+  export default {
+    components: {
+    },
+    data() {
+      return {
+        reviewAcList: [],
+        attachmentsList: [],
+        activityInfo: {}
+      }
+    },
+
+    created() {
+      this.attachmentsList = attachmentsList.data.list;
+      this.activityInfo = activityInfo.data;
+    },
+    methods: {
+
+    },
+    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: 280px auto;
+    margin-top:-50px;
+    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;
+    }
+
+
+
+
+</style>

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

@@ -1,20 +1,77 @@
 <template>
   <div class="container">
     <div class="review-main">
-      <h1>往届回顾1231</h1>
+      <div class="condition-wrap">
+        <div class="condition-wrap-left">
+          <Button type="primary">新媒体新技术</Button>
+          <Button type="success">创新实验室</Button>
+        </div>
+        <div class="condition-wrap-right">
+          <Select v-model="yearDefault" size="large" style="width:100px">
+            <Option v-for="item in years" :value="item" :key="item">{{ item }}</Option>
+          </Select>
+          <Select v-model="monthDefault" size="large" style="width:100px">
+            <Option v-for="item in monthes" :value="item" :key="item">{{ item }}</Option>
+          </Select>
+          <Button size="large">返回今天</Button>
+        </div>
+      </div>
+      <full-calendar :events="fcEvents" lang="zh" @dayClick ="getDay"></full-calendar>
     </div>
   </div>
 </template>
 <script>
+  import FullCalendar from 'vue-fullcalendar'
   export default {
     components: {
+      FullCalendar
     },
     data() {
       return {
+        yearDefault:'2019年',
+        years: [
+          "2012年",
+          "2013年",
+          "2014年",
+          "2015年",
+          "2016年",
+          "2017年",
+          "2018年",
+          "2019年",
+          "2020年",
+          "2021年",
+          "2022年",
+          "2023年",
+          "2024年",
+        ],
+        monthDefault: '1月',
+        monthes: [
+          '1月',
+          '2月',
+          '3月',
+          '4月',
+          '5月',
+          '6月',
+          '7月',
+          '8月',
+          '9月',
+          '11月',
+          '12月',
+        ],
+        fcEvents: [
+          {
+            title: 'Sunny Out of Office',
+            start: '2019-05-5',
+            end: '2019-05-5'
+          }
+        ]
       }
     },
     methods: {
-
+      getDay(day, jsEvent) {
+        console.log(day);
+        console.log(jsEvent);
+      }
 
 
     },
@@ -27,7 +84,7 @@
     height: 100% !important;
     user-select: none;
   }
-
+  
   .main-content {
     background:rgb(248,248,248) !important;
   }
@@ -41,22 +98,41 @@
   .review-main {
     background:#fff;
     width:100%;
-    height:600px;
+    padding:10px 25px;
   }
-    .container .left-box {
-      width:25%;
-      height:600px;
-      background:#fff;
+    .review-main /deep/ .full-calendar-header {
+      display:none;
     }
-
-    .container .right-box {
-      width:73%;
-      height:600px;
-      background:#fff;
+    .review-main /deep/ .comp-full-calendar {
+      padding:0px;
+      max-width:1200px;
     }
-
-  .center-col {
-
+    .review-main /deep/ .weeks {
+      background: -webkit-linear-gradient(#E1E7EC, #B9C6D1); /* Safari 5.1 - 6.0 */
+      background: -o-linear-gradient(#E1E7EC, #B9C6D1); /* Opera 11.1 - 12.0 */
+      background: -moz-linear-gradient(#E1E7EC, #B9C6D1); /* Firefox 3.6 - 15 */
+      background: linear-gradient(#E1E7EC, #B9C6D1); /* 标准的语法 */
+      height: 40px;
+      line-height: 40px;
+    }
+    .review-main /deep/ .full-calendar-body .dates .week-row .day-cell.today {
+      background:#dfe6ec;
+    }
+    .review-main /deep/ .week-row > .not-cur-month {
+      background: linear-gradient( -45deg, #ecf0f4 25%, #ffffff 0, #ffffff 50%, #ecf0f4 0, #ecf0f4 75%, #ffffff 0 ); /* 标准的语法（必须放在最后） */
+      background-size: 20px 20px;
+    }
+    .review-main /deep/ .week-row {
+      height:140px;
+    }
+    .review-main /deep/ .events-week {
+      height:140px;
+    }
+    
+   .condition-wrap {
+    display:flex;
+    flex-direction:row;
+    justify-content : space-between;
   }
 
 </style>

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

@@ -0,0 +1,106 @@
+<template>
+  <div class="details-container">
+    <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>
+    </div>
+    <div class="content" v-html="noticeContent">
+
+    </div>
+    <Button type="primary" @click="backList">返回列表</Button>
+  </div>
+</template>
+<script>
+    import noticeDetails from '@/static/noticeDetails.json'
+  export default {
+    components: {
+    },
+    data() {
+      return {
+        reviewAcList: [],
+        attachmentsList: [],
+        noticeContent: {}
+      }
+    },
+
+    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.noticeContent = noticeDetails.data.content;
+    },
+    methods: {
+      backList() {
+        this.$router.go(-1);
+      }
+
+    },
+    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;
+  }
+
+
+  .details-container {
+    position:relative;
+    width: 1200px;
+    margin: 100px auto;
+    padding:36px 30px 30px;
+    background:#fff;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .notice-header {
+    text-align:center;
+  }
+
+    .notice-header .content-title {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      width: 600px;
+      display: inline-block;
+      font-size: 20px;
+      color: #222;
+    }
+
+    .notice-header .sub {
+      font-size: 14px;
+      color: #999;
+      padding-top: 12px;
+      padding-bottom: 10px;
+      margin-bottom: 24px;
+      border-bottom: 1px solid #f6f6f6;
+    }
+
+    .details-container .ivu-btn {
+      width:150px;
+      margin:10px auto;
+    }
+ 
+
+</style>

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

@@ -1,28 +1,7 @@
 <template>
   <div class="container">
-    <div class="activity-item">
-      <div class="activity-banner">
-        <img src="http://ttkt.sxedu.org:70/upload/activity/banner/40/40.jpg?_=1557231709373" />
-      </div>
-      <div class="activity-brief">
-        <div class="left">
-          <div class="line">
-            <span class="tips">活动：</span>
-            <span title="2019年柯桥区天天智慧课堂 5月份 优课评比" class="items">2019年柯桥区天天智慧课堂 5月份 优课评比</span>
-            <span class="status" style="background: rgb(19, 206, 102);">筹备阶段</span>
-          </div>
-          <div class="line"><span class="tips">时间：</span> <span class="items2">2019.05.01-06.08</span></div>
-          <div class="line"><span class="tips">主办：</span> <span class="items2">柯桥区教师发展中心</span></div>
-          <div class="line"><span class="tips">作品：</span> <span class="items2">征集中</span></div>
 
-        </div>
-        <div class="right">
-          <p class="time-count">距离报名开始还有<span class="count-down"> 0天 0小时 0分</span></p>
-          <Button type="primary" size="large">查看详情</Button>
-        </div>
-      </div>
-    </div>
-    <div class="activity-item">
+    <div class="activity-item" v-for="(item,index) in reviewAcList" :key="index">
       <div class="activity-banner">
         <img src="http://ttkt.sxedu.org:70/upload/activity/banner/40/40.jpg?_=1557231709373" />
       </div>
@@ -30,70 +9,36 @@
         <div class="left">
           <div class="line">
             <span class="tips">活动：</span>
-            <span title="2019年柯桥区天天智慧课堂 5月份 优课评比" class="items">2019年柯桥区天天智慧课堂 5月份 优课评比</span>
-            <span class="status" style="background: rgb(19, 206, 102);">筹备阶段</span>
+            <span class="items">{{item.name}}</span>
+            <span class="status" style="background: rgb(19, 206, 102);">{{item.statusTip}}</span>
           </div>
-          <div class="line"><span class="tips">时间：</span> <span class="items2">2019.05.01-06.08</span></div>
-          <div class="line"><span class="tips">主办：</span> <span class="items2">柯桥区教师发展中心</span></div>
-          <div class="line"><span class="tips">作品：</span> <span class="items2">征集中</span></div>
+          <div class="line"><span class="tips">时间：</span> <span class="items2">{{item.reviewTimeTip}}</span></div>
+          <div class="line"><span class="tips">主办：</span> <span class="items2">{{item.organizer}}</span></div>
+          <div class="line"><span class="tips">作品：</span> <span class="items2">{{item.reviewTimeTip}}</span></div>
 
         </div>
         <div class="right">
           <p class="time-count">距离报名开始还有<span class="count-down"> 0天 0小时 0分</span></p>
-          <Button type="primary" size="large">查看详情</Button>
+          <Button type="primary" size="large" @click="goDetails">查看详情</Button>
         </div>
       </div>
     </div>
 
-    <div class="activity-item">
-      <div class="activity-banner">
-        <img src="http://ttkt.sxedu.org:70/upload/activity/banner/40/40.jpg?_=1557231709373" />
-      </div>
-      <div class="activity-brief">
-        <div class="left">
-          <div class="line">
-            <span class="tips">活动：</span>
-            <span title="2019年柯桥区天天智慧课堂 5月份 优课评比" class="items">2019年柯桥区天天智慧课堂 5月份 优课评比</span>
-            <span class="status" style="background: rgb(19, 206, 102);">筹备阶段</span>
-          </div>
-          <div class="line"><span class="tips">时间：</span> <span class="items2">2019.05.01-06.08</span></div>
-          <div class="line"><span class="tips">主办：</span> <span class="items2">柯桥区教师发展中心</span></div>
-          <div class="line"><span class="tips">作品：</span> <span class="items2">征集中</span></div>
-
-        </div>
-        <div class="right">
-          <p class="time-count">距离报名开始还有<span class="count-down"> 0天 0小时 0分</span></p>
-          <Button type="primary" size="large">查看详情</Button>
-        </div>
-      </div>
-    </div>
   </div>
 </template>
 <script>
-
+    import acList from '@/static/reviewAcList.json'
   export default {
     components: {
     },
     data() {
       return {
-        activeIndex: 0,
-        typeName:"",
-        newColumns: [
-          {
-            title: '标题',
-            key: 'title'
-          },
-          {
-            title: '日期',
-            key: 'startTime'
-          }
-        ],
-        noticeList: []
+        reviewAcList: []
       }
     },
 
     created() {
-
+      this.reviewAcList = acList.data.list;
     },
     methods: {
       getList(type) {
@@ -108,6 +53,10 @@
         this.activeIndex = index;
         this.typeName = name;
         this.getList(typeId);
+      },
+
+      goDetails() {
+        this.$router.push('/activityDetails')
       }
 
 

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

@@ -16,15 +16,11 @@
           <div class="lastest-mark">
             TOP
           </div>
-          <p class="lastest-title">2019年柯桥区天天智慧课堂5月份排课安排表</p>
-          <p class="lastest-date">2019-04-28</p>
+          <p class="lastest-title" @click="handleNoticeClick()">{{noticeList[0].title}}</p>
+          <p class="lastest-date">{{noticeList[0].startTimeTip}}</p>
         </div>
         <ul class="notice-list">
-          <li><span class="title">柯桥区教师在2019年全国中小学互动课堂课例比赛中再创佳绩</span><span class="date">2019-04-22</span></li>
-          <li><span class="title">关于公布2019年柯桥区天天智慧课堂3月份优课评比结果的通知</span><span class="date">2019-04-18</span></li>
-          <li><span class="title">2019年柯桥区智慧课堂第二次研讨活动在实验中学举行</span><span class="date">2019-04-16</span></li>
-          <li><span class="title">关于开展2019年柯桥区智慧课堂第二次研讨活动的通知</span><span class="date">2019-04-11</span></li>
-          <li><span class="title">2019年柯桥区天天智慧课堂4月份排课安排表</span><span class="date">2019-04-01</span></li>
+          <li v-for="(item,index) in noticeList" @click="handleNoticeClick()"><span class="title">{{item.title}}</span><span class="date">{{item.startTimeTip}}</span></li>
         </ul>
       </div>
     </div>
@@ -37,54 +33,21 @@
               <b style="color: rgb(83, 199, 102);">2</b>个活动进行中
             </span>
           </div>
-        </div> <div class="activities">
-          <div class="activity">
-            <div>
-              <div class="img-box"><span class="state" style="background: rgb(19, 206, 102); visibility: visible;">筹备阶段</span> <img src="http://ttkt.sxedu.org:70/upload/activity/cover/40/40.jpg?_=1557199674221" alt=""></div> <div class="infos">
-                <p></p><p class="actName">2019年柯桥区天天智慧课堂 5月份 优课评比</p> <p></p> <p class="actOrganizer">
-                  <span class="organizer">
-                    柯桥区教师发展中心
-                  </span>
-                   <span>主办</span>
-                </p>
-              </div>
-            </div>
-          </div>
-        <div class="activity">
-            <div>
-              <div class="img-box">
-                  <span class="state" style="background: rgb(19, 206, 102); visibility: visible;">筹备阶段</span>
-                  <img src="http://ttkt.sxedu.org:70/upload/activity/cover/39/39.jpg?_=1557199674222" alt="">
-              </div>
-               <div class="infos">
-                  <p></p>
-                  <p class="actName">2019年柯桥区天天智慧课堂 4月份 优课评比</p>
-                  <p></p>
-                  <p class="actOrganizer">
-                    <span class="organizer">柯桥区教师发展中心</span>
+        </div>
+        <div class="activities">
+            <div class="activity" v-for="(item,index) in activityList" @click="handleActivityClick()">
+              <div>
+                <div class="img-box"><span class="state" style="background: rgb(19, 206, 102); visibility: visible;">{{item.statusTip}}</span> <img src="http://ttkt.sxedu.org:70/upload/activity/cover/40/40.jpg?_=1557199674221" alt=""></div> <div class="infos">
+                  <p></p><p class="actName">{{item.name}}</p> <p></p> <p class="actOrganizer">
+                    <span class="organizer">
+                      {{item.organizer}}
+                    </span>
                     <span>主办</span>
                   </p>
-               </div>
-            </div>
-          </div>
-        <div class="activity">
-            <div>
-              <div class="img-box">
-                  <span class="state" style="background: rgb(19, 206, 102); visibility: visible;">筹备阶段</span>
-                  <img src="http://ttkt.sxedu.org:70/upload/activity/cover/39/39.jpg?_=1557199674222" alt="">
+                </div>
               </div>
-               <div class="infos">
-                  <p></p>
-                  <p class="actName">2019年柯桥区天天智慧课堂 4月份 优课评比</p>
-                  <p></p>
-                  <p class="actOrganizer">
-                    <span class="organizer">柯桥区教师发展中心</span>
-                    <span>主办</span>
-                  </p>
-               </div>
             </div>
-          </div>
-        </div>
+</div>
       </div>
     </div>
 
@@ -99,53 +62,18 @@
           </div>
         </div>
         <div class="activities">
-          <div class="activity">
+          <div class="activity" v-for="(item,index) in activityList" @click="handleActivityClick()">
             <div>
-              <div class="img-box"><span class="state" style="background: rgb(19, 206, 102); visibility: visible;">筹备阶段</span> <img src="http://ttkt.sxedu.org:70/upload/activity/cover/40/40.jpg?_=1557199674221" alt=""></div> <div class="infos">
-                <p></p><p class="actName">2019年柯桥区天天智慧课堂 5月份 优课评比</p> <p></p> <p class="actOrganizer">
+              <div class="img-box"><span class="state" style="background: rgb(19, 206, 102); visibility: visible;">{{item.statusTip}}</span> <img src="http://ttkt.sxedu.org:70/upload/activity/cover/40/40.jpg?_=1557199674221" alt=""></div> <div class="infos">
+                <p></p><p class="actName">{{item.name}}</p> <p></p> <p class="actOrganizer">
                   <span class="organizer">
-                    柯桥区教师发展中心
+                    {{item.organizer}}
                   </span>
                    <span>主办</span>
                 </p>
               </div>
             </div>
           </div>
-        <div class="activity">
-            <div>
-              <div class="img-box">
-                  <span class="state" style="background: rgb(19, 206, 102); visibility: visible;">筹备阶段</span>
-                  <img src="http://ttkt.sxedu.org:70/upload/activity/cover/39/39.jpg?_=1557199674222" alt="">
-              </div>
-               <div class="infos">
-                  <p></p>
-                  <p class="actName">2019年柯桥区天天智慧课堂 4月份 优课评比</p>
-                  <p></p>
-                  <p class="actOrganizer">
-                    <span class="organizer">柯桥区教师发展中心</span>
-                    <span>主办</span>
-                  </p>
-               </div>
-            </div>
-          </div>
-
-          <div class="activity">
-            <div>
-              <div class="img-box">
-                  <span class="state" style="background: rgb(19, 206, 102); visibility: visible;">筹备阶段</span>
-                  <img src="http://ttkt.sxedu.org:70/upload/activity/cover/39/39.jpg?_=1557199674222" alt="">
-              </div>
-               <div class="infos">
-                  <p></p>
-                  <p class="actName">2019年柯桥区天天智慧课堂 4月份 优课评比</p>
-                  <p></p>
-                  <p class="actOrganizer">
-                    <span class="organizer">柯桥区教师发展中心</span>
-                    <span>主办</span>
-                  </p>
-               </div>
-            </div>
-          </div>
         </div>
       </div>
     </div>
@@ -154,17 +82,29 @@
 </template>
 <script>
   import headers from '@/components/smart-class/headers'
+  import indexNoticeList from '@/static/indexNoticeList.json'
+  import indexActivityList from '@/static/reviewAcList.json'
   export default {
     components: {
       headers
     },
     data() {
       return {
+        noticeList: [],
+        activityList:[]
       }
     },
+    created() {
+      this.noticeList = indexNoticeList.list;
+      this.activityList = indexActivityList.data.list;
+    },
     methods: {
-
-
+      handleNoticeClick() {
+        this.$router.push('/noticeDetails');
+      },
+      handleActivityClick() {
+        this.$router.push('/activityDetails');
+      }
 
     },
     mounted() {

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

@@ -18,7 +18,7 @@
     </div>
     <div class="right-box center-col">
       <p class="title">{{typeName}}</p>
-      <Table :columns="newColumns" :data="noticeList"></Table>
+      <Table :columns="newColumns" :data="noticeList" @on-row-click="rowClick" no-data-text="暂无数据"></Table>
       <Page :total="50" show-elevator show-total/>
     </div>
   </div>
@@ -63,6 +63,15 @@
         this.activeIndex = index;
         this.typeName = name;
         this.getList(typeId);
+      },
+
+      rowClick(data) {
+        this.$router.push({
+          path:'/noticeDetails',
+          query:{
+            id:data.id
+          }
+        });
       }
 
 

TEAMModelOS.SmartClass/package.json

@@ -26,6 +26,7 @@
     "jwt-decode": "^2.2.0",
     "less": "^3.9.0",
     "vue": "^2.6.9",
+    "vue-fullcalendar": "^1.0.9",
     "vue-infinite-loading": "^2.4.3",
     "vue-router": "^3.0.2",
     "vue-scroll": "^2.1.9",

TEAMModelOS.SmartTeach/ClientApp/components/HeaderPage.vue

@@ -16,27 +16,27 @@
         <div class="who-is">
           <ul class="people-list">
             <li class=" show animated slideInLeft delay-1s">
-              <img src="../assets/image/who01.png">
+              <img src="../../assets/image/resource/who01.png">
               <span>我是管理者</span>
             </li>
             <li class=" show animated slideInLeft ">
-              <img src="../assets/image/who02.png">
+              <img src="../../assets/image/resource/who02.png">
               <span>我是教师</span>
             </li>
             <li class="show animated slideInRight">
-              <img src="../assets/image/who03.png">
+              <img src="../../assets/image/resource/who03.png">
               <span>我是学生</span>
             </li>
             <li class="show animated slideInRight delay-1s">
-              <img src="../assets/image/who04.png">
+              <img src="../../assets/image/resource/who04.png">
               <span>我是家长</span>
             </li>
           </ul>
         </div>
         <div class="center-info">
           <h1>已超过<span>1000</span>所学校开通了我们的服务</h1>
-          <img  src="../assets/image/center01.png" >
-          <img  src="../assets/image/bottom.png" >
+          <img  src="../../assets/image/resource/center01.png" >
+          <img  src="../../assets/image/resource/bottom.png" >
         </div>
      </div>
 </template>
@@ -47,10 +47,10 @@
         homeCarouselImg: [
 
           {
-            images: require('../assets/image/banner02.png')
+            images: require('../../assets/image/resource/banner02.png')
           },
           {
-            images: require('../assets/image/banner01.png')
+            images: require('../../assets/image/resource/banner01.png')
           },
         ]
       };
@@ -66,7 +66,6 @@
 
   .title {
     width: 100%;
-    margin-top: 5%;
   }
 
   .header {

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

@@ -0,0 +1,112 @@
+<template>
+  <div class="map">
+    <!--<div :style="{height:'400px',width:'100%'}" ref="myEchart"></div>-->
+    <div id="myChart" :style="{width: '300px', height: '300px'}"></div>
+    <div ref="MapMountNode" class="charts chart-bar map-mount-node"></div>
+  </div>
+</template>
+<script>
+  //import echarts from 'echarts'
+  //import '../../static/china' // 引入中国地图数据
+  import 'echarts/map/js/china.js';
+  export default {
+    name: "echarts",
+    props: ["userJson"],
+    data() {
+      return {
+        chart: null
+      };
+    },
+    mounted() {
+      this.chinaConfigure();
+    },
+    beforeDestroy() {
+      if (!this.chart) {
+        return;
+      }
+      this.chart.dispose();
+      this.chart = null;
+    },
+    methods: {
+      chinaConfigure() {
+        console.log(this.userJson)
+        let myChart = echarts.init(this.$refs.myEchart); //这里是为了获得容器所在位置    
+        window.onresize = myChart.resize;
+        myChart.setOption({ // 进行相关配置
+          backgroundColor: "#02AFDB",
+          tooltip: {}, // 鼠标移到图里面的浮动提示框
+          dataRange: {
+            show: false,
+            min: 0,
+            max: 1000,
+            text: ['High', 'Low'],
+            realtime: true,
+            calculable: true,
+            color: ['orangered', 'yellow', 'lightskyblue']
+          },
+          geo: { // 这个是重点配置区
+            map: 'china', // 表示中国地图
+            roam: true,
+            label: {
+              normal: {
+                show: true, // 是否显示对应地名
+                textStyle: {
+                  color: 'rgba(0,0,0,0.4)'
+                }
+              }
+            },
+            itemStyle: {
+              normal: {
+                borderColor: 'rgba(0, 0, 0, 0.2)'
+              },
+              emphasis: {
+                areaColor: null,
+                shadowOffsetX: 0,
+                shadowOffsetY: 0,
+                shadowBlur: 20,
+                borderWidth: 0,
+                shadowColor: 'rgba(0, 0, 0, 0.5)'
+              }
+            }
+          },
+          series: [{
+            type: 'scatter',
+            coordinateSystem: 'geo' // 对应上方配置
+          },
+          {
+            name: '启动次数', // 浮动框的标题
+            type: 'map',
+            geoIndex: 0,
+            data: [{
+              "name": "北京",
+              "value": 599
+            }, {
+              "name": "上海",
+              "value": 142
+            }, {
+              "name": "黑龙江",
+              "value": 44
+            }, {
+              "name": "深圳",
+              "value": 92
+            }, {
+              "name": "湖北",
+              "value": 810
+            }, {
+              "name": "四川",
+              "value": 453
+            }]
+          }
+          ]
+        })
+      }
+    }
+  }
+</script>
+<style scoped>
+  .map {
+    width: 100%;
+    height:600px;
+  }
+
+</style>

TEAMModelOS.SmartTeach/ClientApp/router/routes.js

@@ -2,8 +2,12 @@
 //import ServerSideLogin from '@/view/serverside/login'
 // import HTTP404 from '@/view/404'
 import Index from '@/view/resource/index'
+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: 'HomePage', path: '/HomePage', component: HomePage },
+  { name: 'Teacher', path: '/Teacher', component: Teacher },
 ]

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

@@ -0,0 +1,32 @@
+<template>
+  <div id="app">
+    <Header></Header>
+    <Home></Home>
+  </div>
+</template>
+<script>
+  import Header from '@/common/headers.vue'
+  import Home from '@/components/resource/home.vue'
+
+  export default {
+    components: {
+      Header,
+      Home
+    },
+    data() {
+      return {
+
+      }
+    },
+    mounted() {
+
+    }
+  }
+</script>
+<style scoped>
+  #app {
+    width: 100%;
+    height: auto;
+    background-color: #f3f3f3;
+  }
+</style>

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

@@ -0,0 +1,30 @@
+<template>
+  <div id="app">
+    <Header></Header>
+    <teacher-map></teacher-map>
+  </div>
+</template>
+<script>
+  import Header from '@/common/headers.vue'
+  import TeacherMap from '@/components/resource/teacherMap.vue'
+
+  export default {
+    components: {
+      Header,
+      TeacherMap
+    },
+    data() {
+      return {
+
+      }
+    },
+
+  }
+</script>
+<style scoped>
+  #app {
+    width: 100%;
+    height: auto;
+    background-color: #f3f3f3;
+  }
+</style>