Skip to content

E
educationStu
Commit 110b4fe9 authored by youjie's avatar youjie
Browse files
Options

no message

parent c19d31e7
Show whitespace changes
Inline Side-by-side
Showing with 183 additions and 13 deletions
src/pages/bookAclass/index.vue
View file @ 110b4fe9
......@@ -5,7 +5,8 @@
<view>{{year}}年{{month}}月</view>
<view>计划 {{total}}节课</view>
</view>
<lxCalendar @chang="getData" :titleList="titleList"></lxCalendar>
<lxCalendar ref="lxCalendar" @chang="getData" :titleList="titleList" :weeks="weeks"></lxCalendar>
<view v-if="weekShow" class="thisWeek" @click="clickWeek">本周</view>
</view>
<view class="content-box" v-if="dataList.length>0&&total>0">
<scroll-view scroll-y="true" style="width:100%;height: 100%;">
......@@ -75,6 +76,11 @@
{date:'',list:[]},
{date:'',list:[]},
],
weekList:[],
weekShow:false,
weekType:'',
weekTime:'',
weeks:''
})
const methods = {
addPlan(){
......@@ -121,10 +127,89 @@
}
}
});
},
// 实现方法
getMonday(dates) {
data.weekType = dates
let arr = [],weekOne='';
let todayTimeStr = new Date(new Date().toLocaleDateString()).getTime();
var day = (new Date().getDay() - 1) * 24 * 60 * 60 * 1000;
weekOne = todayTimeStr - day;
if(dates == 0){//本周
weekOne = todayTimeStr - day;//周一 0点的时间戳
}
// 一天的时间戳
let dayTime = 24 * 60 * 60 * 1000;
if(dates == -1){//上一周
weekOne = data.weekTime - 7 * 24 * 60 * 60 * 1000;
}else if(dates==1){//下一周
weekOne = data.weekTime + 7 * 24 * 60 * 60 * 1000;
}
data.weekTime = weekOne;
for(let i=0;i<7;i++){
let timeOne_year = new Date(new Date(weekOne + i * dayTime)).getFullYear();
let timeOne_month = new Date(new Date(weekOne + i * dayTime)).getMonth() + 1>=10?new Date(new Date(weekOne + i *
dayTime)).getMonth() + 1:'0' + (new Date(new Date(weekOne + i *
dayTime)).getMonth() + 1);
let timeOne_date = new Date(new Date(weekOne + i * dayTime)).getDate()>=10?(new Date(new Date(weekOne + i *
dayTime)).getDate())-1:'0'+(new Date(new Date(weekOne + i *
dayTime)).getDate()-1);
arr.push(timeOne_year+'-'+timeOne_month+'-'+timeOne_date);
}
// for(let i=0;i<7;i++){
// data.titleList.forEach((item,index) => {
// if(i==index){
// item.num = arr[i]
// }
// });
// }
data.weekList = arr
// if(data.weekType==0){
// data.weekShow = false
// }else{
// data.weekList.forEach(item=>{
// arr.forEach(i=>{
// if(item==i){
// data.weekShow = false
// }else{
// data.weekShow = true
// }
// })
// })
// }
// console.log(arr)
// data.msg.StartDate = arr[0]
// data.msg.EndDate = arr[6]
data.weeks = data.weekList[0]
return arr;
},
// 本周
clickWeek(){
this.$refs.lxCalendar.clickWeek(data.weekList[0])
data.weekShow = false
let list = []
list = data.weekList[0].split('-')
data.month = list[1]
data.msg.StartDate = data.weekList[0]
data.msg.EndDate = data.weekList[6]
methods.getList()
},
getData(arr){
data.year = arr[0].date.slice(0,4)
data.month = arr[0].date.slice(5,6)<10?arr[0].date.slice(5,6):arr[0].date.slice(5,7)
let list = []
list = arr[0].date.split('-')
// if(data.weekList.length>0){
// let year = list[0]
// let Math = list[1]<10?'0' + list[1]:list[1]
// let datas = list[2]<10?'0' + list[2]:list[2]
// if(data.weekList[0]==year+'-'+Math+'-'+datas){
// data.weekShow = false
// }else{
// data.weekShow = true
// }
// }
data.year = list[0]
data.month = list[1]<10?'0'+list[1]:list[1]
data.msg.StartDate = arr[0].date
data.msg.EndDate = arr[6].date
methods.getList()
......@@ -169,20 +254,26 @@
}
onMounted(() => {
methods.getMonday(0)
methods.getDateData()
})
return {
...toRefs(data),
...methods
}
},
onLaunch(){
},
onShow(){
this.getList()
}
}
</script>
<style scoped>
.index-box{
background: #F7F5F6;
position: fixed;
......@@ -220,12 +311,22 @@
justify-content: center;
}
.titleHeader{
position: relative;
position: fixed;
top: 0;
left: 0;
right: 0;
/* padding: 0 36rpx; */
}
.thisWeek{
position: absolute;
right: 0;
top: 45rpx;
border-radius: 50rpx 0 0 50rpx;
background: #ffffff;
padding: 5rpx 10rpx 5rpx 13rpx;
font-size: 24rpx;
}
.titleHeader-year{
display: flex;
justify-content: center;
......
src/pages/bookAclass/lx-calendar/lx-calendar.vue
View file @ 110b4fe9
......@@ -73,6 +73,10 @@
<script>
export default {
props:{
weeks:{
type:String,
default:''
},
value:{
type:[String,Number],
default:''
......@@ -99,6 +103,7 @@ export default {
week_list_prev_week:[],
week_list_next:[],
week_list_next_week:[],
now_date:'',
start_date:'',
end_date:'',
......@@ -115,10 +120,24 @@ export default {
dot_list:[],
current:1,
date:'',
dataList:[]
dataList:[],
ArrList:{
week_list:[],
week_list_prev:[],
week_list_prev_week:[],
week_list_next:[],
week_list_next_week:[],
to_week_index:'',
to_prev_week_index:'',
to_next_week_index:'',
},
dataShow:true
}
},
watch:{
weeks(value){
this.setData()
},
value(value){
this.get_date(this.date_parse(value));
},
......@@ -127,7 +146,6 @@ export default {
dot_lists:{
immediate:true,
handler(value){
this.dot_list = value;
this.set_doc_lists_update()
}
......@@ -150,9 +168,52 @@ export default {
},
created(){
this.init();
// console.log(this.week_list)
this.$emit('chang',this.week_list[this.to_week_index])
},
methods:{
setData(){
// this.ArrList.to_week_index = this.to_week_index,
// this.ArrList.week_list = this.week_list
this.change_week(1)
// console.log(this.week_list_prev)
// this.week_list.forEach(item=>{
// item.forEach(i=>{
// let list = []
// list = i.date.split('-')
// let year = list[0]
// let Math = list[1]<10?'0' + list[1]:list[1]
// let datas = list[2]<10?'0' + list[2]:list[2]
// let yearMathDatas = year+'-'+Math+'-'+datas
// if(this.weeks==yearMathDatas){
// this.ArrList = {
// week_list:this.week_list,
// week_list_prev:this.week_list_prev.length>0?this.week_list_prev:[],
// week_list_prev_week:this.week_list_prev_week>0?this.week_list_prev_week:[],
// week_list_next:this.week_list_next>0?this.week_list_next:[],
// week_list_next_week:this.week_list_next_week>0?this.week_list_next_week:[],
// to_week_index:this.to_week_index,
// to_prev_week_index:this.to_prev_week_index,
// to_next_week_index:this.to_next_week_index
// }
// }
// })
// })
},
clickWeek(value){
this.week_list = this.ArrList.week_list,
this.week_list_prev = this.ArrList.week_list_prev,
this.week_list_prev_week = this.ArrList.week_list_prev_week,
this.week_list_next = this.ArrList.week_list_next,
this.week_list_next_week = this.ArrList.week_list_next_week,
this.to_week_index = this.ArrList.to_week_index,
this.to_prev_week_index = this.ArrList.to_prev_week_index,
this.to_next_week_index = this.ArrList.to_next_week_index
},
change(){
let value = {
fulldate:this.date.replace(/-(\d)(?!\d)/g, '-0$1')
......@@ -185,7 +246,7 @@ export default {
}
this.set_doc_lists_update();
},
change_week(){
change_week(type){
if(this.to_week_index < this.week_list.length - 1){
this.to_next_week_index = this.to_week_index + 1;
......@@ -214,6 +275,19 @@ export default {
this.to_prev_week_index = this.to_week_index - 1;
this.week_list_prev_week = this.week_list;
}
if(type==1){
this.ArrList.week_list = this.week_list
this.ArrList.week_list_prev = this.week_list_prev
this.ArrList.week_list_prev_week = this.week_list_prev_week
this.ArrList.week_list_next = this.week_list_next
this.ArrList.week_list_next_week = this.week_list_next_week
this.ArrList.to_week_index = this.to_week_index,
this.ArrList.to_prev_week_index = this.to_prev_week_index,
this.ArrList.to_next_week_index = this.to_next_week_index
}
// console.log(this.week_list[this.to_week_index],'当前周')
this.$emit('chang',this.week_list[this.to_week_index])
// if(this.current == 1){
......@@ -237,7 +311,6 @@ export default {
},
change_date_week(type){
let week_list = this.week_list;
let to_week_index = this.to_week_index;
if(type == 'prev'){
......@@ -249,8 +322,6 @@ export default {
this.week_list = this.week_list_prev_week
this.week_list_prev_week = this.week_list_next_week;
this.week_list_next_week = week_list;
// console.log(this.week_list_next_week[this.to_next_week_index],'下周--')
}else if(type == 'next'){
this.to_week_index = this.to_next_week_index;
this.to_next_week_index = this.to_prev_week_index
......@@ -259,10 +330,9 @@ export default {
this.week_list = this.week_list_next_week
this.week_list_next_week = this.week_list_prev_week;
this.week_list_prev_week = week_list;
// console.log(this.week_list_prev_week[this.to_prev_week_index],'上周--')
}
this.set_to_day_all();
},
change_date_month(type){
......@@ -569,7 +639,6 @@ export default {
this.end_date = end_date;
this.prev_date = prev_date;
this.next_date = next_date;
}else if(type == 'prev'){
this.week_list_prev = week_list;
}else if(type == 'next'){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment