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/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,
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 {
}
}
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 @@
-
+
+
+ 上月
+ 今天
+ 下月
+
@@ -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) => {