feat:合并

This commit is contained in:
lixg
2022-12-06 16:13:44 +08:00
parent 22a65426f3
commit ebc8ade5f9
2 changed files with 282 additions and 282 deletions

View File

@@ -255,6 +255,11 @@ export default {
if (res.data.code === 200) {
// state.selectedRowKeys = [0];
for (let i = 0; i < res.data.data.list.length; i++) {
console.log(
"res.data.data.list[i].casesId",
res.data.data.list[i].casesId,
props.EditCaseId
);
if (Number(res.data.data.list[i].casesId) == props.EditCaseId) {
state.selectedRowKeys = [i];
}

View File

@@ -48,7 +48,7 @@
<div class="main_left">
<div class="main_item">
<div class="btnbox">
<div class="sign" style="margin-bottom:24px">
<div class="sign" style="margin-bottom: 24px">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
@@ -65,13 +65,13 @@
style="width: 424px; height: 32px; margin-left: 35px"
autocomplete="off"
placeholder="请输入考试名称"
show-count :maxlength="20"
show-count
:maxlength="20"
/>
</a-form-item>
</div>
</div>
<div class="main_item2">
<a-form-item
has-feedback
label="考试说明"
@@ -84,14 +84,15 @@
allow-clear
:rows="6"
style="margin-left: 35px"
show-count :maxlength="200"
show-count
:maxlength="200"
/>
</div>
</a-form-item>
</div>
<div class="main_item">
<div class="btnbox">
<div class="sign" style="margin-bottom:24px">
<div class="sign" style="margin-bottom: 24px">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
@@ -108,21 +109,23 @@
选择考试
</a-button>
<a-tag v-if="paperName != ''" closable color="processing" @close="delTag">
<span style="font-size:14px;line-height: 33px;">{{paperName}}</span>
<a-tag
v-if="paperName != ''"
closable
color="processing"
@close="delTag"
>
<span style="font-size: 14px; line-height: 33px">{{
paperName
}}</span>
</a-tag>
</a-form-item>
</div>
</div>
<div class="main_item">
<div class="btnbox">
<div class="sign" style="margin-bottom:24px">
<div class="sign" style="margin-bottom: 24px">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
@@ -140,7 +143,7 @@
</div>
<div class="main_item">
<div class="btnbox">
<div class="sign" style="margin-bottom:24px">
<div class="sign" style="margin-bottom: 24px">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
@@ -199,15 +202,13 @@
:value="1"
@click="cloradio1"
>允许查看
</a-radio
>
</a-radio>
<a-radio
v-model:checked="checked"
:value="2"
@click="cloradio1"
>不允许查看
</a-radio
>
</a-radio>
</a-radio-group>
</a-form-item>
</div>
@@ -224,15 +225,13 @@
:value="1"
@click="cloradio2"
>允许查看
</a-radio
>
</a-radio>
<a-radio
v-model:checked="checked"
:value="2"
@click="cloradio2"
>不允许查看
</a-radio
>
</a-radio>
</a-radio-group>
</a-form-item>
</div>
@@ -249,15 +248,13 @@
:value="1"
@click="cloradio3"
>最高一次
</a-radio
>
</a-radio>
<a-radio
v-model:checked="checked"
:value="2"
@click="cloradio3"
>最后一次
</a-radio
>
</a-radio>
</a-radio-group>
</a-form-item>
</div>
@@ -290,22 +287,19 @@
:value="1"
@click="cloradio4"
>试题乱序
</a-radio
>
</a-radio>
<a-radio
v-model:checked="checked"
:value="2"
@click="cloradio4"
>试题排
</a-radio
>
>选项乱
</a-radio>
<a-radio
v-model:checked="checked"
:value="3"
@click="cloradio4"
>全部乱序
</a-radio
>
</a-radio>
</a-radio-group>
</a-form-item>
</div>
@@ -342,7 +336,8 @@
style="width: 424px; height: 32px; margin-left: 35px"
autocomplete="off"
placeholder="请输入考试名称"
show-count :maxlength="20"
show-count
:maxlength="20"
/>
</a-form-item>
</div>
@@ -359,7 +354,8 @@
style="width: 424px; height: 32px; margin-left: 35px"
autocomplete="off"
placeholder="数据来源"
show-count :maxlength="20"
show-count
:maxlength="20"
/>
</a-form-item>
</div>
@@ -378,7 +374,8 @@
allow-clear
:rows="6"
style="margin-left: 35px"
show-count :maxlength="200"
show-count
:maxlength="200"
/>
</div>
</a-form-item>
@@ -393,23 +390,23 @@
</div>
<!-- 加载动画 -->
<div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
<a-spin :spinning="addLoading" tip="添加中..."/>
<a-spin :spinning="addLoading" tip="添加中..." />
</div>
<!-- 选择考试抽屉 -->
<s-test v-model:STvisible="STvisible" @getSTData="getData"/>
<s-test v-model:STvisible="STvisible" @getSTData="getData" />
</a-drawer>
</template>
<script>
import {reactive, ref, toRefs} from "vue";
import {message} from "ant-design-vue";
import { reactive, ref, toRefs } from "vue";
import { message } from "ant-design-vue";
import {
createExamination,
queryExaminationDetailById,
updateExamination,
} from "@/api/indexExam";
import STest from "./SelectTest.vue";
import {ProjectEditTask, RouterEditTask} from "@/api/indexTask";
import {addTempTask} from "../../api/indexTaskadd";
import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
import { addTempTask } from "../../api/indexTaskadd";
import dayjs from "dayjs";
export default {
@@ -470,7 +467,7 @@ export default {
type: Number,
default: null,
},
testName:{
testName: {
type: String,
default: null,
},
@@ -499,12 +496,12 @@ export default {
paperName: "", //试卷名称 子组件传过来给考试抽屉选择试卷后框框用
id: "",
testName: "",
TestName:"",
testObj:{
name:"",
paperId:"",
choosedTime:"",
duration:""
TestName: "",
testObj: {
name: "",
paperId: "",
choosedTime: "",
duration: "",
},
choosedTestList: [
{
@@ -542,7 +539,7 @@ export default {
console.log(args);
};
const closeDrawer = () => {
console.log('closeDrawer')
console.log("closeDrawer");
formState.choosedTime = "";
ctx.emit("update:addtestVisible", false);
ctx.emit("update:edit", false);
@@ -560,7 +557,7 @@ export default {
resetForm();
};
const afterVisibleChange = () => {
console.log('props', props)
console.log("props", props);
if (props.addtestVisible && props.edit) {
// 该页面显示同时 edit为true 时,发送查询请求,
queryTest();
@@ -575,7 +572,7 @@ export default {
};
const queryTest = () => {
// state.addLoading = true;
queryExaminationDetailById({examinationId: props.EditTestId})
queryExaminationDetailById({ examinationId: props.EditTestId })
.then((res) => {
formState.examinationName = res.data.data.examinationName;
formState.workRequirement = res.data.data.workRequirement;
@@ -761,9 +758,7 @@ export default {
const changeOuter = (value) => {
state.isOuter = value;
};
const chooseTest = () => {
};
const chooseTest = () => {};
const closeTag = (removedTag) => {
const tags = state.choosedTestList.filter(
(item) => item.key != removedTag