00614d72 by simon

默认提交

1 parent 2e716e32
...@@ -150,6 +150,7 @@ export default { ...@@ -150,6 +150,7 @@ export default {
150 curData.standards = 0; 150 curData.standards = 0;
151 let date = index + 1; 151 let date = index + 1;
152 let buildDate = Date.parse(`${year}.${month}.${date}`); 152 let buildDate = Date.parse(`${year}.${month}.${date}`);
153 if (buildDate) {
153 let nowDate = new Date(); 154 let nowDate = new Date();
154 let day = buildDate.getDay(); 155 let day = buildDate.getDay();
155 let isWeekend = day == 0 || day == 6; 156 let isWeekend = day == 0 || day == 6;
...@@ -188,9 +189,12 @@ export default { ...@@ -188,9 +189,12 @@ export default {
188 }, curData); 189 }, curData);
189 result.push(curData); 190 result.push(curData);
190 } 191 }
192 }
191 193
192 // 当月1号星期几 0-6 往前塞值 194 // 当月1号星期几 0-6 往前塞值
193 let dateStr = month + '.' + '1' + '.' + year; 195 let dateStr = month + '.' + '1' + '.' + year;
196 let firstDate = Date.parse(dateStr);
197 if (firstDate) {
194 let firstDay = Date.parse(dateStr).getDay(); 198 let firstDay = Date.parse(dateStr).getDay();
195 199
196 // 根据星期几在前面补空格 星期日0格子,星期一1格子,星期六6格子 200 // 根据星期几在前面补空格 星期日0格子,星期一1格子,星期六6格子
...@@ -198,6 +202,8 @@ export default { ...@@ -198,6 +202,8 @@ export default {
198 result.unshift(null); 202 result.unshift(null);
199 } 203 }
200 this.fortmatMonthData = result; 204 this.fortmatMonthData = result;
205 }
206
201 }, 207 },
202 // 加/减 月份 208 // 加/减 月份
203 addMonths(value) { 209 addMonths(value) {
...@@ -372,6 +378,7 @@ export default { ...@@ -372,6 +378,7 @@ export default {
372 fortmatMonthData.forEach((element, idx) => { 378 fortmatMonthData.forEach((element, idx) => {
373 if (element) { 379 if (element) {
374 let curDate = `${element.year}-${element.month}-${element.date}`; 380 let curDate = `${element.year}-${element.month}-${element.date}`;
381 curDate = Date.parse(curDate).toString("yyyy-MM-dd"); //转成yyyy-MM-dd
375 if (curDate == dateValue && element.disable == true) { 382 if (curDate == dateValue && element.disable == true) {
376 disable = true; 383 disable = true;
377 } 384 }
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
21 21
22 @extend .bb; 22 @extend .bb;
23 max-width: 450px; 23 max-width: 450px;
24 min-width: 100%;
24 height: 320px; 25 height: 320px;
25 border-radius: $borderRadius; 26 border-radius: $borderRadius;
26 background-color: wheat; 27 background-color: wheat;
......
...@@ -60,7 +60,6 @@ ...@@ -60,7 +60,6 @@
60 .n-item { 60 .n-item {
61 cursor: pointer; 61 cursor: pointer;
62 min-width: 14.75rem; 62 min-width: 14.75rem;
63
64 } 63 }
65 } 64 }
66 65
...@@ -99,7 +98,8 @@ ...@@ -99,7 +98,8 @@
99 // 公共组件 98 // 公共组件
100 .n-item { 99 .n-item {
101 margin-bottom: 2rem; 100 margin-bottom: 2rem;
102 padding-right: .833333rem ; 101 // padding-right: .833333rem ;
102 padding-right: 3rem ;
103 color: #dcdddd; 103 color: #dcdddd;
104 104
105 &:first-child { 105 &:first-child {
......
1 @import '@/styles/_support'; 1 @import '@/styles/_support';
2 .list-container { 2 .list-container {
3 overflow-x: scroll; 3 overflow-x: auto;
4 padding-bottom: 2rem; 4 padding-bottom: 2rem;
5 } 5 }
6 6
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
107 padding: 0 2.75rem; 107 padding: 0 2.75rem;
108 // max-height: 41.666667rem; 108 // max-height: 41.666667rem;
109 transition: max-height ease-out 0.3s !important; 109 transition: max-height ease-out 0.3s !important;
110 overflow: scroll; 110 overflow: auto;
111 111
112 .data-line { 112 .data-line {
113 // padding: 0 2.75rem; 113 // padding: 0 2.75rem;
......