修改了首页

nuxt.config.js

@@ -90,7 +90,8 @@ module.exports = {
     { src: '~/plugins/global.js', ssr: true },
     { src: '~/plugins/editor.js', ssr: false },
     { src: '@/plugins/gallery.js', ssr: false },
-    { src: '@/plugins/ieCharts.js', ssr: false }
+    { src: '@/plugins/ieCharts.js', ssr: false },
+    { src: '@/plugins/fullcalendar.js', ssr: false }
   ],
 
   /*

package.json

@@ -16,10 +16,6 @@
     "precommit": "npm run lint"
   },
   "dependencies": {
-    "@fullcalendar/core": "^4.4.2",
-    "@fullcalendar/daygrid": "^4.4.2",
-    "@fullcalendar/interaction": "^4.4.2",
-    "@fullcalendar/vue": "^4.4.2",
     "@nuxtjs/axios": "^5.3.6",
     "@nuxtjs/dotenv": "^1.3.0",
     "@nuxtjs/pwa": "^2.6.0",
@@ -43,6 +39,7 @@
     "string": "^3.3.3",
     "validator": "^9.4.1",
     "vue-echarts-v3": "^2.0.1",
+    "vue-full-calendar": "^2.8.1-0",
     "vue-gallery-slideshow": "^1.3.1",
     "vue-quill-editor": "^3.0.6",
     "vue-runtime-helpers": "^1.1.2",
@@ -71,9 +68,9 @@
     "eslint-plugin-vue": "^5.2.2",
     "less": "~3.9.0",
     "less-loader": "^4.1.0",
-    "vue-style-loader": "3.1.2",
     "nodemon": "^1.18.9",
     "prettier": "1.14.3",
-    "uglifyjs-webpack-plugin": "^1.3.0"
+    "uglifyjs-webpack-plugin": "^1.3.0",
+    "vue-style-loader": "3.1.2"
   }
 }

pages/workbench/task-calendar/TaskCalendar.vue

@@ -33,23 +33,18 @@
       </div>
       <!--日历-->
       <div style="width: 100%;">
-        <FullCalendar
+        <full-calendar-vue
           ref="fullCalendar"
           :height="275"
-          :plugins="calendarPlugins"
           :header="false"
+          :config="config"
           :events="calendarEvents"
-          @dateClick="_handleDateClick"
-          @eventClick="_handleEventClick"
-          default-view="dayGridMonth"
-          locale="zh-cn"
-          event-order="order"
-        ></FullCalendar>
+        ></full-calendar-vue>
       </div>
     </Card>
     <TestTaskDetail ref="testTask"></TestTaskDetail>
     <ReportTaskDetail ref="reportTask"></ReportTaskDetail>
-    <TaskCalendarFullScreen ref="fullScreen"></TaskCalendarFullScreen>
+<!--    <TaskCalendarFullScreen ref="fullScreen"></TaskCalendarFullScreen>-->
 <!--    <component ref="refModal" :is="currentComponent"></component>-->
 <!--    <TestTaskDetail></TestTaskDetail>-->
 <!--    <ReportTaskDetail></ReportTaskDetail>-->
@@ -58,29 +53,35 @@
 </template>
 
 <script>
-import FullCalendar from '@fullcalendar/vue'
-import dayGridPlugin from '@fullcalendar/daygrid'
-import interactionPlugin from '@fullcalendar/interaction'
-import TaskCalendarFullScreen from './TaskCalendarFullScreen'
+// import FullCalendar from '@fullcalendar/vue'
+// import dayGridPlugin from '@fullcalendar/daygrid'
+// import interactionPlugin from '@fullcalendar/interaction'
+// import TaskCalendarFullScreen from './TaskCalendarFullScreen'
 import TestTaskDetail from './TestTaskDetail'
 import ReportTaskDetail from './ReportTaskDetail'
+import 'fullcalendar/dist/fullcalendar.css'
 
 export default {
   components: {
     TestTaskDetail,
-    ReportTaskDetail,
-    TaskCalendarFullScreen,
-    FullCalendar // make the <FullCalendar> tag available
+    ReportTaskDetail
+    // TaskCalendarFullScreen,
+    // FullCalendar // make the <FullCalendar> tag available
   },
   data() {
     return {
       currentComponent: '',
       currentDate: new Date(),
       calendarPlugins: [
-        // plugins must be defined in the JS
-        dayGridPlugin,
-        interactionPlugin // needed for dateClick
+        // // plugins must be defined in the JS
+        // dayGridPlugin,
+        // interactionPlugin // needed for dateClick
       ],
+      config: {
+        firstDay: '0',
+        locale: 'zh-cn',
+        defaultView: 'month'
+      },
       calendarHeader: {
         left: '',
         center: 'title',
@@ -164,6 +165,4 @@ export default {
 </script>
 
 <style lang='css' scoped>
-@import "~@fullcalendar/core/main.min.css";
-@import "~@fullcalendar/daygrid/main.min.css";
 </style>

pages/workbench/workbench.vue

@@ -32,7 +32,7 @@
             <taskFlow />
           </Col>
           <Col span="12" style="margin-bottom: 10px">
-<!--            <taskCalendar />-->
+            <taskCalendar />
           </Col>
           <Col span="12" style="margin-bottom: 10px">
             <UnfinishedContract></UnfinishedContract>
@@ -73,7 +73,7 @@ import messagePanel from './messagePanel'
 import toDoTask from './ToDoTask'
 import myTask from './MyTask'
 import taskFlow from './TaskFlow'
-// import taskCalendar from './task-calendar/TaskCalendar'
+import taskCalendar from './task-calendar/TaskCalendar'
 import UnfinishedContract from './UnfinishedContract'
 import UnfinishedItem from './UnfinishedItem'
 import YearContractNum from './YearContractNum'
@@ -91,7 +91,7 @@ export default {
     myTask,
     toDoTask,
     taskFlow,
-    // taskCalendar
+    taskCalendar,
     UnfinishedContract,
     UnfinishedItem,
     YearContractNum,

plugins/fullcalendar.js

+import Vue from 'vue'
+import { FullCalendar } from 'vue-full-calendar'
+
+Vue.component('FullCalendarVue', FullCalendar)