LOGO图

.gitignore

@@ -257,3 +257,6 @@ _Pvt_Extensions
 
 .vscode/
 /.idea
+/TEAMModelOS.SmartClass/ClientApp
+/TEAMModelOS.SmartClass/ClientApp/assets/image
+/TEAMModelOS.SmartClass/ClientApp/assets/image/1.png

TEAMModelOS.SmartClass/ClientApp/app.js

@@ -10,7 +10,6 @@ import iView from 'iview';
 import 'iview/dist/styles/iview.css';
 import commons from "@/utils/public.js";
 import apiTools from '@/api/api.js';
-import staticTools from '@/static/index.js';
 import { fetch, post } from '@/filters/http.js';
 import VideoPlayer from 'vue-video-player';
 import jwtDecode from 'jwt-decode';
@@ -32,7 +31,6 @@ Vue.prototype.$get = fetch;
 Vue.prototype.$eventBus = new Vue()
 
 Vue.prototype.$jwtDecode = jwtDecode;
-Vue.prototype.$staticTools = staticTools;
 
 Vue.use(vuescroll)
 Vue.prototype.$echarts = echarts

TEAMModelOS.SmartClass/ClientApp/static/index.js

@@ -1,10 +0,0 @@
-'use strict';
-module.exports = {
-  indexNoticeList: require('@/static/indexNoticeList.json').list, //首页通知公告数据
-  indexActivityList: require('@/static/reviewAcList.json').data.list, //首页评审活动数据
-  noticeAllList: require('@/static/noticeList.json').list, //通知公告页面数据
-  reviewAcList: require('@/static/reviewAcList.json').data.list, //评审活动页面数据
-  pastAcList: require('@/static/pastAcList.json').data.list, //往届回顾页面数据
-  lessonList: require("@/static/lessonList.json"), //天天直播页面数据
-  lessons: require("@/static/lessons.json").list, //优课汇聚页面数据
-};

TEAMModelOS.SmartClass/ClientApp/static/lessonDetails.json

@@ -3,70 +3,70 @@
     "activityStatus": 2,
     "activityStatusTip": "已结束",
     "autoChangeViewActivityStatus": true,
-    "commentCount": 8,
-    "cover": "徐益敏.png",
-    "coverHash": "350.png",
-    "coverUri": "/upload/viewactivity/cover/350/350.png?_=1558335549883",
-    "description": null,
+    "commentCount": 52,
+    "cover": "1胡建良.png",
+    "coverHash": "127.png",
+    "coverUri": "/upload/viewactivity/cover/127/127.png?_=1557819330146",
+    "description": "<br>",
     "dianZanCount": 0,
-    "employeeName": "楼宽",
-    "employeeNo": "31050",
+    "employeeName": "吴雁",
+    "employeeNo": "41489",
     "endTime": {
-      "date": 14,
+      "date": 18,
       "day": 5,
-      "hours": 10,
-      "minutes": 47,
-      "month": 11,
+      "hours": 16,
+      "minutes": 5,
+      "month": 4,
       "nanos": 0,
       "seconds": 0,
-      "time": 1544755620000,
+      "time": 1526630700000,
       "timezoneOffset": -480,
       "year": 118
     },
-    "id": 350,
+    "id": 127,
     "joinWay": 0,
-    "liveHls": null,
-    "liveRtmp": null,
-    "name": "2018年柯桥区天天智慧课堂十佳优质课展示",
-    "notice": null,
+    "liveHls": "http://jpkt.sxedu.org:6080/hls/13CA5E3AD6DB4DF5865839BB47C134F8.m3u8",
+    "liveRtmp": "rtmp://jpkt.sxedu.org:1935/hls/13CA5E3AD6DB4DF5865839BB47C134F8",
+    "name": "创新实验室（学科教室）课例20180518直播",
+    "notice": "<br>",
     "ownUnit": "柯桥区教师发展中心",
-    "parentCategoryId": 18,
-    "parentCategoryName": "化学",
-    "parentGradeId": 12,
-    "parentGradeName": "九年级",
-    "parentGradeSectionId": 2,
-    "parentGradeSectionName": "初中",
-    "parentProjectId": 286,
-    "parentProjectName": "《分子和原子》",
-    "parentTeachePlateId": 0,
-    "parentTeachePlateName": null,
-    "reviewContent": null,
+    "parentCategoryId": 24,
+    "parentCategoryName": "创客",
+    "parentGradeId": 13,
+    "parentGradeName": "高一",
+    "parentGradeSectionId": 3,
+    "parentGradeSectionName": "高中",
+    "parentProjectId": 103,
+    "parentProjectName": "简易冠啸机器人搭建",
+    "parentTeachePlateId": 19,
+    "parentTeachePlateName": "冠啸创新实验室",
+    "reviewContent": "本次直播总点击量： 68 评论数： 44 今日直播只推PC端，采用移动录播设备直播，直播视频推送画面清晰，播放过程流畅无锯齿拖影，声音干净。上课学校设备保障充分，教师教学过程实施完整。直播过程网络通畅，没有出现画面中断停顿现象。",
     "school": null,
-    "schoolName": "柯桥区教师发展中心",
-    "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
-    "score": null,
-    "speaker": "徐益敏",
+    "schoolName": "绍兴市柯桥区钱清中学",
+    "schoolNo": "11AFC704D0A5FE66E050A8C027277C89",
+    "score": 87.67,
+    "speaker": "胡建良",
     "startTime": {
-      "date": 14,
+      "date": 18,
       "day": 5,
-      "hours": 10,
-      "minutes": 0,
-      "month": 11,
+      "hours": 15,
+      "minutes": 20,
+      "month": 4,
       "nanos": 0,
       "seconds": 0,
-      "time": 1544752800000,
+      "time": 1526628000000,
       "timezoneOffset": -480,
       "year": 118
     },
-    "timeRangeTip": "2018.12.14 10:00 - 12.14 10:47",
-    "timeRangeTipHHmm": "10:00 - 10:47",
+    "timeRangeTip": "2018.05.18 15:20 - 05.18 16:05",
+    "timeRangeTipHHmm": "15:20 - 16:05",
     "videoHls": null,
     "videoRtmp": null,
     "viewActivityAwardSetList": [],
-    "viewCount": 69,
-    "viewType": 1,
-    "viwActivityType": 0,
-    "viwActivityTypeTip": "新媒体新技术",
+    "viewCount": 97,
+    "viewType": 0,
+    "viwActivityType": 1,
+    "viwActivityTypeTip": "创新实验室",
     "workHonor": null,
     "yearNo": 2018
   },

TEAMModelOS.SmartClass/ClientApp/store/index.js

@@ -6,6 +6,11 @@ Vue.use(Vuex)
 // TYPES
 const MAIN_SET_COUNTER = 'MAIN_SET_COUNTER'
 
+// STATE
+//const state = {
+//  counter: 1
+//}
+
 
 // MUTATIONS
 const mutations = {
@@ -26,5 +31,160 @@ export default new Vuex.Store({
   mutations,
   actions,
   state: {
-  }
+    //选择关注年级
+    selectgrade: [],
+    //选择关注学期
+    selectterm: [],
+    //选择某次考试
+    selectexam: {},
+    //基础数据
+    basicsdata: {},
+    //柱状图
+    zhuxhuang: {},
+    //雷达图
+    leida: {},
+    //饼图
+    pie: {},
+     //折线图（大）
+    linechart: {},
+    //考试类型选择
+    examtype: {},
+
+    //文理科展现
+    wenli_show: true,
+
+    //任教老师页面
+    //选择数据对比
+    selectcontrast: [],
+    //柱状图
+    barline: {},
+    //大饼图
+    annulus: {},
+    //PR
+    accuracyPR: {},
+
+    periodList: [{
+      value: '1',
+      label: '1',
+      children: [
+        {
+          value: '1-1',
+          label: '1-1',
+          children: [
+            {
+              value: '1-1-1',
+              label: '1-1-1',
+              children: [
+                {
+                  value: '1-1-1-1',
+                  label: '1-1-1-1',
+                }
+              ]
+            },
+            {
+              value: '1-1-2',
+              label: '1-1-2',
+              children: [
+                {
+                  value: '1-1-2-1',
+                  label: '1-1-2-1',
+                }
+              ]
+            }
+          ]
+        },
+        {
+          value: '1-2',
+          label: '1-2',
+          children: [
+            {
+              value: '1-2-1',
+              label: '1-2-1',
+              children: [
+                {
+                  value: '1-2-1-1',
+                  label: '1-2-1-1',
+                }
+              ]
+            },
+            {
+              value: '1-2-2',
+              label: '1-2-2',
+              children: [
+                {
+                  value: '1-2-2-1',
+                  label: '1-2-2-1',
+                }
+              ]
+            }
+          ]
+        },
+
+      ]
+    }, {
+      value: '2',
+      label: '2',
+      children: [
+        {
+          value: '2-1',
+          label: '2-1',
+          children: [
+            {
+              value: '2-1-1',
+              label: '2-1-1',
+              children: [
+                {
+                  value: '2-1-1-1',
+                  label: '2-1-1-1',
+                }]
+            },
+            {
+              value: '2-1-2',
+              label: '2-1-2',
+              children: [
+                {
+                  value: '2-1-2-1',
+                  label: '2-1-2-1'
+                },
+                {
+                  value: '2-1-2-2',
+                  label: '2-1-2-2'
+                }
+              ]
+            },
+          ]
+        },
+        {
+          value: '2-2',
+          label: '2-2',
+          children: [
+            {
+              value: '2-2-1',
+              label: '2-2-1',
+              children: [
+                {
+                  value: '2-2-1-1',
+                  label: '2-2-1-1',
+                }]
+            },
+            {
+              value: '2-2-2',
+              label: '2-2-2',
+              children: [
+                {
+                  value: '2-2-2-1',
+                  label: '2-2-2-1'
+                },
+                {
+                  value: '2-2-2-2',
+                  label: '2-2-2-2'
+                }
+              ]
+            },
+          ]
+        },
+
+      ]
+    }]
+  },
 })

TEAMModelOS.SmartClass/ClientApp/view/app.vue

@@ -30,25 +30,25 @@
     }
   }
 </script>
-<style>
+<style scoped>
   html, body, #app {
     height: 100% !important;
     user-select: none;
+    background:rgb(248,248,248);
   }
 
   .main-content {
     position: relative;
     width: 100%;
     min-width: 1200px;
-    min-height: 100% !important;
+    min-height: 768px;
     display: flex;
     flex-direction: column;
     align-items: center;
-    background:rgb(128, 128, 128);
+    background:rgb(248,248,248);
   }
   .content {
     width:100%;
-    height:100%;
   }
   .logo {
     width: 200px;

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

@@ -7,7 +7,7 @@
 
       <div class="comment-video-src">
         <div>
-          <p style=" font-size: 14px; margin-bottom: 20px;"><span class="title-header">标题 : <span class="title-content">创新实验室（学科教室）课例20190508直播</span></span> <span class="title-header">主讲人 : 潘燕<span class="title-content"></span></span> <span class="liveStatus">播放成功</span></p>
+          <p style=" font-size: 14px; margin-bottom: 20px;"><span class="title-header">标题 : <span class="title-content">创新实验室（学科教室）课例20190508直播</span></span> <span class="title-header">主讲人 : 林燕<span class="title-content"></span></span> <span class="liveStatus">播放成功</span></p>
         </div>
         <video controls="controls" width="780" style="display:block;"
                src="https://teammodelstorage.blob.core.chinacloudapi.cn/teammodelcontest/20190516/acalssOne%E7%BD%91%E9%A1%B5%E7%99%BB%E5%BD%95%E5%AD%A6%E4%B9%A0%E6%96%B9%E6%B3%95.mp4">
@@ -103,6 +103,7 @@
       } else {
         this.routerData = this.rewardDatas[index];
       }
+      
     },
     
     watch: {
@@ -149,7 +150,7 @@
     vertical-align:top;
     padding:20px 10px 20px 30px;
     position:relative;
-    border-left: 15px solid rgb(241,242,243);
+    border-left: 15px solid rgb(252,252,252);
   }
     .comment-video-detail-info .ivu-form-item {
       margin-bottom:8px;

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

@@ -78,7 +78,6 @@
 </template>
 <script>
   import lessonInfo from '@/static/lessonDetails.json'
-import { setTimeout } from 'core-js';
   export default {
     components: {
     },
@@ -164,6 +163,7 @@ import { setTimeout } from 'core-js';
         }]
       };
 
+      myChart.setOption(option);
 
       let comments = this.$echarts.init(document.getElementById('comments'));
       let commentList = lessonInfo.comments.map(a => a.commentCount);
@@ -212,10 +212,7 @@ import { setTimeout } from 'core-js';
         }]
       };
 
-      setTimeout(function () {
-        myChart.setOption(option);
-        comments.setOption(commentsOption);
-      }, 1000);
+      comments.setOption(commentsOption);
     }
   }
 </script>

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

@@ -40,12 +40,28 @@
     },
 
     created() {
-      this.lessons = this.$staticTools.lessons;
+      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('lessonList')
       }
+
+
     },
     mounted() {
     }

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

@@ -16,16 +16,11 @@
           <Button size="large">返回今天</Button>
         </div>
       </div>
