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

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

@@ -1,17 +1,19 @@
 <template>
   <div class="headerContainer">
     <div class="header center-row">
-      <img src="../../assets/image/e_logo3.png" style="width:150px" />
+      <img src="../../assets/image/e_logo4.png" style="width:230px" />
       <ul>
         <li :class="this.$route.path ==  '/main/index' || activeIndex == 0 ? 'li-active':''" @click="handleMenuClick(0,'index')">首页</li>
         <li :class="this.$route.path ==  '/main/notice' || activeIndex == 1? 'li-active':''" @click="handleMenuClick(1,'notice')">通知公告</li>
-        <li :class="this.$route.path ==  '/main/LiveBroadcast' || activeIndex == 4? 'li-active':''" @click="handleMenuClick(4,'LiveBroadcast')">天天直播</li>
-        <li :class="this.$route.path ==  '/main/reviewActivity' || activeIndex == 2? 'li-active':''" @click="handleMenuClick(2,'reviewActivity')">评审活动</li>
+        <li :class="this.$route.path ==  '/main/LiveBroadcast' || activeIndex == 4? 'li-active':''" @click="handleMenuClick(4,'LiveBroadcast')">课例直播</li>
+        <li :class="this.$route.path ==  '/main/reviewActivity' || activeIndex == 2? 'li-active':''" @click="handleMenuClick(2,'reviewActivity')">活动列表</li>
         <li :class="this.$route.path ==  '/main/PastReview' || activeIndex == 3? 'li-active':''" @click="handleMenuClick(3,'PastReview')">往届回顾</li>
-        <li :class="this.$route.path ==  '/main/Lessons' || activeIndex == 5? 'li-active':''" @click="handleMenuClick(5,'Lessons')">优课汇聚</li>
+        <li :class="this.$route.path ==  '/main/Lessons' || activeIndex == 5? 'li-active':''" @click="handleMenuClick(5,'Lessons')">经典课例</li>
       </ul>
-      <span class="btn-login" v-if="isLogin == 1" >欢迎&nbsp;{{userName}} !</span>
-      <Icon type="md-power" v-if="isLogin == 1" @click="loginOut" style="margin-left:30px;cursor:pointer" size="20" title="退出登录" color="white" />
+      <div  v-if="isLogin == 1">
+        <span class="btn-login">欢迎&nbsp;{{userName}} !</span>
+        <Icon type="md-power"  @click="loginOut" style="margin-left:10px;cursor:pointer;margin-top:-4px;" size="20" title="退出登录" color="white" />
+      </div>      
       <span class="btn-login" v-else @click="handleMenuClick(6,'/login')">登录</span>
     </div>
   </div>
@@ -21,7 +23,7 @@
   export default {
     name: "headers",
     data() {
-      return {
+      return { 
         userName: '',
         isLogin:'',
         activeIndex: sessionStorage.getItem('_activeIndex') || 0
@@ -88,11 +90,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;

TEAMModelOS.SmartClass/ClientApp/static/finishAcList.json

@@ -0,0 +1,69 @@
+{
+  "data": {
+    "list": [
+      {
+        "applyCount": 0,
+        "banner": "优课评比banner.jpg",
+        "bannerHash": "40.jpg",
+        "bannerUri": "/upload/activity/banner/40/40.jpg?_=1557301765646",
+        "cover": "智慧课堂1月.jpg",
+        "coverHash": "40.jpg",
+        "coverUri": "/upload/activity/cover/40/40.jpg?_=1557301765646",
+        "name": "2019年高新区智慧课堂 1月份 优课评比",
+        "organizer": "高新区教师发展中心",
+        "publicity": false,
+        "reviewTimeTip": "2019.01.31-02.08",
+        "showApplyScore": false,
+        "state": 1,
+        "stateTip": "有效 ",
+        "status": 1,
+        "statusTip": "已结束",
+        "submitEndTimeTip": "2019.01.31",
+        "submitTimeTip": "2019.01.01-02.30",
+        "timeTip": "2019.01.01-02.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年高新区智慧课堂 2月份 优课评比",
+        "organizer": "高新区教师发展中心",
+        "publicity": false,
+        "reviewTimeTip": "2019.02.28-03.08",
+        "showApplyScore": false,
+        "state": 1,
+        "stateTip": "有效 ",
+        "status": 1,
+        "statusTip": "已结束",
+        "submitEndTimeTip": "2019.02.28",
+        "submitTimeTip": "2019.02.01-03.31",
+        "timeTip": "2019.02.01-03.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": "已结束",
+        "submitEndTimeTip": "2019.05.31",
+        "submitTimeTip": "2019.05.01-05.31",
+        "timeTip": "2019.05.01-06.08"
+      }
+    ]
+  }
+}

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
+
+  ]
+  
 }

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
+    ]
+  }
 }

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
+    ]
+  }
 }

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": "沈若芬",

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">

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);
       });
     },

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

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

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;

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

