From a2441175073f8b09a7eff29effd7e3e617de2f7d Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期四, 06 六月 2024 18:23:01 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/views/console/base/CalenderTab.vue | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/views/console/base/CalenderTab.vue b/src/views/console/base/CalenderTab.vue
index 2d940fd..73ac210 100644
--- a/src/views/console/base/CalenderTab.vue
+++ b/src/views/console/base/CalenderTab.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-04 22:45:43
* @LastEditors: Sneed
- * @LastEditTime: 2024-05-05 21:14:09
+ * @LastEditTime: 2024-06-04 21:07:22
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/base/CalenderTab.vue
-->
<template>
@@ -90,6 +90,7 @@
this.selectInfo = {
...row
}
+ this.months = []
this.$HTTP.get(`/api/blade-cps/calendar/${row.id}`).then(res => {
if (res.code === 200) {
console.log(res.data)
@@ -149,6 +150,7 @@
arr.push(day.format('YYYY-MM-DD'))
}
})
+
for (let i = 0; i < 12; i++) {
this.months.push({
year: year,
@@ -164,8 +166,9 @@
{
highlight: true,
dates: data.calendarDayVOList.filter(item => {
- return moment(item).month() === i
- }),
+ console.log(moment(item).month(), '>>>123')
+ return moment(item.calendarDate).month() === i
+ }).map(v => v.calendarDate),
}
]
})
--
Gitblit v1.9.3