Ver Fonte

修改video applyName

psycho há 6 anos atrás
pai
commit
0f44c3a9ac

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


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


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


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


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


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

@@ -88,11 +88,11 @@
       }
         .header ul li:hover {
           background:rgba(160,160,160,.24);
-          color:#33aafe;
+          color:#41b6ba;
         }
 
       .header ul .li-active {
-        color:#33aafe;
+        color:#41b6ba;
       }
     .header .btn-login {
       color: #fff;

+ 14 - 77
TEAMModelOS.SmartClass/ClientApp/static/finishAcList.json

@@ -6,21 +6,21 @@
         "banner": "优课评比banner.jpg",
         "bannerHash": "40.jpg",
         "bannerUri": "/upload/activity/banner/40/40.jpg?_=1557301765646",
-        "cover": "智慧课堂3月.jpg",
+        "cover": "智慧课堂1月.jpg",
         "coverHash": "40.jpg",
         "coverUri": "/upload/activity/cover/40/40.jpg?_=1557301765646",
-        "name": "2019年高新区智慧课堂 3月份 优课评比",
+        "name": "2019年高新区智慧课堂 1月份 优课评比",
         "organizer": "高新区教师发展中心",
         "publicity": false,
-        "reviewTimeTip": "2019.03.31-04.08",
+        "reviewTimeTip": "2019.01.31-02.08",
         "showApplyScore": false,
         "state": 1,
         "stateTip": "有效 ",
         "status": 1,
-        "statusTip": "筹备阶段",
-        "submitEndTimeTip": "2019.03.31",
-        "submitTimeTip": "2019.03.01-04.30",
-        "timeTip": "2019.03.01-04.08"
+        "statusTip": "已结束",
+        "submitEndTimeTip": "2019.01.31",
+        "submitTimeTip": "2019.01.01-02.30",
+        "timeTip": "2019.01.01-02.08"
       },
       {
         "applyCount": 0,
@@ -30,18 +30,18 @@
         "cover": "智慧课堂5月.jpg",
         "coverHash": "40.jpg",
         "coverUri": "/upload/activity/cover/40/40.jpg?_=1557301765646",
-        "name": "2019年高新区智慧课堂 4月份 优课评比",
+        "name": "2019年高新区智慧课堂 2月份 优课评比",
         "organizer": "高新区教师发展中心",
         "publicity": false,
-        "reviewTimeTip": "2019.04.31-05.08",
+        "reviewTimeTip": "2019.02.28-03.08",
         "showApplyScore": false,
         "state": 1,
         "stateTip": "有效 ",
         "status": 1,
-        "statusTip": "筹备阶段",
-        "submitEndTimeTip": "2019.04.31",
-        "submitTimeTip": "2019.04.01-05.31",
-        "timeTip": "2019.04.01-05.08"
+        "statusTip": "已结束",
+        "submitEndTimeTip": "2019.02.28",
+        "submitTimeTip": "2019.02.01-03.31",
+        "timeTip": "2019.02.01-03.08"
       },
       {
         "applyCount": 0,
@@ -59,70 +59,7 @@
         "state": 1,
         "stateTip": "有效 ",
         "status": 1,
-        "statusTip": "筹备阶段",
-        "submitEndTimeTip": "2019.05.31",
-        "submitTimeTip": "2019.05.01-05.31",
-        "timeTip": "2019.05.01-06.08"
-      },
-      {
-        "applyCount": 0,
-        "banner": "优课评比banner.jpg",
-        "bannerHash": "40.jpg",
-        "bannerUri": "/upload/activity/banner/40/40.jpg?_=1557301765646",
-        "cover": "智慧课堂3月.jpg",
-        "coverHash": "40.jpg",
-        "coverUri": "/upload/activity/cover/40/40.jpg?_=1557301765646",
-        "name": "2019年高新区智慧课堂 3月份 优课评比",
-        "organizer": "高新区教师发展中心",
-        "publicity": false,
-        "reviewTimeTip": "2019.03.31-04.08",
-        "showApplyScore": false,
-        "state": 1,
-        "stateTip": "有效 ",
-        "status": 1,
-        "statusTip": "筹备阶段",
-        "submitEndTimeTip": "2019.03.31",
-        "submitTimeTip": "2019.03.01-04.30",
-        "timeTip": "2019.03.01-04.08"
-      },
-      {
-        "applyCount": 0,
-        "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",
-        "name": "2019年高新区智慧课堂 4月份 优课评比",
-        "organizer": "高新区教师发展中心",
-        "publicity": false,
-        "reviewTimeTip": "2019.04.31-05.08",
-        "showApplyScore": false,
-        "state": 1,
-        "stateTip": "有效 ",
-        "status": 1,
-        "statusTip": "筹备阶段",
-        "submitEndTimeTip": "2019.04.31",
-        "submitTimeTip": "2019.04.01-05.31",
-        "timeTip": "2019.04.01-05.08"
-      },
-      {
-        "applyCount": 0,
-        "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",
-        "name": "2019年高新区智慧课堂 5月份 优课评比",
-        "organizer": "高新区教师发展中心",
-        "publicity": false,
-        "reviewTimeTip": "2019.05.31-06.08",
-        "showApplyScore": false,
-        "state": 1,
-        "stateTip": "有效 ",
-        "status": 1,
-        "statusTip": "筹备阶段",
+        "statusTip": "已结束",
         "submitEndTimeTip": "2019.05.31",
         "submitTimeTip": "2019.05.01-05.31",
         "timeTip": "2019.05.01-06.08"

+ 14 - 678
TEAMModelOS.SmartClass/ClientApp/static/lessons.json

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

+ 54 - 689
TEAMModelOS.SmartClass/ClientApp/static/pastAcList.json

@@ -1,794 +1,159 @@
 {
   "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
+        "text": "3月份 优课评比"
       },
       {
-        "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月份 优课评比",
+        "name": "2019年高新区智慧课堂 4月份 优课评比",
         "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",
+        "reviewTimeTip": "2019.03.31-04.06",
         "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
+        "submitEndTimeTip": "2019.04.31",
+        "submitTimeTip": "2019.04.01-04.31",
+        "timeTip": "2019.04.01-05.06",
+        "text": "4月份 优课评比"
       },
       {
-        "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年高新区智慧课堂十佳优质课评比活动课例评比",
+        "name": "2019年高新区智慧课堂 5月份 优课评比",
         "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",
+        "reviewTimeTip": "2019.03.31-04.06",
         "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
+        "submitEndTimeTip": "2019.05.31",
+        "submitTimeTip": "2019.05.01-05.31",
+        "timeTip": "2019.05.01-06.06",
+        "text": "5月份 优课评比"
       },
       {
-        "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月份 优课评比",
+        "name": "2019年高新区智慧课堂 3月份 优课评比",
         "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",
+        "reviewTimeTip": "2019.03.31-04.06",
         "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
+        "submitEndTimeTip": "2019.03.31",
+        "submitTimeTip": "2019.03.01-03.31",
+        "timeTip": "2019.03.01-04.06",
+        "text": "3月份 优课评比"
       },
       {
-        "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年高新区“第四届智慧课堂教学实践观摩活动”课例征集",
+        "name": "2019年高新区智慧课堂 4月份 优课评比",
         "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",
+        "reviewTimeTip": "2019.03.31-04.06",
         "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
+        "submitEndTimeTip": "2019.04.31",
+        "submitTimeTip": "2019.04.01-04.31",
+        "timeTip": "2019.04.01-05.06",
+        "text": "4月份 优课评比"
       },
       {
-        "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月份 优课评比",
+        "name": "2019年高新区智慧课堂 5月份 优课评比",
         "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,
+        "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": 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
+        "submitEndTimeTip": "2019.05.31",
+        "submitTimeTip": "2019.05.01-05.31",
+        "timeTip": "2019.05.01-06.06",
+        "text": "5月份 优课评比"
       },
       {
-        "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年下高新区创新实验室(学科教室)视频课例评比活动",
+        "name": "2019年高新区智慧课堂 3月份 优课评比",
         "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",
+        "reviewTimeTip": "2019.03.31-04.06",
         "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
+        "submitEndTimeTip": "2019.03.31",
+        "submitTimeTip": "2019.03.01-03.31",
+        "timeTip": "2019.03.01-04.06",
+        "text": "3月份 优课评比"
       },
       {
-        "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月份 优课评比",
+        "name": "2019年高新区智慧课堂 4月份 优课评比",
         "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,
+        "reviewTimeTip": "2019.03.31-04.06",
+        "showApplyScore": false,
         "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
+        "submitEndTimeTip": "2019.04.31",
+        "submitTimeTip": "2019.04.01-04.31",
+        "timeTip": "2019.04.01-05.06",
+        "text": "4月份 优课评比"
       },
       {
-        "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年“高新区智慧课堂研究者联盟”校级研究课题展示交流",
+        "name": "2019年高新区智慧课堂 5月份 优课评比",
         "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,
+        "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": 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
+        "submitEndTimeTip": "2019.05.31",
+        "submitTimeTip": "2019.05.01-05.31",
+        "timeTip": "2019.05.01-06.06",
+        "text": "5月份 优课评比"
       }
-    ],
-    "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
+    ]
+  }
 }