-
-
-      <Tooltip :content="eventContent" placement="right" transfer max-width="300px">
-        <full-calendar :config="config"
-                       :events="fcEvents"
-                       ref="calendar"
-                       @dayClick="getDay">
-        </full-calendar>
-      </Tooltip>
-      <br><br>
+      <full-calendar :config="config"
+                     :events="fcEvents"
+                     ref="calendar"
+                     @dayClick="getDay">
+      </full-calendar>
     </div>
   </div>
 </template>
@@ -37,9 +32,7 @@
       FullCalendar
     },
     data() {
-      const self = this;
       return {
-        eventContent: "",
         yearDefault: '2019年',
         years: [
           "2012年",
@@ -71,7 +64,8 @@
           '12月',
         ],
         _this:null,
-        fcEvents: [],
+        fcEvents: [
+        ],
         config: {
           firstDay: '7',//以周日为每周的第一天
           // weekends: true,//是否在日历中显示周末
@@ -81,7 +75,7 @@
           fixedWeekCount: false,//是否固定显示六周
           // weekMode:"liquid",//周数不定，每周的高度可变，整个日历高度不变
           allDaySlot: false,
-          eventLimit: 1,
+          eventLimit: 7,
           // allDay:true,
           header: {//表头信息
             left: 'prev, next, today',
@@ -89,29 +83,38 @@
             right: 'hide, custom'
           },
           dayClick: function getDay(day, jsEvent) {
+              alert(day);
               console.log(day);
               console.log(jsEvent);
           },
           eventClick:(day, jsEvent)=> {
-            this.$router.push( { path: 'lessonDetails' } );
-          },
-          eventMouseover: function (event, jsEvent, view) {
-            self.eventContent = event.title;
+            this.$router.push(
+              {
+                path: 'lessonDetails'
+              }
+            );
           },
+          //eventMouseover: function getDay(day, jsEvent) {
+          //  console.log(jsEvent);
+          //  console.log(day);
+          //},
+
          },
+
         lessonList: []
       }
     },
-
     methods: {
-      getDay(event, jsEvent, view) {
-      },
+      getDay(day, jsEvent) {
+        alert(day);
+        console.log(day);
+        console.log(jsEvent);
+      }
     },
     mounted() {
       this._this = this;
-      this.lessonList = this.$staticTools.lessonList;
+      this.lessonList = require("@/static/lessonList.json");
       for (let i = 0; i < this.lessonList.length; i++) {
-      
         var sdate = new Date(this.lessonList[i].startTime.time);
         let sY = sdate.getFullYear() + '-';
         let sM = (sdate.getMonth() + 1 < 10 ? '0' + (sdate.getMonth() + 1) : sdate.getMonth() + 1) + '-';
@@ -120,54 +123,38 @@
         let eY = edate.getFullYear() + '-';
         let eM = (edate.getMonth() + 1 < 10 ? '0' + (edate.getMonth() + 1) : edate.getMonth() + 1) + '-';
         let eD = edate.getDate() + ' ';
-
-        let dateArr = this.fcEvents.map(item => item.start);
-
-        //如果已存在
-        if (dateArr.indexOf(sY + sM + sD) == -1) {
-          this.fcEvents.push({
-            title: '名称：' + this.lessonList[i].name
-              + ' \n 学校：' + this.lessonList[i].schoolName
-              + ' \n 主讲人：' + this.lessonList[i].employeeName
-              + ' \n 学科：' + this.lessonList[i].parentCategoryName
-              + ' \n 课题：' + this.lessonList[i].parentProjectName
-              + ' \n 时间：' + this.lessonList[i].timeRangeTipHHmm
-              + ' \n ',
-            start: sY + sM + sD,
-            end: eY + eM + eD
-          });
-        } else {
-          let index = dateArr.indexOf(sY + sM + sD);
-          let newEvent = {
-            title:  this.lessonList[i].name + ' \n\n 等多个活动',
-            start: sY + sM + sD,
-            end: eY + eM + eD,
-            renderHeader: (h, params) => {
-              return h('div', [
-                h('span', params.column.title),
-                h('Tooltip', {
-                  props: {
-                    content: '您希望展示的提示语',
-                    transfer: true,
-                    maxWidth: '220',
-                    theme: 'light'
-                  }
-                }, [
-                  h('Icon', {
-                    props: {
-                      type: 'md-help-circle',
-                      color: "#c8c8c8",
-                      size: "20"
-                    },
-                    class: {iconClass: true}
-                  })
-                ]),
-              ])
-            }
-          }
-          this.fcEvents.splice(index, 1,newEvent);
-        }
+        this.fcEvents.push({
+          title: '名称：' + this.lessonList[i].viwActivityTypeTip,
+          start: sY + sM + sD,
+          end: eY + eM + eD
+        });
+        this.fcEvents.push({
+          title: '学校：' + this.lessonList[i].schoolName,
+          start: sY + sM + sD,
+          end: eY + eM + eD
+        });
+        this.fcEvents.push({
+          title: '主讲人：' + this.lessonList[i].employeeName,
+          start: sY + sM + sD,
+          end: eY + eM + eD
+        });
+        this.fcEvents.push({
+          title: '学科：' + this.lessonList[i].parentCategoryName,
+          start: sY + sM + sD,
+          end: eY + eM + eD
+        });
+        this.fcEvents.push({
+          title: '课题：' + this.lessonList[i].parentProjectName,
+          start: sY + sM + sD,
+          end: eY + eM + eD
+        });
+        this.fcEvents.push({
+          title: '时间：' + this.lessonList[i].timeRangeTipHHmm,
+          start: sY + sM + sD,
+          end: eY + eM + eD
+        });
       }
+      console.log(this.lessonList);
     }
   }
 </script>
@@ -239,16 +226,6 @@
     .review-main /deep/ .fc-event {
       border:none;
     }
-    .review-main /deep/ .fc-content {
-      padding-left:5px;
-    }
-    .review-main /deep/ .fc-title {
-      width: 140px;
-      display: block;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
     .review-main /deep/ .fc-day-header {
       background: -webkit-linear-gradient(#E1E7EC, #B9C6D1); /* Safari 5.1 - 6.0 */
       background: -o-linear-gradient(#E1E7EC, #B9C6D1); /* Opera 11.1 - 12.0 */
@@ -265,7 +242,7 @@
       float:right;
     }
     .review-main /deep/ .fc-widget-content:hover {
-      /*background:#eee;*/
+      background:#eee;
     }
    .condition-wrap {
     display:flex;

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

@@ -22,6 +22,9 @@
       }
     },
     methods: {
+
+
+
     },
     mounted() {
     }
@@ -37,11 +40,11 @@
     position: relative;
     width: 100%;
     min-width: 1200px;
-    min-height: 100%;
+    min-height: 768px;
     display: flex;
     flex-direction: column;
     align-items: center;
-    background: rgb(241,242,243);
+    background: rgb(248,248,248);
   }
 
   .content {

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

@@ -60,6 +60,7 @@
   </div>
 </template>
 <script>
+  import acList from '@/static/pastAcList.json'
   export default {
     components: {
     },
@@ -69,8 +70,7 @@
         activeOrder: 0,
         pageSize: 9,
         searchVal:"",
-        activities: this.$staticTools.pastAcList,
-        allList:this.$staticTools.pastAcList
+        activities: acList.data.list
       }
     },
     methods: {
@@ -79,11 +79,11 @@
       },
       handleMenuClick(index,val) {
         this.activeIndex = index;
-        this.activities = index == 0 ? this.allList : this.allList.filter(item => item.submitTimeTip.substring(0,4) == val);
+        this.activities = index == 0 ? acList.data.list : acList.data.list.filter(item => item.submitTimeTip.substring(0,4) == val);
       },
       handleOrderClick(index) {
         this.activeOrder = index;
-        let list = this.activities;
+        let list = acList.data.list;
         this.activities = list.sort(this.compare('applyCount'));
       },
       compare(property){
@@ -94,7 +94,8 @@
         }
       },
       handleSearch() {
-        this.activities = this.allList.filter(item => item.name.indexOf(this.searchVal) != -1);
+        console.log(acList.data.list.filter(item => item.name.indexOf(this.searchVal) != -1));
+        this.activities = acList.data.list.filter(item => item.name.indexOf(this.searchVal) != -1);
       }
 
     },

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

@@ -27,6 +27,7 @@
   </div>
 </template>
 <script>
+    import acList from '@/static/reviewAcList.json'
   export default {
     components: {
     },
@@ -37,9 +38,16 @@
     },
 
     created() {
-      this.reviewAcList = this.$staticTools.reviewAcList
+      this.reviewAcList = acList.data.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;

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

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

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

@@ -39,7 +39,7 @@
         </Form>
         <div class="download-video">
 
-          <a download="video" style="color:#fff;font-size:14px;" href="https://teammodelstorage.blob.core.chinacloudapi.cn/teammodelcontest/20190516/acalssOne%E7%BD%91%E9%A1%B5%E7%99%BB%E5%BD%95%E5%AD%A6%E4%B9%A0%E6%96%B9%E6%B3%95.mp4">
+          <a download="video" style="color:#999999;font-size:14px;" href="https://teammodelstorage.blob.core.chinacloudapi.cn/teammodelcontest/20190516/acalssOne%E7%BD%91%E9%A1%B5%E7%99%BB%E5%BD%95%E5%AD%A6%E4%B9%A0%E6%96%B9%E6%B3%95.mp4">
             <Icon type="md-cloud-download" size="22" color="white" />
             下载视频
           </a>
@@ -131,8 +131,7 @@
     }
   }
 </script>
-<style scoped>
-
+<style>
   .video-page {
     width: 1200px;
     margin: 100px auto;
@@ -157,12 +156,10 @@
   }
   .video-detail-info {
     width:400px;
-    color:#fff;
     background:#222222;
     display:table-cell;
     vertical-align:top;
     padding:20px 10px 20px 30px;
-    font-size:14px;
     position:relative;
   }
     .video-detail-info .ivu-form-item {
@@ -170,21 +167,12 @@
     }
     .video-detail-info .ivu-form .ivu-form-item-label {
       font-size:14px;
-      color:ffffff;
+      color:#999999;
     }
     .video-detail-info .ivu-form-item-content {
       font-size: 14px;
       color: #ffffff;
     }