@@ -1,36 +1,42 @@
 <template>
-  <div class="login">
-    <div class="drag">
-      <div style="background:rgba(255,255,255,0.1); border-radius:5px;">
-        <Card icon="log-in" title="欢迎登录" :bordered="false" class="login-card">
-          <div class="form-con">
-            <Form ref="loginForm" :model="form" :rules="rules" @keydown.enter.native="handleSubmit">
-              <FormItem prop="userName">
-                <Input v-model="form.userName" placeholder="请输入用户名">
-                <span slot="prepend">
-                  <Icon :size="16" type="ios-person"></Icon>
-                </span>
-                </Input>
-              </FormItem>
-              <FormItem prop="password">
-                <Input type="password" v-model="form.password" placeholder="请输入密码">
-                <span slot="prepend">
-                  <Icon :size="14" type="md-lock"></Icon>
-                </span>
-                </Input>
-              </FormItem>
-              <FormItem>
-                <Button @click="handleSubmit" type="primary" long>登录</Button>
-              </FormItem>
-            </Form>
-            <!--<p class="login-tip">输入任意用户名和密码即可</p>-->
-          </div>
-        </Card>
+  <div style="width:100%;height:100%;">
+    <div class="login-header">
+      <img src="../../assets/image/e_logo5.png" class="logo" />
+      <span class="welcome-login">欢迎登录</span>
+    </div>
+    <div class="login">
+      <div class="drag">
+        <div style="background:rgba(255,255,255,0.1); border-radius:5px;">
+          <Card icon="log-in" title="智慧课堂管理平台" :bordered="false" class="login-card">
+            <div class="form-con">
+              <Form ref="loginForm" :model="form" :rules="rules" @keydown.enter.native="handleSubmit">
+                <FormItem prop="userName">
+                  <Input v-model="form.userName" placeholder="请输入用户名">
+                  <span slot="prepend">
+                    <Icon :size="16" type="ios-person"></Icon>
+                  </span>
+                  </Input>
+                </FormItem>
+                <FormItem prop="password">
+                  <Input type="password" v-model="form.password" placeholder="请输入密码">
+                  <span slot="prepend">
+                    <Icon :size="14" type="md-lock"></Icon>
+                  </span>
+                  </Input>
+                </FormItem>
+                <FormItem>
+                  <Button @click="handleSubmit" type="primary" :loading="loading" long>登&emsp;录</Button>
+                </FormItem>
+              </Form>
+              <span style="float:left;color:#999999;cursor:pointer;">忘记密码？</span>
+              <span style="float:right;color:#999999;cursor:pointer;">立刻注册>>></span>
+            </div>
+          </Card>
+        </div>
       </div>
     </div>
-
-
   </div>