+ 80 - 336
TEAMModelOS.SmartClass/ClientApp/static/reviewAcList.json

@@ -1,388 +1,132 @@
 {
   "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": "智慧课堂3月.jpg",
+        "coverHash": "40.jpg",
+        "coverUri": "/upload/activity/cover/40/40.jpg?_=1557301765646",
+        "name": "2019年高新区智慧课堂 3月份 优课评比",
+        "organizer": "高新区教师发展中心",
+        "publicity": false,
+        "reviewTimeTip": "2019.03.31-04.08",
+        "showApplyScore": false,
+        "state": 1,
+        "stateTip": "有效 ",
+        "status": 1,
+        "statusTip": "筹备阶段",
+        "submitEndTimeTip": "2019.03.31",
+        "submitTimeTip": "2019.03.01-04.30",
+        "timeTip": "2019.03.01-04.08"
+      },
+      {
+        "applyCount": 0,
+        "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",
+        "name": "2019年高新区智慧课堂 4月份 优课评比",
+        "organizer": "高新区教师发展中心",
+        "publicity": false,
+        "reviewTimeTip": "2019.04.31-05.08",
+        "showApplyScore": false,
+        "state": 1,
+        "stateTip": "有效 ",
+        "status": 1,
+        "statusTip": "筹备阶段",
+        "submitEndTimeTip": "2019.04.31",
+        "submitTimeTip": "2019.04.01-05.31",
+        "timeTip": "2019.04.01-05.08"
+      },
+      {
+        "applyCount": 0,
         "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
+        "timeTip": "2019.05.01-06.08"
       },
       {
-        "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,
+        "bannerHash": "40.jpg",
+        "bannerUri": "/upload/activity/banner/40/40.jpg?_=1557301765646",
+        "cover": "智慧课堂3月.jpg",
+        "coverHash": "40.jpg",
+        "coverUri": "/upload/activity/cover/40/40.jpg?_=1557301765646",
+        "name": "2019年高新区智慧课堂 3月份 优课评比",
         "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",
+        "reviewTimeTip": "2019.03.31-04.08",
         "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
+        "status": 1,
+        "statusTip": "筹备阶段",
+        "submitEndTimeTip": "2019.03.31",
+        "submitTimeTip": "2019.03.01-04.30",
+        "timeTip": "2019.03.01-04.08"
       },
       {
-        "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,
+        "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",
         "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",
+        "reviewTimeTip": "2019.04.31-05.08",
         "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
+        "status": 1,
+        "statusTip": "筹备阶段",
+        "submitEndTimeTip": "2019.04.31",
+        "submitTimeTip": "2019.04.01-05.31",
+        "timeTip": "2019.04.01-05.08"
       },
       {
-        "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,
+        "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",
+        "name": "2019年高新区智慧课堂 5月份 优课评比",
         "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",
+        "reviewTimeTip": "2019.05.31-06.08",
         "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
+        "status": 1,
+        "statusTip": "筹备阶段",
+        "submitEndTimeTip": "2019.05.31",
+        "submitTimeTip": "2019.05.01-05.31",
+        "timeTip": "2019.05.01-06.08"
       }
-    ],
-    "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
+    ]
+  }
 }

+ 10 - 10
TEAMModelOS.SmartClass/ClientApp/static/rewardList.json

@@ -10,7 +10,7 @@
         "activityAwardName": "月冠军",
         "applyId": 900,
         "applyIsPush": false,
-        "applyName": "12月13日直播",
+        "applyName": "5月13日直播",
         "categoryId": 1,
         "categoryName": "语文",
         "employeeName": "喻远鑫",
@@ -28,7 +28,7 @@
         "activityAwardName": "月亚军",
         "applyId": 894,
         "applyIsPush": false,
-        "applyName": "12月11日直播",
+        "applyName": "5月11日直播",
         "categoryId": 1,
         "categoryName": "语文",
         "employeeName": "林丽",
@@ -46,7 +46,7 @@
         "activityAwardName": "月季军",
         "applyId": 902,
         "applyIsPush": false,
-        "applyName": "12月14日直播",
+        "applyName": "5月14日直播",
         "categoryId": 18,
         "categoryName": "化学",
         "employeeName": "徐益敏",
@@ -64,7 +64,7 @@
         "activityAwardName": "优课",
         "applyId": 885,
         "applyIsPush": false,
-        "applyName": "12月05日直播",
+        "applyName": "5月05日直播",
         "categoryId": 4,
         "categoryName": "科学",
         "employeeName": "王利芳",
