Merge branch 'vb' of yinet2020/YinetOASystemWeb into master

src/layout/components/Sidebar/Logo.vue

@@ -6,7 +6,7 @@
         <h1 v-else class="sidebar-title" style="font-size: 15px !important;">{{ title }} </h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo">
+<!--        <img v-if="logo" :src="logo" class="sidebar-logo">-->
         <h1 class="sidebar-title" style="font-size: 15px !important;">{{ title }} </h1>
       </router-link>
     </transition>
@@ -27,7 +27,7 @@ export default {
   data() {
     return {
       title: '协同办公平台 ',
-      logo: null
+      logo: logoImg
     }
   }
 }

src/views/system/officework/schedule/schedule.vue

@@ -193,10 +193,15 @@
           eventClick:this.handleEventClick,
           locale:"zh",
           allDayDefault:false,
-          header:{
+          // header:{
+          //   left: 'prev,next today',
+          //   center: 'title',
+          //   right: 'month,agendaWeek,agendaDay,list'
+          // },
+          headerToolbar: {
             left: 'prev,next today',
             center: 'title',
-            right: 'month,agendaWeek,agendaDay,list'
+            right: 'dayGridMonth,timeGridWeek,timeGridDay'
           },
           buttonText: {
             today: '今天',
@@ -216,10 +221,10 @@
           timeGridPlugin,
           interactionPlugin ,
           listPlugin],
-        header:{
+        headerToolbar: {
           left: 'prev,next today',
           center: 'title',
-          right: 'month,agendaWeek,agendaDay,list'
+          right: 'dayGridMonth,timeGridWeek,timeGridDay'
         },
         buttonText: {
           today: '今天',