From 57453a63b0b7327311484303afd67203807264eb Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Mon, 18 Nov 2024 15:07:46 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E9=A2=86=E5=AF=BC=E6=97=A5=E7=A8=8B?=
=?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/Home/rcgl/RcglForm.vue | 15 +++------------
src/views/Home/rcgl/index.vue | 2 +-
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/src/views/Home/rcgl/RcglForm.vue b/src/views/Home/rcgl/RcglForm.vue
index 2fa1312..67815a2 100644
--- a/src/views/Home/rcgl/RcglForm.vue
+++ b/src/views/Home/rcgl/RcglForm.vue
@@ -13,7 +13,7 @@
-
+
-
-
-
@@ -107,7 +99,7 @@ const formData = ref({
title: undefined,
location: undefined,
videoLink: undefined,
- content: undefined,
+ content: "
",
date: undefined,
startTime: undefined,
endTime: undefined,
@@ -117,7 +109,6 @@ const formData = ref({
})
const formRules = reactive({
title: [{ required: true, message: '日程标题不能为空', trigger: 'blur' }],
- date: [{ required: true, message: '开始日期不能为空', trigger: 'blur' }],
startTime: [{ required: true, message: '日程开始时间不能为空', trigger: 'blur' }],
ispublic: [{ required: true, message: '日程是否公开不能为空', trigger: 'blur' }],
endTime: [{ required: true, message: '日程结束时间不能为空', trigger: 'blur' }],
@@ -186,7 +177,7 @@ const resetForm = () => {
title: undefined,
location: undefined,
videoLink: undefined,
- content: undefined,
+ content: "
",
date: undefined,
startTime: undefined,
endTime: undefined,
diff --git a/src/views/Home/rcgl/index.vue b/src/views/Home/rcgl/index.vue
index 68330d3..cbba708 100644
--- a/src/views/Home/rcgl/index.vue
+++ b/src/views/Home/rcgl/index.vue
@@ -138,7 +138,7 @@
-
+
Date: Mon, 18 Nov 2024 15:11:27 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E9=A2=86=E5=AF=BC=E6=97=A5=E7=A8=8B?=
=?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/home/hygl/index.ts | 2 +-
src/views/Home/hygl/hyinfo/index.vue | 29 +++++++++++++++++++++++-----
2 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/src/api/home/hygl/index.ts b/src/api/home/hygl/index.ts
index b766729..bc7e929 100644
--- a/src/api/home/hygl/index.ts
+++ b/src/api/home/hygl/index.ts
@@ -8,7 +8,7 @@ export interface HyglVO {
userId: number // 申请人id
deptName: string // 申请部门名字
deptId: number // 申请部门id
- time: Date // 申请时间
+ time: Date | number // 申请时间
depict: string // 描述
type: number // 会议类型
theme: string // 会议主题
diff --git a/src/views/Home/hygl/hyinfo/index.vue b/src/views/Home/hygl/hyinfo/index.vue
index 57f0727..9bb391f 100644
--- a/src/views/Home/hygl/hyinfo/index.vue
+++ b/src/views/Home/hygl/hyinfo/index.vue
@@ -1,10 +1,15 @@
+
+ 上月
+ 今天
+ 下月
+
@@ -44,6 +49,21 @@ import HyInfoForm from "@/views/Home/hygl/hyinfo/HyInfoForm.vue";
defineOptions({ name: 'HyInfo' })
+const currentDay = ref(new Date().getDate()) // 获取当前天份
+const currentMonth = ref(new Date().getMonth()) // 获取当前年份
+const currentYear = ref(new Date().getFullYear()) // 获取当前年份
+//改变月份
+const selectDate = (val:number) => {
+ if (!val){
+ return
+ }
+ currentMonth.value+=val
+ console.log("today",currentYear.value,currentMonth.value,currentDay.value)
+}
+//回到今天
+const today = () => {
+ currentMonth.value = new Date().getMonth() // 获取当前月份
+}
/** 添加/修改操作 */
const formRef = ref()
//根据id获取数据
@@ -101,7 +121,7 @@ const queryParamsHygl = reactive({
userId: undefined,
deptName: undefined,
deptId: undefined,
- time: [],
+ time: [] as string[],
depict: undefined,
type: undefined,
theme: undefined,
@@ -129,10 +149,8 @@ const getList = async () => {
const hyglData = await HyglApi.getHyglPage(queryParamsHygl)
listHygl.value = hyglData.list
-
for(let item of listHygl.value){
-
- const formattedDate = formatDate2(item.createTime);
+ const formattedDate = formatDate2(item.time);
// 如果 holidays2[formattedDate] 不存在或不是数组，初始化为数组
if (!Array.isArray(holidays2[formattedDate])) {
holidays2[formattedDate] = [];
@@ -140,6 +158,7 @@ const getList = async () => {
// 将 title 添加到数组中
holidays2[formattedDate].push({id:item.id,title:item.title});
}
+ // console.log("holidays2",holidays2)
} finally {
}
}
From a0e88e9831eedacab403d6239381e9a56018bd5f Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Mon, 18 Nov 2024 15:19:20 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E9=A2=86=E5=AF=BC=E6=97=A5=E7=A8=8B?=
=?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/home/hygl/index.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/api/home/hygl/index.ts b/src/api/home/hygl/index.ts
index bc7e929..b766729 100644
--- a/src/api/home/hygl/index.ts
+++ b/src/api/home/hygl/index.ts
@@ -8,7 +8,7 @@ export interface HyglVO {
userId: number // 申请人id
deptName: string // 申请部门名字
deptId: number // 申请部门id
- time: Date | number // 申请时间
+ time: Date // 申请时间
depict: string // 描述
type: number // 会议类型
theme: string // 会议主题
From de428998199d1a542fb0014251d2a92d82d61215 Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Mon, 18 Nov 2024 15:21:10 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E9=A2=86=E5=AF=BC=E6=97=A5=E7=A8=8B?=
=?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/Home/hygl/hyinfo/index.vue | 4 ++--
src/views/Home/rcgl/rcglInfo/index.vue | 22 +++++++++++++++++++++-
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/views/Home/hygl/hyinfo/index.vue b/src/views/Home/hygl/hyinfo/index.vue
index 9bb391f..24baaa7 100644
--- a/src/views/Home/hygl/hyinfo/index.vue
+++ b/src/views/Home/hygl/hyinfo/index.vue
@@ -121,7 +121,7 @@ const queryParamsHygl = reactive({
userId: undefined,
deptName: undefined,
deptId: undefined,
- time: [] as string[],
+ time: [],
depict: undefined,
type: undefined,
theme: undefined,
@@ -150,7 +150,7 @@ const getList = async () => {
listHygl.value = hyglData.list
for(let item of listHygl.value){
- const formattedDate = formatDate2(item.time);
+ const formattedDate = formatDate2(item.createTime);
// 如果 holidays2[formattedDate] 不存在或不是数组，初始化为数组
if (!Array.isArray(holidays2[formattedDate])) {
holidays2[formattedDate] = [];
diff --git a/src/views/Home/rcgl/rcglInfo/index.vue b/src/views/Home/rcgl/rcglInfo/index.vue
index 628faf3..d468659 100644
--- a/src/views/Home/rcgl/rcglInfo/index.vue
+++ b/src/views/Home/rcgl/rcglInfo/index.vue
@@ -1,10 +1,15 @@
+
+ 上月
+ 今天
+ 下月
+
@@ -62,6 +67,21 @@ const queryParamsRcgl = reactive({
createTime: [] as string[],
})
+const currentDay = ref(new Date().getDate()) // 获取当前天份
+const currentMonth = ref(new Date().getMonth()) // 获取当前年份
+const currentYear = ref(new Date().getFullYear()) // 获取当前年份
+//改变月份
+const selectDate = (val:number) => {
+ if (!val){
+ return
+ }
+ currentMonth.value+=val
+ console.log("today",currentYear.value,currentMonth.value,currentDay.value)
+}
+//回到今天
+const today = () => {
+ currentMonth.value = new Date().getMonth() // 获取当前月份
+}
/** 添加/修改操作 */
const formRef = ref()
const openForm = (id: number) => {
From 46e26fb13812aba322b37fbb9799de147e9fe297 Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Mon, 18 Nov 2024 15:22:36 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E9=A2=86=E5=AF=BC=E6=97=A5=E7=A8=8B?=
=?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/home/hygl/index.ts | 2 +-
src/views/Home/hygl/hyinfo/index.vue | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/api/home/hygl/index.ts b/src/api/home/hygl/index.ts
index b766729..bb32574 100644
--- a/src/api/home/hygl/index.ts
+++ b/src/api/home/hygl/index.ts
@@ -8,7 +8,7 @@ export interface HyglVO {
userId: number // 申请人id
deptName: string // 申请部门名字
deptId: number // 申请部门id
- time: Date // 申请时间
+ time: number // 申请时间
depict: string // 描述
type: number // 会议类型
theme: string // 会议主题
diff --git a/src/views/Home/hygl/hyinfo/index.vue b/src/views/Home/hygl/hyinfo/index.vue
index 24baaa7..9bb391f 100644
--- a/src/views/Home/hygl/hyinfo/index.vue
+++ b/src/views/Home/hygl/hyinfo/index.vue
@@ -121,7 +121,7 @@ const queryParamsHygl = reactive({
userId: undefined,
deptName: undefined,
deptId: undefined,
- time: [],
+ time: [] as string[],
depict: undefined,
type: undefined,
theme: undefined,
@@ -150,7 +150,7 @@ const getList = async () => {
listHygl.value = hyglData.list
for(let item of listHygl.value){
- const formattedDate = formatDate2(item.createTime);
+ const formattedDate = formatDate2(item.time);
// 如果 holidays2[formattedDate] 不存在或不是数组，初始化为数组
if (!Array.isArray(holidays2[formattedDate])) {
holidays2[formattedDate] = [];
From bdc3b4a780e6354ccd586a752d04939e0e9bdb9f Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Mon, 18 Nov 2024 15:28:55 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E9=A2=86=E5=AF=BC=E6=97=A5=E7=A8=8B?=
=?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/Home/homeimg/imgForm.vue | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/views/Home/homeimg/imgForm.vue b/src/views/Home/homeimg/imgForm.vue
index 73e9fbc..53f3f12 100644
--- a/src/views/Home/homeimg/imgForm.vue
+++ b/src/views/Home/homeimg/imgForm.vue
@@ -129,18 +129,18 @@ const formData = ref({
newsImg: [],
newsContent: undefined,
contentType: undefined,
- newsStatus: undefined,
+ newsStatus: '
',
status: undefined,
deptId: undefined,
userId: undefined,
})
const formRules = reactive({
- imgName: [{ required: true, message: '新闻名称不能为空', trigger: 'blur' }],
- imgImg: [{ required: true, message: '轮换图片不能为空', trigger: 'blur' }],
- imgContent: [{ required: true, message: '新闻内容不能为空', trigger: 'blur' }],
+ newsName: [{ required: true, message: '新闻名称不能为空', trigger: 'blur' }],
+ newsImg: [{ required: true, message: '轮换图片不能为空', trigger: 'blur' }],
+ newsContent: [{ required: true, message: '新闻内容不能为空', trigger: 'blur' }],
contentType: [{ required: true, message: '新闻分类不能为空', trigger: 'change' }],
- imgStatus: [{ required: true, message: '新闻图片状态不能为空', trigger: 'change' }],
- contentStatus: [{ required: true, message: '新闻状态不能为空', trigger: 'change' }],
+ newsStatus: [{ required: true, message: '新闻图片状态不能为空', trigger: 'change' }],
+ status: [{ required: true, message: '新闻状态不能为空', trigger: 'change' }],
})
const formRef = ref() // 表单 Ref
@@ -198,7 +198,7 @@ const resetForm = () => {
newsName: undefined,
newsCreatetime: undefined,
newsImg: undefined,
- newsContent: undefined,
+ newsContent: '
',
contentType: undefined,
newsStatus: undefined,
status: undefined,