@@ -82,7 +82,7 @@
         "activityAwardName": "优课",
         "applyId": 892,
         "applyIsPush": false,
-        "applyName": "12月10日直播",
+        "applyName": "5月10日直播",
         "categoryId": 4,
         "categoryName": "科学",
         "employeeName": "徐飞",
@@ -100,7 +100,7 @@
         "activityAwardName": "优课",
         "applyId": 888,
         "applyIsPush": false,
-        "applyName": "12月06日直播",
+        "applyName": "5月06日直播",
         "categoryId": 3,
         "categoryName": "英语",
         "employeeName": "章晓瑛",
@@ -118,7 +118,7 @@
         "activityAwardName": "优课",
         "applyId": 896,
         "applyIsPush": false,
-        "applyName": "12月12日直播",
+        "applyName": "5月12日直播",
         "categoryId": 3,
         "categoryName": "英语",
         "employeeName": "王超",
@@ -136,7 +136,7 @@
         "activityAwardName": "优课",
         "applyId": 884,
         "applyIsPush": false,
-        "applyName": "12月04日直播",
+        "applyName": "5月04日直播",
         "categoryId": 7,
         "categoryName": "数学",
         "employeeName": "倪丽红",
@@ -154,7 +154,7 @@
         "activityAwardName": "优课",
         "applyId": 883,
         "applyIsPush": false,
-        "applyName": "12月03日直播",
+        "applyName": "5月03日直播",
         "categoryId": 5,
         "categoryName": "历史与社会",
         "employeeName": "张圣凯",
@@ -172,7 +172,7 @@
         "activityAwardName": "优课",
         "applyId": 899,
         "applyIsPush": false,
-        "applyName": "12月14日直播",
+        "applyName": "5月14日直播",
         "categoryId": 1,
         "categoryName": "语文",
         "employeeName": "沈若芬",

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

@@ -1,7 +1,7 @@
 <template>
   <div id="app">
     <div class="banner">
-      <img src="../../assets/image/banner.png" />
+      <img src="../../assets/image/gxq_banner.png" />
     </div>
     <div class="details-container">
         <div class="activity-brief center-row">

+ 3 - 0
TEAMModelOS.SmartClass/ClientApp/view/smart-class/CommentVideo.vue

@@ -236,6 +236,9 @@
 
       myChart.on('click', function (params) {
         let totalSecond = document.getElementsByClassName('vjs-tech')[0].duration;
+        //document.getElementsByClassName('vjs-control-bar')[0].style.opacity = 1;
+        that.$refs.videoPlayer.player.play();
+        console.log(that.$refs.videoPlayer.player.controls);
         that.$refs.videoPlayer.player.currentTime(totalSecond * parseInt(params.value[0]) * 0.01);
       });
     },

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

@@ -7,7 +7,7 @@
     </div>
     <div class="activity-item" v-for="(item,index) in lessons" :key="index">
       <div class="activity-banner">
-        <img src="../../assets/image/bg_lessons.png" />
+        <img :src="getThumb(index)" />
       </div>
       <div class="activity-brief">
         <div class="left">
@@ -52,6 +52,15 @@
         this.noticeList = newArray;
       },
 
