获奖详情与优课汇聚页面

TEAMModelOS.SmartClass/ClientApp/router/routes.js

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

TEAMModelOS.SmartClass/ClientApp/static/lessons.json

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

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

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

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

@@ -8,7 +8,7 @@
           <div class="activity-brief-right">
             <div class="activity-brief-title">
               <span>2019年柯桥区天天智慧课堂 5月份 优课评比 </span>
-              <span class="status" style="background: rgb(19, 206, 102);">活动结束</span>
+              <span class="status" style="background: rgb(182, 182, 182);">活动结束</span>
             </div>
             <div class="activity-brief-info center-row">
               <div class="brief-info-left">
@@ -26,7 +26,10 @@
           <div class="details-left center-col">
             <div class="title-tip">
               <p class="title">奖项设置<span>FORMAT</span></p>
-              <div class="content" v-html="activityInfo.requirement"></div>
+              <div class="award" v-for="(item,index) in rewardSettings" :key="index">
+                <p class="award-name">{{item.name}}</p>
+                <p class="award-tip">{{item.ratioTip}}</p>
+              </div>
             </div>
             <div class="review-attachment">
             <p class="title">活动附件<span>ATTACHMENT</span></p>
@@ -40,12 +43,12 @@
           </div>
           <div class="details-right center-col">
             <div class="review-awards" style="margin-top:0">
-              <Tabs value="1">
-                <TabPane label="获奖作品" name="1"></TabPane>
-                <TabPane label="月冠军" name="2"></TabPane>
-                <TabPane label="月亚军" name="3"></TabPane>
-                <TabPane label="月季军" name="4"></TabPane>
-                <TabPane label="优客" name="5"></TabPane>
+              <Tabs value="获奖作品" @on-click="tabClick">
+                <TabPane label="获奖作品" name="获奖作品"></TabPane>
+                <TabPane label="月冠军" name="月冠军"></TabPane>
+                <TabPane label="月亚军" name="月亚军"></TabPane>
+                <TabPane label="月季军" name="月季军"></TabPane>
+                <TabPane label="优课" name="优课"></TabPane>
               </Tabs>
               <Table :columns="columns1" :data="rewardDatas"></Table>
             </div>
@@ -87,6 +90,52 @@
       return {
         reviewAcList: [],
         attachmentsList: [],
+        rewardSettings:[
+            {
+                "activityId":16,
+                "activityName":"2018年柯桥区天天智慧课堂 12月份 优课评比",
+                "applyCount":20,
+                "id":46,
+                "name":"月冠军",
+                "ratio":1,
+                "ratioTip":"5.00%/1人",
+                "sortNumber":1,
+                "type":2
+            },
+            {
+                "activityId":16,
+                "activityName":"2018年柯桥区天天智慧课堂 12月份 优课评比",
+                "applyCount":20,
+                "id":47,
+                "name":"月亚军",
+                "ratio":1,
+                "ratioTip":"5.00%/1人",
+                "sortNumber":2,
+                "type":2
+            },
+            {
+                "activityId":16,
+                "activityName":"2018年柯桥区天天智慧课堂 12月份 优课评比",
+                "applyCount":20,
+                "id":48,
+                "name":"月季军",
+                "ratio":1,
+                "ratioTip":"5.00%/1人",
+                "sortNumber":3,
+                "type":2
+            },
+            {
+                "activityId":16,
+                "activityName":"2018年柯桥区天天智慧课堂 12月份 优课评比",
+                "applyCount":20,
+                "id":49,
+                "name":"优课",
+                "ratio":7,
+                "ratioTip":"35.00%/7人",
+                "sortNumber":4,
+                "type":2
+            }
+        ],
         activityInfo: {},
         columns1: [
             {
@@ -124,7 +173,9 @@
       this.rewardDatas = rewardList.data.list;
     },
     methods: {
-
+      tabClick(name) {
+        this.rewardDatas = name == "获奖作品" ? rewardList.data.list : rewardList.data.list.filter(item => item.activityAwardName == name);
+      }
     },
     mounted() {
     }
@@ -313,6 +364,18 @@
       font-weight:bold;
     }
 
+    .details-container .details-left .award {
+      margin:15px;
+      letter-spacing:1px;
+    }
+
+    .details-container .details-left .award-name {
+      font-size:16px;
+      color:#666;
+      font-weight:bolder;
+      margin-bottom:5px;
+    }
+
 
 
 </style>