hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-13 04:46:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat:合并

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/drawers/AddCase.vue
View File

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

105
src/components/drawers/AddTest.vue
View File

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