Jelajahi Sumber

优课列表及详情

psycho 6 tahun lalu
induk
melakukan
7353c78d7f

+ 8 - 3
TEAMModelOS.SmartClass/ClientApp/router/routes.js

@@ -55,9 +55,14 @@ export const routes = [
         component: resolve => require(['@/view/smart-class/RewardDetails'], resolve), //路由懒加载
       },
       {
-        name: 'lessons',
-        path: '/lessons',
-        component: resolve => require(['@/view/smart-class/Lessons'], resolve), //路由懒加载
+        name: 'lessonList',
+        path: '/lessonList',
+        component: resolve => require(['@/view/smart-class/LessonList'], resolve), //路由懒加载
+      },
+      {
+        name: 'lessonDetails',
+        path: '/lessonDetails',
+        component: resolve => require(['@/view/smart-class/LessonDetails'], resolve), //路由懒加载
       }
     ]
   }

+ 420 - 0
TEAMModelOS.SmartClass/ClientApp/static/lessonDetails.json

@@ -0,0 +1,420 @@
+{
+  "data": {
+    "activityStatus": 2,
+    "activityStatusTip": "已结束",
+    "autoChangeViewActivityStatus": true,
+    "commentCount": 52,
+    "cover": "1胡建良.png",
+    "coverHash": "127.png",
+    "coverUri": "/upload/viewactivity/cover/127/127.png?_=1557819330146",
+    "description": "<br>",
+    "dianZanCount": 0,
+    "employeeName": "吴雁",
+    "employeeNo": "41489",
+    "endTime": {
+      "date": 18,
+      "day": 5,
+      "hours": 16,
+      "minutes": 5,
+      "month": 4,
+      "nanos": 0,
+      "seconds": 0,
+      "time": 1526630700000,
+      "timezoneOffset": -480,
+      "year": 118
+    },
+    "id": 127,
+    "joinWay": 0,
+    "liveHls": "http://jpkt.sxedu.org:6080/hls/13CA5E3AD6DB4DF5865839BB47C134F8.m3u8",
+    "liveRtmp": "rtmp://jpkt.sxedu.org:1935/hls/13CA5E3AD6DB4DF5865839BB47C134F8",
+    "name": "创新实验室(学科教室)课例20180518直播",
+    "notice": "<br>",
+    "ownUnit": "柯桥区教师发展中心",
+    "parentCategoryId": 24,
+    "parentCategoryName": "创客",
+    "parentGradeId": 13,
+    "parentGradeName": "高一",
+    "parentGradeSectionId": 3,
+    "parentGradeSectionName": "高中",
+    "parentProjectId": 103,
+    "parentProjectName": "简易冠啸机器人搭建",
+    "parentTeachePlateId": 19,
+    "parentTeachePlateName": "冠啸创新实验室",
+    "reviewContent": "本次直播总点击量: 68 评论数: 44 今日直播只推PC端,采用移动录播设备直播,直播视频推送画面清晰,播放过程流畅无锯齿拖影,声音干净。上课学校设备保障充分,教师教学过程实施完整。直播过程网络通畅,没有出现画面中断停顿现象。",
+    "school": null,
+    "schoolName": "绍兴市柯桥区钱清中学",
+    "schoolNo": "11AFC704D0A5FE66E050A8C027277C89",
+    "score": 87.67,
+    "speaker": "胡建良",
+    "startTime": {
+      "date": 18,
+      "day": 5,
+      "hours": 15,
+      "minutes": 20,
+      "month": 4,
+      "nanos": 0,
+      "seconds": 0,
+      "time": 1526628000000,
+      "timezoneOffset": -480,
+      "year": 118
+    },
+    "timeRangeTip": "2018.05.18 15:20 - 05.18 16:05",
+    "timeRangeTipHHmm": "15:20 - 16:05",
+    "videoHls": null,
+    "videoRtmp": null,
+    "viewActivityAwardSetList": [],
+    "viewCount": 97,
+    "viewType": 0,
+    "viwActivityType": 1,
+    "viwActivityTypeTip": "创新实验室",
+    "workHonor": null,
+    "yearNo": 2018
+  },
+  "comments": [
+    {
+      "commentCount": 30,
+      "school": "绍兴市柯桥区钱清中学",
+      "schoolName": "绍兴市柯桥区钱清中学",
+      "schoolNo": "11AFC704D0A5FE66E050A8C027277C89",
+      "viewCount": 0
+    },
+    {
+      "commentCount": 5,
+      "school": "绍兴市柯桥区平水镇中学",
+      "schoolName": "绍兴市柯桥区平水镇中学",
+      "schoolNo": "3133005946",
+      "viewCount": 0
+    },
+    {
+      "commentCount": 5,
+      "school": "绍兴市柯桥区齐贤镇中心小学陶里校区",
+      "schoolName": "绍兴市柯桥区齐贤中心小学陶里校区",
+      "schoolNo": "2133006421",
+      "viewCount": 0
+    },
+    {
+      "commentCount": 3,
+      "school": "绍兴市柯桥区齐贤镇中学",
+      "schoolName": "绍兴市柯桥区齐贤中学",
+      "schoolNo": "3133005938",
+      "viewCount": 0
+    },
+    {
+      "commentCount": 1,
+      "school": "绍兴市柯桥区华舍中学",
+      "schoolName": "绍兴市柯桥区华舍中学",
+      "schoolNo": "3133005958",
+      "viewCount": 0
+    },
+    {
+      "commentCount": 1,
+      "school": "绍兴市柯桥区中国轻纺城第二小学",
+      "schoolName": "绍兴市柯桥区中国轻纺城第二小学",
+      "schoolNo": "2133006477",
+      "viewCount": 0
+    },
+    {
+      "commentCount": 1,
+      "school": "绍兴市柯桥区杨汛桥镇中学",
+      "schoolName": "绍兴市柯桥区杨汛桥镇中学",
+      "schoolNo": "3133005949",
+      "viewCount": 0
+    },
+    {
+      "commentCount": 1,
+      "school": "绍兴市柯桥区夏履镇中心小学",
+      "schoolName": "绍兴市柯桥区夏履镇中心小学",
+      "schoolNo": "2133006432",
+      "viewCount": 0
+    },
+    {
+      "commentCount": 1,
+      "school": "绍兴市柯桥区越崎中学",
+      "schoolName": "绍兴市柯桥区越崎中学",
+      "schoolNo": "3433005812",
+      "viewCount": 0
+    },
+    {
+      "commentCount": 1,
+      "school": "绍兴市柯桥区齐贤镇中心小学",
+      "schoolName": "绍兴市柯桥区齐贤中心小学",
+      "schoolNo": "2133006415",
+      "viewCount": 0
+    }
+  ],
+  "attachments": [
+    {
+      "attachmentType": 1,
+      "attachmentTypeId": 1,
+      "attachmentTypeName": "观课视频",
+      "attachmentTypeTip": "观课视频",
+      "fileName": "钱清中学胡建良创新实验室课例.mp4",
+      "fileNameHash": "511.mp4",
+      "fileNameRtmpUri": "rtmp://6.182.0.4:1935/upload//viewactivity/attachment/511/511.mp4",
+      "fileNameUri": "/upload/viewactivity/attachment/511/511.mp4?_=1557819505405",
+      "fileSize": 220083912,
+      "fileSizeTip": "209.89MB",
+      "fileType": 2,
+      "fileTypeTip": "视频",
+      "htmName": null,
+      "htmRemark": "无法转换:2018-06-05 12:35:08",
+      "id": 511,
+      "pdfName": null,
+      "pdfRemark": "无法转换:2018-06-05 12:35:08",
+      "swfName": null,
+      "swfRemark": "无法转换:2018-06-05 12:35:08",
+      "viewActivityId": 127,
+      "viewActivityName": "创新实验室(学科教室)课例20180518直播"
+    },
+    {
+      "attachmentType": 3,
+      "attachmentTypeId": 3,
+      "attachmentTypeName": "教学设计",
+      "attachmentTypeTip": "教学设计",
+      "fileName": "教学设计表.docx",
+      "fileNameHash": "740.docx",
+      "fileNameRtmpUri": null,
+      "fileNameUri": "/upload/viewactivity/attachment/740/740.docx?_=1557819505405",
+      "fileSize": 18127,
+      "fileSizeTip": "17.70KB",
+      "fileType": 1,
+      "fileTypeTip": "文档",
+      "htmName": "740.htm",
+      "htmRemark": "成功:2018-07-06 14:09:43",
+      "id": 740,
+      "pdfName": "740.pdf",
+      "pdfRemark": "成功:2018-07-06 14:09:42",
+      "swfName": "740.swf",
+      "swfRemark": "成功:2018-07-06 14:09:43",
+      "viewActivityId": 127,
+      "viewActivityName": "创新实验室(学科教室)课例20180518直播"
+    },
+    {
+      "attachmentType": 4,
+      "attachmentTypeId": 4,
+      "attachmentTypeName": "教学反思",
+      "attachmentTypeTip": "教学反思",
+      "fileName": "教学反思表.docx",
+      "fileNameHash": "741.docx",
+      "fileNameRtmpUri": null,
+      "fileNameUri": "/upload/viewactivity/attachment/741/741.docx?_=1557819505406",
+      "fileSize": 17767,
+      "fileSizeTip": "17.35KB",
+      "fileType": 1,
+      "fileTypeTip": "文档",
+      "htmName": "741.htm",
+      "htmRemark": "成功:2018-07-06 14:09:44",
+      "id": 741,
+      "pdfName": "741.pdf",
+      "pdfRemark": "成功:2018-07-06 14:09:44",
+      "swfName": "741.swf",
+      "swfRemark": "成功:2018-07-06 14:09:45",
+      "viewActivityId": 127,
+      "viewActivityName": "创新实验室(学科教室)课例20180518直播"
+    }
+  ],
+  "views": [
+    {
+      "liveCount": 28,
+      "school": "绍兴市柯桥区钱清中学",
+      "schoolName": "绍兴市柯桥区钱清中学",
+      "schoolNo": "11AFC704D0A5FE66E050A8C027277C89",
+      "videoCount": 5,
+      "viewCount": 33
+    },
+    {
+      "liveCount": 25,
+      "school": "绍兴市柯桥区平水镇中学",
+      "schoolName": "绍兴市柯桥区平水镇中学",
+      "schoolNo": "3133005946",
+      "videoCount": 0,
+      "viewCount": 25
+    },
+    {
+      "liveCount": 1,
+      "school": "柯桥区教师发展中心",
+      "schoolName": "柯桥区教师发展中心",
+      "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
+      "videoCount": 6,
+      "viewCount": 7
+    },
+    {
+      "liveCount": 5,
+      "school": "绍兴市柯桥区齐贤镇中学",
+      "schoolName": "绍兴市柯桥区齐贤中学",
+      "schoolNo": "3133005938",
+      "videoCount": 0,
+      "viewCount": 5
+    },
+    {
+      "liveCount": 3,
+      "school": "绍兴市柯桥区齐贤镇中心小学陶里校区",
+      "schoolName": "绍兴市柯桥区齐贤中心小学陶里校区",
+      "schoolNo": "2133006421",
+      "videoCount": 2,
+      "viewCount": 5
+    },
+    {
+      "liveCount": 0,
+      "school": "绍兴市柯桥区钱清镇中学",
+      "schoolName": "绍兴市柯桥区钱清镇中学",
+      "schoolNo": "3133005936",
+      "videoCount": 4,
+      "viewCount": 4
+    },
+    {
+      "liveCount": 0,
+      "school": "绍兴市柯桥区齐贤镇中心小学",
+      "schoolName": "绍兴市柯桥区齐贤中心小学",
+      "schoolNo": "2133006415",
+      "videoCount": 3,
+      "viewCount": 3
+    },
+    {
+      "liveCount": 0,
+      "school": "绍兴市柯桥区越崎中学",
+      "schoolName": "绍兴市柯桥区越崎中学",
+      "schoolNo": "3433005812",
+      "videoCount": 2,
+      "viewCount": 2
+    },
+    {
+      "liveCount": 0,
+      "school": "绍兴市柯桥区华甫中学",
+      "schoolName": "绍兴市柯桥区华甫中学",
+      "schoolNo": "3133005928",
+      "videoCount": 1,
+      "viewCount": 1
+    },
+    {
+      "liveCount": 1,
+      "school": "绍兴市柯桥区秋瑾小学金三角校区",
+      "schoolName": "绍兴市柯桥区秋瑾小学金三角校区",
+      "schoolNo": "2133006434",
+      "videoCount": 0,
+      "viewCount": 1
+    }
+  ],
+  "commentList": [
+    {
+      "employeeName": "刘彬",
+      "employeeNo": "a1e4165d47704fd0b19416a91375b8fd",
+      "employeeSchool": "柯桥微课中学",
+      "employeeSchoolName": "柯桥微课中学",
+      "employeeSchoolNo": "126d15f2d1474cf4b4774ca083d45cf9",
+      "id": 224,
+      "parentCategoryId": 9,
+      "parentCategoryName": "语文",
+      "reviewContent": "喻老师执教的本节课师生互动很成功,整节课,学生始终处于一种探求氛围之中,阅读课文、分析人物形象、探讨、提问、回答问题、纠正错误等处理得很棒。科技的运用到达了实质性利用的层次,不再是为用多媒体而用多媒体,而是作为课堂教学的一个必要补充,尤其是科技聚焦核心知识,生成反馈有效促进了对文本的解读。",
+      "reviewTime": {
+        "date": 15,
+        "day": 2,
+        "hours": 13,
+        "minutes": 18,
+        "month": 0,
+        "nanos": 0,
+        "seconds": 47,
+        "time": 1547529527000,
+        "timezoneOffset": -480,
+        "year": 119
+      },
+      "school": null,
+      "schoolName": "柯桥区教师发展中心",
+      "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
+      "score": null,
+      "viewActivityActivityStatus": 2,
+      "viewActivityActivityStatusTip": "已结束",
+      "viewActivityCover": "喻远鑫.png",
+      "viewActivityCoverHash": "351.png",
+      "viewActivityCoverUri": "/upload/viewactivity/cover/351/351.png?_=1557820590437",
+      "viewActivityEndTime": {
+        "date": 13,
+        "day": 4,
+        "hours": 9,
+        "minutes": 48,
+        "month": 11,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1544665680000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "viewActivityId": 351,
+      "viewActivityName": "2018年柯桥区天天智慧课堂十佳优质课展示",
+      "viewActivitySpeaker": "喻远鑫",
+      "viewActivityStartTime": {
+        "date": 13,
+        "day": 4,
+        "hours": 9,
+        "minutes": 0,
+        "month": 11,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1544662800000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "viewActivityTimeRangeTip": "2018.12.13 09:00 - 12.13 09:48"
+    },
+    {
+      "employeeName": "张立新",
+      "employeeNo": "551c927cf05d4b9cb9244b5b741d2774",
+      "employeeSchool": "kqedu2018",
+      "employeeSchoolName": "kqedu2018",
+      "employeeSchoolNo": "9cfc6f6b2eb643aba8b86d6c04efe843",
+      "id": 225,
+      "parentCategoryId": 9,
+      "parentCategoryName": "语文",
+      "reviewContent": "本节课中,教师通过一系列 问题引导学生深度解读课文文本,分析人物特征和心理,基本达到了教学目标。建议:1.提高问题的有效性;2.发挥学生PAD支持自主学习的作用。",
+      "reviewTime": {
+        "date": 20,
+        "day": 0,
+        "hours": 19,
+        "minutes": 45,
+        "month": 0,
+        "nanos": 0,
+        "seconds": 48,
+        "time": 1547984748000,
+        "timezoneOffset": -480,
+        "year": 119
+      },
+      "school": null,
+      "schoolName": "柯桥区教师发展中心",
+      "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
+      "score": null,
+      "viewActivityActivityStatus": 2,
+      "viewActivityActivityStatusTip": "已结束",
+      "viewActivityCover": "喻远鑫.png",
+      "viewActivityCoverHash": "351.png",
+      "viewActivityCoverUri": "/upload/viewactivity/cover/351/351.png?_=1557820590437",
+      "viewActivityEndTime": {
+        "date": 13,
+        "day": 4,
+        "hours": 9,
+        "minutes": 48,
+        "month": 11,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1544665680000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "viewActivityId": 351,
+      "viewActivityName": "2018年柯桥区天天智慧课堂十佳优质课展示",
+      "viewActivitySpeaker": "喻远鑫",
+      "viewActivityStartTime": {
+        "date": 13,
+        "day": 4,
+        "hours": 9,
+        "minutes": 0,
+        "month": 11,
+        "nanos": 0,
+        "seconds": 0,
+        "time": 1544662800000,
+        "timezoneOffset": -480,
+        "year": 118
+      },
+      "viewActivityTimeRangeTip": "2018.12.13 09:00 - 12.13 09:48"
+    }
+  ]
+}

+ 450 - 0
TEAMModelOS.SmartClass/ClientApp/static/observationList.json

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

+ 794 - 0
TEAMModelOS.SmartClass/ClientApp/static/pastAcList.json

@@ -0,0 +1,794 @@
+{
+  "data": {
+    "data": null,
+    "errorCode": null,
+    "html": null,
+    "key": null,
+    "list": [
+      {
+        "activityCover": null,
+        "activityCoverHash": null,
+        "activityCoverUri": null,
+        "activityId": null,
+        "activityName": null,
+        "applyCount": 28,
+        "autoChangeStatus": false,
+        "banner": "1920-560.png",
+        "bannerHash": "37.png",
+        "bannerUri": "/upload/activity/banner/37/37.png?_=1557912462417",
+        "cover": "天天智慧课堂3月.jpg",
+        "coverHash": "37.jpg",
+        "coverUri": "/upload/activity/cover/37/37.jpg?_=1557912462417",
+        "employeeName": "楼宽",
+        "employeeNo": "31050",
+        "enjoinType": 3,
+        "hasDelNoGetAwardRes": false,
+        "hideAttachmentAfterEnd": false,
+        "hideAwardAfterEnd": false,
+        "id": 37,
+        "name": "2019年柯桥区天天智慧课堂 3月份 优课评比",
+        "nameMaxLength": null,
+        "numberOfProduction": 1,
+        "organizer": "柯桥区教师发展中心",
+        "publicity": false,
+        "reviewEndTime": {
+          "date": 6,
+          "day": 6,
+          "hours": 0,
+          "minutes": 0,
+          "month": 3,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1554480000000,
+          "timezoneOffset": -480,
+          "year": 119
+        },
+        "reviewTimeTip": "2019.03.31-04.06",
+        "showApplyScore": false,
+        "state": 1,
+        "stateTip": "有效 ",
+        "status": 4,
+        "statusTip": "活动结束",
+        "subActivityApplyCount": null,
+        "subActivityApplyPushCount": 0,
+        "subPushEndTime": null,
+        "subPushEndTimeLimitTip": "",
+        "subPushEndTimeTip": "",
+        "submitEndTime": {
+          "date": 31,
+          "day": 0,
+          "hours": 0,
+          "minutes": 0,
+          "month": 2,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1553961600000,
+          "timezoneOffset": -480,
+          "year": 119
+        },
+        "submitEndTimeTip": "2019.03.31",
+        "submitStartTime": {
+          "date": 1,
+          "day": 5,
+          "hours": 0,
+          "minutes": 0,
+          "month": 2,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1551369600000,
+          "timezoneOffset": -480,
+          "year": 119
+        },
+        "submitTimeTip": "2019.03.01-03.31",
+        "timeTip": "2019.03.01-04.06",
+        "videoMaxLength": null,
+        "videoMaxSize": null,
+        "view": true,
+        "weikeMaxLength": null,
+        "weikeMaxSize": null
+      },
+      {
+        "activityCover": null,
+        "activityCoverHash": null,
+        "activityCoverUri": null,
+        "activityId": null,
+        "activityName": null,
+        "applyCount": 20,
+        "autoChangeStatus": false,
+        "banner": "优课评比banner.jpg",
+        "bannerHash": "16.jpg",
+        "bannerUri": "/upload/activity/banner/16/16.jpg?_=1557912462417",
+        "cover": "201812.jpg",
+        "coverHash": "16.jpg",
+        "coverUri": "/upload/activity/cover/16/16.jpg?_=1557912462417",
+        "employeeName": "楼宽",
+        "employeeNo": "31050",
+        "enjoinType": 3,
+        "hasDelNoGetAwardRes": false,
+        "hideAttachmentAfterEnd": false,
+        "hideAwardAfterEnd": false,
+        "id": 16,
+        "name": "2018年柯桥区天天智慧课堂 12月份 优课评比",
+        "nameMaxLength": null,
+        "numberOfProduction": 1,
+        "organizer": "柯桥区教师发展中心",
+        "publicity": false,
+        "reviewEndTime": {
+          "date": 16,
+          "day": 0,
+          "hours": 0,
+          "minutes": 0,
+          "month": 11,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1544889600000,
+          "timezoneOffset": -480,
+          "year": 118
+        },
+        "reviewTimeTip": "2018.12.14-12.16",
+        "showApplyScore": false,
+        "state": 1,
+        "stateTip": "有效 ",
+        "status": 4,
+        "statusTip": "活动结束",
+        "subActivityApplyCount": null,
+        "subActivityApplyPushCount": 0,
+        "subPushEndTime": null,
+        "subPushEndTimeLimitTip": "",
+        "subPushEndTimeTip": "",
+        "submitEndTime": {
+          "date": 14,
+          "day": 5,
+          "hours": 0,
+          "minutes": 0,
+          "month": 11,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1544716800000,
+          "timezoneOffset": -480,
+          "year": 118
+        },
+        "submitEndTimeTip": "2018.12.14",
+        "submitStartTime": {
+          "date": 1,
+          "day": 6,
+          "hours": 0,
+          "minutes": 0,
+          "month": 11,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1543593600000,
+          "timezoneOffset": -480,
+          "year": 118
+        },
+        "submitTimeTip": "2018.12.01-12.14",
+        "timeTip": "2018.12.01-12.16",
+        "videoMaxLength": null,
+        "videoMaxSize": null,
+        "view": true,
+        "weikeMaxLength": null,
+        "weikeMaxSize": null
+      },
+      {
+        "activityCover": null,
+        "activityCoverHash": null,
+        "activityCoverUri": null,
+        "activityId": null,
+        "activityName": null,
+        "applyCount": 24,
+        "autoChangeStatus": false,
+        "banner": "十大优质课.jpg",
+        "bannerHash": "23.jpg",
+        "bannerUri": "/upload/activity/banner/23/23.jpg?_=1557912462417",
+        "cover": "十佳优质课评比340_190.jpg",
+        "coverHash": "23.jpg",
+        "coverUri": "/upload/activity/cover/23/23.jpg?_=1557912462417",
+        "employeeName": "楼宽",
+        "employeeNo": "31050",
+        "enjoinType": 3,
+        "hasDelNoGetAwardRes": false,
+        "hideAttachmentAfterEnd": false,
+        "hideAwardAfterEnd": false,
+        "id": 23,
+        "name": "2018年柯桥区天天智慧课堂十佳优质课评比活动课例评比",
+        "nameMaxLength": null,
+        "numberOfProduction": 1,
+        "organizer": "柯桥区教师发展中心",
+        "publicity": false,
+        "reviewEndTime": {
+          "date": 2,
+          "day": 3,
+          "hours": 0,
+          "minutes": 0,
+          "month": 0,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1546358400000,
+          "timezoneOffset": -480,
+          "year": 119
+        },
+        "reviewTimeTip": "2018.12.20-2019.01.02",
+        "showApplyScore": false,
+        "state": 1,
+        "stateTip": "有效 ",
+        "status": 4,
+        "statusTip": "活动结束",
+        "subActivityApplyCount": null,
+        "subActivityApplyPushCount": 0,
+        "subPushEndTime": null,
+        "subPushEndTimeLimitTip": "",
+        "subPushEndTimeTip": "",
+        "submitEndTime": {
+          "date": 20,
+          "day": 4,
+          "hours": 0,
+          "minutes": 0,
+          "month": 11,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1545235200000,
+          "timezoneOffset": -480,
+          "year": 118
+        },
+        "submitEndTimeTip": "2018.12.20",
+        "submitStartTime": {
+          "date": 1,
+          "day": 6,
+          "hours": 0,
+          "minutes": 0,
+          "month": 11,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1543593600000,
+          "timezoneOffset": -480,
+          "year": 118
+        },
+        "submitTimeTip": "2018.12.01-12.20",
+        "timeTip": "2018.12.01-2019.01.02",
+        "videoMaxLength": null,
+        "videoMaxSize": null,
+        "view": true,
+        "weikeMaxLength": null,
+        "weikeMaxSize": null
+      },
+      {
+        "activityCover": null,
+        "activityCoverHash": null,
+        "activityCoverUri": null,
+        "activityId": null,
+        "activityName": null,
+        "applyCount": 25,
+        "autoChangeStatus": false,
+        "banner": "优课评比banner.jpg",
+        "bannerHash": "15.jpg",
+        "bannerUri": "/upload/activity/banner/15/15.jpg?_=1557912462417",
+        "cover": "201811.jpg",
+        "coverHash": "15.jpg",
+        "coverUri": "/upload/activity/cover/15/15.jpg?_=1557912462417",
+        "employeeName": "楼宽",
+        "employeeNo": "31050",
+        "enjoinType": 3,
+        "hasDelNoGetAwardRes": false,
+        "hideAttachmentAfterEnd": false,
+        "hideAwardAfterEnd": true,
+        "id": 15,
+        "name": "2018年柯桥区天天智慧课堂 11月份 优课评比",
+        "nameMaxLength": null,
+        "numberOfProduction": 1,
+        "organizer": "柯桥区教师发展中心",
+        "publicity": false,
+        "reviewEndTime": {
+          "date": 3,
+          "day": 1,
+          "hours": 0,
+          "minutes": 0,
+          "month": 11,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1543766400000,
+          "timezoneOffset": -480,
+          "year": 118
+        },
+        "reviewTimeTip": "2018.11.30-12.03",
+        "showApplyScore": false,
+        "state": 1,
+        "stateTip": "有效 ",
+        "status": 4,
+        "statusTip": "活动结束",
+        "subActivityApplyCount": null,
+        "subActivityApplyPushCount": 0,
+        "subPushEndTime": null,
+        "subPushEndTimeLimitTip": "",
+        "subPushEndTimeTip": "",
+        "submitEndTime": {
+          "date": 30,
+          "day": 5,
+          "hours": 0,
+          "minutes": 0,
+          "month": 10,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1543507200000,
+          "timezoneOffset": -480,
+          "year": 118
+        },
+        "submitEndTimeTip": "2018.11.30",
+        "submitStartTime": {
+          "date": 1,
+          "day": 4,
+          "hours": 0,
+          "minutes": 0,
+          "month": 10,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1541001600000,
+          "timezoneOffset": -480,
+          "year": 118
+        },
+        "submitTimeTip": "2018.11.01-11.30",
+        "timeTip": "2018.11.01-12.03",
+        "videoMaxLength": null,
+        "videoMaxSize": null,
+        "view": true,
+        "weikeMaxLength": null,
+        "weikeMaxSize": null
+      },
+      {
+        "activityCover": null,
+        "activityCoverHash": null,
+        "activityCoverUri": null,
+        "activityId": null,
+        "activityName": null,
+        "applyCount": 223,
+        "autoChangeStatus": false,
+        "banner": "智慧课堂观摩活动.jpg",
+        "bannerHash": "24.jpg",
+        "bannerUri": "/upload/activity/banner/24/24.jpg?_=1557912462417",
+        "cover": "智慧课堂课例征集340_190.jpg",
+        "coverHash": "24.jpg",
+        "coverUri": "/upload/activity/cover/24/24.jpg?_=1557912462417",
+        "employeeName": "楼宽",
+        "employeeNo": "31050",
+        "enjoinType": 3,
+        "hasDelNoGetAwardRes": false,
+        "hideAttachmentAfterEnd": false,
+        "hideAwardAfterEnd": false,
+        "id": 24,
+        "name": "2018年柯桥区“第四届智慧课堂教学实践观摩活动”课例征集",
+        "nameMaxLength": null,
+        "numberOfProduction": 1,
+        "organizer": "柯桥区教师发展中心",
+        "publicity": false,
+        "reviewEndTime": {
+          "date": 20,
+          "day": 4,
+          "hours": 0,
+          "minutes": 0,
+          "month": 11,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1545235200000,
+          "timezoneOffset": -480,
+          "year": 118
+        },
+        "reviewTimeTip": "2018.12.05-12.20",
+        "showApplyScore": false,
+        "state": 1,
+        "stateTip": "有效 ",
+        "status": 4,
+        "statusTip": "活动结束",
+        "subActivityApplyCount": 250,
+        "subActivityApplyPushCount": 0,
+        "subPushEndTime": null,
+        "subPushEndTimeLimitTip": "",
+        "subPushEndTimeTip": "",
+        "submitEndTime": {
+          "date": 5,
+          "day": 3,
+          "hours": 0,
+          "minutes": 0,
+          "month": 11,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1543939200000,
+          "timezoneOffset": -480,
+          "year": 118
+        },
+        "submitEndTimeTip": "2018.12.05",
+        "submitStartTime": {
+          "date": 1,
+          "day": 4,
+          "hours": 0,
+          "minutes": 0,
+          "month": 10,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1541001600000,
+          "timezoneOffset": -480,
+          "year": 118
+        },
+        "submitTimeTip": "2018.11.01-12.05",
+        "timeTip": "2018.11.01-12.20",
+        "videoMaxLength": null,
+        "videoMaxSize": null,
+        "view": false,
+        "weikeMaxLength": null,
+        "weikeMaxSize": null
+      },
+      {
+        "activityCover": null,
+        "activityCoverHash": null,
+        "activityCoverUri": null,
+        "activityId": null,
+        "activityName": null,
+        "applyCount": 22,
+        "autoChangeStatus": true,
+        "banner": "优课评比banner.jpg",
+        "bannerHash": "14.jpg",
+        "bannerUri": "/upload/activity/banner/14/14.jpg?_=1557912462417",
+        "cover": "201810.jpg",
+        "coverHash": "14.jpg",
+        "coverUri": "/upload/activity/cover/14/14.jpg?_=1557912462417",
+        "employeeName": "楼宽",
+        "employeeNo": "31050",
+        "enjoinType": 3,
+        "hasDelNoGetAwardRes": false,
+        "hideAttachmentAfterEnd": false,
+        "hideAwardAfterEnd": false,
+        "id": 14,
+        "name": "2018年柯桥区天天智慧课堂 10月份 优课评比",
+        "nameMaxLength": null,
+        "numberOfProduction": 1,
+        "organizer": "柯桥区教师发展中心",
+        "publicity": false,
+        "reviewEndTime": {
+          "date": 24,
+          "day": 6,
+          "hours": 0,
+          "minutes": 0,
+          "month": 10,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1542988800000,
+          "timezoneOffset": -480,
+          "year": 118
+        },
+        "reviewTimeTip": "2018.10.31-11.24",
+        "showApplyScore": true,
+        "state": 1,
+        "stateTip": "有效 ",
+        "status": 4,
+        "statusTip": "活动结束",
+        "subActivityApplyCount": null,
+        "subActivityApplyPushCount": 0,
+        "subPushEndTime": null,
+        "subPushEndTimeLimitTip": "",
+        "subPushEndTimeTip": "",
+        "submitEndTime": {
+          "date": 31,
+          "day": 3,
+          "hours": 0,
+          "minutes": 0,
+          "month": 9,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1540915200000,
+          "timezoneOffset": -480,
+          "year": 118
+        },
+        "submitEndTimeTip": "2018.10.31",
+        "submitStartTime": {
+          "date": 8,
+          "day": 1,
+          "hours": 0,
+          "minutes": 0,
+          "month": 9,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1538928000000,
+          "timezoneOffset": -480,
+          "year": 118
+        },
+        "submitTimeTip": "2018.10.08-10.31",
+        "timeTip": "2018.10.08-11.24",
+        "videoMaxLength": null,
+        "videoMaxSize": null,
+        "view": true,
+        "weikeMaxLength": null,
+        "weikeMaxSize": null
+      },
+      {
+        "activityCover": null,
+        "activityCoverHash": null,
+        "activityCoverUri": null,
+        "activityId": null,
+        "activityName": null,
+        "applyCount": 43,
+        "autoChangeStatus": false,
+        "banner": "创新实验室评比banner.png",
+        "bannerHash": "22.png",
+        "bannerUri": "/upload/activity/banner/22/22.png?_=1557912462418",
+        "cover": "创新实验室课例评比下.jpg",
+        "coverHash": "22.jpg",
+        "coverUri": "/upload/activity/cover/22/22.jpg?_=1557912462418",
+        "employeeName": "吴雁",
+        "employeeNo": "41489",
+        "enjoinType": 3,
+        "hasDelNoGetAwardRes": true,
+        "hideAttachmentAfterEnd": false,
+        "hideAwardAfterEnd": false,
+        "id": 22,
+        "name": "2018年下柯桥区创新实验室(学科教室)视频课例评比活动",
+        "nameMaxLength": null,
+        "numberOfProduction": 1,
+        "organizer": "柯桥区教师发展中心",
+        "publicity": false,
+        "reviewEndTime": {
+          "date": 18,
+          "day": 2,
+          "hours": 0,
+          "minutes": 0,
+          "month": 11,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1545062400000,
+          "timezoneOffset": -480,
+          "year": 118
+        },
+        "reviewTimeTip": "2018.11.30-12.18",
+        "showApplyScore": false,
+        "state": 1,
+        "stateTip": "有效 ",
+        "status": 4,
+        "statusTip": "活动结束",
+        "subActivityApplyCount": null,
+        "subActivityApplyPushCount": 0,
+        "subPushEndTime": null,
+        "subPushEndTimeLimitTip": "",
+        "subPushEndTimeTip": "",
+        "submitEndTime": {
+          "date": 30,
+          "day": 5,
+          "hours": 0,
+          "minutes": 0,
+          "month": 10,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1543507200000,
+          "timezoneOffset": -480,
+          "year": 118
+        },
+        "submitEndTimeTip": "2018.11.30",
+        "submitStartTime": {
+          "date": 8,
+          "day": 1,
+          "hours": 0,
+          "minutes": 0,
+          "month": 9,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1538928000000,
+          "timezoneOffset": -480,
+          "year": 118
+        },
+        "submitTimeTip": "2018.10.08-11.30",
+        "timeTip": "2018.10.08-12.18",
+        "videoMaxLength": null,
+        "videoMaxSize": null,
+        "view": true,
+        "weikeMaxLength": null,
+        "weikeMaxSize": null
+      },
+      {
+        "activityCover": null,
+        "activityCoverHash": null,
+        "activityCoverUri": null,
+        "activityId": null,
+        "activityName": null,
+        "applyCount": 20,
+        "autoChangeStatus": false,
+        "banner": "优课评比banner.jpg",
+        "bannerHash": "12.jpg",
+        "bannerUri": "/upload/activity/banner/12/12.jpg?_=1557912462418",
+        "cover": "201809.jpg",
+        "coverHash": "12.jpg",
+        "coverUri": "/upload/activity/cover/12/12.jpg?_=1557912462418",
+        "employeeName": "楼宽",
+        "employeeNo": "31050",
+        "enjoinType": 3,
+        "hasDelNoGetAwardRes": false,
+        "hideAttachmentAfterEnd": false,
+        "hideAwardAfterEnd": false,
+        "id": 12,
+        "name": "2018年柯桥区天天智慧课堂 9月份 优课评比",
+        "nameMaxLength": null,
+        "numberOfProduction": 1,
+        "organizer": "柯桥区教师发展中心",
+        "publicity": false,
+        "reviewEndTime": {
+          "date": 16,
+          "day": 2,
+          "hours": 0,
+          "minutes": 0,
+          "month": 9,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1539619200000,
+          "timezoneOffset": -480,
+          "year": 118
+        },
+        "reviewTimeTip": "2018.09.30-10.16",
+        "showApplyScore": true,
+        "state": 1,
+        "stateTip": "有效 ",
+        "status": 4,
+        "statusTip": "活动结束",
+        "subActivityApplyCount": null,
+        "subActivityApplyPushCount": 0,
+        "subPushEndTime": null,
+        "subPushEndTimeLimitTip": "",
+        "subPushEndTimeTip": "",
+        "submitEndTime": {
+          "date": 30,
+          "day": 0,
+          "hours": 0,
+          "minutes": 0,
+          "month": 8,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1538236800000,
+          "timezoneOffset": -480,
+          "year": 118
+        },
+        "submitEndTimeTip": "2018.09.30",
+        "submitStartTime": {
+          "date": 11,
+          "day": 2,
+          "hours": 0,
+          "minutes": 0,
+          "month": 8,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1536595200000,
+          "timezoneOffset": -480,
+          "year": 118
+        },
+        "submitTimeTip": "2018.09.11-09.30",
+        "timeTip": "2018.09.11-10.16",
+        "videoMaxLength": null,
+        "videoMaxSize": null,
+        "view": true,
+        "weikeMaxLength": null,
+        "weikeMaxSize": null
+      },
+      {
+        "activityCover": null,
+        "activityCoverHash": null,
+        "activityCoverUri": null,
+        "activityId": null,
+        "activityName": null,
+        "applyCount": 48,
+        "autoChangeStatus": true,
+        "banner": "智慧者联盟.jpg",
+        "bannerHash": "13.jpg",
+        "bannerUri": "/upload/activity/banner/13/13.jpg?_=1557912462418",
+        "cover": "智慧课堂研究课题展示340_190.jpg",
+        "coverHash": "13.jpg",
+        "coverUri": "/upload/activity/cover/13/13.jpg?_=1557912462418",
+        "employeeName": "楼宽",
+        "employeeNo": "31050",
+        "enjoinType": 3,
+        "hasDelNoGetAwardRes": false,
+        "hideAttachmentAfterEnd": true,
+        "hideAwardAfterEnd": true,
+        "id": 13,
+        "name": "2018年“柯桥区智慧课堂研究者联盟”校级研究课题展示交流",
+        "nameMaxLength": null,
+        "numberOfProduction": 1,
+        "organizer": "柯桥区教师发展中心",
+        "publicity": false,
+        "reviewEndTime": {
+          "date": 31,
+          "day": 1,
+          "hours": 0,
+          "minutes": 0,
+          "month": 11,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1546185600000,
+          "timezoneOffset": -480,
+          "year": 118
+        },
+        "reviewTimeTip": "2018.12.31-12.31",
+        "showApplyScore": true,
+        "state": 1,
+        "stateTip": "有效 ",
+        "status": 4,
+        "statusTip": "活动结束",
+        "subActivityApplyCount": null,
+        "subActivityApplyPushCount": 0,
+        "subPushEndTime": null,
+        "subPushEndTimeLimitTip": "",
+        "subPushEndTimeTip": "",
+        "submitEndTime": {
+          "date": 31,
+          "day": 1,
+          "hours": 0,
+          "minutes": 0,
+          "month": 11,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1546185600000,
+          "timezoneOffset": -480,
+          "year": 118
+        },
+        "submitEndTimeTip": "2018.12.31",
+        "submitStartTime": {
+          "date": 1,
+          "day": 6,
+          "hours": 0,
+          "minutes": 0,
+          "month": 8,
+          "nanos": 0,
+          "seconds": 0,
+          "time": 1535731200000,
+          "timezoneOffset": -480,
+          "year": 118
+        },
+        "submitTimeTip": "2018.09.01-12.31",
+        "timeTip": "2018.09.01-12.31",
+        "videoMaxLength": null,
+        "videoMaxSize": null,
+        "view": true,
+        "weikeMaxLength": null,
+        "weikeMaxSize": null
+      }
+    ],
+    "message": null,
+    "query": {
+      "fields": [],
+      "orders": [
+        {
+          "asc": false,
+          "property": "submitStartTime"
+        }
+      ],
+      "pageCount": 2,
+      "pageIndex": 1,
+      "pageSize": 9,
+      "recordCount": 18,
+      "recordEnd": 9,
+      "recordStart": 1
+    },
+    "success": true,
+    "systemTime": {
+      "date": 15,
+      "day": 3,
+      "hours": 17,
+      "minutes": 27,
+      "month": 4,
+      "seconds": 42,
+      "time": 1557912462404,
+      "timezoneOffset": -480,
+      "year": 119
+    },
+    "uri": null
+  },
+  "errorCode": null,
+  "html": null,
+  "key": null,
+  "message": null,
+  "success": true,
+  "systemTime": {
+    "date": 15,
+    "day": 3,
+    "hours": 17,
+    "minutes": 27,
+    "month": 4,
+    "seconds": 42,
+    "time": 1557912462416,
+    "timezoneOffset": -480,
+    "year": 119
+  },
+  "uri": null
+}

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

@@ -34,6 +34,7 @@
   html, body, #app {
     height: 100% !important;
     user-select: none;
+    background:rgb(248,248,248);
   }
 
   .main-content {

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

@@ -0,0 +1,403 @@
+<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'+activityInfo.coverUri" />
+        </div>
+        <div class="activity-brief-right">
+          <div class="activity-brief-title">
+            <span>{{activityInfo.name}}</span>
+            <span class="status" style="background: #999;">{{activityInfo.activityStatusTip}}</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">主讲单位:<span style="font-weight:bold;color:#000">{{activityInfo.ownUnit}}</span></p></div>
+              <div class="items"><p class="item">主讲人:<span style="font-weight:bold;color:#000">{{activityInfo.speaker}}</span></p></div>
+              <div class="items"><p class="item">学校:<span style="font-weight:bold;color:#000">{{activityInfo.schoolName}}</span></p></div>
+              <div class="items"><p class="item">年级:<span style="font-weight:bold;color:#000">{{activityInfo.parentGradeName}}</span></p></div>
+              <div class="items"><p class="item">学科:<span style="font-weight:bold;color:#000">{{activityInfo.parentCategoryName}}</span></p></div>
+              <div class="items"><p class="item">课题:<span style="font-weight:bold;color:#000">{{activityInfo.parentProjectName}}</span></p></div>
+            </div>
+            <div class="brief-info-left">
+              <div class="items"><p class="item">活动时间:<span style="font-weight:bold;color:#000">{{activityInfo.timeRangeTip}}</span></p></div>
+              <div class="items"><p class="item">授课平台:<span style="font-weight:bold;color:#000">{{activityInfo.parentTeachePlateName}}</span></p></div>
+              <div class="items"><p class="item">业务荣誉:<span style="font-weight:bold;color:#000">{{activityInfo.workHonor}}</span></p></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>VIEW CLASS USER</span></p>
+            <div class="content">
+              <p style="margin:15px">专家:刘斌</p>
+              <p style="margin:15px">成员:公开参与</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="description title-tip" style="margin-top:0">
+            <p class="title">
+              观课统计
+              <span>VIEW CLASS STATISTICS</span>
+            </p>
+            <div class="content">
+              <div id="views" style="width:100%; height:500px;"></div>
+              <div id="comments" style="width:100%; height:500px;"></div>
+            </div>
+          </div>
+          <div class="guide title-tip">
+            <p class="title">
+              观点评论
+              <span>REVIEW</span>
+            </p>
+            <div class="content">
+              <p class="comment-item" v-for="item in commentList" ><span style="color:#666">{{item.employeeName}}</span> : {{item.reviewContent}}</p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  import lessonInfo from '@/static/lessonDetails.json'
+  export default {
+    components: {
+    },
+    data() {
+      return {
+        reviewAcList: [],
+        attachmentsList: [],
+        commentList:[],
+        activityInfo: {}
+      }
+    },
+
+    created() {
+      this.attachmentsList = lessonInfo.attachments;
+      this.activityInfo = lessonInfo.data;
+      this.commentList = lessonInfo.commentList;
+
+    },
+    methods: {
+
+    },
+    mounted() {
+      let myChart = this.$echarts.init(document.getElementById('views'));
+      let schoolList = lessonInfo.views.map(a => a.schoolName);
+      let viewsList = lessonInfo.views.map(a => a.viewCount);
+
+      let option = {
+        color: ['#ff8745'],
+        tooltip: {
+          trigger: 'axis',
+          axisPointer : {            // 坐标轴指示器,坐标轴触发有效
+              type : 'shadow'        // 默认为直线,可选为:'line' | 'shadow'
+          }
+        },
+        xAxis: {
+          data: schoolList,
+          axisLabel: {
+            interval: 0,
+            rotate: 40,
+            formatter: function (value) {
+              return (value.length > 6 ? (value.slice(0,6)+"...") : value )
+            },  
+          },
+          splitLine: {    // gird 区域中的分割线
+            show: false,   // 是否显示
+            lineStyle: {
+              color: '#666',
+              width: 0,
+              type: 'dashed'
+            }
+          },
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          height: '400px',
+
+          containLabel: true
+       },
+        yAxis: {
+          name: "点击量",
+          splitLine: {    // gird 区域中的分割线
+            show: false,   // 是否显示
+            lineStyle: {
+              color: '#666',
+              width: 1,
+              type: 'dashed'
+            }
+          },
+        },
+        series: [{
+          name: '点击量',
+          type: 'bar',
+          barWidth: 20,//柱图宽度
+          data: viewsList
+        }]
+      };
+
+      myChart.setOption(option);
+
+      let comments = this.$echarts.init(document.getElementById('comments'));
+      let commentList = lessonInfo.comments.map(a => a.commentCount);
+
+      let commentsOption = {
+        color: ['#ff8745'],
+        tooltip: {
+          trigger: 'axis',
+          axisPointer : {            // 坐标轴指示器,坐标轴触发有效
+              type : 'shadow'        // 默认为直线,可选为:'line' | 'shadow'
+          }
+        },
+        xAxis: {
+          data: schoolList,
+          axisLabel: {
+            interval: 0,
+            rotate: 40,
+            formatter: function (value) {
+              return (value.length > 6 ? (value.slice(0,6)+"...") : value )
+            },  
+          },
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          height:'400px',
+          containLabel: true
+       },
+        yAxis: {
+          name: "评论数",
+          splitLine: {    // gird 区域中的分割线
+            show: false,   // 是否显示
+            lineStyle: {
+              color: '#666',
+              width: 1,
+              type: 'dashed'
+            }
+          },
+        },
+        series: [{
+          name: '评论数',
+          type: 'bar',
+          barWidth: 20,//柱图宽度
+          data: commentList
+        }]
+      };
+
+      comments.setOption(commentsOption);
+    }
+  }
+</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: 80px 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: 40px 20px 0 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: 5px;
+      }
+
+        .details-container .brief-info-left .items .item {
+          font-size: 14px;
+          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 .comment-item {
+        line-height: 40px;
+        color: #333;
+        font-weight:bold;
+        border-bottom: 1px solid #f6f6f6;
+    }
+</style>

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

@@ -0,0 +1,170 @@
+<template>
+  <div class="container">
+
+    <div class="search">
+      <DatePicker type="daterange" placement="bottom-end" placeholder="选择起止时间" style="width: 200px"></DatePicker>
+      <Button>搜索</Button>
+    </div>
+    <div class="activities">
+      <div class="activity" v-for="(item,index) in lessons" @click="handleLessonClick()">
+        <div>
+          <div class="img-box"><span class="state" style="background: rgb(130, 147, 166); visibility: visible;">{{item.activityStatusTip}}</span> <img :src="'http://ttkt.sxedu.org:70'+item.coverUri" alt=""></div>
+          <div class="infos">
+            <p></p>
+              <p>名称:{{item.mainActivityName}}</p>
+              <p>学校:{{item.schoolName}}</p>
+              <p>主讲:{{item.speaker}}</p>
+              <p>学科:{{item.categoryName}}</p>
+              <p>时间:{{item.timeTip}}</p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+    import lessons from '@/static/observationList.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);
+      },
+
+      handleLessonClick() {
+        this.$router.push('/lessonDetails')
+      },
+
+      goDetails() {
+        this.$router.push('/activityDetails')
+      }
+
+
+    },
+    mounted() {
+    }
+  }
+</script>
+<style scoped>
+  html, body, #app {
+    height: 100% !important;
+    user-select: none;
+  }
+
+  .main-content {
+    background: rgb(248,248,248) !important;
+  }
+
+  .container {
+    width: 1200px;
+    margin: 100px auto;
+    display: flex;
+    flex-direction: column;
+  }
+
+.container .activities {
+    min-height: 300px;
+    overflow: hidden
+}
+
+.container .activity {
+    margin-top: 30px;
+    margin-right: 25px;
+    margin-bottom: 30px;
+    width: 383px;
+    float: left;
+    cursor: pointer;
+    border: 1px solid #ddd;
+    box-sizing: border-box
+}
+
+.container .activities .activity:hover {
+    box-shadow: 0 26px 40px -24px rgba(0,36,100,.3);
+    transform: translateY(-6px);
+    transition: all .3s ease 0s
+}
+
+.container .activities .activity:nth-child(3n) {
+    margin-right: 0
+}
+
+.img-box {
+    height: 210px
+}
+
+.img-box .state {
+    padding: 5px 8px;
+    line-height: 20px;
+    position: relative;
+    left: 0;
+    top: 3px;
+    z-index: 1;
+    background-color: #13ce66;
+    color: #fff
+}
+
+.img-box img {
+    width: 382px;
+    height: 210px;
+    position: relative;
+    left: 0;
+    top: -21px;
+    padding-top: 1px
+}
+
+.infos {
+    background-color: #fff;
+    padding:10px;
+    font-size:14px;
+}
+
+  .infos p {
+    margin:5px 0;
+  }
+
+.infos .actName {
+    color: #444;
+    font-size: 16px;
+    padding: 20px 10px 10px 20px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    width: 280px
+}
+
+.infos .actOrganizer {
+    color: #999;
+    font-size: 14px;
+    padding-left: 20px;
+    padding-bottom: 20px
+}
+
+.infos .actTime {
+    color: #aaa;
+    font-size: 14px;
+    padding-left: 20px;
+    padding-bottom: 10px
+}
+
+
+</style>

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

