Browse Source

日历插件

psycho 6 năm trước cách đây
mục cha
commit
ee94576e4b

+ 4 - 2
TEAMModelOS.SmartClass/ClientApp/view/app.vue

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

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

@@ -119,7 +119,7 @@
     }
   }
 </script>
-<style>
+<style scoped>
   .video-page {
     width: 1200px;
     margin: 100px auto;

+ 27 - 10
TEAMModelOS.SmartClass/ClientApp/view/smart-class/LiveBroadcast.vue

@@ -24,7 +24,8 @@
                        ref="calendar"
                        @dayClick="getDay">
         </full-calendar>
-      </Tooltip><br><br>
+      </Tooltip>
+      <br><br>
     </div>
   </div>
 </template>
@@ -95,15 +96,9 @@
             this.$router.push( { path: 'lessonDetails' } );
           },
           eventMouseover: function (event, jsEvent, view) {
-            console.log(event);
-            console.log(event.start._i);
             self.eventContent = event.title;
-
-
           },
-
          },
-
         lessonList: []
       }
     },
@@ -116,6 +111,7 @@
       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) + '-';
@@ -145,12 +141,33 @@
           let newEvent = {
             title:  this.lessonList[i].name + ' \n\n 等多个活动',
             start: sY + sM + sD,
-            end: eY + eM + eD
+            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>
@@ -248,7 +265,7 @@
       float:right;
     }
     .review-main /deep/ .fc-widget-content:hover {
-      background:#eee;
+      /*background:#eee;*/
     }
    .condition-wrap {
     display:flex;

+ 2 - 5
TEAMModelOS.SmartClass/ClientApp/view/smart-class/MainPage.vue

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

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

@@ -131,7 +131,8 @@
     }
   }
 </script>
-<style>
+<style scoped>
+
   .video-page {
     width: 1200px;
     margin: 100px auto;

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

@@ -100,19 +100,19 @@
     },
     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);
       }
 

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