+      getThumb(index) {
+        let thumb = {
+          0: require("../../assets/image/bg_lessons.png"),
+           1: require("../../assets/image/bg_lessons_2.png"),
+           2: require("../../assets/image/bg_lessons_3.png")
+         };
+         return thumb[index];
+      },
+
       handleMenuClick(index,typeId,name) {
         this.activeIndex = index;
         this.typeName = name;

+ 22 - 10
TEAMModelOS.SmartClass/ClientApp/view/smart-class/PastReview.vue

@@ -32,11 +32,11 @@
         <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="../../assets/image/cover.png" alt="">
-              </div> <div class="infos">
+                <span class="state" style="background: rgb(149, 155, 155); visibility: visible;">{{item.statusTip}}</span>
+                  <span class="time">{{item.text}}</span>
+              </div>
+            <div class="infos">
                 <p class="actName">{{item.name}}</p>
                 <p class="actOrganizer">
                   <span class="organizer">
@@ -185,20 +185,34 @@
 }
 
 .img-box {
-    width: 335px;
+    height:185px;
+    position:relative;
+    background:url(../../assets/image/cover.png);
+    background-size:cover;
+    display:flex;
+    flex-direction:row;
+    justify-content:center;
+    align-items:center;
 }
 
 .img-box .state {
     padding: 5px 8px;
-    line-height: 20px;
-    position: relative;
+    position: absolute;
     left: 0;
-    top: 3px;
+    top: 0px;
     z-index: 1;
     background-color: #13ce66;
     color: #fff
 }
 
+.img-box .time {
+    margin-top:130px;
+    z-index: 1;
+    color: #dbd8d8;
+    font-size:18px;
+    font-weight:bold;
+}
+
 .img-box img {
     width: 333px;
     height: 210px;
@@ -209,8 +223,6 @@
 }
 
 .infos {
-  position:relative;
-  top:-21px;
     background-color: #fff
 }
 

+ 4 - 0
TEAMModelOS.SmartClass/ClientApp/view/smart-class/ReviewActivity.vue

@@ -135,5 +135,9 @@
       font-size:16px;
     }
 
+    .container .ivu-btn-primary {
+      background:#41b6ba;
+      border-color:#41b6ba;
+    }
 
 </style>

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

@@ -52,7 +52,8 @@
               </Tabs>
               <Table :columns="columns1" :data="rewardDatas">
                 <template slot-scope="{ row, index }" slot="applyName" >
-                  <Icon color="#A8CDF3" size="20" type="logo-youtube" style="cursor:pointer;"/><strong  style="margin-right: 5px;cursor:pointer;" @click="showVideo(index)">{{row.applyName}}</strong>
+                  <Icon color="#A8CDF3" size="20" type="logo-youtube" style="cursor:pointer;"/>
+                  <strong  style="margin-right: 5px;margin-left:10px;cursor:pointer;" @click="showVideo(index)">{{row.applyName}}</strong>
                 </template>
               </Table>
             </div>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="video-page">
     <div class="video-title">
-      <h3 class="video-title-h3">12月03日直播</h3>
+      <h3 class="video-title-h3">{{routerData.applyName}}</h3>
     </div>
     <div class="video-info">
 
@@ -51,9 +51,9 @@
       <h3 class="video-title-h3">推荐作品</h3>
     </div>
     <div class="videos-wrap">
-      <div class="video-item" v-for="(item , index) in videos" @click="showVideo(index)">
+      <div class="video-item" v-for="(item , index) in rewardDatas" @click="showVideo(index)">
         <img src="../../assets/image/default-act.png" width="95%" />
-        <p>{{item.title}}</p>
+        <p>{{item.applyName}}</p>
       </div>
     </div>
   </div>
@@ -86,28 +86,28 @@
         rewardDatas: [],
         videos: [
           {
-            title:'12月14日直播'
+            title:'05月11日直播'
           },
           {
-            title:'12月14日直播'
+            title:'05月12日直播'
           },
           {
-            title:'12月14日直播'
+            title:'05月13日直播'
           },
           {
-            title:'12月14日直播'
+            title:'05月14日直播'
           },
           {
-            title:'12月14日直播'
+            title:'05月15日直播'
           },
           {
-            title:'12月14日直播'
+            title:'05月16日直播'
           },
           {
-            title:'12月14日直播'
+            title:'05月17日直播'
           },
           {
-            title:'12月14日直播'
+            title:'05月18日直播'
           }
         ]
       }

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