@@ -58,7 +58,7 @@
       },
 
       goDetails() {
-        this.$router.push('/activityDetails')
+        this.$router.push('/lessonList')
       }
 
 

+ 23 - 19
TEAMModelOS.SmartClass/ClientApp/view/smart-class/LiveBroadcast.vue

@@ -16,12 +16,16 @@
           <Button size="large">返回今天</Button>
         </div>
       </div>
-      <full-calendar :events="fcEvents" lang="zh" @dayClick ="getDay" :config="config" ></full-calendar>
+      <full-calendar :config="config"
+                     :events="fcEvents"
+                     ref="calendar">
+      </full-calendar>
     </div>
   </div>
 </template>
 <script>
-  import FullCalendar from 'vue-fullcalendar'
+  import  FullCalendar  from 'vue-fullcalendar'
+  //import 'fullcalendar/dist/fullcalendar.css'
   export default {
     components: {
       FullCalendar
@@ -60,22 +64,22 @@
         ],
         fcEvents: [
         ],
-        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'
-          },
+       config: {
+        firstDay:'1',//以周日为每周的第一天
+        // 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:[]
       }
     },
@@ -84,8 +88,6 @@
         console.log(day);
         console.log(jsEvent);
       }
-
-
     },
     mounted() {
       this.lessonList = require("@/static/lessonList.json");
@@ -184,10 +186,12 @@
     }
     .review-main /deep/ .full-calendar-body .dates .dates-events .events-week .events-day .event-box .event-item {
       background:none;
+      height:15px;
     }
     /*.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;

+ 61 - 83
TEAMModelOS.SmartClass/ClientApp/view/smart-class/PastReview.vue

@@ -5,37 +5,42 @@
         <p class="title">
           往届回顾
           <span class="sub">
-            <span>18</span>
+            <span>{{activities.length}}</span>
             个活动已结束
           </span>
         </p>
         <div class="selections">
           <span class="name">年份:</span>
           <ul>
-            <li class="active"><span class="item">不限</span></li>
-            <li class=""><span class="item">2015</span></li>
-            <li class=""><span class="item">2016</span></li>
-            <li class=""><span class="item">2017</span></li>
-            <li class=""><span class="item">2018</span></li>
-            <li class=""><span class="item">2019</span></li>
+            <li :class="activeIndex == 0 ? 'active':''" @click="handleMenuClick(0,0)"><span class="item">不限</span></li>
+            <li :class="activeIndex == 1 ? 'active':''" @click="handleMenuClick(1,2015)"><span class="item">2015</span></li>
+            <li :class="activeIndex == 2 ? 'active':''" @click="handleMenuClick(2,2016)"><span class="item">2016</span></li>
+            <li :class="activeIndex == 3 ? 'active':''" @click="handleMenuClick(3,2017)"><span class="item">2017</span></li>
+            <li :class="activeIndex == 4 ? 'active':''" @click="handleMenuClick(4,2018)"><span class="item">2018</span></li>
+            <li :class="activeIndex == 5 ? 'active':''" @click="handleMenuClick(5,2019)"><span class="item">2019</span></li>
+
           </ul>
         </div>
         <div class="selections">
           <span class="name">排序:</span>
           <ul>
-            <li class="active"><span class="item">最新</span></li>
-            <li class=""><span class="item">最热</span></li>
+            <li :class="activeOrder == 0 ? 'active':''" @click="handleOrderClick(0)"><span class="item">最新</span></li>
+            <li :class="activeOrder == 1 ? 'active':''" @click="handleOrderClick(1)"><span class="item">最热</span></li>
           </ul>
         </div>
         <div style="clear:both;"></div>
+        <Input search v-model="searchVal" placeholder="输入活动名称或者关键词" style="width:300px;margin-top:10px" @on-search="handleSearch" @on-change="handleSearch" />
         <div class="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">
+              <div class="img-box">
+                <span class="state" style="background: rgb(19, 206, 102); visibility: visible; display:none;">{{item.status}}</span>
+                <img :src="'http://ttkt.sxedu.org:70'+item.coverUri" alt="">
+              </div> <div class="infos">
                 <p class="actName">{{item.name}}</p>
                 <p class="actOrganizer">
                   <span class="organizer">
-                    {{item.time}}
+                    {{item.submitTimeTip}}
                   </span>
                   <span style="display:none;">主办</span>
                 </p>
@@ -43,97 +48,62 @@
             </div>
           </div>
         </div>
+
+        <Page show-total
+              :current="1"
+              :total="activities.length"
+              :page-size="pageSize"
+              class="page-box"
+              style="margin:20px 0" />
       </div>
     </div>
   </div>
 </template>
 <script>
+  import acList from '@/static/pastAcList.json'
   export default {
     components: {
     },
     data() {
       return {
-        activities: [
-          {
-            status: "筹备阶段",
-            img: "http://ttkt.sxedu.org:70/upload/activity/cover/40/40.jpg?_=1557199674221",
-            name: "2019年柯桥区天天智慧课堂 5月份 优课评比",
-            organizer: "柯桥区教师发展中心",
-            time:"2019.03.01-04.06"
-          },{
-            status: "筹备阶段",
-            img: "http://ttkt.sxedu.org:70/upload/activity/cover/40/40.jpg?_=1557199674221",
-            name: "2019年柯桥区天天智慧课堂 5月份 优课评比",
-            organizer: "柯桥区教师发展中心",
-            time:"2019.03.01-04.06"
-          },{
-            status: "筹备阶段",
-            img: "http://ttkt.sxedu.org:70/upload/activity/cover/40/40.jpg?_=1557199674221",
-            name: "2019年柯桥区天天智慧课堂 5月份 优课评比",
-            organizer: "柯桥区教师发展中心",
-            time:"2019.03.01-04.06"
-          },{
-            status: "筹备阶段",
-            img: "http://ttkt.sxedu.org:70/upload/activity/cover/40/40.jpg?_=1557199674221",
-            name: "2019年柯桥区天天智慧课堂 5月份 优课评比",
-            organizer: "柯桥区教师发展中心",
-            time:"2019.03.01-04.06"
-          },{
-            status: "筹备阶段",
-            img: "http://ttkt.sxedu.org:70/upload/activity/cover/40/40.jpg?_=1557199674221",
-            name: "2019年柯桥区天天智慧课堂 5月份 优课评比",
-            organizer: "柯桥区教师发展中心",
-            time:"2019.03.01-04.06"
-          },{
-            status: "筹备阶段",
-            img: "http://ttkt.sxedu.org:70/upload/activity/cover/40/40.jpg?_=1557199674221",
-            name: "2019年柯桥区天天智慧课堂 5月份 优课评比",
-            organizer: "柯桥区教师发展中心",
-            time:"2019.03.01-04.06"
-          },
-          {
-            status: "筹备阶段",
-            img: "http://ttkt.sxedu.org:70/upload/activity/cover/40/40.jpg?_=1557199674221",
-            name: "2019年柯桥区天天智慧课堂 5月份 优课评比",
-            organizer: "柯桥区教师发展中心",
-            time:"2019.03.01-04.06"
-          },{
-            status: "筹备阶段",
-            img: "http://ttkt.sxedu.org:70/upload/activity/cover/40/40.jpg?_=1557199674221",
-            name: "2019年柯桥区天天智慧课堂 5月份 优课评比",
-            organizer: "柯桥区教师发展中心",
-            time:"2019.03.01-04.06"
-          },{
-            status: "筹备阶段",
-            img: "http://ttkt.sxedu.org:70/upload/activity/cover/40/40.jpg?_=1557199674221",
-            name: "2019年柯桥区天天智慧课堂 5月份 优课评比",
-            organizer: "柯桥区教师发展中心",
-            time:"2019.03.01-04.06"
-          }
-        ]
+        activeIndex: 0,
+        activeOrder: 0,
+        pageSize: 9,
+        searchVal:"",
+        activities: acList.data.list
       }
     },
     methods: {
       activityClick() {
         this.$router.push('/rewardDetails');
+      },
+      handleMenuClick(index,val) {
+        this.activeIndex = index;
+        this.activities = index == 0 ? acList.data.list : acList.data.list.filter(item => item.submitTimeTip.substring(0,4) == val);
+      },
+      handleOrderClick(index) {
+        this.activeOrder = index;
+        let list = acList.data.list;
+        this.activities = list.sort(this.compare('applyCount'));
+      },
+      compare(property){
+        return function(a,b){
+            var value1 = a[property];
+            var value2 = b[property];
+            return value1 - value2;
+        }
+      },
+      handleSearch() {
+        console.log(acList.data.list.filter(item => item.name.indexOf(this.searchVal) != -1));
+        this.activities = acList.data.list.filter(item => item.name.indexOf(this.searchVal) != -1);
       }
 
-
     },
     mounted() {
     }
   }
 </script>
 <style scoped>
-  html, body, #app {
-    height: 100% !important;
-    user-select: none;
-  }
-
-  .main-content {
-    background: rgb(248,248,248) !important;
-  }
-
   .container {
     width: 1200px;
     margin: 100px auto;
@@ -171,7 +141,10 @@
     float: left;
     clear: left;
   }
-
+  .selections ul {
+    height:30px;
+    margin-top:10px;
+  }
   .selections ul li {
     float: left;
     font-size: 14px;
@@ -180,9 +153,10 @@
     padding: 0 0 0 40px;
   }
 
-    .selections ul li.active {
-      color: #33aeff;
-    }
+  .selections ul li.active {
+    color: #33aeff;
+    font-weight:bold;
+  }
   .activities {
     min-height: 300px;
     overflow: hidden;
@@ -268,4 +242,8 @@
     text-decoration: none;
     float: right
 }
+
+  .page-box {
+    float:right;
+  }
 </style>

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

@@ -189,6 +189,7 @@
 
   .main-content {
     background: rgb(248,248,248) !important;
+    height:100%;
   }
 
   .center-row {

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

@@ -47,7 +47,7 @@
                 </div>
               </div>
             </div>
-</div>
+          </div>
       </div>
     </div>
 

+ 3 - 1
TEAMModelOS.SmartClass/package.json

@@ -26,12 +26,15 @@
     "jwt-decode": "^2.2.0",
     "less": "^3.9.0",
     "vue": "^2.6.9",
+    "vue-full-calendar": "^2.7.0",
     "vue-fullcalendar": "^1.0.9",
     "vue-infinite-loading": "^2.4.3",
+    "vue-loader": "^15.7.0",
     "vue-router": "^3.0.2",
     "vue-scroll": "^2.1.9",
     "vue-server-renderer": "^2.6.9",
     "vue-template-compiler": "^2.6.9",
+    "vue-template-loader": "^1.0.0",
     "vue-video-player": "^5.0.2",
     "vuex": "^3.1.0",
     "vuex-router-sync": "^5.0.0"
@@ -80,7 +83,6 @@
     "style-loader": "^0.23.1",
     "url-loader": "^1.1.2",
     "vue-i18n": "^8.9.0",
-    "vue-loader": "^15.7.0",
     "webpack": "^4.29.0",
     "webpack-cli": "^3.3.0",
     "webpack-dev-server": "^3.1.14",