-
-  .video-info /deep/ .ivu-form .ivu-form-item-label {
-    color:#ffffff;
-    font-size:14px;
-  }
-
-  .video-info .ivu-form-item-content {
-    font-size:14px;
-  }
   .video-src {
     display:table-cell;
     width:800px;

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

@@ -82,6 +82,8 @@
 </template>
 <script>
   import headers from '@/components/smart-class/headers'
+  import indexNoticeList from '@/static/indexNoticeList.json'
+  import indexActivityList from '@/static/reviewAcList.json'
   export default {
     components: {
       headers
@@ -93,24 +95,24 @@
       }
     },
     created() {
-      this.noticeList = this.$staticTools.indexNoticeList;
-      this.activityList = this.$staticTools.indexActivityList;
+      this.noticeList = indexNoticeList.list;
+      this.activityList = indexActivityList.data.list;
     },
     methods: {
       handleNoticeClick() {
-        this.$router.push('noticeDetails');
+        this.$router.push('/noticeDetails');
         this.$eventBus.$emit("activeIndex", 1);
       },
       handleActivityClick() {
-        this.$router.push('activityDetails');
+        this.$router.push('/activityDetails');
         this.$eventBus.$emit("activeIndex", 2);
       },
       goNotice() {
-        this.$router.push('notice');
+        this.$router.push('/notice');
         this.$eventBus.$emit("activeIndex", 1);
       },
       goActivity() {
-        this.$router.push('reviewActivity');
+        this.$router.push('/reviewActivity');
         this.$eventBus.$emit("activeIndex", 2);
       }
 

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

@@ -26,6 +26,7 @@
 </template>
 <script>
 
+  import noticeList from '@/static/noticeList.json'
   export default {
     components: {
     },
@@ -43,18 +44,16 @@
             key: 'startTime'
           }
         ],
-        allList:[],
-        noticeList: []
+        noticeList: noticeList.list
       }
     },
 
     created() {
-      this.allList = this.$staticTools.noticeAllList;
       this.getList(0);
     },
     methods: {
       getList(type) {
-        let list = this.allList;
+        let list = noticeList.list;
         var newArray = list.filter(function(item){
             return item.noticeTypeId == type;
         });

TEAMModelOS.SmartClass/TEAMModelOS.SmartClass.csproj

@@ -13,9 +13,6 @@
     <None Remove="ClientApp\components\新文件夹1\**" />
     <None Remove="Providers\**" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Remove="ClientApp\static\area.json" />
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>

TEAMModelOS.SmartClass/Views/Shared/_Layout.cshtml

@@ -5,7 +5,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>@ViewData["Title"]智慧课堂管理平台</title>
-    @*<link rel="stylesheet" href="~/dist/style.css" asp-append-version="true" />*@
+    <link rel="stylesheet" href="~/dist/style.css" asp-append-version="true" />
     <link rel="icon" type="image/x-icon" class="js-site-favicon" href="https://account.habookaclass.biz/dist/6854ccd21afb6b1f994e1556c2360dd8.ico">
     @*<link rel="stylesheet" href="~/dist/vendor.css" asp-append-version="true" />
         <environment names="Staging,Production">

TEAMModelOS.SmartClass/package.json

@@ -23,8 +23,10 @@
     "core-js": "^2.5.3",
     "echarts": "^4.2.1",
     "iview": "^3.3.3",
+    "jquery": "^3.3.1",
     "jwt-decode": "^2.2.0",
     "less": "^3.9.0",
+    "moment": "^2.23.0",
     "vue": "^2.6.9",
     "vue-calendar-component": "^2.7.4",
     "vue-full-calendar": "^2.7.0",

TEAMModelOS.SmartTeach/ClientApp/common/headers.vue

@@ -2,7 +2,7 @@
   <div style="width:100%;border-bottom: #f1f1f1 solid 1px;">
     <div class="header_box">
       <div class="header_left">
-        <img src="https://css.huijiaoyun.com/tianyu_edu/area/888888/images/logo/logo.png?v=0818" class="logo_img" />
+        <img src="../assets/image/resource/logo_img.png" class="logo_img" />
         <div class="header_list">
           <ul>
             <li v-for="items in navlist" class="nav_name"><a :href="items.url" style="color:#555;">{{items.name}}</a></li>
@@ -51,7 +51,8 @@
   }
   .logo_img {
     float: left;
-    margin-left:5%;
+    width: 25%;
+    margin-top: 1.5%;
   }
   .header_list {
     float: left;

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

@@ -1,103 +0,0 @@
-<template>
-  <div class="home">
-    <div class="title">
-      <Icon type="ios-home-outline" size="22" />
-      <p><router-link to="/TeacherZone/ZonesHome">工作室首页</router-link></p><span>>活动列表</span>
-    </div>
-    <div class="list-info">
-      <h1 class="list-title">活动列表</h1>
-      <Tabs class="list" value="name1">
-        <TabPane label="全部" name="name1">暂无活动</TabPane>
-        <TabPane label="未开始" name="name2">暂无活动</TabPane>
-        <TabPane label="进行中" name="name3">暂无活动</TabPane>
-        <TabPane label="已结束" name="name4">暂无活动</TabPane>
-      </Tabs>
-    </div>
-    <div class="content-info">
-      <h1 class="list-title">最新活动</h1>
-      <p>暂无活动</p>
-    </div>
-  </div>
-</template>
-<script>
-  export default {
-    data() {
-      return {
-
-      }
-    },
-    methods: {
-      viewDetails() {
-        this.$router.push({ path: '/TeacherZone/TeachDetails' })
-
-      },
-      chooseTab() {
-        this.info = this.data;
-      }
-    }
-  }
-</script>
-<style scoped>
-  .home {
-    width: 66%;
-    height: 500px;
-    position: absolute;
-    top: 70%;
-    left: 53%;
-    transform: translate(-50%,-50%);
-    float: left;
-    display: inline-flex;
-  }
-
-  .title {
-    font-size: 16px;
-    text-align: left;
-    font-weight: 600;
-    width: 300px;
-  }
-
-    .title p {
-      display: inline;
-    }
-
-  .list-info {
-    margin-top: 35px;
-    width: 50%;
-    background: #fff;
-    /* float: left; */
-    margin-left: -24%;
-    height: 200px;
-    border: 1px solid #ededed;
-  }
-
-  .list-title {
-    float: left;
-    height: 57px;
-    line-height: 57px;
-    font-size: 20px;
-    margin-left: 10px;
-    color: #288add;
-    border-bottom: 1px solid #288add;
-  }
-
-  .list {
-    margin-top: 10%;
-    margin-left: 1%;
-    font-size: 15px;
-  }
-
-  .content-info {
-    width: 25%;
-    height: 200px;
-    border: 1px solid #ededed;
-    margin-top: 3%;
-    margin-left: 4%;
-    background-color: #ffffff;
-  }
-
-    .content-info p {
-      margin-top: 25%;
-      font-size: 15px;
-      margin-left: 10px;
-    }
-</style>

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

@@ -1,104 +0,0 @@
-
-<template>
-  <div class="home">
-    <div class="title">
-      <Icon type="ios-home-outline" size="22" />
-      <p><router-link to="/TeacherZone/ZonesHome">工作室首页</router-link></p><span>>评课列表</span>
-    </div>
-    <div class="list-info">
-      <h1 class="list-title">网上评课</h1>
-      <Tabs class="list" value="name1">
-        <TabPane label="全部" name="name1">暂无数据</TabPane>
-        <TabPane label="进行中2" name="name2">暂无数据</TabPane>
-        <TabPane label="未开始" name="name3">暂无数据</TabPane>
-        <TabPane label="已结束" name="name4">暂无数据</TabPane>
-      </Tabs>
-    </div>
-    <div class="content-info">
-      <h1 class="list-title">最新评课</h1>
-      <p>暂无数据</p>
-    </div>
-  </div>
-</template>
-<script>
-  export default {
-    data() {
-      return {
-
-      }
-    },
-    methods: {
-      viewDetails() {
-        this.$router.push({ path: '/TeacherZone/TeachDetails' })
-
-      },
-      chooseTab() {
-        this.info = this.data;
-      }
-    }
-  }
-</script>
-<style scoped>
-  .home {
-    width: 66%;
-    height: 500px;
-    position: absolute;
-    top: 70%;
-    left: 53%;
-    transform: translate(-50%,-50%);
-    float: left;
-    display: inline-flex;
-  }
-
-  .title {
-    font-size: 16px;
-    text-align: left;
-    font-weight: 600;
-    width: 300px;
-  }
-
-    .title p {
-      display: inline;
-    }
-
-  .list-info {
-    margin-top: 35px;
-    width: 50%;
-    background: #fff;
-    /* float: left; */
-    margin-left: -24%;
-    height: 200px;
-    border: 1px solid #ededed;
-  }
-
-  .list-title {
-    float: left;
-    height: 57px;
-    line-height: 57px;
-    font-size: 20px;
-    margin-left: 10px;
-    color: #288add;
-    border-bottom: 1px solid #288add;
-  }
-
-  .list {
-    margin-top: 10%;
-    margin-left: 1%;
-    font-size: 15px;
-  }
-
-  .content-info {
-    width: 25%;
-    height: 200px;
-    border: 1px solid #ededed;
-    margin-top: 3%;
-    margin-left: 4%;
-    background-color: #ffffff;
-  }
-
-    .content-info p {
-      margin-top: 25%;
-      font-size: 15px;
-      margin-left: 10px;
-    }
-</style>

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

@@ -1,103 +0,0 @@
-<template>
-  <div class="home">
-    <div class="title">
-      <Icon type="ios-home-outline" size="22" />
-      <p><router-link to="/TeacherZone/ZonesHome">工作室首页</router-link></p><span>>课题研究列表</span>
-    </div>
-    <div class="list-info">
-      <h1 class="list-title">课题列表</h1>
-      <Tabs class="list" value="name1">
-        <TabPane label="不限" name="name1">暂时没有课题研究</TabPane>
-        <TabPane label="国家级" name="name2">暂时没有课题研究</TabPane>
-        <TabPane label="省级" name="name3">暂时没有课题研究</TabPane>
-        <TabPane label="市级" name="name4">暂时没有课题研究</TabPane>
-        <TabPane label="校级" name="name5">暂时没有课题研究</TabPane>
-      </Tabs>
-    </div>
-    <div class="content-info">
-      <h1 class="list-title">最新课题</h1>
-      <p>暂无课题</p>
-    </div>
-  </div>
-</template>
-<script>
-  export default {
-    data() {
-      return {
-
-      }
-    },
-    methods: {
-      viewDetails() {
-        this.$router.push({ path: '/TeacherZone/TeachDetails' })
-
-      },
-      chooseTab() {
-        this.info = this.data;
-      }
-    }
-  }
-</script>
-<style scoped>
-  .home {
-    width: 66%;
-    height: 500px;
-    position: absolute;
-    top: 70%;
-    left: 53%;
-    transform: translate(-50%,-50%);
-    float: left;
-    display: inline-flex;
-  }
-
-  .title {
-    font-size: 16px;
-    text-align: left;
-    font-weight: 600;
-    width:300px;
-  }
-
-    .title p {
-      display: inline;
-    }
-
-  .list-info {
-    margin-top: 35px;
-    width: 50%;
-    background: #fff;
-    /* float: left; */
-    margin-left: -24%;
-    height: 200px;
-    border: 1px solid #ededed;
-  }
-
-  .list-title {
-    float: left;
-    height: 57px;
-    line-height: 57px;
-    font-size: 20px;
-    margin-left:10px;
-    color: #288add;
-    border-bottom: 1px solid #288add;
-  }
-  .list{
-    margin-top:10%;
-    margin-left:1%;
-    font-size:15px;
-  }
-  .content-info {
-    width: 25%;
-    height: 200px;
-    border: 1px solid #ededed;
-    margin-top: 3%;
-    margin-left: 4%;
-    background-color: #ffffff;
-  }
-  .content-info p{
-    margin-top:25%;
-    font-size:15px;
-    margin-left:10px;
-  }
-
-
-</style>

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

@@ -1,430 +0,0 @@
-<template>
-  <div class="home">
-    <div class="title">
-      <Icon type="ios-home-outline" size="22" />
-      <p><router-link to="/TeacherZone/ZonesHome">工作室首页</router-link></p><span>>资源列表</span>
-    </div>
-    <div class="list-info">
-      <h1 class="list-title">资源列表</h1>
-      <div class="list">
-        <Tree :data="data2" @on-select-change="chooseTab"></Tree>
-      </div>
-    </div>
-    <div class="content-info">
-      <h1 class="list-title">全部资源</h1>
-      <ul class="source-title" >
-        <li v-for="item in info">
-          <a class="titles">
-            <span class="doc">
-              {{item.title}}
-            </span>
-          </a>
-          <span class="style">ppt</span>
-          <span class="peo">
-            <a title="陈海波"   style="border:none">
-              {{item.name}}
-            </a>
-          </span>
-          <span class="date">{{item.data}}</span>
-          <p class="download"><Icon type="ios-cloud-download-outline "size="22"/></p>
-        </li>
-      </ul>
-    </div>
-  </div>
-</template>
-<script>
-  export default {
-    data() {
-      return {
-        data: [
-          {
-            title: '16-17版 第1部分 专题6 机械能守恒定律　功能关系',
-            name: '刘国元',
-            data: '2018-05-16',
-          },
-          {
-            title: '16-17版 第1部分 专题6 机械能守恒定律　功能关系',
-            name: '刘国元',
-            data: '2018-05-16',
-          },
-          {
-            title: '16-17版 第1部分 专题6 机械能守恒定律　功能关系',
-            name: '刘国元',
-            data: '2018-05-16',
-          },
-          {
-            title: '16-17版 第1部分 专题6 机械能守恒定律　功能关系',
-            name: '刘国元',
-            data: '2018-05-16',
-          },
-          {
-            title: '16-17版 第1部分 专题6 机械能守恒定律　功能关系',
-            name: '刘国元',
-            data: '2018-05-16',
-          },
-          {
-            title: '16-17版 第1部分 专题6 机械能守恒定律　功能关系',
-            name: '刘国元',
-            data: '2018-05-16',
-          },
-          {
-            title: '16-17版 第1部分 专题6 机械能守恒定律　功能关系',
-            name: '刘国元',
-            data: '2018-05-16',
-          },
-          {
-            title: '16-17版 第1部分 专题6 机械能守恒定律　功能关系',
-            name: '刘国元',
-            data: '2018-05-16',
-          },
-        ],
-        data2: [
-          {
-            title: '根目录',
-            expand: true,
-            children: [
-              {
-                title: '必修一',
-                expand: true,
-                render: (h, { root, node, data }) => {
-                  return h('span', {
-                    style: {
-                      display: 'inline-block',
-                      width: '40%'
-                    }
-                  }, [
-                      h('span', [
-                        h('Icon', {
-                          props: {
-                            type: 'md-folder-open',
-                            size:'15',
-                            color:'blue'
-                          },
-                          style: {
-                            marginRight: '8px',
-                            width: '20px',
-                          }
-                        }),
-                        h('span', data.title)
-                      ]),
-                    ]);
-                },
-                children: [
-                  {
-                    title: '教学学案'
-                  },
-                  {
-                    title: '教学资源'
-                  }
-                ]
-              },
-              {
-                title: '必修二',
-                expand: true,
-                render: (h, { root, node, data }) => {
-                  return h('span', {
-                    style: {
-                      display: 'inline-block',
-                      width: '40%'
-                    }
-                  }, [
-                      h('span', [
-                        h('Icon', {
-                          props: {
-                            type: 'md-folder-open',
-                            size: '15',
-                            color: 'blue'
-                          },
-                          style: {
-                            marginRight: '8px',
-                            width: '20px',
-                          }
-                        }),
-                        h('span', data.title)
-                      ]),
-                    ]);
-                },
-                children: [
-                  {
-                    title: '教学学案'
-                  },
-                  {
-                    title: '教学资源'
-                  }
-                ]
-              },
-              {
-                title: '必修三',
-                expand: true,
-                render: (h, { root, node, data }) => {
-                  return h('span', {
-                    style: {
-                      display: 'inline-block',
-                      width: '40%'
-                    }
-                  }, [
-                      h('span', [
-                        h('Icon', {
-                          props: {
-                            type: 'md-folder-open',
-                            size: '15',
-                            color: 'blue'
-                          },
-                          style: {
-                            marginRight: '8px',
-                            width: '20px',
-                          }
-                        }),
-                        h('span', data.title)
-                      ]),
-                    ]);
-                },
-                children: [
-                  {
-                    title: '教学学案'
-                  },
-                  {
-                    title: '教学资源'
-                  }
-                ]
-              },
-              {
-                title: '必修四',
-                expand: true,
-                render: (h, { root, node, data }) => {
-                  return h('span', {
-                    style: {
-                      display: 'inline-block',
-                      width: '40%'
-                    }
-                  }, [
-                      h('span', [
-                        h('Icon', {
-                          props: {
-                            type: 'md-folder-open',
-                            size: '15',
-                            color: 'blue'
-                          },
-                          style: {
-                            marginRight: '8px',
-                            width: '20px',
-                          }
-                        }),
-                        h('span', data.title)
-                      ]),
-                    ]);
-                },
-                children: [
-                  {
-                    title: '教学学案'
-                  },
-                  {
-                    title: '教学资源'
-                  }
-                ]
-              },
-              {
-                title: '必修五',
-                expand: true,
-                render: (h, { root, node, data }) => {
-                  return h('span', {
-                    style: {
-                      display: 'inline-block',
-                      width: '40%'
-                    }
-                  }, [
-                      h('span', [
-                        h('Icon', {
-                          props: {
-                            type: 'md-folder-open',
-                            size: '15',
-                            color: 'blue'
-                          },
-                          style: {
-                            marginRight: '8px',
-                            width: '20px',
-                          }
-                        }),
-                        h('span', data.title)
-                      ]),
-                    ]);
-                },
-                children: [
-                  {
-                    title: '教学学案'
-                  },
-                  {
-                    title: '教学资源'
-                  }
-                ]
-              },
-            ]
-          }
-        ],
-        info: [
-          {
-            title: '高中物理高效课堂应重视培养学生的创新意识',
-            name: '张一啊',
-            data: '2018-02-26',
-            num: '25',
-          },
-          {
-            title: '高中物理高效课堂应重视培养学生的创新意识',
-            name: '张一啊',
-            data: '2018-02-26',
-            num: '25',
-          },
-          {
-            title: '高中物理高效课堂应重视培养学生的创新意识',
-            name: '张一啊',
-            data: '2018-02-26',
-            num: '25',
-          },
-          {
-            title: '高中物理高效课堂应重视培养学生的创新意识',
-            name: '张一啊',
-            data: '2018-02-26',
-            num: '25',
-          },
-          {
-            title: '高中物理高效课堂应重视培养学生的创新意识',
-            name: '张一啊',
-            data: '2018-02-26',
-            num: '25',
-          },
-          {
-            title: '高中物理高效课堂应重视培养学生的创新意识',
-            name: '张一啊',
-            data: '2018-02-26',
-            num: '25',
-          },
-          {
-            title: '高中物理高效课堂应重视培养学生的创新意识',
-            name: '张一啊',
-            data: '2018-02-26',
-            num: '25',
-          },
-          {
-            title: '高中物理高效课堂应重视培养学生的创新意识',
-            name: '张一啊',
-            data: '2018-02-26',
-            num: '25',
-          },
-
-        ]
-      }
-    },
-    methods: {
-      viewDetails() {
-        this.$router.push({ path: '/TeacherZone/TeachDetails' })
-
-      },
-      chooseTab() {
-        this.info = this.data;
-      }
-    }
-  }
-</script>
-<style scoped>
-  .home {
-    width: 65%;
-    height: 500px;
-    position: absolute;
-    top: 69%;
-    left: 53%;
-    transform: translate(-50%,-50%);
-    float:left;
-    display:inline-flex;
-  }
-
-  .title {
-    font-size: 16px;
-    text-align: left;
-    font-weight: 600;
-  }
-
-    .title p {
-      display: inline;
-    }
-  .list-info {
-    margin-top: 35px;
-    width: 260px;
-    background: #fff;
-    /* float: left; */
-    margin-left: -16%;
-    height: 600px;
-    border: 1px solid #ededed;
-  }
-  .list-title {
-    float: left;
-    height: 57px;
-    line-height: 57px;
-    font-size: 20px;
-    color: #288add;
-    border-bottom: 1px solid #288add;
-  }
-  .list{
-    width:80%;
-    height:400px;
-    float:left;
-    margin-left:20px;
-    overflow:scroll;
-  }
-  .list >>> .ivu-tree ul li {
-    text-align: left;
-    margin-left: -10px;
-    font-size: 14px;
-    font-weight: 600;
-  }
-  .content-info {
-    width: 75%;
-    height: 800px;
-    border: 1px solid #ededed;
-    margin-top: 3%;
-    margin-left: 4%;
-    background-color:#ffffff;
-    /* float: right; */
-    /* display: inline; */
-    overflow:scroll;
-  }
-  .source-title{
-    margin-top:10%;
-  }
-  .source-title  li{
-    display: block;
-    line-height: 56px;
-    height: 56px;
-    margin-left:20px;
-    border-bottom: 1px dashed #dfdfdf;
-  }
-  .source-title  li:hover {
-    background-color: #f7f7f7;
-    text-decoration: none;
-  }
-  .doc {
-    font-size: 14px;
-    background: url(../../assets/image/resource/ppt_small.jpg) no-repeat left center;
-    padding: 3px 0 3px 23px;
-  }
-    
-    .source-title .style {
-      margin-left: 30px;
-      font-size: 15px;
-    }
-    .source-title .peo {
-      border: none;
-      margin-left: 30px;
-      font-size: 15px;
-    }
-    .source-title .date {
-      margin-left: 50px;
-      font-size: 16px;
-    }
-    .source-title .download {
-      font-size: 16px;
-      display: inline;
-      /* width: 50px; */
-      margin-left: 100px;
-    }
-
-</style>

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

@@ -1,276 +0,0 @@
-
-<template>
-  <div class="home">
-    <div class="title">
-      <Icon type="ios-home-outline" size="22" />
-      <p><router-link to="/TeacherZone/ZonesHome">工作室首页</router-link></p><span>>名师课堂</span>
-    </div>
-    <div class="list-info">
-      <h1 class="list-title">最新课例</h1>
-      <div class="video">
-        <div class="video_box">
-          <div class="video_list">
-            <div class="video_left">
-              <img src="../../assets/image/resource/teach01.jpg" />
-              <a target="_blank" href="/videodetails" class="playbtn1"></a>
-              <h4 class="name">
-                <a target="_blank" href="" style="color:#fff">选修3-1第二章恒定电流,电源和电流</a>
-              </h4>
-            </div>
-            <ul class="video_right">
-              <li class="video_more_list" v-for="item in video_list">
-                <img :src="item.imgurl" />
-                <a target="_blank" :href="item.url" class="playbtn1"></a>
-                <h4 class="name_more">
-                  <a target="_blank" :href="item.url" style="color:#fff">{{item.slogan}}</a>
-                </h4>
-              </li>
-            </ul>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="list-infos">
-      <h1 class="list-title">微课课例</h1>
-      <div class="video">
-        <div class="video_box">
-          <div class="video_list">
-            <ul class="video_rights">
-              <li class="video_more_list" v-for="item in video_lists">
-                <img :src="item.imgurl" />
-                <a target="_blank" :href="item.url" class="playbtn1"></a>
-                <h4 class="name_more">
-                  <a target="_blank" :href="item.url" style="color:#fff">{{item.slogan}}</a>
-                </h4>
-              </li>
-            </ul>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-  export default {
-    data() {
-      return {
-        video_list: [
-          { "id": 1, "imgurl": require("../../assets/image/resource/teach03.jpg"), "slogan": '选修3-1第二章恒定电流,电流的微观解析', "url": '/videodetails?id=1' },
-          { "id": 2, "imgurl": require("../../assets/image/resource/teach01.jpg"), "slogan": '选修3-1第二章恒定电流,电流的微观解析', "url": '/videodetails?id=2' },
-          { "id": 3, "imgurl": require("../../assets/image/resource/teach02.jpg"), "slogan": '选修3-1第二章恒定电流,电流的微观解析', "url": '/videodetails?id=3' },
-          { "id": 4, "imgurl": require("../../assets/image/resource/teach04.jpg"), "slogan": '选修3-1第二章恒定电流,电流的微观解析', "url": '/videodetails?id=4' },
-        ],
-        video_lists: [
-          { "id": 1, "imgurl": require("../../assets/image/resource/teach03.jpg"), "slogan": '选修3-1第二章恒定电流,电流的微观解析', "url": '/videodetails?id=1' },
-          { "id": 2, "imgurl": require("../../assets/image/resource/teach01.jpg"), "slogan": '选修3-1第二章恒定电流,电流的微观解析', "url": '/videodetails?id=2' },
-          { "id": 3, "imgurl": require("../../assets/image/resource/teach02.jpg"), "slogan": '选修3-1第二章恒定电流,电流的微观解析', "url": '/videodetails?id=3' },
-          { "id": 4, "imgurl": require("../../assets/image/resource/teach04.jpg"), "slogan": '选修3-1第二章恒定电流,电流的微观解析', "url": '/videodetails?id=4' },
-
-        ],
-      }
-    },
-    methods: {
-      viewDetails() {
-        this.$router.push({ path: '/TeacherZone/TeachDetails' })
-
-      },
-      chooseTab() {
-        this.info = this.data;
-      }
-    }
-  }
-</script>
-<style scoped>
-  .home {
-    width: 66%;
-    height: 500px;
-    position: absolute;
-    top: 70%;
-    left: 53%;
-    transform: translate(-50%,-50%);
-    float: left;
-    /*display: inline-flex;*/
-  }
-
-  .title {
-    font-size: 16px;
-    text-align: left;
-    font-weight: 600;
-    width: 300px;
-  }
-
-    .title p {
-      display: inline;
-    }
-
-  .list-info {
-    margin-top: 35px;
-    width: 90%;
-    background: #fff;
-    /* float: left; */
-    /*margin-left: -24%;*/
-    height: 450px;
-    border: 1px solid #ededed;
-  }
-  .list-infos {
-    margin-top: 35px;
-    width: 90%;
-    background: #fff;
-    height: 500px;
-    border: 1px solid #ededed;
-  }
-
-  .list-title {
-    float: left;
-    height: 57px;
-    line-height: 57px;
-    font-size: 20px;
-    margin-left: 10px;
-    color: #288add;
-    border-bottom: 1px solid #288add;
-  }
-  .video {
-    margin-top: 7%;
-    /* float: left; */
-    /* display: inline; */
-    background-color: #f3f3f3;
-  }
-
-  .video_box {
-    background-color: #fff;
-    margin: 0 auto;
-    margin-top: 20px;
-  }
- .video_name {
-    float: left;
-    line-height: 39px;
-    border-bottom: #288add solid 1px;
-    padding: 12px 5px 0px 5px;
-    font-size: 24px;
-    font-weight: normal;
-    color: #288add;
-  }
-
-  /*i {
-    float: left;
-    margin: 22px 0px 0px 8px;
-    height: 20px;
-    line-height: 20px;
-    border-radius: 10px;
-    background: #8ea9b9;
-    font-size: 14px;
-    padding: 0px 10px;
-    color: #fff;
-  }*/
-
-  .video_select {
-    width: 30%;
-    float: left;
-    list-style: none;
-    border-bottom: #ececec solid 1px;
-  }
-
-  .select_name {
-    float: left;
-    width: 15%;
-    line-height: 39px;
-    padding: 12px 5px 0px 5px;
-    font-size: 14px;
-    color: #6f8abb;
-  }
-
-  .select_name_more {
-    float: left;
-    width: 15%;
-    padding: 0px 5px 0px 5px;
-  }
-
-  .video_list {
-    width: 100%;
-    /* float: left; */
-    padding: 1.5%;
-    display: flex;
-  }
-
-  .video_left {
-    width: 50%;
-    float: left;
-    position: relative;
-  }
-
-    .video_left img {
-      width: 100%;
-    }
-
-    .video_left:hover .playbtn1 {
-      display: block;
-    }
-
-  .video_more_list:hover .playbtn1 {
-    display: block;
-  }
-
-  .playbtn1 {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    background: url(../../assets/image/resource/play.png) no-repeat;
-    width: 64px;
-    height: 64px;
-    margin-top: -32px;
-    margin-left: -32px;
-    display: none;
-  }
-
-  .name {
-    position: absolute;
-    bottom: 5px;
-    left: 0px;
-    width: 100%;
-    font-weight: normal;
-    line-height: 45px;
-    font-size: 16px;
-    background-color: rgba(52, 52, 52, .5);
-    color: #fff;
-  }
-
-  .name_more {
-    position: absolute;
-    bottom: 0px;
-    left: 0px;
-    width: 100%;
-    font-weight: normal;
-    line-height: 35px;
-    font-size: 14px;
-    background-color: rgba(52, 52, 52, .5);
-    color: #fff;
-  }
-
-  .video_right {
-    width: 48%;
-    float: left;
-    list-style: none;
-    margin-left: 2%;
-  }
-  .video_rights {
-    width: 48%;
-    float: left;
-    list-style: none;
-    margin-left: 2%;
-    display: contents;
-  }
-
-  .video_more_list {
-    width: 48%;
-    float: left;
-    position: relative;
-    height: 170px;
-    margin-top: 12px;
-    margin: 0.5% 1%;
-  }
-
-    .video_more_list img {
-      width: 100%;
-      height: 170px;
-    }
-</style>

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

@@ -1,102 +0,0 @@
-<template>
-  <div class="home">
-    <div class="title">
-      <Icon type="ios-home-outline" size="22" />
-      <p><router-link to="/TeacherZone/ZonesHome">工作室首页</router-link></p><span>>话题列表</span>
-    </div>
-    <div class="list-info">
-      <h1 class="list-title">话题列表</h1>
-      <Tabs class="list" value="name1">
-        <TabPane label="不限" name="name1">暂无话题</TabPane>
-        <TabPane label="进行中" name="name2">暂无话题</TabPane>
-        <TabPane label="已结束" name="name3">暂无话题</TabPane>
-      </Tabs>
-    </div>
-    <div class="content-info">
-      <h1 class="list-title">最新话题</h1>
-      <p>暂无话题</p>
-    </div>
-  </div>
-</template>
-<script>
-  export default {
-    data() {
-      return {
-
-      }
-    },
-    methods: {
-      viewDetails() {
-        this.$router.push({ path: '/TeacherZone/TeachDetails' })
-
-      },
-      chooseTab() {
-        this.info = this.data;
-      }
-    }
-  }
-</script>
-<style scoped>
-  .home {
-    width: 66%;
-    height: 500px;
-    position: absolute;
-    top: 70%;
-    left: 53%;
-    transform: translate(-50%,-50%);
-    float: left;
-    display: inline-flex;
-  }
-
-  .title {
-    font-size: 16px;
-    text-align: left;
-    font-weight: 600;
-    width: 300px;
-  }
-
-    .title p {
-      display: inline;
-    }
-
-  .list-info {
-    margin-top: 35px;
-    width: 50%;
-    background: #fff;
-    /* float: left; */
-    margin-left: -24%;
-    height: 200px;
-    border: 1px solid #ededed;
-  }
-
-  .list-title {
-    float: left;
-    height: 57px;
-    line-height: 57px;
-    font-size: 20px;
-    margin-left: 10px;
-    color: #288add;
-    border-bottom: 1px solid #288add;
-  }
-
-  .list {
-    margin-top: 10%;
-    margin-left: 1%;
-    font-size: 15px;
-  }
-
-  .content-info {
-    width: 25%;
-    height: 200px;
-    border: 1px solid #ededed;
-    margin-top: 3%;
-    margin-left: 4%;
-    background-color: #ffffff;
-  }
-
-    .content-info p {
-      margin-top: 25%;
-      font-size: 15px;
-      margin-left: 10px;
-    }
-</style>

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

@@ -1,236 +0,0 @@
-<template>
-  <div class="home">
-    <div class="title">
-      <Icon type="ios-home-outline" size="22" />
-      <p><router-link to="/TeacherZone/ZonesHome">工作室首页</router-link></p><span>>学科文章</span>
-    </div>
-    <div class="content-info">
-      <Tabs type="card" size="default" :animated="false">
-        <TabPane label="默认栏目" icon="logo-apple">
-          <div class="info">
-            <ul class="first">
-              <li  v-for="item in info">
-                <p @click="viewDetails">
-                  <span class="title" title="高中物理高效课堂应重视培养学生的创新意识">
-                    {{item.title}}
-                  </span>
-                  <span class="user">{{item.name}}</span>
-                  <span class="date">{{item.data}}</span>
-                  <span>浏览{{item.num}}</span>
-                </p>
-              </li>
-            </ul>
-
-          </div>
-        </TabPane>
-        <TabPane label="保健安康" icon="ios-text-outline">
-          <div class="info">
-            <ul class="first" >
-              <li v-for="item in info">
-                <p @click="viewDetails">
-                  <span class="title" title="高中物理高效课堂应重视培养学生的创新意识">
-                    {{item.title}}
-                  </span>
-                  <span class="user">{{item.name}}</span>
-                  <span class="date">{{item.data}}</span>
-                  <span>浏览{{item.num}}</span>
-                </p>
-              </li>
-            </ul>
-
-          </div>
-        </TabPane>
-        <TabPane label="工作室相册" icon="ios-text-outline">
-          <div class="info">
-            <ul class="first" >
-              <li v-for="item in info">
-                <p @click="viewDetails">
-                  <span class="title" title="高中物理高效课堂应重视培养学生的创新意识">
-                    {{item.title}}
-                  </span>
-                  <span class="user">{{item.name}}</span>
-                  <span class="date">{{item.data}}</span>
-                  <span>浏览{{item.num}}</span>
-                </p>
-              </li>
-            </ul>
-
-          </div>
-        </TabPane>
-        <TabPane label="工作室建设" icon="ios-text-outline">
-          <div class="info">
-            <ul class="first">
-              <li  v-for="item in info">
-                <p @click="viewDetails">
-                  <span class="title" title="高中物理高效课堂应重视培养学生的创新意识">
-                    {{item.title}}
-                  </span>
-                  <span class="user">{{item.name}}</span>
-                  <span class="date">{{item.data}}</span>
-                  <span>浏览{{item.num}}</span>
-                </p>
-              </li>
-            </ul>
-
-          </div>
-        </TabPane>
-        <TabPane label="班主任工作" icon="ios-text-outline">
-          <div class="info">
-            <ul class="first" >
-              <li v-for="item in info">
-                <p @click="viewDetails">
-                  <span class="title" title="高中物理高效课堂应重视培养学生的创新意识">
-                    {{item.title}}
-                  </span>
-                  <span class="user">{{item.name}}</span>
-                  <span class="date">{{item.data}}</span>
-                  <span>浏览{{item.num}}</span>
-                </p>
-              </li>
-            </ul>
-
-          </div>
-        </TabPane>
-      </Tabs>
-    </div>
-  </div>
-</template>
-<script>
-  export default {
-    data() {
-      return {
-        info: [
-          {
-            title: '高中物理高效课堂应重视培养学生的创新意识',
-            name: '张一啊',
-            data: '2018-02-26',
-            num: '25',
-          },
-          {
-            title: '高中物理高效课堂应重视培养学生的创新意识',
-            name: '张一啊',
-            data: '2018-02-26',
-            num: '25',
-          },
-          {
-            title: '高中物理高效课堂应重视培养学生的创新意识',
-            name: '张一啊',
-            data: '2018-02-26',
-            num: '25',
-          },
-          {
-            title: '高中物理高效课堂应重视培养学生的创新意识',
-            name: '张一啊',
-            data: '2018-02-26',
-            num: '25',
-          },
-          {
-            title: '高中物理高效课堂应重视培养学生的创新意识',
-            name: '张一啊',
-            data: '2018-02-26',
-            num: '25',
-          },
-          {
-            title: '高中物理高效课堂应重视培养学生的创新意识',
-            name: '张一啊',
-            data: '2018-02-26',
-            num: '25',
-          },
-          {
-            title: '高中物理高效课堂应重视培养学生的创新意识',
-            name: '张一啊',
-            data: '2018-02-26',
-            num: '25',
-          },
-          {
-            title: '高中物理高效课堂应重视培养学生的创新意识',
-            name: '张一啊',
-            data: '2018-02-26',
-            num: '25',
-          },
-
-        ]
-      }
-    },
-    methods: {
-      viewDetails() {
-        this.$router.push({ path: '/TeacherZone/TeachDetails' })
-
-      }
-    }
-  }
-</script>
-<style scoped>
-  .home {
-    width: 59%;
-    height: 500px;
-    position: absolute;
-    top: 69%;
-    left: 50%;
-    transform: translate(-50%,-50%);
-    text-align: center;
-  }
-
-  .title {
-    font-size: 16px;
-    text-align: left;
-    font-weight: 600;
-  }
-
-    .title p {
-      display: inline;
-    }
-
-  .content-info {
-    margin-top: 10px;
-  }
-
-  .info {
-    width: 100%;
-    height: 400px;
-    border: 1px solid #666;
-    background-color: #ffffff;
-    overflow: scroll;
-  }
-
-    .info .first {
-      padding-right: 20px;
-    }
-
-  .mgt20 {
-    margin-top: 20px;
-  }
-
-  .info ul {
-    list-style: none;
-  }
-
-  .info li p {
-    display: block;
-    height: 50px;
-    border-bottom: 1px dashed #dfdfdf;
-    padding-left: 10px;
-  }
-
-  .first p:hover {
-    background: #f7f7f7;
-    text-decoration: none;
-    cursor: pointer;
-  }
-
-  .first span {
-    display: inline-block;
-    color: #555;
-    /* text-align: left; */
-    line-height: 60px;
-    width: 440px;
-  }
-
-  .first .user {
-    width: 75px;
-  }
-
-  .first .date {
-    width: 105px;
-  }
-</style>

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

@@ -9,13 +9,24 @@
       <div class="w1200">
         <ul class="nav-li">
           <li><router-link to="/TeacherZone/ZonesHome">首页</router-link></li>
-          <li><router-link to="/TeacherZone/TeacherWork">教学文章</router-link></li>
-          <li><router-link to="/TeacherZone/TeachSource">教学资源</router-link></li>
-          <li><router-link to="/TeacherZone/TeachResearch">课题研究</router-link></li>
-          <li><router-link to="/TeacherZone/TeachTopclass">名师课堂</router-link></li>
-          <li><router-link to="/TeacherZone/TeachClass">网上评课</router-link></li>
-          <li><router-link to="/TeacherZone/TeachActivies">教研活动</router-link></li>
-          <li><router-link to="/TeacherZone/TeachTopic">话题研讨</router-link></li>
+          <li>
+            <a  title="教学资源">教学资源</a>
+          </li>
+          <li>
+            <a title="课题研究">课题研究</a>
+          </li>
+          <li>
+            <a title="名师课堂">名师课堂</a>
+          </li>
+          <li>
+            <a title="网上评课">网上评课</a>
+          </li>
+          <li>
+            <a title="教研活动">教研活动</a>
+          </li>
+          <li>
+            <a title="话题研讨">话题研讨</a>
+          </li>
         </ul>
       </div>
     </div>
@@ -84,8 +95,7 @@
   }
   .content{
     width:100%;
-    height:1200px;
-    /*max-height:1200px;*/
+    min-height:1000px;
     background-color:#f9f9f9;
   }
 </style>

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

@@ -628,7 +628,6 @@
 
   .source_list {
     margin-top: 70px;
-    margin-left: 5px;
   }
 
     .source_list li {

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

@@ -159,34 +159,34 @@
             <div class="rankheader"><div class="rank_icon"></div><i class="header_name">小学</i><div class="fwtp"><span>访问量</span><span>投票数</span></div></div>
             <ul class="rankdata">
               <li>
-                <em class="rank r01">1</em><span class="name">孙琴娥</span>
+                <em class="rank r01">1</em><span class="name">李慧</span>
                 <span class="area">成都外国语小学</span>
-                <span class="info load">6,858</span>
-                <span class="info">5,720</span>
+                <span class="info load">2858</span>
+                <span class="info">1720</span>
               </li>
               <li>
-                <em class="rank r02">2</em><span class="name">朱磊</span>
+                <em class="rank r02">2</em><span class="name">张丽</span>
                 <span class="area">成都高新区芳草小学</span>
-                <span class="info load">4,858</span>
-                <span class="info">5,938</span>
+                <span class="info load">2650</span>
+                <span class="info">938</span>
               </li>
               <li>
-                <em class="rank r03">3</em><span class="name">倪惠妮</span>
+                <em class="rank r03">3</em><span class="name">王丹</span>
                 <span class="area">成都盐道街小学</span>
-                <span class="info load">4,765</span>
-                <span class="info">5,638</span>
+                <span class="info load">1765</span>
+                <span class="info">638</span>
               </li>
               <li>
-                <em class="rank">4</em><span class="name">赵雪琴</span>
+                <em class="rank">4</em><span class="name">黎雪琴</span>
                 <span class="area">成都师范银都紫藤小学</span>
-                <span class="info load">4,650</span>
-                <span class="info">5,360</span>
+                <span class="info load">1650</span>
+                <span class="info">560</span>
               </li>
               <li>
-                <em class="rank">5</em><span class="name">孟雪芹</span>
+                <em class="rank">5</em><span class="name">范模</span>
                 <span class="area">成都师范银都紫藤小学</span>
-                <span class="info load">4,556</span>
-                <span class="info">5,330</span>
+                <span class="info load">1556</span>
+                <span class="info">330</span>
               </li>
             </ul>
           </div>
@@ -194,34 +194,34 @@
             <div class="rankheader"><div class="rank_icon_02"></div><i class="header_name">初中</i><div class="fwtp"><span>访问量</span><span>投票数</span></div></div>
             <ul class="rankdata">
               <li>
-                <em class="rank r01">1</em><span class="name">孙琴娥</span>
+                <em class="rank r01">1</em><span class="name">王川</span>
                 <span class="area">成都树德中学</span>
-                <span class="info load">6,858</span>
-                <span class="info">5,720</span>
+                <span class="info load">5858</span>
+                <span class="info">2720</span>
               </li>
               <li>
-                <em class="rank r02">2</em><span class="name">朱磊</span>
+                <em class="rank r02">2</em><span class="name">张丽君</span>
                 <span class="area">成都盐道街中学</span>
-                <span class="info load">4,858</span>
-                <span class="info">5,938</span>
+                <span class="info load">5239</span>
+                <span class="info">1938</span>
               </li>
               <li>
-                <em class="rank r03">3</em><span class="name">倪惠妮</span>
+                <em class="rank r03">3</em><span class="name">程力帆</span>
                 <span class="area">成都第七中学</span>
-                <span class="info load">4,765</span>
-                <span class="info">5,638</span>
+                <span class="info load">4765</span>
+                <span class="info">1638</span>
               </li>
               <li>
                 <em class="rank">4</em><span class="name">赵雪琴</span>
                 <span class="area">成都外国语中学</span>
-                <span class="info load">4,650</span>
-                <span class="info">5,360</span>
+                <span class="info load">4650</span>
+                <span class="info">1360</span>
               </li>
               <li>
                 <em class="rank">5</em><span class="name">孟雪芹</span>
                 <span class="area">成都第七中学</span>
-                <span class="info load">4,556</span>
-                <span class="info">5,330</span>
+                <span class="info load">4556</span>
+                <span class="info">1330</span>
               </li>
             </ul>
           </div>
@@ -229,34 +229,34 @@
             <div class="rankheader"><div class="rank_icon_03"></div><i class="header_name">高中</i><div class="fwtp"><span>访问量</span><span>投票数</span></div></div>
             <ul class="rankdata">
               <li>
-                <em class="rank r01">1</em><span class="name">孙琴娥</span>
+                <em class="rank r01">1</em><span class="name">王兵</span>
                 <span class="area">成都树德中学</span>
-                <span class="info load">6,858</span>
-                <span class="info">5,720</span>
+                <span class="info load">3858</span>
+                <span class="info">2720</span>
               </li>
               <li>
-                <em class="rank r02">2</em><span class="name">朱磊</span>
+                <em class="rank r02">2</em><span class="name">孙晓军</span>
                 <span class="area">成都盐道街中学</span>
-                <span class="info load">4,858</span>
-                <span class="info">5,938</span>
+                <span class="info load">3100</span>
+                <span class="info">1938</span>
               </li>
               <li>
-                <em class="rank r03">3</em><span class="name">倪惠妮</span>
+                <em class="rank r03">3</em><span class="name">何森</span>
                 <span class="area">成都第七中学</span>
-                <span class="info load">4,765</span>
-                <span class="info">5,638</span>
+                <span class="info load">2765</span>
+                <span class="info">1638</span>
               </li>
               <li>
-                <em class="rank">4</em><span class="name">赵雪琴</span>
+                <em class="rank">4</em><span class="name">李欣</span>
                 <span class="area">成都外国语中学</span>
-                <span class="info load">4,650</span>
-                <span class="info">5,360</span>
+                <span class="info load">2650</span>
+                <span class="info">1360</span>
               </li>
               <li>
-                <em class="rank">5</em><span class="name">孟雪芹</span>
+                <em class="rank">5</em><span class="name">黎冰玉</span>
                 <span class="area">成都第七中学</span>
-                <span class="info load">4,556</span>
-                <span class="info">5,330</span>
+                <span class="info load">1556</span>
+                <span class="info">1330</span>
               </li>
             </ul>
           </div>
@@ -272,31 +272,31 @@
                   <div class="rankheader"><div class="rank_icon"></div><i class="header_name">小学</i><div class="fwtp"><span>访问量</span><span>投票数</span></div></div>
                   <ul class="rankdata">
                     <li>
-                      <em class="rank r01">1</em><span class="name">孙琴娥</span>
+                      <em class="rank r01">1</em><span class="name">李勇</span>
                       <span class="area">成都外国语小学</span>
                       <span class="info load">6,858</span>
                       <span class="info">5,720</span>
                     </li>
                     <li>
-                      <em class="rank r02">2</em><span class="name">朱磊</span>
+                      <em class="rank r02">2</em><span class="name">朱军</span>
                       <span class="area">成都高新区芳草小学</span>
                       <span class="info load">4,858</span>
                       <span class="info">5,938</span>
                     </li>
                     <li>
-                      <em class="rank r03">3</em><span class="name">倪惠妮</span>
+                      <em class="rank r03">3</em><span class="name">王一鸣</span>
                       <span class="area">成都盐道街小学</span>
                       <span class="info load">4,765</span>
                       <span class="info">5,638</span>
                     </li>
                     <li>
-                      <em class="rank">4</em><span class="name">赵雪琴</span>
+                      <em class="rank">4</em><span class="name">刘碧君</span>
                       <span class="area">成都师范银都紫藤小学</span>
                       <span class="info load">4,650</span>
                       <span class="info">5,360</span>
                     </li>
                     <li>
-                      <em class="rank">5</em><span class="name">孟雪芹</span>
+                      <em class="rank">5</em><span class="name">王梦华</span>
                       <span class="area">成都师范银都紫藤小学</span>
                       <span class="info load">4,556</span>
                       <span class="info">5,330</span>
@@ -307,31 +307,31 @@
                   <div class="rankheader"><div class="rank_icon_02"></div><i class="header_name">初中</i><div class="fwtp"><span>访问量</span><span>投票数</span></div></div>
                   <ul class="rankdata">
                     <li>
-                      <em class="rank r01">1</em><span class="name">孙琴娥</span>
+                      <em class="rank r01">1</em><span class="name">胡宇诚</span>
                       <span class="area">成都树德中学</span>
                       <span class="info load">6,858</span>
                       <span class="info">5,720</span>
                     </li>
                     <li>
-                      <em class="rank r02">2</em><span class="name">朱磊</span>
+                      <em class="rank r02">2</em><span class="name">马齐森</span>
                       <span class="area">成都盐道街中学</span>
                       <span class="info load">4,858</span>
                       <span class="info">5,938</span>
                     </li>
                     <li>
-                      <em class="rank r03">3</em><span class="name">倪惠妮</span>
+                      <em class="rank r03">3</em><span class="name">马彪</span>
                       <span class="area">成都第七中学</span>
                       <span class="info load">4,765</span>
                       <span class="info">5,638</span>
                     </li>
                     <li>
-                      <em class="rank">4</em><span class="name">赵雪琴</span>
+                      <em class="rank">4</em><span class="name">夏跃豪</span>
                       <span class="area">成都外国语中学</span>
                       <span class="info load">4,650</span>
                       <span class="info">5,360</span>
                     </li>
                     <li>
-                      <em class="rank">5</em><span class="name">孟雪芹</span>
+                      <em class="rank">5</em><span class="name">胡芳雨</span>
                       <span class="area">成都第七中学</span>
                       <span class="info load">4,556</span>
                       <span class="info">5,330</span>

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

@@ -1,7 +1,27 @@
 <template>
   <div class="exam">
     <div class="exam_list_box_width">
-      <div class="exam_box" v-for="item in listdata">
+      <div class="exam_box" v-for="item in listdata" v-if="index">
+        <div class="exam_title"><div class="exam_name">{{item.title}}</div><i>{{item.num}}</i></div>
+        <div class="exam_img"><img :src="item.img" /></div>
+        <ul class="exam_list">
+          <li class="exam_list_data" v-for="items in item.data">
+            <div class="exam_list_title"><a :href="items.url" target="_blank">{{items.title}}</a></div>
+            <div class="look"><Icon type="ios-eye" size="16" />{{items.loocknum}}</div>
+          </li>
+        </ul>
+      </div>
+      <div class="exam_box" v-for="item in arealistdata" v-if="areaindex">
+        <div class="exam_title"><div class="exam_name">{{item.title}}</div><i>{{item.num}}</i></div>
+        <div class="exam_img"><img :src="item.img" /></div>
+        <ul class="exam_list">
+          <li class="exam_list_data" v-for="items in item.data">
+            <div class="exam_list_title"><a :href="items.url" target="_blank">{{items.title}}</a></div>
+            <div class="look"><Icon type="ios-eye" size="16" />{{items.loocknum}}</div>
+          </li>
+        </ul>
+      </div>
+      <div class="exam_box" v-for="item in schoollistdata" v-if="schoolindex">
         <div class="exam_title"><div class="exam_name">{{item.title}}</div><i>{{item.num}}</i></div>
         <div class="exam_img"><img :src="item.img" /></div>
         <ul class="exam_list">
@@ -19,6 +39,9 @@
   export default {
     data() {
       return {
+        index: false,
+        areaindex: false,
+        school:false,
         listdata: [
           {
             "id": 1, "title": '中考专区', "num": '980', "img": require("../../assets/image/resource/exam_img_one.jpg"), data: [
@@ -44,7 +67,63 @@
               { "type": '优课', "title": '振兴中华，我们的责任', "loocknum": '535', "url":'http://1s1k.eduyun.cn/portal/redesign/index/index.jsp?sdResIdCaseId=ff8080815cb052d2015cbebe8a1b23fa&t=2&sessionKey=EvC9kFlYWNaWFm1tKsG0' },
             ]
           },
-        ]
+        ],
+        arealistdata: [
+          {
+            "id": 1, "title": '中考专区', "num": '980', "img": require("../../assets/image/resource/exam_img_one.jpg"), data: [
+              { "type": '物理', "title": '2018年成都市高新区联考物理试卷.doc', "loocknum": '750', "url": '/details' },
+              { "type": '英语', "title": '2018年成都市高新区联考英语试卷.doc', "loocknum": '920', "url": '/details' },
+              { "type": '数学', "title": '2018年成都市高新区联考数学试卷.doc', "loocknum": '1006', "url": '/details' },
+            ]
+          },
+          {
+            "id": 2, "title": '高考专区', "num": '1080', "img": require("../../assets/image/resource/exam_img_two.jpg"), data: [
+              { "type": '语文', "title": '2018年成都市高新区联考语文试卷.doc', "loocknum": '1750', "url": '/details' },
+              { "type": '英语', "title": '2018年成都市高新区联考英语试卷.doc', "loocknum": '1220', "url": '/details' },
+            ]
+          },
+          {
+            "id": 3, "title": '优课专区', "num": '900', "img": require("../../assets/image/resource/exam_img_three.jpg"), data: [
+              { "type": '优课', "title": '我的影子', "loocknum": '620', "url": 'http://1s1k.eduyun.cn/portal/redesign/index/index.jsp?sdResIdCaseId=8aee80a562bc9be10162be0f7167109d&t=2&sessionKey=ey65FtcgEGMh4uHprmSE' },
+              { "type": '优课', "title": '路程、时间与速度', "loocknum": '606', "url": 'http://1s1k.eduyun.cn/portal/redesign/index/index.jsp?sdResIdCaseId=ff8080815d07057f015d07443709007a&t=2&sessionKey=wj0ZhZK7YbjgxhIBJiGw' },
+              { "type": '优课', "title": '古诗二首', "loocknum": '350', "url": 'http://1s1k.eduyun.cn/portal/redesign/index/index.jsp?sdResIdCaseId=8aee808f62fbe7ab016300a9e6a22e65&t=2&sessionKey=3xCsBKvbaWPKVmk1Yk9Y' },
+            ]
+          },
+        ],
+        schoollistdata: [
+          {
+            "id": 1, "title": '考试专区', "num": '980', "img": require("../../assets/image/resource/exam_school_one.png"), data: [
+              { "type": '语文', "title": '2018成都师范银都紫藤小学语文试卷.doc', "loocknum": '750', "url": '/details' },
+              { "type": '英语', "title": '2018成都师范银都紫藤小学英语试卷.doc', "loocknum": '920', "url": '/details' },
+              { "type": '数学', "title": '2018成都师范银都紫藤小学数学试卷.doc', "loocknum": '1006', "url": '/details' },
+            ]
+          },
+          {
+            "id": 2, "title": '期末考专区', "num": '1080', "img": require("../../assets/image/resource/exam_school_two.png"), data: [
+              { "type": '语文', "title": '2018成都市师范银都紫藤小学语文试卷.doc', "loocknum": '170', "url": '/details' },
+            ]
+          },
+          {
+            "id": 3, "title": '优课专区', "num": '900', "img": require("../../assets/image/resource/exam_img_three.jpg"), data: [
+              { "type": '优课', "title": '我的影子', "loocknum": '20', "url": 'http://1s1k.eduyun.cn/portal/redesign/index/index.jsp?sdResIdCaseId=8aee80a562bc9be10162be0f7167109d&t=2&sessionKey=ey65FtcgEGMh4uHprmSE' },
+              { "type": '优课', "title": '路程、时间与速度', "loocknum": '66', "url": 'http://1s1k.eduyun.cn/portal/redesign/index/index.jsp?sdResIdCaseId=ff8080815d07057f015d07443709007a&t=2&sessionKey=wj0ZhZK7YbjgxhIBJiGw' },
+            ]
+          },
+        ],
+      }
+    },
+    created() {
+      this.init();
+    },
+    methods: {
+      init() {
+        if (this.$route.path == '/resource') {
+          this.index = true
+        } else if (this.$route.path == '/arearesource') {
+          this.areaindex = true;
+        } else if (this.$route.path == '/schoolresource') {
+          this.schoolindex = true;
+        }
       }
     }
   }
@@ -63,7 +142,7 @@
   }
   .exam_box {
     width: 30%;
-    height: auto;
+    height: 250px;
     margin: 1% 0% 1% 4.5%;
     text-align: center;
     float: left;

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="list_box">
+  <div :class="bannerimg">
     <ul class="list_header">
       <li class="list_data"><Icon type="ios-menu-outline" size="30" style="color:#fff;margin-bottom:10px;" /><span class="list_header_title">学科资源</span></li>
       <li class="moreover_data_one">
@@ -54,6 +54,7 @@
   export default {
     data() {
       return {
+        bannerimg: '',
         xs:false,
         xiaoxue: [
           { "id": 1, "title": '语文', "data": [{ "id": 2, "pid": 1, "title": '同步资源', "url": '/synch' }, { "id": 3, "pid": 1, "title": '卷库', "url":'/library' },] },
@@ -106,8 +107,20 @@
         ],
       }
     },
+    created() {
+      this.init_url();
+    },
     methods: {
-
+      init_url() {
+        console.log(this.$route.path,6666)
+        if (this.$route.path == '/arearesource') {
+          this.bannerimg = 'list_box_area'
+        } else if (this.$route.path == '/resource') {
+          this.bannerimg = 'list_box'
+        } else if (this.$route.path == '/schoolresource') {
+          this.bannerimg = 'list_box_school'
+        }
+      }
     }
   }
 </script>
@@ -119,12 +132,26 @@
     height:396px;
     position:relative;
   }
