diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue index a294b35c..9de9e876 100644 --- a/src/components/drawers/ActiveAttendance.vue +++ b/src/components/drawers/ActiveAttendance.vue @@ -17,7 +17,7 @@
-
+
{{datasource}} 起止时间:{{ datasource && datasource.startTime ? datasource.startTime : "-" }} diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index 9219faf1..8f668a16 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -53,7 +53,7 @@
{ dateTime.value = [] resetFields() }; - +/** const range = (start, end) => { const result = []; for (let i = start; i < end; i++) { result.push(i); } return result; -}; +};*/ function timeChange(time, timeStr) { formData.value.activityStartTime = timeStr[0] @@ -291,14 +291,14 @@ function timeChange(time, timeStr) { const disabledDate = (current) => { return current && current < dayjs().startOf('day'); }; - +/** const disabledRangeTime = () => ({ // disabledHours: () => range(0, 24).splice(4, 20), disabledMinutes: () => range(30, 60), disabledSeconds: () => [55, 56], }); - +*/ async function confirm() { // debugger await validate().catch(({errorFields}) => { diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index eb4a3a92..7b344437 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -175,6 +175,7 @@ function reset() { selectsData.value = []; params.value.pageIndex = 1 params.value.keyWord = '' + params.value.authorName = '' fetch() } diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 046e16fc..a1b2a248 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -105,7 +105,8 @@
{ formData.value = {} dateTime.value = [] }; - +/** const range = (start, end) => { const result = []; for (let i = start; i < end; i++) { @@ -115,7 +115,7 @@ const range = (start, end) => { } return result; }; - +*/ function timeChange(time, timeStr) { formData.value.submitStartTime = timeStr[0] formData.value.submitEndTime = timeStr[1] @@ -124,13 +124,13 @@ function timeChange(time, timeStr) { const disabledDate = (current) => { return current && current < dayjs().startOf('day'); }; - +/** const disabledRangeTime = () => ({ disabledHours: () => range(0, 24).splice(4, 20), disabledMinutes: () => range(30, 60), disabledSeconds: () => [55, 56], }); - + */ function confirm() { if (taskIndex.value === -1) { const list = props.taskList diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 2683c336..7c46804a 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -76,7 +76,7 @@ { dateTime.value = []; resetFields(); }; - +/** const range = (start, end) => { const result = []; for (let i = start; i < end; i++) { @@ -441,7 +441,7 @@ const range = (start, end) => { } return result; }; - +*/ function timeChange(time, timeStr) { formData.value.liveStartTime = timeStr[0]; formData.value.liveEndTime = timeStr[1]; @@ -450,13 +450,13 @@ function timeChange(time, timeStr) { const disabledDate = (current) => { return current && current < dayjs().startOf("day"); }; - +/** const disabledRangeTime = () => ({ // disabledHours: () => range(0, 24).splice(4, 20), disabledMinutes: () => range(30, 60), disabledSeconds: () => [55, 56], }); - + */ async function confirm() { // debugger; console.log("确定按钮:"); diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue index 20a29050..5130f258 100644 --- a/src/components/drawers/AddProject.vue +++ b/src/components/drawers/AddProject.vue @@ -291,6 +291,9 @@ function reset() { selectsData.value = []; params.value.pageNo = 1 params.value.keyWord = '' + params.value.createName = '' + params.value.manager = '' + params.value.name = '' fetch() } diff --git a/src/components/drawers/AssessmentAll.vue b/src/components/drawers/AssessmentAll.vue index eb30f68a..a4cf1020 100644 --- a/src/components/drawers/AssessmentAll.vue +++ b/src/components/drawers/AssessmentAll.vue @@ -180,6 +180,7 @@ function reset() { selectsData.value = []; params.value.pageIndex = 1; params.value.keyWord = ""; + params.value.assessmentName =""; fetch(); } @@ -231,6 +232,8 @@ const goResearchmanage = () => { .main_item { display: flex; align-items: center; + margin-top: 20px; + margin-bottom: 20px; .fi_input { margin-right: 20px; diff --git a/src/components/drawers/ProjectScore.vue b/src/components/drawers/ProjectScore.vue index 0dbdfae2..99f35d88 100644 --- a/src/components/drawers/ProjectScore.vue +++ b/src/components/drawers/ProjectScore.vue @@ -360,7 +360,7 @@ export default { className: "h", }, { - title: "证书", + title: "已获得积分", dataIndex: "diploma", key: "diploma", width: 40,