|
@@ -212,12 +212,12 @@ async function getEventList (){
|
|
|
let planDates = ref([])
|
|
|
//获取有日程的日期
|
|
|
function getPlanDates({CalendarList,RsMattersList}){
|
|
|
- const calendarDay = CalendarList.map(item=>{
|
|
|
+ const calendarDay = CalendarList?CalendarList.map(item=>{
|
|
|
return [item.StartDate,item.EndDate]
|
|
|
- })
|
|
|
- const MatterDay = RsMattersList.map(item=>{
|
|
|
+ }):[]
|
|
|
+ const MatterDay = RsMattersList?RsMattersList.map(item=>{
|
|
|
return [item.StartDate,item.EndDate]
|
|
|
- })
|
|
|
+ }):[]
|
|
|
planDates.value = [...calendarDay.flat(),...MatterDay.flat()]
|
|
|
planDates.value = Array.from(new Set(planDates.value))
|
|
|
console.log('arr',planDates.value)
|