+  .list_box_area {
+    width: 100%;
+    background: url("../../assets/image/resource/banner_area.png") no-repeat;
+    background-size: 100% 100%;
+    height: 396px;
+    position: relative;
+  }
+  .list_box_school {
+    width: 100%;
+    background: url("../../assets/image/resource/banner_school.png") no-repeat;
+    background-size: 100% 100%;
+    height: 396px;
+    position: relative;
+  }
   .list_header {
-    width:11%;
-    position:absolute;
-    left:352px;
-    height:400px;
-    text-align:center;
+    width: 11%;
+    position: absolute;
+    left: 352px;
+    height: 400px;
+    text-align: center;
   }
   .list_data {
     width: 100%;

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

@@ -73,7 +73,7 @@
         <p class="left_title">最热资源</p>
         <ul class="recommend_left">
           <li class="recommend_list" v-for="item in hot">
-            <a href="item.url" style="color:#555;">
+            <a :href="item.url" style="color:#555;">
               <div class="recommend_list_title"><Icon :type="item.icon" size="16" :class="item.iconclass" />{{item.title}}</div><div class="recommend_list_time"><Icon type="ios-eye" size="18" />{{item.looknum}}</div>
             </a>
            </li>

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

@@ -190,8 +190,6 @@
           { provice: '四川', subject: '语文', title: '省级名师', name: '周一', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
           { provice: '四川', subject: '语文', title: '省级名师', name: '周一', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
           { provice: '四川', subject: '语文', title: '省级名师', name: '周一', period: '小学', text1: '成员', number1: '1000', text2: '资源', number2: '2000', text3: '热度', number3: '1500' },
-
-
         ],
         geoCoordMap: {
           "四川省": [104.06, 30.67],
@@ -219,15 +217,14 @@
           "青海省": [101.60, 36.75],
           "西藏自治区": [90.97, 29.84],
         },
-
       };
     },
