Browse Source

Merge remote-tracking branch 'origin/visu_forest_0_1' into visu_forest_0_1

彭宇 2 years ago
parent
commit
3627f3838d
1 changed files with 7 additions and 2 deletions
  1. 7 2
      src/views/date.vue

+ 7 - 2
src/views/date.vue

@@ -2,8 +2,6 @@
 	<div class="calendar-wrapper">
 	<div class="calendar-wrapper">
 		<!-- 月份变换区 -->
 		<!-- 月份变换区 -->
 		<div class="header rowJcAc" v-if="headerBar">
 		<div class="header rowJcAc" v-if="headerBar">
-
-
 			<!-- <div class="pre " @click="changeMonth('pre')">上个月</div> -->
 			<!-- <div class="pre " @click="changeMonth('pre')">上个月</div> -->
 			<div class="yearMonth">
 			<div class="yearMonth">
 				<div class="arrowIcon rowJcAc" @click="changeMonth('pre')" v-if="monthOpen">
 				<div class="arrowIcon rowJcAc" @click="changeMonth('pre')" v-if="monthOpen">
@@ -32,6 +30,9 @@
               todayChoose: isTodayChoose(item.year,item.month,item.date) ,
               todayChoose: isTodayChoose(item.year,item.month,item.date) ,
               nolm:!item.isCurM,
               nolm:!item.isCurM,
               today:isToday(item.year,item.month,item.date),
               today:isToday(item.year,item.month,item.date),
+			  notallowed:isFutureDay(item.year,item.month,item.date) 
+			  
+			  
           }">
           }">
 						<div class="markDay" v-if="isMarkDay(item.year,item.month,item.date)"
 						<div class="markDay" v-if="isMarkDay(item.year,item.month,item.date)"
 							:class="[choose==`${item.year}-${item.month}-${item.date}` ? 'markDayChoose':'markDayNoChoose']">
 							:class="[choose==`${item.year}-${item.month}-${item.date}` ? 'markDayChoose':'markDayNoChoose']">
@@ -201,6 +202,7 @@ import {
           }
           }
         }
         }
         return "date-state-pointer d-state-zc";
         return "date-state-pointer d-state-zc";
+		
       },
       },
 			formatNum(num) {
 			formatNum(num) {
 				let res = Number(num);
 				let res = Number(num);
@@ -402,6 +404,9 @@ import {
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
+	.notallowed{
+		cursor: not-allowed !important
+	}
 	@import '@/assets/styles/base.scss';
 	@import '@/assets/styles/base.scss';
 	//状态
 	//状态
 	.d-state-zc {
 	.d-state-zc {