--fix bug 重复数据

This commit is contained in:
yuping
2023-03-18 13:15:58 +08:00
parent 38efcd780c
commit 7e391e6145
12 changed files with 184 additions and 181 deletions

View File

@@ -136,13 +136,14 @@
import { defineEmits, defineProps, ref } from "vue"; import { defineEmits, defineProps, ref } from "vue";
import { Form, message } from "ant-design-vue"; import { Form, message } from "ant-design-vue";
import dayjs from "dayjs"; import dayjs from "dayjs";
import {useResetRef} from "@/utils/useCommon";
const props = defineProps({ const props = defineProps({
type: Number, type: Number,
taskList: [] taskList: []
}) })
const visible = ref(false) const visible = ref(false)
const formData = ref({ const formData = useResetRef({
activityName: '', activityName: '',
activityNotice: '', activityNotice: '',
activityStartTime: '', activityStartTime: '',
@@ -195,22 +196,14 @@ const rulesRef = ref({
], ],
}); });
const { resetFields, validate } = Form.useForm(formData, rulesRef); const { validate } = Form.useForm(formData, rulesRef);
const closeDrawer = () => { const closeDrawer = () => {
visible.value = false visible.value = false
taskIndex.value = -1 taskIndex.value = -1
dateTime.value = [] dateTime.value = []
resetFields() formData.reset()
}; };
/**
const range = (start, end) => {
const result = [];
for (let i = start; i < end; i++) {
result.push(i);
}
return result;
};*/
function timeChange(time, timeStr) { function timeChange(time, timeStr) {
formData.value.activityStartTime = timeStr[0] formData.value.activityStartTime = timeStr[0]
@@ -220,14 +213,7 @@ function timeChange(time, timeStr) {
const disabledDate = (current) => { const disabledDate = (current) => {
return current && current < dayjs().startOf('day'); 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() { async function confirm() {
// debugger // debugger
await validate().catch(({ errorFields }) => { await validate().catch(({ errorFields }) => {

View File

@@ -120,6 +120,7 @@ import { computed, defineEmits, defineProps, ref, watch } from "vue";
import { useBoeApiPage } from "@/api/request"; import { useBoeApiPage } from "@/api/request";
import { CASE_PAGE } from "@/api/ThirdApi"; import { CASE_PAGE } from "@/api/ThirdApi";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import {useResetRef} from "@/utils/useCommon";
const props = defineProps({ const props = defineProps({
type: Number, type: Number,
@@ -144,14 +145,13 @@ const columns = ref([
align: "center", align: "center",
}, },
]); ]);
const initParams = { const params = useResetRef({
keyWord: "", keyWord: "",
authorName: "", authorName: "",
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
orderAsc: true, orderAsc: true,
}; });
const params = ref(initParams);
const rowSelectKeys = ref([]); const rowSelectKeys = ref([]);
const selectsData = ref([]); const selectsData = ref([]);
@@ -221,9 +221,7 @@ function search() {
function reset() { function reset() {
rowSelectKeys.value = []; rowSelectKeys.value = [];
selectsData.value = []; selectsData.value = [];
params.value.pageIndex = 1; params.reset()
params.value.keyWord = "";
params.value.authorName = "";
fetch(); fetch();
} }
@@ -258,7 +256,6 @@ function confirm() {
} }
let selectedRows = ref(null); let selectedRows = ref(null);
function openDrawer(i, row) { function openDrawer(i, row) {
console.log("iiiiiiiii", i, row);
row && (rowSelectKeys.value = [row.info]); row && (rowSelectKeys.value = [row.info]);
row && (selectsData.value = [{ title: row.name, id: row.courseId }]); row && (selectsData.value = [{ title: row.name, id: row.courseId }]);
i >= 0 && (taskIndex.value = i); i >= 0 && (taskIndex.value = i);

View File

@@ -80,13 +80,14 @@
<script setup> <script setup>
import {defineEmits, defineProps, ref} from "vue"; import {defineEmits, defineProps, ref} from "vue";
import {Form, message} from "ant-design-vue"; import {Form, message} from "ant-design-vue";
import {useResetRef} from "@/utils/useCommon";
const props = defineProps({ const props = defineProps({
type: Number, type: Number,
taskList: [] taskList: []
}) })
const visible = ref(false) const visible = ref(false)
const formData = ref({discussName: '', discussExplain: '', discussSettings: ''}) const formData = useResetRef({discussName: '', discussExplain: '', discussSettings: ''})
const emit = defineEmits({}) const emit = defineEmits({})
const taskIndex = ref(-1); const taskIndex = ref(-1);
const dateTime = ref([]); const dateTime = ref([]);
@@ -105,13 +106,13 @@ const rulesRef = ref({
], ],
}); });
const {resetFields, validate} = Form.useForm(formData, rulesRef); const {validate} = Form.useForm(formData, rulesRef);
const closeDrawer = () => { const closeDrawer = () => {
visible.value = false visible.value = false
taskIndex.value = -1 taskIndex.value = -1
dateTime.value = [] dateTime.value = []
resetFields() formData.reset()
}; };
async function confirm() { async function confirm() {

View File

@@ -62,8 +62,8 @@
<div v-if="formData.evaluationTypeName" style="margin-left: 20px"> <div v-if="formData.evaluationTypeName" style="margin-left: 20px">
<a-tag closable @close="delTag" color="processing"> <a-tag closable @close="delTag" color="processing">
<span style="font-size: 14px; line-height: 33px">{{ <span style="font-size: 14px; line-height: 33px">{{
formData.evaluationTypeName formData.evaluationTypeName
}}</span> }}</span>
</a-tag> </a-tag>
</div> </div>
</div> </div>
@@ -112,17 +112,18 @@
</a-drawer> </a-drawer>
</template> </template>
<script setup> <script setup>
import { defineEmits, defineProps, ref } from "vue"; import {defineEmits, defineProps, ref} from "vue";
import EvList from "./EvList.vue"; import EvList from "./EvList.vue";
import { Form, message } from "ant-design-vue"; import {Form, message} from "ant-design-vue";
import dayjs from "dayjs"; import dayjs from "dayjs";
import {useResetRef} from "@/utils/useCommon";
const props = defineProps({ const props = defineProps({
type: Number, type: Number,
taskList: [], taskList: [],
}); });
const visible = ref(false); const visible = ref(false);
const formData = ref({ const formData = useResetRef({
evaluationName: "", evaluationName: "",
evaluationTypeId: "", evaluationTypeId: "",
evaluationTypeName: "", evaluationTypeName: "",
@@ -154,13 +155,13 @@ const rulesRef = ref({
], ],
}); });
const { resetFields, validate } = Form.useForm(formData, rulesRef); const { validate } = Form.useForm(formData, rulesRef);
const closeDrawer = () => { const closeDrawer = () => {
visible.value = false; visible.value = false;
taskIndex.value = -1; taskIndex.value = -1;
dateTime.value = []; dateTime.value = [];
resetFields(); formData.reset();
}; };
const range = (start, end) => { const range = (start, end) => {
@@ -210,7 +211,7 @@ async function confirm() {
} else { } else {
const data = props.taskList[taskIndex.value]; const data = props.taskList[taskIndex.value];
data.name = formData.value.evaluationName; data.name = formData.value.evaluationName;
data.info = {...formData.value}; data.info = { ...formData.value };
data.duration = dayjs(formData.value.evaluationEndTime).diff( data.duration = dayjs(formData.value.evaluationEndTime).diff(
formData.value.evaluationStartTime, formData.value.evaluationStartTime,
"minutes" "minutes"
@@ -223,10 +224,10 @@ async function confirm() {
function openDrawer(i, row) { function openDrawer(i, row) {
row && (formData.value = { ...row.info }); row && (formData.value = { ...row.info });
row && row &&
(dateTime.value = [ (dateTime.value = [
dayjs(row.info.evaluationStartTime, "YYYY-MM-DD HH:mm"), dayjs(row.info.evaluationStartTime, "YYYY-MM-DD HH:mm"),
dayjs(row.info.evaluationEndTime, "YYYY-MM-DD HH:mm"), dayjs(row.info.evaluationEndTime, "YYYY-MM-DD HH:mm"),
]); ]);
i >= 0 && (taskIndex.value = i); i >= 0 && (taskIndex.value = i);
visible.value = true; visible.value = true;
} }
@@ -443,8 +444,8 @@ defineExpose({ openDrawer });
} }
.ant-table-tbody .ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td { > td {
background: #f6f9fd; background: #f6f9fd;
} }

View File

@@ -28,13 +28,14 @@
import {defineEmits, defineProps, ref} from "vue"; import {defineEmits, defineProps, ref} from "vue";
import {Form, message} from "ant-design-vue"; import {Form, message} from "ant-design-vue";
import FaceClassAll from "@/components/drawers/FeaceClassAll.vue"; import FaceClassAll from "@/components/drawers/FeaceClassAll.vue";
import {useResetRef} from "@/utils/useCommon";
const props = defineProps({ const props = defineProps({
type: Number, type: Number,
taskList: [] taskList: []
}); });
const visible = ref(false); const visible = ref(false);
const formData = ref({ const formData = useResetRef({
courseId: "", courseId: "",
courseName: "", courseName: "",
}); });
@@ -55,12 +56,12 @@ const rulesRef = ref({
], ],
}); });
const { resetFields, validate } = Form.useForm(formData, rulesRef); const { validate } = Form.useForm(formData, rulesRef);
const closeDrawer = () => { const closeDrawer = () => {
visible.value = false; visible.value = false;
taskIndex.value = -1; taskIndex.value = -1;
resetFields(); formData.reset();
}; };
async function confirm() { async function confirm() {

View File

@@ -15,8 +15,8 @@
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img
src="@/assets/images/coursewareManage/asterisk.png" src="@/assets/images/coursewareManage/asterisk.png"
alt="" alt=""
/> />
</div> </div>
<span style="margin-right: 3px">作业名称</span> <span style="margin-right: 3px">作业名称</span>
@@ -33,22 +33,22 @@
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img
src="@/assets/images/coursewareManage/asterisk.png" src="@/assets/images/coursewareManage/asterisk.png"
alt="" alt=""
/> />
</div> </div>
<span style="margin-right: 3px">开始时间</span> <span style="margin-right: 3px">开始时间</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-range-picker <a-range-picker
style="width: 400px; height: 40px; border-radius: 8px" style="width: 400px; height: 40px; border-radius: 8px"
:show-time="{ format: 'hh:mm' }" :show-time="{ format: 'hh:mm' }"
:disabled-date="disabledDate" :disabled-date="disabledDate"
v-model:value="dateTime" v-model:value="dateTime"
format="YYYY-MM-DD HH:mm" format="YYYY-MM-DD HH:mm"
@change="timeChange" @change="timeChange"
:placeholder="[' 开始时间', ' 结束时间']" :placeholder="[' 开始时间', ' 结束时间']"
/> />
</div> </div>
</div> </div>
@@ -56,8 +56,8 @@
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img
src="@/assets/images/coursewareManage/asterisk.png" src="@/assets/images/coursewareManage/asterisk.png"
alt="" alt=""
/> />
</div> </div>
<span style="margin-right: 3px">作业要求</span> <span style="margin-right: 3px">作业要求</span>
@@ -90,69 +90,93 @@
import {defineEmits, defineProps, ref} from "vue"; import {defineEmits, defineProps, ref} from "vue";
import dayjs from "dayjs"; import dayjs from "dayjs";
import FJUpload from "@/components/common/FJUpload"; import FJUpload from "@/components/common/FJUpload";
import {useResetRef} from "@/utils/useCommon";
import {Form, message} from "ant-design-vue";
const props = defineProps({ const props = defineProps({
type: Number, type: Number,
taskList: [] taskList: []
}) });
const visible = ref(false) const visible = ref(false);
const formData = ref({}) const formData = useResetRef({ workName: "", submitStartTime: "", submitEndTime: "", workRequirement: "" });
const emit = defineEmits({}) const emit = defineEmits({});
const taskIndex = ref(-1); const taskIndex = ref(-1);
const dateTime = ref([]); const dateTime = ref([]);
const rulesRef = ref({
workName: [
{
required: true,
message: "请输入作业名称",
},
],
submitStartTime: [
{
required: true,
message: "请选择开始时间",
},
],
submitEndTime: [
{
required: true,
message: "请选择结束时间",
},
],
workRequirement: [
{
required: true,
message: "请输入作业要求",
},
],
});
const { validate } = Form.useForm(formData, rulesRef);
const closeDrawer = () => { const closeDrawer = () => {
visible.value = false visible.value = false;
taskIndex.value = -1 taskIndex.value = -1;
formData.value = {} formData.reset();
dateTime.value = [] dateTime.value = [];
}; };
/**
const range = (start, end) => {
const result = [];
for (let i = start; i < end; i++) {
result.push(i);
}
return result;
};
*/
function timeChange(time, timeStr) { function timeChange(time, timeStr) {
formData.value.submitStartTime = timeStr[0] formData.value.submitStartTime = timeStr[0];
formData.value.submitEndTime = timeStr[1] formData.value.submitEndTime = timeStr[1];
} }
const disabledDate = (current) => { const disabledDate = (current) => {
return current && current < dayjs().startOf('day'); return current && current < dayjs().startOf("day");
}; };
/**
const disabledRangeTime = () => ({ async function confirm() {
disabledHours: () => range(0, 24).splice(4, 20), await validate().catch(({ errorFields }) => {
disabledMinutes: () => range(30, 60), message.warning(errorFields[0].errors.join());
disabledSeconds: () => [55, 56], throw Error("数据校验不通过");
}); });
*/
function confirm() {
if (taskIndex.value === -1) { if (taskIndex.value === -1) {
const list = props.taskList const list = props.taskList;
list.push({name: formData.value.workName,duration:dayjs(formData.value.submitEndTime).diff(formData.value.submitStartTime,'minutes'), 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 { } else {
const data = props.taskList[taskIndex.value] const data = props.taskList[taskIndex.value];
data.name = formData.value.workName data.name = formData.value.workName;
data.info = {...formData.value} data.info = { ...formData.value };
data.duration = dayjs(formData.value.submitEndTime).diff(formData.value.submitStartTime,'minutes') data.duration = dayjs(formData.value.submitEndTime).diff(formData.value.submitStartTime, "minutes");
} }
emit('update:taskList', [...props.taskList]) emit("update:taskList", [...props.taskList]);
closeDrawer() closeDrawer();
} }
function openDrawer(i, row) { function openDrawer(i, row) {
row && (formData.value = {...row.info}); row && (formData.value = { ...row.info });
row && (dateTime.value = [dayjs(row.info.submitStartTime, "YYYY-MM-DD HH:mm"), dayjs(row.info.submitEndTime, "YYYY-MM-DD HH:mm")]); row && (dateTime.value = [dayjs(row.info.submitStartTime, "YYYY-MM-DD HH:mm"), dayjs(row.info.submitEndTime, "YYYY-MM-DD HH:mm")]);
(i >= 0) && (taskIndex.value = i); (i >= 0) && (taskIndex.value = i);
visible.value = true visible.value = true;
} }
defineExpose({openDrawer}) defineExpose({ openDrawer });
</script> </script>
<style lang="scss"> <style lang="scss">
.ant-table-striped :deep(.table-striped) td { .ant-table-striped :deep(.table-striped) td {

View File

@@ -28,13 +28,14 @@
import {defineEmits, defineProps, ref} from "vue"; import {defineEmits, defineProps, ref} from "vue";
import {Form, message} from "ant-design-vue"; import {Form, message} from "ant-design-vue";
import AssessmentAll from "@/components/drawers/AssessmentAll.vue"; import AssessmentAll from "@/components/drawers/AssessmentAll.vue";
import {useResetRef} from "@/utils/useCommon";
const props = defineProps({ const props = defineProps({
type: Number, type: Number,
taskList: [] taskList: []
}) })
const visible = ref(false) const visible = ref(false)
const formData = ref({ const formData = useResetRef({
assessmentId: '', assessmentId: '',
assessmentName: '', assessmentName: '',
}) })
@@ -55,12 +56,12 @@ const rulesRef = ref({
], ],
}); });
const {resetFields, validate} = Form.useForm(formData, rulesRef); const {validate} = Form.useForm(formData, rulesRef);
const closeDrawer = () => { const closeDrawer = () => {
visible.value = false visible.value = false
taskIndex.value = -1 taskIndex.value = -1
resetFields() formData.reset()
}; };
async function confirm() { async function confirm() {

View File

@@ -226,6 +226,7 @@ import ProjectManager from "@/components/project/ProjectManagerNew";
import AddInvistRoot from "@/components/drawers/AddInvistRoot.vue"; import AddInvistRoot from "@/components/drawers/AddInvistRoot.vue";
import { Form, message } from "ant-design-vue"; import { Form, message } from "ant-design-vue";
import { fileUp } from "../../api/indexEval"; import { fileUp } from "../../api/indexEval";
import {useResetRef} from "@/utils/useCommon";
const removePG = () => { const removePG = () => {
formData.value.assessmentId = ""; formData.value.assessmentId = "";
@@ -242,7 +243,7 @@ const props = defineProps({
taskList: [], taskList: [],
}); });
const visible = ref(false); const visible = ref(false);
const formData = ref({ const formData = useResetRef({
liveName: "", liveName: "",
liveLink: "", liveLink: "",
liveStartTime: "", liveStartTime: "",
@@ -325,38 +326,20 @@ const rulesRef = ref({
const { resetFields, validate } = Form.useForm(formData, rulesRef); const { resetFields, validate } = Form.useForm(formData, rulesRef);
const closeDrawer = () => { const closeDrawer = () => {
formData.value.liveCover = "";
formData.value.livePlaybackLink = "";
imageUrl.value = ""; imageUrl.value = "";
visible.value = false; visible.value = false;
taskIndex.value = -1; taskIndex.value = -1;
dateTime.value = []; dateTime.value = [];
formData.reset()
resetFields(); resetFields();
}; };
/**
const range = (start, end) => {
const result = [];
for (let i = start; i < end; i++) {
result.push(i);
}
return result;
};
*/
function timeChange(time, timeStr) { function timeChange(time, timeStr) {
formData.value.liveStartTime = timeStr[0]; formData.value.liveStartTime = timeStr[0];
formData.value.liveEndTime = timeStr[1]; formData.value.liveEndTime = timeStr[1];
} }
const disabledDate = (current) => { const disabledDate = (current) => {
return current && current < dayjs().startOf("day"); 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() { async function confirm() {
// debugger; // debugger;
console.log("确定按钮:"); console.log("确定按钮:");

View File

@@ -3,18 +3,18 @@
<slot></slot> <slot></slot>
</div> </div>
<a-drawer <a-drawer
:visible="visible" :visible="visible"
class="drawerStyle addrefDrawer" class="drawerStyle addrefDrawer"
width="1000" width="1000"
placement="right" placement="right"
> >
<div class="drawerMain"> <div class="drawerMain">
<div class="header"> <div class="header">
<div class="headerTitle">{{ taskIndex >= 0 ? "编辑" : "添加" }}外链</div> <div class="headerTitle">{{ taskIndex >= 0 ? "编辑" : "添加" }}外链</div>
<img <img
style="width: 29px; height: 29px; cursor: pointer" style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png" src="../../assets/images/basicinfo/close.png"
@click="closeDrawer" @click="closeDrawer"
/> />
</div> </div>
<div class="contentMain"> <div class="contentMain">
@@ -23,18 +23,18 @@
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img
src="@/assets/images/coursewareManage/asterisk.png" src="@/assets/images/coursewareManage/asterisk.png"
alt="" alt=""
/> />
</div> </div>
<span style="margin-right: 3px">外链名称</span> <span style="margin-right: 3px">外链名称</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-input <a-input
v-model:value="formData.linkName" v-model:value="formData.linkName"
style="width: 400px; height: 40px; border-radius: 8px;" style="width: 400px; height: 40px; border-radius: 8px;"
placeholder="请输入外链名称" placeholder="请输入外链名称"
show-count :maxlength="20" show-count :maxlength="20"
/> />
</div> </div>
</div> </div>
@@ -42,19 +42,19 @@
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img
src="@/assets/images/coursewareManage/asterisk.png" src="@/assets/images/coursewareManage/asterisk.png"
alt="" alt=""
/> />
</div> </div>
<span style="margin-right: 3px">链接</span> <span style="margin-right: 3px">链接</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-input <a-input
v-model:value="formData.linkAddress" v-model:value="formData.linkAddress"
style="width: 400px; height: 40px; border-radius: 8px;" style="width: 400px; height: 40px; border-radius: 8px;"
placeholder="请输入链接" placeholder="请输入链接"
show-count :maxlength="100" show-count :maxlength="100"
/> />
</div> </div>
</div> </div>
@@ -64,11 +64,11 @@
</div> </div>
<div class="textarea" style="width:400px;"> <div class="textarea" style="width:400px;">
<a-textarea <a-textarea
v-model:value="formData.linkDescription" v-model:value="formData.linkDescription"
placeholder="请输入外链说明" placeholder="请输入外链说明"
allow-clear allow-clear
:rows="6" :rows="6"
show-count :maxlength="200" show-count :maxlength="200"
/> />
</div> </div>
</div> </div>
@@ -83,66 +83,67 @@
</template> </template>
<script setup> <script setup>
import {defineEmits, defineProps, ref} from "vue"; import {defineEmits, defineProps, ref} from "vue";
import {Form, message} from 'ant-design-vue'; import {Form, message} from "ant-design-vue";
import {useResetRef} from "@/utils/useCommon";
const props = defineProps({ const props = defineProps({
type: Number, type: Number,
taskList: [] taskList: []
}) });
const visible = ref(false) const visible = ref(false);
const formData = ref({linkName: '', linkAddress: '', linkDescription: ''}) const formData = useResetRef({ linkName: "", linkAddress: "", linkDescription: "" });
const emit = defineEmits({}) const emit = defineEmits({});
const taskIndex = ref(-1); const taskIndex = ref(-1);
const dateTime = ref([]); const dateTime = ref([]);
const rulesRef = ref({ const rulesRef = ref({
linkName: [ linkName: [
{ {
required: true, required: true,
message: '请输入链接名称', message: "请输入链接名称",
}, },
], ],
linkAddress: [ linkAddress: [
{ {
type: 'url', type: "url",
required: true, required: true,
message: '请输入合法的链接地址', message: "请输入合法的链接地址",
}, },
], ],
}); });
const {resetFields, validate} = Form.useForm(formData, rulesRef); const { validate } = Form.useForm(formData, rulesRef);
const closeDrawer = () => { const closeDrawer = () => {
visible.value = false visible.value = false;
taskIndex.value = -1 taskIndex.value = -1;
dateTime.value = [] dateTime.value = [];
resetFields() formData.reset();
}; };
async function confirm() { async function confirm() {
await validate().catch(({errorFields}) => { await validate().catch(({ errorFields }) => {
message.warning(errorFields[0].errors.join()); message.warning(errorFields[0].errors.join());
throw Error("数据校验不通过") throw Error("数据校验不通过");
}); });
if (taskIndex.value === -1) { if (taskIndex.value === -1) {
const list = props.taskList const list = props.taskList;
list.push({name: formData.value.linkName, type: props.type, info: {...formData.value}}) list.push({ name: formData.value.linkName, type: props.type, info: { ...formData.value } });
} else { } else {
const data = props.taskList[taskIndex.value] const data = props.taskList[taskIndex.value];
data.name = formData.value.linkName data.name = formData.value.linkName;
data.info = {...formData.value} data.info = { ...formData.value };
} }
emit('update:taskList', [...props.taskList]) emit("update:taskList", [...props.taskList]);
closeDrawer() closeDrawer();
} }
function openDrawer(i, row) { function openDrawer(i, row) {
row && (formData.value = {...row.info}); row && (formData.value = { ...row.info });
(i >= 0) && (taskIndex.value = i); (i >= 0) && (taskIndex.value = i);
visible.value = true visible.value = true;
} }
defineExpose({openDrawer}) defineExpose({ openDrawer });
</script> </script>
<style lang="scss"> <style lang="scss">
.ant-table-striped :deep(.table-striped) td { .ant-table-striped :deep(.table-striped) td {
@@ -261,7 +262,7 @@ defineExpose({openDrawer})
background: #4ea6ff; background: #4ea6ff;
border-radius: 8px; border-radius: 8px;
border: 0; border: 0;
margin-right: 16px 8px 32px 0; margin-right: 16px;
color: #fff; color: #fff;
margin-top: 16px; margin-top: 16px;
margin-bottom: 60px; margin-bottom: 60px;
@@ -279,7 +280,7 @@ defineExpose({openDrawer})
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16); box-shadow: 0 1px 35px 0 rgba(118, 136, 166, 0.16);
.btn1 { .btn1 {
width: 100px; width: 100px;

View File

@@ -246,6 +246,7 @@ import { defineEmits, defineProps, ref, watch } from "vue";
import STest from "./SelectTest.vue"; import STest from "./SelectTest.vue";
import dayjs from "dayjs"; import dayjs from "dayjs";
import { Form, message } from "ant-design-vue"; import { Form, message } from "ant-design-vue";
import {useResetRef} from "@/utils/useCommon";
const props = defineProps({ const props = defineProps({
type: Number, type: Number,
@@ -269,7 +270,7 @@ const initValue = {
externalExplain: "", externalExplain: "",
examinationExplain: "" examinationExplain: ""
} }
const formData = ref(initValue) const formData = useResetRef(initValue)
const innerRule = { const innerRule = {
examinationName: [ examinationName: [
{ {
@@ -323,14 +324,12 @@ const outerRule = {
], ],
} }
const rulesRef = ref(innerRule); const rulesRef = ref(innerRule);
const emit = defineEmits({}) const emit = defineEmits({})
const taskIndex = ref(-1); const taskIndex = ref(-1);
const dateTime = ref([]); const dateTime = ref([]);
let isEdit = ref(true); let isEdit = ref(true);
const { resetFields, validate } = Form.useForm(formData, rulesRef); const { resetFields, validate } = Form.useForm(formData, rulesRef);
watch(() => formData.value.examType, () => { watch(() => formData.value.examType, () => {
formData.value.examType === 1 ? rulesRef.value = innerRule : rulesRef.value = outerRule formData.value.examType === 1 ? rulesRef.value = innerRule : rulesRef.value = outerRule
}) })
@@ -338,9 +337,7 @@ watch(() => formData.value.examType, () => {
const closeDrawer = () => { const closeDrawer = () => {
visible.value = false visible.value = false
taskIndex.value = -1 taskIndex.value = -1
formData.value.examinationLimit = '' formData.reset()
formData.value.examinationExplain = ''
resetFields()
dateTime.value = [] dateTime.value = []
}; };

View File

@@ -113,13 +113,14 @@ import {defineEmits, defineProps, ref} from "vue";
import CreateVote from "./CreateVote.vue"; import CreateVote from "./CreateVote.vue";
import {Form, message} from "ant-design-vue"; import {Form, message} from "ant-design-vue";
import dayjs from "dayjs"; import dayjs from "dayjs";
import {useResetRef} from "@/utils/useCommon";
const props = defineProps({ const props = defineProps({
type: Number, type: Number,
taskList: [] taskList: []
}) })
const visible = ref(false) const visible = ref(false)
const formData = ref({ const formData = useResetRef({
voteName: '', voteName: '',
voteStartTime: '', voteStartTime: '',
voteEndTime: '', voteEndTime: '',
@@ -156,13 +157,13 @@ const rulesRef = ref({
], ],
}); });
const {resetFields, validate} = Form.useForm(formData, rulesRef); const {validate} = Form.useForm(formData, rulesRef);
const closeDrawer = () => { const closeDrawer = () => {
visible.value = false visible.value = false
taskIndex.value = -1 taskIndex.value = -1
dateTime.value = [] dateTime.value = []
resetFields() formData.reset()
}; };
function timeChange(time, timeStr) { function timeChange(time, timeStr) {

View File

@@ -19,6 +19,16 @@ export function useInterval(fun, time) {
return { start }; return { start };
} }
export function useResetRef(initValue) {
const valueRef = ref(initValue);
function reset() {
valueRef.value = initValue;
}
return Object.assign(valueRef, { reset });
}
export function useTimeout(asyncFun, time) { export function useTimeout(asyncFun, time) {
const timer = ref(); const timer = ref();
const maxCount = ref(0); const maxCount = ref(0);