-    mounted() {
-      this.drawLine();
+    created() {
+      this.convertData();
     },
-
     methods: {
       convertData(data) {
+        console.log(this.geoCoordMap, 6666);
         var res = [];
         for (var i = 0; i < 5; i++) {
           var geoCoord = this.geoCoordMap[[i]];
@@ -238,7 +235,7 @@
             });
           }
         }
-        return res;
+        this.drawLine(res);
       },
       drawLine () {
         // 基于准备好的dom，初始化echarts实例
@@ -293,7 +290,7 @@
               name: '报名人数',
               type: 'scatter',
               coordinateSystem: 'geo',
-              data: this.convertData(this.data),
+              data: this.convertData(data),
               symbolSize: function (val) {
                 return val[2] / 4;
               },
@@ -346,8 +343,6 @@
             }
           ]
         }
-        // 绘制图表
-        myChart.setOption(option);
       }
     },
     

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

@@ -12,10 +12,10 @@
       </ul>
       <div class="video_list">
         <div class="video_left">
-          <img src="../../assets/image/resource/video_img.jpg" />
+          <img :src="imgurl" />
           <a target="_blank" href="/videodetails" class="playbtn1"></a>
           <h4 class="name">
-            <a target="_blank" href="" style="color:#fff">人教五上第五单元_列方程解决实际问题</a>
+            <a target="_blank" href="" style="color:#fff">{{imgtext}}</a>
           </h4>
         </div>
         <ul class="video_right">
