diff --git a/backend/vue2-forntend/src/views/Calendar/index.vue b/backend/vue2-forntend/src/views/Calendar/index.vue
index 7460a484a4b4e30d647153c03a5d8c1a82c2774c..28cc8e6a26c00720b789e1886ad852fee2891299 100644
--- a/backend/vue2-forntend/src/views/Calendar/index.vue
+++ b/backend/vue2-forntend/src/views/Calendar/index.vue
@@ -70,7 +70,7 @@
-
+
@@ -84,6 +84,14 @@
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
@@ -247,7 +262,6 @@ export default {
createOpen: false, //创建日程窗口的开关状态
events: [],
colors: ['blue', 'indigo', 'deep-purple', 'cyan', 'green', 'orange', 'grey darken-1'],
- names: ['Meeting', 'Holiday', 'PTO', 'Travel', 'Event', 'Birthday', 'Conference', 'Party'],
detailForm:{ //详情页
tid:-1,
title:'',
@@ -261,7 +275,8 @@ export default {
notification_alert:false,
notification_time: '',
isAdmin: false,
- is_finished: false
+ is_finished: false,
+ repeat:'',
},
defaultForm:{ //默认创建页
tid: -1,
@@ -276,7 +291,8 @@ export default {
alertTime:'',
isAdmin: false,
notification_alert:false,
- participant: []
+ participant: [],
+ repeat:''
},
newForm:{//创建日程界面
tid: -1,
@@ -291,7 +307,8 @@ export default {
isAdmin: false,
alertTime:'',
notification_alert:false,
- participant: []
+ participant: [],
+ repeat:''
},
createRule:{
title:[
@@ -378,19 +395,7 @@ export default {
this.selectedEvent = event
this.selectedElement = nativeEvent.target
this.detailForm = Object.assign({}, event.detail)
- // console.log("event.detail:",event.detail)
- // console.log("event.detail.isAdmin:",event.detail.isAdmin)
-
- // console.log("this.selectedEvent:", this.selectedEvent)
- // console.log("this.selectedEvent.detail.isAdmin", this.selectedEvent.detail.isAdmin)
-
- // console.log(this.detailForm)
- // console.log('---------------test--------------')
- // console.log(this.detailForm.isAdmin)
- // console.log(typeof(this.detailForm.isAdmin))
- // console.log(this.detailForm.notification_alert)
- // console.log(typeof(this.detailForm.notification_alert))
-
+
setTimeout(() => this.selectedOpen = true, 10)
//console.log(event.detail)
@@ -583,31 +588,6 @@ export default {
// ? `${a.getFullYear()}-${a.getMonth() + 1}-${a.getDate()} ${a.getHours()}:${a.getMinutes()}:${a.getSeconds()}`
// : `${a.getFullYear()}-${a.getMonth() + 1}-${a.getDate()}`
},
-
- /*
- //生成detail格式，与从后台获取的json中的data格式相同
- formatDetail(tid,title,category,urls,platform,cid,cname,ddl_id,ddl_time,alert,alert_time,create_time,done){
- var detail = { // personal
- "tid":tid,
- "title":title,
- "category": category,
- "useful_urls": null,
- "platform": platform,
- "cid": null,
- "course_name": cname,
- "ddl": {
- "ddl_id":ddl_id,
- "ddl_time":ddl_time,
- "notification_alert":alert,
- "notification_time":alert_time,
- "notification_repeat": null,
- "notification_content": ''
- },
- "created_at":create_time, //获取时间
- "is_finished": done
- }
- return detail
- }*/
}
}
diff --git a/backend/vue2-forntend/src/views/Eventlist/index.vue b/backend/vue2-forntend/src/views/Eventlist/index.vue
index 7edfbd2a0264913ac1c359573caf6366e1998d0c..026cd5ab2c14d02fce7ffc80a61229adf3e528ac 100644
--- a/backend/vue2-forntend/src/views/Eventlist/index.vue
+++ b/backend/vue2-forntend/src/views/Eventlist/index.vue
@@ -85,6 +85,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -256,7 +272,8 @@ export default {
notification_alert:false,
notification_time: '',
isAdmin:false,
- is_finished: false
+ is_finished: false,
+ repeat:''
},
defaultForm:{ //详情页
tid:-1,
@@ -271,7 +288,8 @@ export default {
notification_alert:false,
notification_time: '',
isAdmin:false,
- is_finished: false
+ is_finished: false,
+ repeat:''
},
newForm:{//创建日程界面
tid: -1,
@@ -285,7 +303,8 @@ export default {
alertDay:'',
alertTime:'',
notification_alert:false,
- participant: []
+ participant: [],
+ repeat:''
},
createRule:{