@@ -1,7 +1,7 @@
 <template>
   <div id="app">
     <div class="banner">
-      <img src="../../assets/image/banner.png" />
+      <img src="../../assets/image/gxq_banner.png" />
     </div>
 
     <div class="activity-container notice-wrap">
@@ -37,8 +37,12 @@
         <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="../../assets/image/cover.png" alt=""></div> <div class="infos">
-                  <p></p><p class="actName">{{item.name}}</p> <p></p> <p class="actOrganizer">
+                <div class="img-box">
+                <span class="state" style="background: rgb(8, 203, 203); visibility: visible;">{{item.statusTip}}</span>
+                  <span class="time">{{item.timeTip}}</span>
+                </div>
+                <div class="infos">
+                  <p class="actName">{{item.name}}</p> <p></p> <p class="actOrganizer">
                     <span class="organizer">
                       {{item.organizer}}
                     </span>
@@ -63,17 +67,21 @@
           </div>
         </div>
         <div class="activities">
-          <div class="activity" v-for="(item,index) in activityList" @click="handleActivityClick()">
+          <div class="activity" v-for="(item,index) in finishAcList" @click="handleActivityClick()">
             <div>
-              <div class="img-box"><span class="state" style="background: rgb(19, 206, 102); visibility: visible;">{{item.statusTip}}</span> <img src="../../assets/image/cover.png" alt=""></div> <div class="infos">
-              <p></p>
-              <p class="actName">{{item.name}}</p>
-              <p></p>
-              <p class="actOrganizer">
+              <div class="img-box">
+                <span class="state" style="background: rgb(168, 170, 169); visibility: visible;">{{item.statusTip}}</span>
+                <span class="time">{{item.timeTip}}</span>
+              </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>
+                  <span>主办</span>
                 </p>
               </div>
             </div>
@@ -88,6 +96,7 @@
   import headers from '@/components/smart-class/headers'
   import indexNoticeList from '@/static/indexNoticeList.json'
   import indexActivityList from '@/static/reviewAcList.json'
+  import indexFinishActivityList from '@/static/finishAcList.json'
   export default {
     components: {
       headers
@@ -101,6 +110,7 @@
     created() {
       this.noticeList = indexNoticeList.list;
       this.activityList = indexActivityList.data.list;
+      this.finishAcList = indexFinishActivityList.data.list;
     },
     methods: {
       handleNoticeClick() {
@@ -150,7 +160,7 @@
     .header-line h3 {
       float: left;
       padding-left: 10px;
-      border-left: 4px solid #33aafe;
+      border-left: 4px solid #41b6ba;
       color: #333
     }
 
@@ -167,6 +177,9 @@
       color: #666;
       font-size: 14px
     }
+  .banner {
+    margin-top:50px;
+  }
    .banner  img {
     width: 100%;
     min-width: 1280px;
@@ -192,7 +205,7 @@
         line-height: 28px;
         width: 64px;
         height: 28px;
-        background-color: #33aafe;
+        background-color: #41b6ba;
         color: #fff;
         font-size: 24px;
         font-family: Arial;
@@ -222,7 +235,7 @@
         list-style-type: disc;
         padding: 10px 0 10px 8px;
         font-size: 14px;
-        color: #20a0ff;
+        color: #41b6ba;
         cursor: pointer;
       }
 
@@ -276,24 +289,38 @@
 }
 
 .img-box {
-    height: 210px
+    height: 210px;
+    position:relative;
+    background:url(../../assets/image/cover.png);
+    background-size:cover;
+    display:flex;
+    flex-direction:row;
+    justify-content:center;
+    align-items:center;
 }
 
 .img-box .state {
     padding: 5px 8px;
-    line-height: 20px;
-    position: relative;
+    position: absolute;
     left: 0;
-    top: 3px;
+    top: 0px;
     z-index: 1;
     background-color: #13ce66;
     color: #fff
 }
 
+.img-box .time {
+    margin-top:130px;
+    z-index: 1;
+    color: #dbd8d8;
+    font-size:18px;
+    font-weight:bold;
+}
+
 .img-box img {
     width: 382px;
     height: 210px;
-    position: relative;
+    position: absolute;
     left: 0;
     top: -21px;
     padding-top: 1px