解决版本错误

TEAMModelOS.SmartClass/ClientApp/static/attachmentsList.json

@@ -7,8 +7,8 @@
     "list": [
       {
         "activityId": 40,
-        "activityName": "2019年柯桥区天天智慧课堂 5月份 优课评比",
-        "fileName": "柯桥区天天智慧课堂教学设计表.docx",
+        "activityName": "2019年高新区天天智慧课堂 5月份 优课评比",
+        "fileName": "高新区天天智慧课堂教学设计表.docx",
         "fileNameHash": "73.docx",
         "fileNameUri": "/upload/activity/attachment/73/73.docx?_=1557313944956",
         "fileSize": 21981,
@@ -24,8 +24,8 @@
       },
       {
         "activityId": 40,
-        "activityName": "2019年柯桥区天天智慧课堂 5月份 优课评比",
-        "fileName": "柯桥区天天智慧课堂教学反思表.docx",
+        "activityName": "2019年高新区天天智慧课堂 5月份 优课评比",
+        "fileName": "高新区天天智慧课堂教学反思表.docx",
         "fileNameHash": "74.docx",
         "fileNameUri": "/upload/activity/attachment/74/74.docx?_=1557313944957",
         "fileSize": 21772,
@@ -41,7 +41,7 @@
       },
       {
         "activityId": 40,
-        "activityName": "2019年柯桥区天天智慧课堂 5月份 优课评比",
+        "activityName": "2019年高新区天天智慧课堂 5月份 优课评比",
         "fileName": "天天智慧课堂课例封面（模版）.ppt",
         "fileNameHash": "75.ppt",
         "fileNameUri": "/upload/activity/attachment/75/75.ppt?_=1557313944957",
@@ -58,7 +58,7 @@
       },
       {
         "activityId": 40,
-        "activityName": "2019年柯桥区天天智慧课堂 5月份 优课评比",
+        "activityName": "2019年高新区天天智慧课堂 5月份 优课评比",
         "fileName": "天天智慧课堂评课封面（模版）.ppt",
         "fileNameHash": "76.ppt",
         "fileNameUri": "/upload/activity/attachment/76/76.ppt?_=1557313944957",
@@ -75,8 +75,8 @@
       },
       {
         "activityId": 40,
-        "activityName": "2019年柯桥区天天智慧课堂 5月份 优课评比",
-        "fileName": "柯桥区天天智慧课堂课例评选指标.xls",
+        "activityName": "2019年高新区天天智慧课堂 5月份 优课评比",
+        "fileName": "高新区天天智慧课堂课例评选指标.xls",
         "fileNameHash": "77.xls",
         "fileNameUri": "/upload/activity/attachment/77/77.xls?_=1557313944957",
         "fileSize": 27648,
@@ -92,8 +92,8 @@
       },
       {
         "activityId": 40,
-        "activityName": "2019年柯桥区天天智慧课堂 5月份 优课评比",
-        "fileName": "2019年柯桥区天天智慧课堂5月份排课安排表.docx",
+        "activityName": "2019年高新区天天智慧课堂 5月份 优课评比",
+        "fileName": "2019年高新区天天智慧课堂5月份排课安排表.docx",
         "fileNameHash": "78.docx",
         "fileNameUri": "/upload/activity/attachment/78/78.docx?_=1557313944957",
         "fileSize": 25472,

TEAMModelOS.SmartClass/ClientApp/static/lessonDetails.json

@@ -29,7 +29,7 @@
     "liveRtmp": "rtmp://jpkt.sxedu.org:1935/hls/13CA5E3AD6DB4DF5865839BB47C134F8",
     "name": "创新实验室（学科教室）课例20180518直播",
     "notice": "<br>",
-    "ownUnit": "柯桥区教师发展中心",
+    "ownUnit": "高新区教师发展中心",
     "parentCategoryId": 24,
     "parentCategoryName": "创客",
     "parentGradeId": 13,
@@ -42,7 +42,7 @@
     "parentTeachePlateName": "冠啸创新实验室",
     "reviewContent": "本次直播总点击量： 68 评论数： 44 今日直播只推PC端，采用移动录播设备直播，直播视频推送画面清晰，播放过程流畅无锯齿拖影，声音干净。上课学校设备保障充分，教师教学过程实施完整。直播过程网络通畅，没有出现画面中断停顿现象。",
     "school": null,
-    "schoolName": "绍兴市柯桥区钱清中学",
+    "schoolName": "成都市高新区钱清中学",
     "schoolNo": "11AFC704D0A5FE66E050A8C027277C89",
     "score": 87.67,
     "speaker": "胡建良",
@@ -73,71 +73,71 @@
   "comments": [
     {
       "commentCount": 30,
-      "school": "绍兴市柯桥区钱清中学",
-      "schoolName": "绍兴市柯桥区钱清中学",
+      "school": "成都高新区西芯小学",
+      "schoolName": "成都高新区西芯小学",
       "schoolNo": "11AFC704D0A5FE66E050A8C027277C89",
       "viewCount": 0
     },
     {
       "commentCount": 5,
-      "school": "绍兴市柯桥区平水镇中学",
-      "schoolName": "绍兴市柯桥区平水镇中学",
+      "school": "四川省成都高新区实验小",
+      "schoolName": "四川省成都高新区实验小",
       "schoolNo": "3133005946",
       "viewCount": 0
     },
     {
       "commentCount": 5,
-      "school": "绍兴市柯桥区齐贤镇中心小学陶里校区",
-      "schoolName": "绍兴市柯桥区齐贤中心小学陶里校区",
+      "school": "成都市高新区齐贤镇中心小学陶里校区",
+      "schoolName": "成都市高新区齐贤中心小学陶里校区",
       "schoolNo": "2133006421",
       "viewCount": 0
     },
     {
       "commentCount": 3,
-      "school": "绍兴市柯桥区齐贤镇中学",
-      "schoolName": "绍兴市柯桥区齐贤中学",
+      "school": "成都市高新区齐贤镇中学",
+      "schoolName": "成都市高新区齐贤中学",
       "schoolNo": "3133005938",
       "viewCount": 0
     },
     {
       "commentCount": 1,
-      "school": "绍兴市柯桥区华舍中学",
-      "schoolName": "绍兴市柯桥区华舍中学",
+      "school": "成都市高新区华舍中学",
+      "schoolName": "成都市高新区华舍中学",
       "schoolNo": "3133005958",
       "viewCount": 0
     },
     {
       "commentCount": 1,
-      "school": "绍兴市柯桥区中国轻纺城第二小学",
-      "schoolName": "绍兴市柯桥区中国轻纺城第二小学",
+      "school": "成都市高新区中国轻纺城第二小学",
+      "schoolName": "成都市高新区中国轻纺城第二小学",
       "schoolNo": "2133006477",
       "viewCount": 0
     },
     {
       "commentCount": 1,
-      "school": "绍兴市柯桥区杨汛桥镇中学",
-      "schoolName": "绍兴市柯桥区杨汛桥镇中学",
+      "school": "成都市高新区杨汛桥镇中学",
+      "schoolName": "成都市高新区杨汛桥镇中学",
       "schoolNo": "3133005949",
       "viewCount": 0
     },
     {
       "commentCount": 1,
-      "school": "绍兴市柯桥区夏履镇中心小学",
-      "schoolName": "绍兴市柯桥区夏履镇中心小学",
+      "school": "成都市高新区夏履镇中心小学",
+      "schoolName": "成都市高新区夏履镇中心小学",
       "schoolNo": "2133006432",
       "viewCount": 0
     },
     {
       "commentCount": 1,
-      "school": "绍兴市柯桥区越崎中学",
-      "schoolName": "绍兴市柯桥区越崎中学",
+      "school": "成都市高新区越崎中学",
+      "schoolName": "成都市高新区越崎中学",
       "schoolNo": "3433005812",
       "viewCount": 0
     },
     {
       "commentCount": 1,
-      "school": "绍兴市柯桥区齐贤镇中心小学",
-      "schoolName": "绍兴市柯桥区齐贤中心小学",
+      "school": "成都市高新区齐贤镇中心小学",
+      "schoolName": "成都市高新区齐贤中心小学",
       "schoolNo": "2133006415",
       "viewCount": 0
     }
@@ -216,80 +216,80 @@
   "views": [
     {
       "liveCount": 28,
-      "school": "绍兴市柯桥区钱清中学",
-      "schoolName": "绍兴市柯桥区钱清中学",
+      "school": "成都市高新区钱清中学",
+      "schoolName": "成都市高新区钱清中学",
       "schoolNo": "11AFC704D0A5FE66E050A8C027277C89",
       "videoCount": 5,
       "viewCount": 33
     },
     {
       "liveCount": 25,
-      "school": "绍兴市柯桥区平水镇中学",
-      "schoolName": "绍兴市柯桥区平水镇中学",
+      "school": "成都市高新区平水镇中学",
+      "schoolName": "成都市高新区平水镇中学",
       "schoolNo": "3133005946",
       "videoCount": 0,
       "viewCount": 25
     },
     {
       "liveCount": 1,
-      "school": "柯桥区教师发展中心",
-      "schoolName": "柯桥区教师发展中心",
+      "school": "高新区教师发展中心",
+      "schoolName": "高新区教师发展中心",
       "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
       "videoCount": 6,
       "viewCount": 7
     },
     {
       "liveCount": 5,
-      "school": "绍兴市柯桥区齐贤镇中学",
-      "schoolName": "绍兴市柯桥区齐贤中学",
+      "school": "成都市高新区齐贤镇中学",
+      "schoolName": "成都市高新区齐贤中学",
       "schoolNo": "3133005938",
       "videoCount": 0,
       "viewCount": 5
     },
     {
       "liveCount": 3,
-      "school": "绍兴市柯桥区齐贤镇中心小学陶里校区",
-      "schoolName": "绍兴市柯桥区齐贤中心小学陶里校区",
+      "school": "成都市高新区齐贤镇中心小学陶里校区",
+      "schoolName": "成都市高新区齐贤中心小学陶里校区",
       "schoolNo": "2133006421",
       "videoCount": 2,
       "viewCount": 5
     },
     {
       "liveCount": 0,
-      "school": "绍兴市柯桥区钱清镇中学",
-      "schoolName": "绍兴市柯桥区钱清镇中学",
+      "school": "成都市高新区钱清镇中学",
+      "schoolName": "成都市高新区钱清镇中学",
       "schoolNo": "3133005936",
       "videoCount": 4,
       "viewCount": 4
     },
     {
       "liveCount": 0,
-      "school": "绍兴市柯桥区齐贤镇中心小学",
-      "schoolName": "绍兴市柯桥区齐贤中心小学",
+      "school": "成都市高新区齐贤镇中心小学",
+      "schoolName": "成都市高新区齐贤中心小学",
       "schoolNo": "2133006415",
       "videoCount": 3,
       "viewCount": 3
     },
     {
       "liveCount": 0,
-      "school": "绍兴市柯桥区越崎中学",
-      "schoolName": "绍兴市柯桥区越崎中学",
+      "school": "成都市高新区越崎中学",
+      "schoolName": "成都市高新区越崎中学",
       "schoolNo": "3433005812",
       "videoCount": 2,
       "viewCount": 2
     },
     {
       "liveCount": 0,
-      "school": "绍兴市柯桥区华甫中学",
-      "schoolName": "绍兴市柯桥区华甫中学",
+      "school": "成都市高新区华甫中学",
+      "schoolName": "成都市高新区华甫中学",
       "schoolNo": "3133005928",
       "videoCount": 1,
       "viewCount": 1
     },
     {
       "liveCount": 1,
-      "school": "绍兴市柯桥区秋瑾小学金三角校区",
-      "schoolName": "绍兴市柯桥区秋瑾小学金三角校区",
+      "school": "成都市高新区秋瑾小学金三角校区",
+      "schoolName": "成都市高新区秋瑾小学金三角校区",
       "schoolNo": "2133006434",
       "videoCount": 0,
       "viewCount": 1
@@ -319,7 +319,7 @@
         "year": 119
       },
       "school": null,
-      "schoolName": "柯桥区教师发展中心",
+      "schoolName": "高新区教师发展中心",
       "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
       "score": null,
       "viewActivityActivityStatus": 2,
@@ -340,7 +340,7 @@
         "year": 118
       },
       "viewActivityId": 351,
-      "viewActivityName": "2018年柯桥区天天智慧课堂十佳优质课展示",
+      "viewActivityName": "2018年高新区天天智慧课堂十佳优质课展示",
       "viewActivitySpeaker": "喻远鑫",
       "viewActivityStartTime": {
         "date": 13,
@@ -379,7 +379,7 @@
         "year": 119
       },
       "school": null,
-      "schoolName": "柯桥区教师发展中心",
+      "schoolName": "高新区教师发展中心",
       "schoolNo": "11AFC704CA3EFE66E050A8C027277C89",
       "score": null,
       "viewActivityActivityStatus": 2,
@@ -400,7 +400,7 @@
         "year": 118
       },
       "viewActivityId": 351,
-      "viewActivityName": "2018年柯桥区天天智慧课堂十佳优质课展示",
+      "viewActivityName": "2018年高新区天天智慧课堂十佳优质课展示",
       "viewActivitySpeaker": "喻远鑫",
       "viewActivityStartTime": {
         "date": 13,

TEAMModelOS.SmartClass/ClientApp/static/rewardList.json

@@ -15,8 +15,8 @@
         "categoryName": "语文",
         "employeeName": "喻远鑫",
         "employeeNo": "298380",
-        "employeeSchool": "湖塘中学",
-        "employeeSchoolName": "绍兴市柯桥区湖塘中学",
+        "employeeSchool": "成都高新区金苹果公学",
+        "employeeSchoolName": "成都高新区金苹果公学",
         "employeeSchoolNo": "3133005945",
         "gradeId": 12,
         "gradeName": "九年级",
@@ -33,8 +33,8 @@
         "categoryName": "语文",
         "employeeName": "林丽",
         "employeeNo": "34181",
-        "employeeSchool": "柯桥小学",
-        "employeeSchoolName": "绍兴市柯桥区柯桥小学",
+        "employeeSchool": "成都高新区西芯小学",
+        "employeeSchoolName": "成都高新区西芯小学",
         "employeeSchoolNo": "2133006474",
         "gradeId": 9,
         "gradeName": "六年级",
@@ -51,8 +51,8 @@
         "categoryName": "化学",
         "employeeName": "徐益敏",
         "employeeNo": "shixun_xym235782",
-        "employeeSchool": "西藏民族中学",
-        "employeeSchoolName": "绍兴市柯桥区西藏民族中学",
+        "employeeSchool": "四川省成都高新区实验小学",
+        "employeeSchoolName": "四川省成都高新区实验小学",
         "employeeSchoolNo": "3133005932",
         "gradeId": 12,
         "gradeName": "九年级",
@@ -69,8 +69,8 @@
         "categoryName": "科学",
         "employeeName": "王利芳",
         "employeeNo": "37878",
-        "employeeSchool": "夏履镇中学",
-        "employeeSchoolName": "绍兴市柯桥区夏履镇中学",
+        "employeeSchool": "成都高新区芳草小学",
+        "employeeSchoolName": "成都高新区芳草小学",
         "employeeSchoolNo": "3133005940",
         "gradeId": 11,
         "gradeName": "八年级",
@@ -87,8 +87,8 @@
         "categoryName": "科学",
         "employeeName": "徐飞",
         "employeeNo": "138828",
-        "employeeSchool": "柯岩中学",
-        "employeeSchoolName": "绍兴市柯桥区柯岩中学",
+        "employeeSchool": "成都高新区锦城小学",
+        "employeeSchoolName": "成都高新区锦城小学",
         "employeeSchoolNo": "3133005935",
         "gradeId": 10,
         "gradeName": "七年级",
@@ -105,8 +105,8 @@
         "categoryName": "英语",
         "employeeName": "章晓瑛",
         "employeeNo": "134567",
-        "employeeSchool": "柯桥区秋瑾小学",
-        "employeeSchoolName": "绍兴市柯桥区秋瑾小学金三角校区",
+        "employeeSchool": "成都高新区锦晖小学",
+        "employeeSchoolName": "成都高新区锦晖小学",
         "employeeSchoolNo": "2133006434",
         "gradeId": 9,
         "gradeName": "六年级",
@@ -123,8 +123,8 @@
         "categoryName": "英语",
         "employeeName": "王超",
         "employeeNo": "702091",
-        "employeeSchool": "王坛镇中心小学",
-        "employeeSchoolName": "绍兴市柯桥区王坛镇中心小学",
+        "employeeSchool": "成都高新区中和小学",
+        "employeeSchoolName": "成都高新区中和小学",
         "employeeSchoolNo": "2133006457",
         "gradeId": 8,
         "gradeName": "五年级",
@@ -141,8 +141,8 @@
         "categoryName": "数学",
         "employeeName": "倪丽红",
         "employeeNo": "653800",
-        "employeeSchool": "齐贤中学",
-        "employeeSchoolName": "绍兴市柯桥区齐贤中学",
+        "employeeSchool": "成都高新区庆安小学",
+        "employeeSchoolName": "成都高新区庆安小学",
         "employeeSchoolNo": "3133005938",
         "gradeId": 10,
         "gradeName": "七年级",
@@ -159,8 +159,8 @@
         "categoryName": "历史与社会",
         "employeeName": "张圣凯",
         "employeeNo": "shixun_zsk060031",
-        "employeeSchool": "柯桥区稽东镇中学",
-        "employeeSchoolName": "绍兴市柯桥区稽东镇中学",
+        "employeeSchool": "成都高新区益州小学学",
+        "employeeSchoolName": "成都高新区益州小学",
         "employeeSchoolNo": "3133005937",
         "gradeId": 11,
         "gradeName": "八年级",
@@ -177,8 +177,8 @@
         "categoryName": "语文",
         "employeeName": "沈若芬",
         "employeeNo": "31994",
-        "employeeSchool": "柯桥区稽东镇中心小学",
-        "employeeSchoolName": "绍兴市柯桥区稽东镇中心小学",
+        "employeeSchool": "成都高新区益民学校",
+        "employeeSchoolName": "成都高新区益民学校",
         "employeeSchoolNo": "2133006478",
         "gradeId": 9,
         "gradeName": "六年级",

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

@@ -12,7 +12,7 @@
             <div class="activity-brief-title">
               <span>2019年柯桥区天天智慧课堂 5月份 优课评比 </span>
               <span class="status" style="background: rgb(19, 206, 102);">筹备阶段</span>
-              <Button type="primary" size="large">参加活动</Button>
+              <!--<Button type="primary" size="large">参加活动</Button>-->
             </div>
             <div class="activity-brief-info center-row">
               <div class="brief-info-left">

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

@@ -16,23 +16,30 @@
           <Button size="large">返回今天</Button>
         </div>
       </div>
-      <full-calendar :config="config"
-                     :events="fcEvents"
-                     ref="calendar"
-                     @dayClick="getDay">
-      </full-calendar>
+
+
+      <Tooltip :content="eventContent" placement="right" transfer max-width="300px">
+        <full-calendar :config="config"
+                       :events="fcEvents"
+                       ref="calendar"
+                       @dayClick="getDay">
+        </full-calendar>
+      </Tooltip>
+      <br><br>
     </div>
   </div>
 </template>
 <script>
-  import { FullCalendar }  from 'vue-full-calendar'
+  import { FullCalendar } from 'vue-full-calendar'
   import 'fullcalendar/dist/fullcalendar.css'
   export default {
     components: {
       FullCalendar
     },
     data() {
+      const self = this;
       return {
+        eventContent: "",
         yearDefault: '2019年',
         years: [
           "2012年",
@@ -63,9 +70,8 @@
           '11月',
           '12月',
         ],
-        _this:null,
-        fcEvents: [
-        ],
+        _this: null,
+        fcEvents: [],
         config: {
           firstDay: '7',//以周日为每周的第一天
           // weekends: true,//是否在日历中显示周末
@@ -75,7 +81,7 @@
           fixedWeekCount: false,//是否固定显示六周
           // weekMode:"liquid",//周数不定，每周的高度可变，整个日历高度不变
           allDaySlot: false,
-          eventLimit: 7,
+          eventLimit: 1,
           // allDay:true,
           header: {//表头信息
             left: 'prev, next, today',
@@ -83,38 +89,29 @@
             right: 'hide, custom'
           },
           dayClick: function getDay(day, jsEvent) {
-              alert(day);
-              console.log(day);
-              console.log(jsEvent);
+            console.log(day);
+            console.log(jsEvent);
           },
-          eventClick:(day, jsEvent)=> {
-            this.$router.push(
-              {
-                path: 'lessonDetails'
-              }
-            );
+          eventClick: (day, jsEvent) => {
+            this.$router.push({ path: 'lessonDetails' });
           },
-          //eventMouseover: function getDay(day, jsEvent) {
-          //  console.log(jsEvent);
-          //  console.log(day);
-          //},
-
-         },
-
+          eventMouseover: function (event, jsEvent, view) {
+            self.eventContent = event.title;
+          },
+        },
         lessonList: []
       }
     },
+
     methods: {
-      getDay(day, jsEvent) {
-        alert(day);
-        console.log(day);
-        console.log(jsEvent);
-      }
+      getDay(event, jsEvent, view) {
+      },
     },
     mounted() {
       this._this = this;
       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) + '-';
@@ -123,70 +120,91 @@
         let eY = edate.getFullYear() + '-';
         let eM = (edate.getMonth() + 1 < 10 ? '0' + (edate.getMonth() + 1) : edate.getMonth() + 1) + '-';
         let eD = edate.getDate() + ' ';
-        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
-        });
+
+        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);
+        }
       }