@@ -35,6 +35,8 @@
   export default {
     data() {
       return {
+        imgurl: '',
+        imgtext:'',
         video_list: [
           { "id": 1, "imgurl": require("../../assets/image/resource/video_img_one.jpg"), "slogan": '人教三上第四单元_三位数减三位...', "url": '/videodetails?id=1' },
           { "id": 2, "imgurl": require("../../assets/image/resource/video_img_two.jpg"), "slogan": '五上第七单元_在一条线段上植树', "url": '/videodetails?id=2' },
@@ -43,6 +45,23 @@
         ],
       }
     },
+    created() {
+      this.init();
+    },
+    methods: {
+      init() {
+        if (this.$route.path == '/resource') {
+          this.imgurl = require("../../assets/image/resource/video_img.jpg");
+          this.imgtext = '人教五上单元_列方程解决实际问题';
+        } else if (this.$route.path == '/arearesource') {
+          this.imgurl = require("../../assets/image/resource/video_area_img.png");
+          this.imgtext = '人教版 一年级（下册） ';
+        } else if (this.$route.path == '/schoolresource') {
+          this.imgurl = require("../../assets/image/resource/video_school_img.jpg");
+          this.imgtext = '习作·猜猜他是谁';
+        }
+      }
+    }
   }
 </script>
 <style scoped>

