mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-12 12:26:47 +08:00
fix bug
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
<a-drawer
|
||||
:visible="visible"
|
||||
class="drawerStyle addactiveDrawer"
|
||||
width="80%"
|
||||
width="800"
|
||||
title="添加活动"
|
||||
placement="right"
|
||||
>
|
||||
@@ -307,11 +307,12 @@ async function confirm() {
|
||||
});
|
||||
if (taskIndex.value === -1) {
|
||||
const list = props.taskList
|
||||
list.push({name: formData.value.activityName, type: props.type, info: {...formData.value}})
|
||||
list.push({name: formData.value.activityName, type: props.type,duration:dayjs(formData.value.activityEndTime).diff(formData.value.activityStartTime,'minutes'), info: {...formData.value}})
|
||||
} else {
|
||||
const data = props.taskList[taskIndex.value]
|
||||
data.name = formData.value.activityName
|
||||
data.info = {...formData.value}
|
||||
data.duration = dayjs(formData.value.activityEndTime).diff(formData.value.activityStartTime,'minutes')
|
||||
}
|
||||
emit('update:taskList', [...props.taskList])
|
||||
closeDrawer()
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<div @click="openDrawer">
|
||||
<slot></slot>
|
||||
</div>
|
||||
<a-drawer :visible="visible" class="drawerStyle addevalDrawer" width="80%" title="添加测评" placement="right">
|
||||
<a-drawer :visible="visible" class="drawerStyle addevalDrawer" width="800" title="添加测评" placement="right">
|
||||
<div class="drawerMain">
|
||||
<div class="header">
|
||||
<div class="headerTitle">{{ taskIndex >= 0 ? "编辑" : "添加" }}测评</div>
|
||||
@@ -171,11 +171,12 @@ async function confirm() {
|
||||
});
|
||||
if (taskIndex.value === -1) {
|
||||
const list = props.taskList
|
||||
list.push({name: formData.value.evaluationName, type: props.type, info: {...formData.value}})
|
||||
list.push({name: formData.value.evaluationName,duration:dayjs(formData.value.evaluationEndTime).diff(formData.value.evaluationStartTime,'minutes'), type: props.type, info: {...formData.value}})
|
||||
} else {
|
||||
const data = props.taskList[taskIndex.value]
|
||||
data.name = formData.value.evaluationName
|
||||
data.info = formData.value
|
||||
data.duration = dayjs(formData.value.evaluationEndTime).diff(formData.value.evaluationStartTime,'minutes')
|
||||
}
|
||||
emit('update:taskList', [...props.taskList])
|
||||
closeDrawer()
|
||||
|
||||
@@ -134,11 +134,12 @@ const disabledRangeTime = () => ({
|
||||
function confirm() {
|
||||
if (taskIndex.value === -1) {
|
||||
const list = props.taskList
|
||||
list.push({name: formData.value.workName, type: props.type, info: {...formData.value}})
|
||||
list.push({name: formData.value.workName,duration:dayjs(formData.value.submitEndTime).diff(formData.value.submitStartTime,'minutes'), type: props.type, info: {...formData.value}})
|
||||
} else {
|
||||
const data = props.taskList[taskIndex.value]
|
||||
data.name = formData.value.workName
|
||||
data.info = formData.value
|
||||
data.duration = dayjs(formData.value.submitEndTime).diff(formData.value.submitStartTime,'minutes')
|
||||
}
|
||||
emit('update:taskList', [...props.taskList])
|
||||
closeDrawer()
|
||||
|
||||
@@ -466,12 +466,15 @@ async function confirm() {
|
||||
list.push(
|
||||
{name: formData.value.liveName,
|
||||
type: props.type,
|
||||
info: {...formData.value}
|
||||
info: {...formData.value},
|
||||
duration:dayjs(formData.value.liveEndTime).diff(formData.value.liveStartTime,'minutes')
|
||||
})
|
||||
} else {
|
||||
const data = props.taskList[taskIndex.value];
|
||||
data.name = formData.value.liveName;
|
||||
data.info = formData.value;
|
||||
data.duration = dayjs(formData.value.liveEndTime).diff(formData.value.liveStartTime,'minutes')
|
||||
|
||||
}
|
||||
emit("update:taskList", [...props.taskList]);
|
||||
closeDrawer();
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<a-drawer
|
||||
:visible="visible"
|
||||
class="drawerStyle addtestDrawer"
|
||||
width="80%"
|
||||
width="800"
|
||||
placement="right"
|
||||
>
|
||||
<div class="drawerMain">
|
||||
@@ -475,12 +475,13 @@ function confirmouter() {
|
||||
|
||||
if (taskIndex.value === -1) {
|
||||
const list = props.taskList
|
||||
list.push({name: formDataOuter.value.examinationName, type: props.type, info: {...formDataOuter.value}})
|
||||
list.push({name: formDataOuter.value.examinationName,duration:dayjs(formData.value.examinationEndTime).diff(formData.value.examinationStartTime,'minutes'), type: props.type, info: {...formDataOuter.value}})
|
||||
} else {
|
||||
const data = props.taskList[taskIndex.value]
|
||||
data.name = formDataOuter.value.examinationName
|
||||
data.info = formDataOuter.value
|
||||
data.examType = 2
|
||||
data.duration = dayjs(formData.value.examinationEndTime).diff(formData.value.examinationStartTime,'minutes')
|
||||
}
|
||||
emit('update:taskList', [...props.taskList])
|
||||
closeDrawer()
|
||||
|
||||
@@ -199,11 +199,12 @@ async function confirm() {
|
||||
});
|
||||
if (taskIndex.value === -1) {
|
||||
const list = props.taskList
|
||||
list.push({name: formData.value.voteName, type: props.type, info: {...formData.value}})
|
||||
list.push({name: formData.value.voteName, type: props.type,duration:dayjs(formData.value.voteEndTime).diff(formData.value.voteStartTime,'minutes'), info: {...formData.value}})
|
||||
} else {
|
||||
const data = props.taskList[taskIndex.value]
|
||||
data.name = formData.value.voteName
|
||||
data.info = {...formData.value}
|
||||
data.duration = dayjs(formData.value.voteEndTime).diff(formData.value.voteStartTime,'minutes')
|
||||
}
|
||||
emit('update:taskList', [...props.taskList])
|
||||
closeDrawer()
|
||||
|
||||
Reference in New Issue
Block a user