-      console.log(this.lessonList);
     }
   }
 </script>
-<style scoped>
+<style>
   html, body, #app {
     height: 100% !important;
     user-select: none;
   }
-  
+
   .main-content {
-    background:rgb(248,248,248) !important;
+    background: rgb(248,248,248) !important;
   }
+
   .container {
     width: 1200px;
     margin: 100px auto;
-    display:flex;
-    flex-direction:row;
-    justify-content:space-between;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
   }
+
   .review-main {
-    background:#fff;
-    width:100%;
-    padding:10px 25px;
+    background: #fff;
+    width: 100%;
+    padding: 10px 25px;
   }
-    .review-main /deep/ .full-calendar-header {
-      display:none;
+
+    .review-main  .full-calendar-header {
+      display: none;
     }
-    .review-main /deep/ .comp-full-calendar {
-      padding:0px;
-      max-width:1200px;
+
+    .review-main  .comp-full-calendar {
+      padding: 0px;
+      max-width: 1200px;
     }
-    .review-main /deep/ .weeks {
+
+    .review-main  .weeks {
       background: -webkit-linear-gradient(#E1E7EC, #B9C6D1); /* Safari 5.1 - 6.0 */
       background: -o-linear-gradient(#E1E7EC, #B9C6D1); /* Opera 11.1 - 12.0 */
       background: -moz-linear-gradient(#E1E7EC, #B9C6D1); /* Firefox 3.6 - 15 */
@@ -194,39 +212,60 @@
       height: 40px;
       line-height: 40px;
     }
-    .review-main /deep/ .full-calendar-body .dates .week-row .day-cell.today {
-      background:#dfe6ec;
+
+    .review-main  .full-calendar-body .dates .week-row .day-cell.today {
+      background: #dfe6ec;
     }
-    .review-main /deep/ .week-row > .not-cur-month {
+
+    .review-main  .week-row > .not-cur-month {
       background: linear-gradient( -45deg, #ecf0f4 25%, #ffffff 0, #ffffff 50%, #ecf0f4 0, #ecf0f4 75%, #ffffff 0 ); /* 标准的语法（必须放在最后） */
       background-size: 20px 20px;
     }
-    .review-main /deep/ .week-row {
-      height:140px;
+
+    .review-main  .week-row {
+      height: 140px;
     }
-    .review-main /deep/ .events-week {
-      height:140px;
+
+    .review-main  .events-week {
+      height: 140px;
     }
-    .review-main /deep/ .full-calendar-body .dates .dates-events .events-week .events-day .event-box .event-item {
-      background:none;
-      height:15px;
+
+    .review-main  .full-calendar-body .dates .dates-events .events-week .events-day .event-box .event-item {
+      background: none;
+      height: 15px;
     }
-    /*.review-main /deep/ .full-calendar-body .dates .dates-events .events-week .events-day .event-box .more-link {
+    /*.review-main  .full-calendar-body .dates .dates-events .events-week .events-day .event-box .more-link {
       display:none;
     }*/
-    .review-main /deep/ .fc-event, .fc-event:hover {
-      color:black;
+    .review-main  .fc-event, .fc-event:hover {
+      color: black;
     }
-    .review-main /deep/ .fc-day-grid-event .fc-time{
-      display:none;
+
+    .review-main  .fc-day-grid-event .fc-time {
+      display: none;
+    }
+
+    .review-main  .fc-event, .fc-event-dot {
+      background: none;
+    }
+
+    .review-main  .fc-event {
+      border: none;
     }
-    .review-main /deep/ .fc-event, .fc-event-dot {
-      background:none;
+
+    .review-main  .fc-content {
+      padding-left: 5px;
     }
-    .review-main /deep/ .fc-event {
-      border:none;
+
+    .review-main  .fc-title {
+      width: 140px;
+      display: block;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
-    .review-main /deep/ .fc-day-header {
+
+    .review-main  .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 */
       background: -moz-linear-gradient(#E1E7EC, #B9C6D1); /* Firefox 3.6 - 15 */
@@ -234,20 +273,23 @@
       height: 40px;
       line-height: 40px;
     }
-    .review-main /deep/ .fc-other-month {
+
+    .review-main  .fc-other-month {
       background: linear-gradient( -45deg, #ecf0f4 25%, #ffffff 0, #ffffff 50%, #ecf0f4 0, #ecf0f4 75%, #ffffff 0 ); /* 标准的语法（必须放在最后） */
       background-size: 20px 20px;
     }
-    .review-main /deep/ .fc-left {
-      float:right;
+
+    .review-main  .fc-left {
+      float: right;
     }
-    .review-main /deep/ .fc-widget-content:hover {
-      background:#eee;
+
+    .review-main  .fc-widget-content:hover {
+      /*background:#eee;*/
     }
-   .condition-wrap {
-    display:flex;
-    flex-direction:row;
-    justify-content : space-between;
-  }
 
+  .condition-wrap {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+  }
 </style>

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

@@ -100,11 +100,11 @@
     },
     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() {
@@ -112,7 +112,7 @@
         this.$eventBus.$emit("activeIndex", 1);
       },
       goActivity() {
-        this.$router.push('/reviewActivity');
+        this.$router.push('reviewActivity');
         this.$eventBus.$emit("activeIndex", 2);
       }