TEAMModelOS.SmartTeach/ClientApp/router/routes.js

@@ -2,6 +2,8 @@
 //import ServerSideLogin from '@/view/serverside/login'
 // import HTTP404 from '@/view/404'
 import Index from '@/view/resource/index'
+import Indexarea from '@/view/resource/indexarea.vue'
+import Indexschool from '@/view/resource/indexschool.vue'
 import Synch from '@/view/resource/resourceindex/synchronization.vue'
 import Library from '@/view/resource/resourceindex/library.vue'
 import Details from '@/view/resource/resourceindex/details.vue'
@@ -16,18 +18,12 @@ import Login from '@/view/resource/login.vue'
 import HomePage from '@/view/resource/HomePage'
 import Teacher from '@/view/resource/Teacher'
 import TeacherZone from '@/view/resource/TeacherZone'
-//import { resolve } from 'url';
-import ZonesHome from '../components/resource/ZonesHome.vue'
-import TeacherWork from '../components/resource/TeacherWork.vue'
-import TeachDetails from '../components/resource/TeachDetails.vue'
-import TeachSource from '../components/resource/TeachSource.vue'
-import TeachResearch from '../components/resource/TeachResearch.vue'
-import TeachTopic from '../components/resource/TeachTopic.vue'
-import TeachActivies from '../components/resource/TeachActivies.vue'
-import TeachClass from '../components/resource/TeachClass.vue'
-import TeachTopclass from '../components/resource/TeachTopclass.vue'
-export const routes = [  
+import { resolve } from 'url';
+
+export const routes = [
   { name: 'index', path: '/resource', component: Index },
+  { name: 'indexarea', path: '/arearesource', component: Indexarea },
+  { name: 'Indexschool', path: '/schoolresource', component: Indexschool },
   { name: 'synch', path: '/synch', component: Synch },
   { name: 'library', path: '/library', component: Library },
   { name: 'details', path: '/details', component: Details },
@@ -41,19 +37,5 @@ export const routes = [
   { name: 'Login', path: '/login', component: Login },
   { name: 'HomePage', path: '/HomePage', component: HomePage },
   { name: 'Teacher', path: '/Teacher', component: Teacher },
-  {
-    name: 'TeacherZone', path: '/TeacherZone', component: TeacherZone, redirect: "/TeacherZone/ZonesHome",
-    children: [
-      { name: 'ZonesHome', path: 'ZonesHome', component: ZonesHome },
-      { name: 'TeacherWork', path: 'TeacherWork', component: TeacherWork },
-      { name: 'TeachDetails', path: 'TeachDetails', component: TeachDetails },
-      { name: 'TeachSource', path: 'TeachSource', component: TeachSource },
-      { name: 'TeachResearch', path: 'TeachResearch', component: TeachResearch },
-      { name: 'TeachTopic', path: 'TeachTopic', component: TeachTopic },
-      { name: 'TeachActivies', path: 'TeachActivies', component: TeachActivies },
-      { name: 'TeachClass', path: 'TeachClass', component: TeachClass },
-      { name: 'TeachTopclass', path: 'TeachTopclass', component: TeachTopclass }
-    ]
-
-  },
+  { name: 'TeacherZone', path: '/TeacherZone', component: TeacherZone },
 ]

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

@@ -0,0 +1,44 @@
+<template>
+  <div id="app">
+    <Header></Header>
+    <Banner></Banner>
+    <Exam></Exam>
+    <Video></Video>
+    <Recommend></Recommend>
+    <Footer></Footer>
+  </div>
+</template>
+<script>
+  import Header from '@/common/headers.vue'
+  import Footer from '@/common/footer.vue'
+  import Banner from '@/components/resource/list.vue'
+  import Exam from '@/components/resource/exam.vue'
+  import Video from '@/components/resource/video.vue'
+  import Recommend from '@/components/resource/recommend.vue'
+  export default {
+    components: {
+      Header,
+      Banner,
+      Exam,
+      Video,
+      Recommend,
+      Footer
+    },
+    data() {
+      return {
+       
+      }
+    },
+      mounted() {
+       
+      }
+    }
+</script>
+<style scoped>
+  #app {
+    width: 100%;
+    height: auto;
+    background-color: #fff;
+    margin: 0 auto;
+  }
+</style>

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

@@ -0,0 +1,46 @@
+<template>
+  <div id="app">
+    <Header></Header>
+    <Banner></Banner>
+    <Exam></Exam>
+    <Video></Video>
+    <Recommend></Recommend>
+    <Footer></Footer>
+  </div>
+</template>
+<script>
+  import Header from '@/common/headers.vue'
+  import Footer from '@/common/footer.vue'
+  import Banner from '@/components/resource/list.vue'
+  import Exam from '@/components/resource/exam.vue'
+  import Video from '@/components/resource/video.vue'
+  import Recommend from '@/components/resource/recommend.vue'
+  export default {
+    components: {
+      Header,
+      Banner,
+      Exam,
+      Video,
+      Recommend,
+      Footer
+    },
+    data() {
+      return {
+        bannerimg:'',
+      }
+    },
+      mounted() {
+        if (this.$route.path == 'arearesource') {
+
+        }
+      }
+    }
+</script>
+<style scoped>
+  #app {
+    width: 100%;
+    height: auto;
+    background-color: #fff;
+    margin: 0 auto;
+  }
+</style>

TEAMModelOS.TeachZone/ClientApp/router/routes.js

@@ -10,6 +10,7 @@ import NoticeDetail from '@/view/noticeDetail'
 import Source from '@/view/source'
 import TeachSource from '@/view/teachSource'
 import TeachSourceDetail from '@/view/teachSourceDetail'
+import Report from '@/view/report'
 import { resolve } from 'url';
 
 export const routes = [
@@ -58,4 +59,9 @@ export const routes = [
     path: '/teachSourceDetail',
     component: TeachSourceDetail
   },
+  {
+    name: 'report',
+    path: '/report',
+    component: Report
+  },
 ]

TEAMModelOS.TeachZone/ClientApp/view/report.vue

