reactor:合并考试代码

src/layout/navBars/breadcrumb/userNews.vue

@@ -12,7 +12,7 @@
 				<template #default>
 					<template v-if="state.newsList.length > 0">
 						<div class="content-box-item" v-for="(v, k) in state.newsList" :key="k" @click="linkNews(v)">
-							<div class="text-no-wrap">{{ v.title }} ({{ v.circularTypeText }})</div>
+							<div class="text-no-wrap">【{{ v.circularTypeName }}】{{ v.title }} ({{ v.circularTypeText }})</div>
 							<div class="content-box-msg">
 								<div class="text-ellipsis2" v-html="v.content"></div>
 							</div>

src/views/auxiliary/notice/components/Notice-add.vue

@@ -412,7 +412,7 @@ const onSubmit = throttle(async (formEl: FormInstance | undefined) => {
 		switch (dialogTitle.value) {
 			case '新增通知':
 				const checkedTable = tables.value?.filter((item: any) => item.checked).map((item: any) => item);
-				const nodesOrg = treeSearchRef.value.getCheckedNodes();
+				const nodesOrg = treeSearchRef.value?.getCheckedNodes();
 				if (state.ruleForm.circularType === 1 && !checkedTable.length) {
 					ElMessage.warning('请选择通知人');
 					loading.value = false;

src/views/auxiliary/notice/components/Notice-edit.vue

@@ -478,7 +478,7 @@ const onSubmit = throttle(async (formEl: FormInstance | undefined) => {
 		switch (dialogTitle.value) {
 			case '编辑通知':
 				const checkedTable = tables.value?.filter((item: any) => item.checked).map((item: any) => item);
-				const nodesOrg = treeSearchRef.value.getCheckedNodes();
+				const nodesOrg = treeSearchRef.value?.getCheckedNodes();
 				if (state.ruleForm.circularType === 1 && !checkedTable.length) {
 					ElMessage.warning('请选择通知人');
 					loading.value = false;

src/views/examTrain/exam/marking/components/Exam-Marking.vue

@@ -67,7 +67,7 @@
 						<div>
 							<el-button type="primary" @click="onSave(ruleFormRef)" :loading="state.loading" v-if="!isView">保存</el-button>
 							<!--							<el-button type="primary" @click="onSubmit" :loading="state.loading">提交</el-button>-->
-							<el-button class="default-button" @click="onCancel" :loading="state.loading">关闭 </el-button>
+							<el-button class="default-button" @click="onCancel" :loading="state.loading">取消 </el-button>
 						</div>
 					</div>
 				</pane>
@@ -78,16 +78,12 @@
 
 <script setup lang="ts" name="examTrainExamMarkingEdit">
 import { computed, onMounted, reactive, ref } from 'vue';
-import type { FormInstance } from 'element-plus';
 import { ElMessage } from 'element-plus';
 import mittBus from '@/utils/mitt';
 import { useRoute, useRouter } from 'vue-router';
 import { Splitpanes, Pane } from 'splitpanes';
 import 'splitpanes/dist/splitpanes.css';
-import { Local } from '@/utils/storage';
-import other from '@/utils/other';
-import { throttle, transformFile, guid } from '@/utils/tools';
-import { addExamManage, editExamManage, getExamManageDetail, getTestPaperQuestionCount } from '@/api/examTrain/examManage';
+import { throttle } from '@/utils/tools';
 import { batchMarking, getMarkingDetailByUser, getMarkingDetailUser } from '@/api/examTrain/marking';
 
 // 定义变量内容
@@ -144,7 +140,8 @@ const onSave = throttle(() => {
 			isCheck: true,
 		};
 	});
-	batchMarking({items:request})
+	state.loading = true;
+	batchMarking({ items: request })
 		.then(() => {
 			state.loading = false;
 			handleSuccess();