首页，添加日程弹窗

src/views/system/dashboard/components/util.js

@@ -178,8 +178,8 @@ export function buildComponent (name, column, preview, vm) {
             mounted () {
                 this.defaultForm = JSON.parse(JSON.stringify(this.quickNavform))
                 this.$nextTick(async () => {
-                    this.fetchData()
-                    this.handleDateClick({dateStr : this.$common.getDateNow()})
+                    await this.fetchData()
+
                     // this.scheduleData = await this.getScheduleData()
                 })
             },
@@ -218,6 +218,7 @@ export function buildComponent (name, column, preview, vm) {
                                 zhuangTai: i.emergencyState,
                                 color: this.colorStatus[Number(i.emergencyState) - 1]
                             }))
+                            this.handleDateClick({ dateStr: this.$common.getDateNow() })
                         }).catch(() => {
                             this.$message.error('获取日历日程失败！')
                         })
@@ -250,7 +251,7 @@ export function buildComponent (name, column, preview, vm) {
                         })
                     }
                 },
-                
+
                 // 过滤日程提醒数据
                 filterAlertData (data, dayNumber = 3) {
                     if (dayNumber <= 0) return
@@ -344,7 +345,7 @@ export function buildComponent (name, column, preview, vm) {
                     item.templateHtml = null
                     return item
                 },
-                isDateInRange(dateToCheck, startTime, endTime){
+                isDateInRange (dateToCheck, startTime, endTime) {
                     return dateToCheck >= startDate && dateToCheck <= endDate;
                 },
                 /**
@@ -353,7 +354,7 @@ export function buildComponent (name, column, preview, vm) {
                  * @returns
                  */
                 getFullCalendarConfig (data) {
-                    
+
                     const events = data === null ? [] : Utils.parseJSON(data)
                     // console.log('events', events, this.height)
                     const config = {
@@ -369,13 +370,13 @@ export function buildComponent (name, column, preview, vm) {
                             dayGridMonth: '月',
                             listMonth: '日程'
                         },
-                        dayHeaderContent: function(arg) {
+                        dayHeaderContent: function (arg) {
                             const weekdays = ['日', '一', '二', '三', '四', '五', '六'];
                             return { html: '<div>' + weekdays[arg.date.getDay()] + '</div>' };
                         },
-                        dayCellContent: function(arg) {
-                            const dayNumber = arg.date.getDate();
-                            return { html: dayNumber };
+                        dayCellContent: function (arg) {
+                            const dayNumber = arg.date.getDate()
+                            return { html: dayNumber }
                         },
                         dateClick: this.handleDateClick, // 日期点击
                         eventClick: this.handleEventClick,
@@ -393,42 +394,36 @@ export function buildComponent (name, column, preview, vm) {
                     return config
                 },
                 handleDateClick (param) {
-                    console.log('2222', param)
-                    // this.$emit(
-                    //     'open',
-                    //     'calendar',
-                    //     [param.dateStr, param.dateStr],
-                    //     this.data
-                    // )
-                    let arr = [{
+                    const arr = [{
                         title: '今日没有计划日程',
                         jieShuShiJian: param.dateStr,
                         start: param.dateStr,
                         current: param.dateStr,
                         zhuangTai: -1
                     }]
-                    
+
                     const status = ['急', '重', '轻', '缓']
                     const eventTrees = []
                     for (const i of this.data) {
                         // 根据指定日期A获取A在时间区间内的数据
-                        console.log(param.dateStr, i.start, i.jieShuShiJian)
-                        if ((this.compareDates(param.dateStr, i.start ) >= 0) && (this.compareDates(param.dateStr, i.jieShuShiJian ) <= 0)) {
+                        console.log('日程', param.dateStr, i.start, i.jieShuShiJian)
+                        if ((this.compareDates(param.dateStr, i.start) >= 0) && (this.compareDates(param.dateStr, i.jieShuShiJian) <= 0)) {
                             i.label = i.zhuangTai ? `【${status[Number(i.zhuangTai) - 1] ? status[Number(i.zhuangTai) - 1] : ''}】` + i.title : i.title
                             i.current = param.dateStr
                             eventTrees.push(i)
                         }
                     }
-                    if(eventTrees && eventTrees.length > 0){
+
+                    if (eventTrees && eventTrees.length > 0) {
                         this.eventTrees = eventTrees
-                    }else{
+                    } else {
                         this.eventTrees = arr
                     }
                 },
                 handleEventClick (param) {
                     // const dayEl = param.el.closest('.fc-day');
                     // const dateStr = dayEl?.getAttribute('data-date');
-                    
+
                     // console.log('事件所在单元格日期:', dateStr); // YYYY-MM-DD
 
                     // console.log('111',param.event)
@@ -443,11 +438,16 @@ export function buildComponent (name, column, preview, vm) {
                         }
                     }
                     this.eventTrees = eventTrees
-                    console.log('eventTrees', eventTrees)
                 },
 
-                handleNewEventClick(event) {
-                    if(event.zhuangTai == -1){
+                handleNewEventClick (event) {
+                    if (event.zhuangTai === -1) {
+                        this.$emit(
+                            'open',
+                            'calendar',
+                            [event.current, event.current],
+                            this.data
+                        )
                         return
                     }
                     this.$emit(
@@ -469,7 +469,7 @@ export function buildComponent (name, column, preview, vm) {
                     var time2 = new Date(date2).getTime()
                     return Math.sign(time1 - time2) // 使用Math.sign()函数返回值为 -1, 0, 1
                 },
-                
+
                 handleMoreLinkClick (date) {
                     // this.$emit(
                     //     'open',
@@ -531,9 +531,9 @@ export function buildComponent (name, column, preview, vm) {
                     const menuMap = {
                         myTraining: 'rygl/rypxx/wdpx',
                         myTesting: 'rygl/kszx/wdks',
-                        myDevices: 'sbgls/sbwh/wh', 
+                        myDevices: 'sbgls/sbwh/wh',
                         notice: 'xtgl/gg',
-                        myFacility: 'mjsshjgl/sshjjk/sshjkzzl',  
+                        myFacility: 'mjsshjgl/sshjjk/sshjkzzl',
                         quickNavigation: 'xtgl/systemManagement/kjdh',
                     }
                     if (menuMap[url]) {

src/views/system/dashboard/templates/scheduleAdd.vue

@@ -186,7 +186,6 @@ export default {
         visible: {
             handler: function (val, oldVal) {
                 this.calendarVisible = this.visible
-                console.log('22222222222222', this.props)
             },
             immediate: true
         },