+  
 </template>
 <script>
   export default {
@@ -55,6 +61,7 @@
     },
     data() {
       return {
+        loading:false,
         form: {
           userName: '',
           password: ''
@@ -70,16 +77,19 @@
       }
     },
     methods: {
+      loginSuccess() {
+        this.$router.push({ path: '/main' });
+      },
       handleSubmit() {
         this.$refs.loginForm.validate((valid) => {
           if (valid) {
             localStorage.setItem("userName", this.form.userName);
             localStorage.setItem("isLogin", 1);
-            if (this.password == 'habook') {
-              this.$router.push({ path: '/main' });
-            } else {
-              this.$router.push({ path: '/main' });
-            }
+            this.loading = true;
+            setTimeout(() => {
+              this.loading = false;
+              this.loginSuccess();
+            }, 1500);
           }
         })
       }
@@ -88,7 +98,7 @@
 </script>
 <style scoped>
   .login {
-    background-image: url('../../assets/image/login_bg.jpg');
+    background-image: url('../../assets/image/login_bg1.png');
     width: 100%;
     height: 100%;
     background-size: cover;
@@ -97,12 +107,32 @@
     align-items: center;
     justify-content: center;
   }
-
+  .welcome-login {
+    float: right;
+    line-height: 80px;
+    margin-right: 120px;
+    font-size: 22px;
+    font-weight: 800;
+    color: #1196D2;
+  }
+  .login-header {
+    width:100%;
+    height:80px;
+    background-color:#fff;
+    position:absolute;
+    z-index:10;
+    /*box-shadow: 0 -5px 10px 6px #41b6ba inset;*/
+  }
+  .logo {
+    height: 60px;
+    margin-top:10px;
+    margin-left:100px;
+  }
     .login:after {
       content: "";
       width: 100%;
       height: 100%;
-      position: absolute;
+      position: relative;
       left: 0;
       top: 0;
       background: inherit;
@@ -118,6 +148,7 @@
     box-shadow: 0 0 10px 6px rgba(0,0,0,.5);
     width: 90%;
     max-width: 350px;
+    background:white;
   }
 
   .login-tip {
@@ -125,13 +156,16 @@
   }
 
   .drag >>> .ivu-card-head p span {
-    color: white;
+    color: #555555;
+    /*padding-top:10px;*/
+    display:inline-block;
     font-size: 18px;
   }
 
   .login-card {
     background: none;
-    color: white;
+    padding-bottom:20px;
+    color: black;
     width: 100%;
   }
 </style>

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
 }
 

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>

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>

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日直播'
           }
         ]
       }

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

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

@@ -38,13 +38,13 @@
       <h1>开通智慧学校</h1>
       <div class="box"></div>
     </div>
-    <img src="../../assets/image/resource/center01.png">
+    <img src="../../assets/image/resource/center001.png">
     <div class="arrow">
       <img src="../../assets/image/resource/arrow.png">
       <h1>开通智慧云平台</h1>
       <div class="box"></div>
     </div>
-    <img src="../../assets/image/resource/bottom.png" style="width:100%">
+    <img src="../../assets/image/resource/botton.png" style="width:100%">
     <div class="arrow">
       <img src="../../assets/image/resource/arrow.png" >
       <h1>联系我们</h1>
@@ -60,7 +60,7 @@
       return {
         homeCarouselImg: [
           {
-            images: require('../../assets/image/resource/banner02.png')
+            images: require('../../assets/image/resource/banner002.png')
           },
           {
             images: require('../../assets/image/resource/banner01.png')
@@ -106,9 +106,9 @@
     margin-top: -80px;
     position: relative;
     z-index: 20;
-    width: 56.5%;
+    width: 60%;
     /*overflow: hidden;*/
-    margin-left: 21.5%;
+    margin-left: 21%;
   }
 
   .people-list {

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

@@ -1,22 +1,24 @@
 <template>
   <div class="content">
-    <div class="map">
-      <span class="map-pro">四川省</span>
+    <div class="top">
+      <div class="map">
+        <span class="map-pro">{{countData.name}}</span>
 
-      <div class="my-map">
-        <div id="myChart" :style="{width: '600px', height: '600px'}"></div>
-      </div>
-      <div class="chart">
-        <h1>15854</h1><h2>个</h2>
-        <span>名师工作室</span>
-        <ul>
-          <li><span>5215人</span><span>一线教师</span></li>
-          <li><span>5215个</span><span>资源</span></li>
-          <li><span>54546次</span><span>关注度</span></li>
-        </ul>
-        <!--<div id="Chart" :style="{width: '500px', height: '700px'}"></div>-->
+        <div class="my-map">
+          <div id="myChart" :style="{width: '600px', height: '600px'}"></div>
+        </div>
+        <div class="chart">
+          <h1>{{countData.data}}</h1><h2>个</h2>
+          <h3>名师工作室</h3>
+          <ul>
+            <li><span>{{countData.teacher}}人</span><p>一线教师</p></li>
+            <li><span>{{countData.source}}个</span><p>资源</p></li>
+            <li><span>{{countData.focus}}次</span><p>关注度</p></li>
+          </ul>
+        </div>
       </div>
     </div>
+
     <div class="teacher-show">
       <div class="header">
         <h1 class="title ">名师展示</h1>
@@ -72,52 +74,19 @@
       </div>
     </div>
     <div class="data-view">
-      <div class="four">
-        <img src="https://css.huijiaoyun.com/tianyu_edu/html_other_edu/cd_good_school/images/four.png" alt="">
-      </div>
       <div class="resource-data">
-        <div class="data-item">
-          <div class="img-content">
-            <span class="data-view-teacher"></span>
-          </div>
-          <p class="data-name">名师总数</p>
-          <p class="number">13201</p>
-        </div>
-        <div class="data-item">
-          <div class="img-content">
-            <span class="data-view-member"></span>
-          </div>
-          <p class="data-name">成员总数</p>
-          <p class="number">57260</p>
-        </div>
-        <div class="data-item">
-          <div class="img-content">
-            <span class="data-view-article"></span>
-          </div>
-          <p class="data-name">文章总数</p>
-          <p class="number">15686</p>
-        </div>
-        <div class="data-item">
-          <div class="img-content">
-            <span class="data-view-active"></span>
-          </div>
-          <p class="data-name">活动总数</p>
-          <p class="number">38792</p>
-        </div>
-        <div class="data-item">
-          <div class="img-content">
-            <span class="data-view-resource"></span>
-          </div>
-          <p class="data-name">资源总数</p>
-          <p class="number">142890</p>
-        </div>
-        <div class="data-item">
-          <div class="img-content">
-            <span class="data-view-move"></span>
-          </div>
-          <p class="data-name">优课总数</p>
-          <p class="number">23446</p>
-        </div>
+        <ul>
+          <li>445585</li>
+          <li>856585</li>
+          <li>482655</li>
+        </ul>
+      </div>
+      <div class="resource">
+        <ul>
+          <li>6545585</li>
+          <li>152685</li>
+          <li>624585</li>
+        </ul>
       </div>
     </div>
   </div>
@@ -129,10 +98,39 @@
   export default {
     data() {
       return {
-        chart: null,
-        data: [],
-        total: 0,
         model1: '',
+        countData:[],
+        dataIndex: '',
+        countDatas: [
+          {
+            name: '四川省',
+            data:'14666',
+            teacher: '41654',
+            source: '599545',
+            focus:'454556'
+          },
+          {
+            name: '湖北省',
+            data: '14956',
+            teacher: '44944',
+            source: '544445',
+            focus: '45956'
+          },
+          {
+            name: '广东省',
+            data: '89966',
+            teacher: '41654',
+            source: '545445',
+            focus: '5416'
+          },
+          {
+            name: '云南省',
+            data: '14986',
+            teacher: '418794',
+            source: '545445',
+            focus: '45556'
+          }
+        ],
         periodList: [
           {
             value: 1,
@@ -214,38 +212,23 @@
             { provice: '四川', subject: '语文', img: require('../../assets/image/resource/people11.jpg'), title: '省级名师', name: '张浩然', period: '中学', text1: '成员', number1: '1060', text2: '资源', number2: '2800', text3: '热度', number3: '1500' },
           ]
           },
-        teacherData: [
-          {
-            "name": "高新区",
-            "value": 80
-          }, {
-            "name": "青羊区",
-            "value": 87
-          }, {
-            "name": "天府新区",
-            "value": 60
-          }, {
-            "name": "锦江区",
-            "value": 40
-          }, {
-            "name": "金牛区",
-            "value": 50
-          }, {
-            "name": "郫都区",
-            "value": 30
-          }, {
-            "name": "温江区",
-            "value": 40
-          }
-        ]
-
       };
     },
     mounted() {
       this.drawLine();
-      //this.drawChart();
       this.teacherList = this.teacher.datazt;
+      this.countData = this.countDatas[0]
     },
+    //computed: {
+    //  dataIndex: function () {
+    //    console.log('12111541');
+    //  }
+    //},
+    //watch: {
+    //  dataIndex() {
+    //    console.log('23612651');
+    //  },  
+    //},
     methods: {
       chooseSchool(data) {
         if (data == "zt") {
@@ -261,6 +244,18 @@
       teacherZone() {
         this.$router.push('/TeacherZone')
       },
+      choosePro(data) {
+        console.log(data, '5646464');
+        if (data == '0') {
+          this.countData = this.countDatas[0]
+        } else if (data == '2') {
+          this.countData = this.countDatas[1]
+        }else if (data == '1') {
+          this.countData = this.countDatas[2]
+        }else if (data == '3') {
+          this.countData = this.countDatas[3]
+        }
+      },
       drawLine() {
         var mapChart = echarts.init(document.getElementById('myChart'));
         // mapChart的配置
@@ -294,7 +289,7 @@
               normal: {
                 borderWidth: .5,//区域边框宽度
                 borderColor: '#666',//区域边框颜色
-                areaColor: "#fff",//区域颜色
+                areaColor: "lightblue",//区域颜色
                 //background-image: linear-gradient(135deg, #f5f7fa 0 %, #c3cfe2 100 %);
               },
               emphasis: {
@@ -307,158 +302,49 @@
               { name: '四川', selected: true },//福建为选中状态
               { name: '广东', selected: true },//福建为选中状态
               { name: '湖北', selected: true },//福建为选中状态
+              { name: '云南', selected: true },//福建为选中状态
             ]
           }],
         }
         mapChart.setOption(option);
-        mapChart.on('click', function (params) {
-          this.dataIndex = params.dataIndex;
-          console.log(params);
+        mapChart.on('click', (params) => {
+          let data = params.dataIndex;
+          this.choosePro(data);
         });
       },
-      //drawChart() {
-      //  var myChart = echarts.init(document.getElementById('Chart'));
-      //  var xData = [],
-      //    yData = [];
-      //  var min = 50; // 最小值的定义
-      //  this.teacherData.map(function (a, b) {
-      //    xData.push(a.name);
-      //    if (a.value === 0) {
-      //      yData.push(a.value + min);
-      //    } else {
-      //      yData.push(a.value);
-      //    }
-      //  });
-      //  var option = {
-      //    //color: ['#3398DB'],
-      //    tooltip: {
-      //      trigger: 'axis',
-      //      axisPointer: {
-      //        type: 'line',
-      //        lineStyle: {
-      //          opacity: 0
-      //        }
-      //      },
-      //      formatter: function (prams) {
-      //        return "名师数：" + prams[0].data
-      //      }
-      //    },
-      //    grid: {
-      //      left: '0%',
-      //      right: '0%',
-      //      bottom: '5%',
-      //      top: '5%',
-      //      height: '50%',
-      //      containLabel: true,
-      //      z: 22
-      //    },
-      //    xAxis: [{
-      //      type: 'category',
-      //      gridIndex: 0,
-      //      data: xData,
-      //      axisTick: {
-      //        alignWithLabel: true
-      //      },
-      //      axisLine: {
-      //        lineStyle: {
-      //          color: '#0c3b71'
-      //        }
-      //      },
-      //      axisLabel: {
-      //        show: true,
-      //        color: 'rgb(170,170,170)',
-      //        fontSize: 12
-      //      }
-      //    }],
-      //    yAxis: [{
-      //      type: 'value',
-      //      gridIndex: 0,
-      //      splitLine: {
-      //        show: true
-      //      },
-      //      axisTick: {
-      //        show: true
-      //      },
-      //      max: 150,
-      //      axisLine: {
-      //        lineStyle: {
-      //          color: '#0c3b71'
-      //        }
-      //      },
-      //      axisLabel: {
-      //        color: 'rgb(170,170,170)',
-      //        formatter: '{value} '
-      //      }
-      //    },
-      //    {
-      //      type: 'value',
-      //      gridIndex: 0,
-      //      max: 200,
-      //    }
-      //    ],
-      //    series: [{
-      //      type: 'bar',
-      //      barWidth: '20',
-      //      xAxisIndex: 0,
-      //      yAxisIndex: 0,
-      //      itemStyle: {
-      //        normal: {
-      //          //barBorderRadius: [30, 30, 0, 0],
-      //          color: new echarts.graphic.LinearGradient(
-      //            0, 0, 0, 1, [
-      //              //  {
-      //              //  offset: 0,
-      //              //  color: '#00feff'
-      //              //},
-      //              {
-      //                offset: 0.5,
-      //                color: '#4da1ff'
-      //              },
-      //              {
-      //                offset: 1,
-      //                color: '#4da1ff'
-      //              }
-      //            ]
-      //          )
-      //        }
-      //      },
-      //      data: yData,
-      //      zlevel: 11
-
-      //    },
-      //    ]
-      //  };
-      //  myChart.setOption(option);
-      //}
     },
     
   }
 </script>
 <style scoped>
+  .top {
+    width: 100%;
+    background: -webkit-linear-gradient(left, #FFD3AC,#FFC381);
+  }
   .map {
     width: 65%;
     height: 600px;
     margin: auto;
     /*margin-left:150px;*/
     padding-left: 250px;
-    background: url("../../assets/image/resource/map-bg.png") no-repeat;
+    background: url("../../assets/image/resource/map-bg.png");
     background-repeat: no-repeat;
     background-size: 100% 100%;
-    /*display:flex;*/
   }
   .map-pro {
     display: block;
     padding-top: 13%;
     margin-left: 2%;
-    font-size: 24px;
+    font-size: 25px;
     font-weight: 800;
-    color: orangered;
+    color: #f05053;
   }
   .my-map {
     height: 600px;
     width: 600px;
     /*border: 1px solid red;*/
     /*text-align: right;*/
+    /*background-color:#555;*/
     margin-top: -15%;
     margin-left: 25%;
   }
@@ -470,23 +356,47 @@
     margin-left: -18%;
   }
   .chart h1{
-    color:coral;
+    color:gold;
+    margin-top:35px;
   }
     .chart h2 {
       display: block;
-      margin-top: -10%;
+      margin-top: -33px;
       margin-left: 25%;
+      font-size: 20px;
+      color: #fefefe;
+      font-weight: 800;
+    }
+    .chart h3 {
+      font-size:20px;
+      font-weight:800;
+      color:#fefefe;
     }
     .chart ul {
       list-style:none;
       width:150px;
+      margin-top:10%;
     }
     .chart li {
-      width: 150px;
+      width: 200px;
       height: 20px;
-      border: 1px solid red;
-      margin-bottom: 10px;
+      /*border: 1px solid red;*/
+      margin-bottom: 15px;
       border-radius: 25px;
+      background: -webkit-linear-gradient(left, #f05053, #f05053);
+    }
+    .chart span {
+      color:#fff;
+      font-size:14px;
+      margin-left:15px;
+    }
+    .chart p {
+      color: #fff;
+      font-size: 15px;
+      font-weight: 800;
+      display: block;
+      margin-left: 100px;
+      margin-top: -21px;
     }
   .header {
     width: 100%;
@@ -601,12 +511,12 @@
       font-weight: bold;
     }
     .teacher-info .subject {
-      width: 116px;
-      height: 24px;
+      width: 120px;
+      height: 25px;
       margin: 0 auto;
       -webkit-border-radius: 20px;
       border-radius: 20px;
-      background: -webkit-linear-gradient(left, #a1c4fd, #c2e9fb);
+      background: -webkit-linear-gradient(left, #ff7e56, #ffc77d);
     }
       .teacher-info .subject p span {
         display: inline-block;
@@ -618,6 +528,11 @@
         background: #fff;
         margin: 3px 6px;
       }
+      .teacher-info .subject p {
+        padding-top: 3px;
+        font-size: 12px;
+        font-weight: 800;
+      }
   .teacher-detailed {
     width: 100%;
     height: 60px;
@@ -635,9 +550,11 @@
   }
   .data-view {
     width: 100%;
-    height: 663px;
+    height: 650px;
     overflow: hidden;
-    background: url('../../assets/image/resource/data-view-bg.png') no-repeat center center;
+    background: url('../../assets/image/resource/teacher-bottom.png') no-repeat;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
   }
   .four {
     width: 409px;
@@ -666,19 +583,41 @@
     margin-top: 10px;
   }
   .resource-data {
-    width: 1100px;
+    /*width: 1100px;*/
     height: 130px;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    margin: 130px auto 0;
-    display: -webkit-box;
-    display: -webkit-flex;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-justify-content: space-around;
-    -ms-flex-pack: distribute;
-    justify-content: space-around;
+    /*text-align:left;*/
   }
+    .resource-data ul {
+      font-size: 25px;
+      font-weight: 800;
+      margin-top: 365px;
+      margin-left: 565px;
+    }
+      .resource-data ul li {
+        float: left;
+        width: 316px;
+        display: block;
+        font-size: 28px;
+        color:#ff705b;
+      }
+ .resource {
+    /*width: 1100px;*/
+    height: 130px;
+    /*text-align:left;*/
+  }
+  .resource ul {
+    font-size: 25px;
+    font-weight: 800;
+    margin-top: 48px;
+    margin-left: 565px;
+  }
+      .resource ul li {
+        float: left;
+        width: 316px;
+        display: block;
+        font-size: 28px;
+        color:#ff705b;
+      }
   .data-item {
     width: 130px;
     height: 100%;
@@ -689,42 +628,6 @@
     margin: 25px auto 17px;
     text-align: center;
   }
-  .data-view-teacher {
-    width: 43px;
-    height: 51px;
-    margin-top: 4px;
-    background: url('../../assets/image/resource/data-view-teacher.png') no-repeat;
-  }
-  .data-view-member {
-    width: 54px;
-    height: 33px;
-    margin-top: 13px;
-    background: url('../../assets/image/resource/data-view-member.png') no-repeat;
-  }
-  .data-view-article {
-    width: 46px;
-    height: 50px;
-    margin-top: 4px;
-    background: url('../../assets/image/resource/data-view-article.png') no-repeat;
-  }
-  .data-view-active {
-    width: 44px;
-    height: 50px;
-    margin-top: 4px;
-    background: url('../../assets/image/resource/data-view-active.png') no-repeat;
-  }
-  .data-view-resource {
-    width: 46px;
-    height: 50px;
-    margin-top: 4px;
-    background: url('../../assets/image/resource/data-view-resource.png') no-repeat;
-  }
-  .data-view-move {
-    width: 52px;
-    height: 50px;
-    margin-top: 4px;
-    background: url('../../assets/image/resource/data-view-move.png') no-repeat;
-  }
   .data-name {
     font-size: 18px;
     color: #555;