@@ -0,0 +1,559 @@
+<template>
+  <div class="report_container">
+    <Header></Header>
+    <Master></Master>
+    <div class="report_box bgf pad20">
+      <div class="header_basic">
+        <ul>
+          <li><Icon type="md-person" size="24" /><span class="name">姓名：</span><span class="name_content">张三</span></li>
+          <li><Icon type="md-bookmarks" size="24" /><span class="name">学号：</span><span class="name_content">201901001</span></li>
+          <li><Icon type="ios-clipboard" size="24" /><span class="name">班级：</span><span class="name_content">2019级五班</span></li>
+        </ul>
+        <br/>
+        <ul>
+          <li><span class="vice-name">本次考试名称：</span><span class="vice-name_content">2019 全市第一次联考</span></li>
+          <li><span class="vice-name">考试类型：</span><span class="vice-name_content">区级联考</span></li>
+          <li><span class="vice-name">考试总分：</span><span class="vice-name_content">460</span></li>
+          <li><span class="vice-name">学习稳定系数：</span><span class="vice-name_content">0.6</span></li>
+        </ul>
+      </div>
+      <div class="chooseexam">
+        <div class="exam">
+          <span>考试选择:</span>
+          <Select v-model="model1" style="width:200px">
+            <Option v-for="item in cityList" :value="item.value" :key="item.value">{{ item.label }}</Option>
+          </Select>
+        </div>
+        <div class="subjects">
+          <span>科目:</span>
+          <Select v-model="model2" style="width:200px">
+            <Option v-for="itemc in cityList1" :value="itemc.value" :key="itemc.value">{{ itemc.label }}</Option>
+          </Select>
+        </div>
+      </div>
+      <div class="summarize">
+        <p class="summarize_header_title">总结：</p>
+        <div class="summarize_content">
+          <p class="content_header">同学，你好</p>
+          <p class="content_text">您在本次<span class="exam_color">2019 全市第一次联考</span>中，当前科目 数学分数为<span class="number_color">460</span>考试范围为：1-4章节。</p>
+          <p class="content_text">您在 <span class="dot1">知识点1、知识点2、知识点3</span> 处的题目都表现出色，全部都答对了。</p>
+          <p class="content_text">您在 <span class="dot2">知识点3、知识点4、知识点6 </span> 处的题目有待加强，部分答对了，其中<span class="dot3">知识点3-XXXX，知识点4-XXXX，知识点6-XXX</span> 需加强练习或复习。</p>
+          <p class="content_text">您在<span class="dot4">知识点7、知识点8、知识点9 </span> 处的题目表现较差，都答错了。建议将答错试题请教老师，重新学习知识点内容，也可进入补救题库，进行补救。</p>
+        </div>
+      </div>
+      <div class="trend">
+        <p>成绩分析趋势</p>
+        <div id="zhexian" style="width:100%; height:400px;"></div>
+      </div>
+      <div class="structure">
+        <p>知识点分数占比</p>
+        <div id="zhishidian" style="width:100%; height:400px;"></div>
+      </div>
+      <div class="structure_details">
+        <Table :columns="columns1" :data="data1"></Table>
+      </div>
+    </div>
+    <Footer></Footer>
+  </div>
+</template>
+<script>
+  import Header from '@/common/header.vue'
+  import Master from '@/common/master.vue'
+  import Footer from '@/common/footer.vue'
+  export default {
+    components: {
+      Header,
+      Master,
+      Footer
+    },
+    data() {
+      return {
+        cityList: [
+          {
+            value: '2019 全市第一次联考',
+            label: '2019 全市第一次联考'
+          },
+          {
+            value: '2019 全市第二次联考',
+            label: '2019 全市第二次联考'
+          },
+          {
+            value: '2019 全市第三次联考',
+            label: '2019 全市第三次联考'
+          },
+          {
+            value: '2019 全市第四次联考',
+            label: '2019 全市第四次联考'
+          },
+        ],
+        model1: '2019 全市第一次联考',
+        cityList1: [
+          {
+            value: '语文',
+            label: '语文'
+          },
+          {
+            value: '数学',
+            label: '数学'
+          },
+          {
+            value: '英语',
+            label: '英语'
+          },
+          {
+            value: '物理',
+            label: '物理'
+          },
+        ],
+        model2: '语文',
+        columns1: [
+          {
+            title: '知识点名称',
+            key: 'name'
+          },
+          {
+            title: '掌握情况',
+            key: 'master'
+          },
+          {
+            title: '难度系数',
+            key: 'difficulty'
+          },
+          {
+            title: '配分',
+            key: 'score'
+          },
+          {
+            title: '相关题目数',
+            key: 'topic'
+          },
+          {
+            title: '答对率',
+            key: 'accuracy'
+          },
+        ],
+        data1: [
+          {
+            name: '知识点1',
+            master: '一般',
+            difficulty: 0.6,
+            score: 20,
+            topic: '3/5',
+            accuracy: '60%',
+            className: 'demo-table-info-column'
+          },
+          {
+            name: '知识点2',
+            master: '良好',
+            difficulty: 0.4,
+            score: 25,
+            topic: '4/5',
+            accuracy: '80%'
+          },
+          {
+            name: '知识点3',
+            master: '差',
+            difficulty: 0.5,
+            score: 15,
+            topic: '0/3',
+            accuracy: '0%'
+          },
+          {
+            name: '知识点4',
+            master: '差',
+            difficulty: 0.7,
+            score: 10,
+            topic: '0/2',
+            accuracy: '0%'
+          },
+          {
+            name: '知识点5',
+            master: '优秀',
+            difficulty: 0.6,
+            score: 30,
+            topic: '4/4',
+            accuracy: '100%'
+          },
+        ]
+      }
+    },
+    mounted() {
+      this.drawLine();
+      this.graph();
+    },
+    methods: {
+      drawLine() {
+        let myChart = this.$echarts.init(document.getElementById('zhexian'));
+        var xData = function () {
+          var data = [];
+          for (var i = 1; i < 15; i++) {
+            data.push(i + "");
+          }
+          return data;
+        }();
+        myChart.setOption({
+          backgroundColor: "#344b58",
+          "tooltip": {
+            "trigger": "axis",
+            "axisPointer": {
+              "type": "shadow",
+              textStyle: {
+                color: "#fff"
+              }
+
+            },
+          },
+          "grid": {
+            "borderWidth": 0,
+            "top": 100,
+            "bottom": 35,
+            "right":30,
+            textStyle: {
+              color: "#fff"
+            }
+          },
+          "legend": {
+            x: '4%',
+            top: '11%',
+            textStyle: {
+              color: '#90979c',
+            },
+            "data": ['成绩', '趋势']
+          },
+
+
+          "calculable": true,
+          "xAxis": [{
+            "type": "category",
+            "axisLine": {
+              lineStyle: {
+                color: '#90979c'
+              }
+            },
+            "splitLine": {
+              "show": false
+            },
+            "axisTick": {
+              "show": false
+            },
+            "splitArea": {
+              "show": false
+            },
+            "axisLabel": {
+              "interval": 0,
+
+            },
+            "data": ["2019 全市第一次联考", "2019 全市第二次联考", "2019 全市第三次联考","2019 全市第四次联考","2019 全市第五次联考"],
+          }],
+          "yAxis": [{
+            "type": "value",
+            "splitLine": {
+              "show": false
+            },
+            "axisLine": {
+              lineStyle: {
+                color: '#90979c'
+              }
+            },
+            "axisTick": {
+              "show": false
+            },
+            "axisLabel": {
+              "interval": 0,
+
+            },
+            "splitArea": {
+              "show": false
+            },
+
+          }],
+          "series": [{
+            "name": "成绩",
+            "type": "bar",
+            "stack": "总量",
+            "barMaxWidth": 35,
+            "barGap": "10%",
+            "itemStyle": {
+              "normal": {
+                "color": "rgba(255,144,128,1)",
+                "label": {
+                  "show": true,
+                  "textStyle": {
+                    "color": "#fff"
+                  },
+                  "position": "insideTop",
+                  formatter: function (p) {
+                    return p.value > 0 ? (p.value) : '';
+                  }
+                }
+              }
+            },
+            "data": [76,83,93,90,68,83],
+          },
+          {
+            "name": "趋势",
+            "type": "line",
+            "stack": "总量",
+            symbolSize: 20,
+            symbol: 'circle',
+            "itemStyle": {
+              "normal": {
+                "color": "rgba(252,230,48,1)",
+                "barBorderRadius": 0,
+                "label": {
+                  "show": true,
+                  "position": "top",
+                  formatter: function (p) {
+                    return p.value > 0 ? (p.value) : '';
+                  }
+                }
+              }
+            },
+            "data": [76, 83, 93, 90, 68, 83],
+          },
+          ]
+        })
+     },
+      graph() {
+        let myCharts = this.$echarts.init(document.getElementById('zhishidian'));
+        myCharts.setOption({
+          backgroundColor: "#344b58",
+          title: {
+            text: '知识点分数占比',
+            left: 'center',
+            top: 20,
+            textStyle: {
+              color: '#fff'
+            }
+          },
+
+          tooltip: {
+            trigger: 'item',
+            formatter: "{b} : {c} ({d}%)"
+          },
+
+          visualMap: {
+            show: false,
+            min: 0,
+            max: 100,
+            inRange: {
+              //colorLightness: [0, 1]
+            }
+          },
+          series: [{
+            name: '访问来源',
+            type: 'pie',
+            radius: '70%',
+            center: ['50%', '50%'],
+            color: ['rgb(131,249,103)', '#FBFE27', '#FE5050', '#1DB7E5'], //'#FBFE27','rgb(11,228,96)','#FE5050'
+            data: [{
+              value: 15,
+              name: '知识点1'
+            },
+            {
+              value: 20,
+              name: '知识点2'
+            },
+            {
+              value: 30,
+              name: '知识点3'
+            },
+            {
+              value: 35,
+              name: '知识点4'
+            }
+            ].sort(function (a, b) {
+              return a.value - b.value
+            }),
+            roseType: 'radius',
+            label: {
+              normal: {
+                formatter: ['{c|{c}分}', '{b|{b}}'].join('\n'),
+                rich: {
+                  c: {
+                    color: '#fff',
+                    fontSize: 20,
+                    fontWeight: 'bold',
+                    lineHeight: 5
+                  },
+                  b: {
+                    color: 'rgb(98,137,169)',
+                    fontSize: 15,
+                    height: 40
+                  },
+                },
+              }
+            },
+            labelLine: {
+              normal: {
+                lineStyle: {
+                  color: 'rgb(98,137,169)',
+                },
+                smooth: 0.2,
+                length: 10,
+                length2: 20,
+
+              }
+            },
+            itemStyle: {
+              normal: {
+                shadowColor: 'rgba(0, 0, 0, 0.8)',
+                shadowBlur: 50,
+              }
+            }
+          }]
+        })
+      },
+      rowClassName(row, index) {
+        if (index === 1) {
+          return 'demo-table-info-row';
+        } else if (index === 3) {
+          return 'demo-table-error-row';
+        }
+        return '';
+      }
+    }
+  }
+</script>
+<style>
+ .ivu-select-single .ivu-select-selection .ivu-select-selected-value {
+    border: 1px solid #d3d3d3 !important;
+    border-radius: 7px;
+  }
+  .ivu-table .demo-table-info-row td {
+    background-color: #2db7f5;
+    color: #fff;
+  }
+
+  .ivu-table .demo-table-error-row td {
+    background-color: #ff6600;
+    color: #fff;
+  }
+
+  .ivu-table td.demo-table-info-column {
+    background-color: #2db7f5;
+    color: #fff;
+  }
+
+  .ivu-table .demo-table-info-cell-name {
+    background-color: #2db7f5;
+    color: #fff;
+  }
+
+  .ivu-table .demo-table-info-cell-age {
+    background-color: #ff6600;
+    color: #fff;
+  }
+
+  .ivu-table .demo-table-info-cell-address {
+    background-color: #187;
+    color: #fff;
+  }
+</style>
+<style scoped>
+  .report_container {
+    width:100%;
+    height:auto;
+  }
+  .report_box {
+    width:1200px;
+    height:auto;
+    margin:0 auto;
+  }
+  .header_basic {
+    width:100%;
+    text-align:center;
+    border:1px solid #333;
+    margin-top:5px;
+  }
+    .header_basic ul {
+      display:inline-block;
+      margin-top:20px;
+    }
+      .header_basic ul li {
+        padding:3px 4px 2px 4px;
+        margin-left:20px;
+      }
+        .header_basic ul li i {
+          float: left;
+          margin-top: 4px;
+        }
+  .name {
+    font-size: 18px;
+    font-family: "微软雅黑";
+    
+  }
+  .name_content {
+    font-size: 20px;
+    font-family: "微软雅黑";
+  
+  }
+  .vice-name, .vice-name_content {
+    font-size: 16px;
+    font-family: "微软雅黑";
+  }
+  .chooseexam {
+    width:100%;
+    height:auto;
+    padding-top:1%;
+  }
+  .exam {
+    width:25%;
+    float:left;
+    padding-left:1%;
+  }
+  .summarize {
+    width: 96%;
+    margin: 2%;
+    border:1px solid #d3d3d3;
+    padding-bottom:10px;
+    padding-left:0.5%;
+    border-radius:8px;
+  }
+  .summarize_header_title {
+    font-size:22px;
+    padding-top:10px;
+  }
+  .summarize_content {
+    width:1000px;
+    height:auto;
+    margin:0 auto;
+  }
+    .summarize_content p {
+      padding-top:5px;
+    }
+    .content_header {
+      font-size: 16px;
+    }
+  .content_text {
+    font-size: 14px;
+  }
+    .content_text span {
+      font-size:16px;
+    }
+  .exam_color, .dot1 {
+    color: #FF6633;
+  }
+  .number_color, .dot4 {
+    color: #FF3366;
+  }
+  .dot2 {
+    color: #0099CC;
+  }
+  .dot3 {
+    color: #0000CC;
+  }
+  .trend, .structure {
+    width: 100%;
+    height: auto;
+    padding: 1.5%;
+  }
+    .trend p, .structure  p{
+      width: 100%;
+      font-size: 18px;
+    }
+  .structure_details {
+    width:100%;
+    padding:1%
+  }
+</style>