diff --git a/p__Classrooms__Overview__index.async.js b/p__Classrooms__Overview__index.async.js index 09b6529016..774d32453d 100644 --- a/p__Classrooms__Overview__index.async.js +++ b/p__Classrooms__Overview__index.async.js @@ -265,7 +265,7 @@ var Page = function Page(_ref3) { setUrlData = _useState2[1]; var _useState3 = (0,_react_17_0_2_react.useState)({ start_time: dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')).format('YYYY-MM-DD'), - end_time: dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'), + end_time: dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')).format('YYYY-MM-DD'), // start_time: moment(moment().year(moment().year()).startOf('year').valueOf()).format('YYYY-MM-DD'), // end_time: moment(moment().year(moment().year() + 1).startOf('year').valueOf()).format('YYYY-MM-DD'), data_type: "Course" @@ -277,7 +277,7 @@ var Page = function Page(_ref3) { // start_time: moment(moment().year(moment().year()).startOf('year')), //end_time: moment(moment().year(moment().year() + 1).startOf('year')), start_time: dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')), - end_time: dayjs_min_default()(dayjs_min_default()()) + end_time: dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')) }), _useState6 = slicedToArray_default()(_useState5, 2), defauleDate = _useState6[0], @@ -693,7 +693,7 @@ var Page = function Page(_ref3) { } var tooLate = dateValue[0] && current.diff(dateValue[0], 'years') > 5; var tooEarly = dateValue[1] && dateValue[1].diff(current, 'years') > 5; - return !!tooEarly || !!tooLate || current > dayjs_min_default()().endOf('day'); + return !!tooEarly || !!tooLate || current > dayjs_min_default()().subtract(1, 'days'); }; var seriesName = function seriesName() { switch (statParams.data_type) { @@ -1054,21 +1054,21 @@ var Page = function Page(_ref3) { setPicker(key); if (key == 'year') { statParams.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')).format('YYYY-MM-DD'); - statParams.end_time = dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'); + statParams.end_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')).format('YYYY-MM-DD'); defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')); - defauleDate.end_time = dayjs_min_default()(); + defauleDate.end_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')); } if (key == 'month') { statParams.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'months')).format('YYYY-MM-DD'); - statParams.end_time = dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'); + statParams.end_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')).format('YYYY-MM-DD'); defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'months')); - defauleDate.end_time = dayjs_min_default()(); + defauleDate.end_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')); } if (key == 'week') { statParams.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'weeks')).format('YYYY-MM-DD'); - statParams.end_time = dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'); + statParams.end_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')).format('YYYY-MM-DD'); defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'weeks')); - defauleDate.end_time = dayjs_min_default()(); + defauleDate.end_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')); } setStatParams(objectSpread2_default()({}, statParams)); setDefaultDate(objectSpread2_default()({}, defauleDate)); diff --git a/p__Paths__Overview__index.async.js b/p__Paths__Overview__index.async.js index 2885417115..5daf58ea50 100644 --- a/p__Paths__Overview__index.async.js +++ b/p__Paths__Overview__index.async.js @@ -204,7 +204,7 @@ var Page = function Page(_ref) { setUrlData = _useState4[1]; var _useState5 = (0,_react_17_0_2_react.useState)({ start_time: dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')).format('YYYY-MM-DD'), - end_time: dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'), + end_time: dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')).format('YYYY-MM-DD'), data_type: "Subject" }), _useState6 = slicedToArray_default()(_useState5, 2), @@ -212,7 +212,7 @@ var Page = function Page(_ref) { setStatParams = _useState6[1]; var _useState7 = (0,_react_17_0_2_react.useState)({ start_time: dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')), - end_time: dayjs_min_default()(dayjs_min_default()()) + end_time: dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')) }), _useState8 = slicedToArray_default()(_useState7, 2), defauleDate = _useState8[0], @@ -830,7 +830,7 @@ var Page = function Page(_ref) { } var tooLate = dateValue[0] && current.diff(dateValue[0], 'years') > 5; var tooEarly = dateValue[1] && dateValue[1].diff(current, 'years') > 5; - return !!tooEarly || !!tooLate || current > dayjs_min_default()().endOf('day'); + return !!tooEarly || !!tooLate || current > dayjs_min_default()().subtract(1, 'days'); }; (0,_react_17_0_2_react.useEffect)(function () { (0,util/* setDocumentTitle */.Dk)("实践课程概览"); @@ -1115,21 +1115,21 @@ var Page = function Page(_ref) { setPicker(key); if (key == 'year') { statParams.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')).format('YYYY-MM-DD'); - statParams.end_time = dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'); + statParams.end_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')).format('YYYY-MM-DD'); defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')); - defauleDate.end_time = dayjs_min_default()(); + defauleDate.end_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')); } if (key == 'month') { statParams.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'months')).format('YYYY-MM-DD'); - statParams.end_time = dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'); + statParams.end_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')).format('YYYY-MM-DD'); defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'months')); - defauleDate.end_time = dayjs_min_default()(); + defauleDate.end_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')); } if (key == 'week') { statParams.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'weeks')).format('YYYY-MM-DD'); - statParams.end_time = dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'); + statParams.end_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')).format('YYYY-MM-DD'); defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'weeks')); - defauleDate.end_time = dayjs_min_default()(); + defauleDate.end_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')); } setStatParams(objectSpread2_default()({}, statParams)); setDefaultDate(objectSpread2_default()({}, defauleDate)); diff --git a/p__Shixuns__Overview__index.async.js b/p__Shixuns__Overview__index.async.js index b094669a69..27de045fb1 100644 --- a/p__Shixuns__Overview__index.async.js +++ b/p__Shixuns__Overview__index.async.js @@ -246,7 +246,7 @@ var Page = function Page(_ref3) { setUrlData = _useState2[1]; var _useState3 = (0,_react_17_0_2_react.useState)({ start_time: dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')).format('YYYY-MM-DD'), - end_time: dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'), + end_time: dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')).format('YYYY-MM-DD'), data_type: "Clearance" }), _useState4 = slicedToArray_default()(_useState3, 2), @@ -254,7 +254,7 @@ var Page = function Page(_ref3) { setStatParams = _useState4[1]; var _useState5 = (0,_react_17_0_2_react.useState)({ start_time: dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')).format('YYYY-MM-DD'), - end_time: dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'), + end_time: dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')).format('YYYY-MM-DD'), data_type: "Evaluation" }), _useState6 = slicedToArray_default()(_useState5, 2), @@ -262,14 +262,14 @@ var Page = function Page(_ref3) { setStatParams2 = _useState6[1]; var _useState7 = (0,_react_17_0_2_react.useState)({ start_time: dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')), - end_time: dayjs_min_default()(dayjs_min_default()()) + end_time: dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')) }), _useState8 = slicedToArray_default()(_useState7, 2), defauleDate = _useState8[0], setDefaultDate = _useState8[1]; var _useState9 = (0,_react_17_0_2_react.useState)({ start_time: dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')), - end_time: dayjs_min_default()(dayjs_min_default()()) + end_time: dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')) }), _useState10 = slicedToArray_default()(_useState9, 2), defauleDate2 = _useState10[0], @@ -555,7 +555,7 @@ var Page = function Page(_ref3) { } var tooLate = dateValue[0] && current.diff(dateValue[0], 'years') > 5; var tooEarly = dateValue[1] && dateValue[1].diff(current, 'years') > 5; - return !!tooEarly || !!tooLate || current > dayjs_min_default()().endOf('day'); + return !!tooEarly || !!tooLate || current > dayjs_min_default()().subtract(1, 'days'); }; var disabledDate2 = function disabledDate2(current) { if (!dateValue2) { @@ -563,7 +563,7 @@ var Page = function Page(_ref3) { } var tooLate = dateValue2[0] && current.diff(dateValue2[0], 'years') > 5; var tooEarly = dateValue2[1] && dateValue2[1].diff(current, 'years') > 5; - return !!tooEarly || !!tooLate || current > dayjs_min_default()().endOf('day'); + return !!tooEarly || !!tooLate || current > dayjs_min_default()().subtract(1, 'days'); }; var hanleItemDiffOption = function hanleItemDiffOption() { // 实践项目难度分布 @@ -1168,21 +1168,21 @@ var Page = function Page(_ref3) { setPicker(key); if (key == 'year') { statParams.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')).format('YYYY-MM-DD'); - statParams.end_time = dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'); + statParams.end_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')).format('YYYY-MM-DD'); defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')); - defauleDate.end_time = dayjs_min_default()(); + defauleDate.end_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')); } if (key == 'month') { statParams.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'months')).format('YYYY-MM-DD'); - statParams.end_time = dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'); + statParams.end_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')).format('YYYY-MM-DD'); defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'months')); - defauleDate.end_time = dayjs_min_default()(); + defauleDate.end_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')); } if (key == 'week') { statParams.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'weeks')).format('YYYY-MM-DD'); - statParams.end_time = dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'); + statParams.end_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')).format('YYYY-MM-DD'); defauleDate.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'weeks')); - defauleDate.end_time = dayjs_min_default()(); + defauleDate.end_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')); } setStatParams(objectSpread2_default()({}, statParams)); setDefaultDate(objectSpread2_default()({}, defauleDate)); @@ -1279,21 +1279,21 @@ var Page = function Page(_ref3) { setPicker2(key); if (key == 'year') { statParams2.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')).format('YYYY-MM-DD'); - statParams2.end_time = dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'); + statParams2.end_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')).format('YYYY-MM-DD'); defauleDate2.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'years')); - defauleDate2.end_time = dayjs_min_default()(); + defauleDate2.end_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')); } if (key == 'month') { statParams2.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'months')).format('YYYY-MM-DD'); - statParams2.end_time = dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'); + statParams2.end_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')).format('YYYY-MM-DD'); defauleDate2.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'months')); - defauleDate2.end_time = dayjs_min_default()(); + defauleDate2.end_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')); } if (key == 'week') { statParams2.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'weeks')).format('YYYY-MM-DD'); - statParams2.end_time = dayjs_min_default()(dayjs_min_default()()).format('YYYY-MM-DD'); + statParams2.end_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')).format('YYYY-MM-DD'); defauleDate2.start_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'weeks')); - defauleDate2.end_time = dayjs_min_default()(); + defauleDate2.end_time = dayjs_min_default()(dayjs_min_default()().subtract(1, 'days')); } setStatParams2(objectSpread2_default()({}, statParams2)); setDefaultDate2(objectSpread2_default()({}, defauleDate2));