diff --git a/src/components/drawers/ AssessmentList.vue b/src/components/drawers/ AssessmentList.vue
index 0be19b7f..9775accb 100644
--- a/src/components/drawers/ AssessmentList.vue
+++ b/src/components/drawers/ AssessmentList.vue
@@ -93,6 +93,10 @@ export default {
titleTag: {
type: Boolean,
default: false,
+ },
+ assessmentName:{
+ type:String,
+ default: null,
}
},
setup(props, ctx) {
@@ -105,7 +109,8 @@ export default {
tableDataTotal: 0,
tableData: [],
selectedRowKeys: [],
- assessmentId:null
+ assessmentId:null,
+ assessmentName:null,
});
const closeDrawer = () => {
state.selectedRowKeys = [];
@@ -157,13 +162,17 @@ export default {
const rowSelection = {
type: "radio",
onSelect: (selectedRows) => {
+
state.assessment =selectedRows;
- state.assessmentId = selectedRows.assessmentId;
+
+ /* state.assessmentId = selectedRows.assessmentId;
ctx.emit("checkedAss", state.assessment);
ctx.emit("update:assessmentId", state.assessmentId);
+ ctx.emit("update:assessmentName", state.assessment.name);
+ console.log("state.assessment",state.assessment);
state.selectedRowKeys = [];
- closeDrawer();
- },
+ closeDrawer();*/
+ },
};
// const onSelectChange = (selectedRowKeys) => {
// if(selectedRowKeys.length>2){return}
@@ -179,6 +188,8 @@ export default {
state.assessmentId = selectRow[0].assessmentId;
ctx.emit("checkedAss", state.assessment);
ctx.emit("update:assessmentId", state.assessmentId);
+ ctx.emit("update:assessmentName", state.assessment.name);
+
state.selectedRowKeys = [];
closeDrawer();
};
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index 930d5e9b..bd913849 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -33,11 +33,15 @@
-
- {{
- evaluationTypeName
- }}
-
+
+
+ {{evaluationTypeName}}
+
+
+
+
@@ -259,11 +263,11 @@ export default {
const editInvistText = () => {
if (!state.inputV1) {
message.destroy();
- return message.info("请输入测评名称");
+ return message.warning("请输入测评名称");
}
if (!state.evaluationTypeId) {
message.destroy();
- return message.info("请选择测评");
+ return message.warning("请选择测评");
}
let objei = {
evaluationName: state.inputV1,
@@ -295,11 +299,11 @@ export default {
const createEvalText = () => {
if (!state.inputV1) {
message.destroy();
- return message.info("请输入测评名称");
+ return message.warning("请输入测评名称");
}
if (!state.evaluationTypeId) {
message.destroy();
- return message.info("请选择测评");
+ return message.warning("请选择测评");
}
let obj = {
evaluationName: state.inputV1,
diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index ad5eaee1..fca1980e 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -193,7 +193,7 @@
- 删除评估
+ {{assessmentName}}
{
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 1dedcb9a..4cc9fc5b 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -207,7 +207,7 @@
@@ -215,6 +215,7 @@
v-model:assessmentVisible="assessmentVisible"
v-model:titleTag="titleTag"
v-model:assessmentId="assessmentId"
+ v-model:assessmentName="assessmentName"
/>
@@ -401,6 +402,7 @@ export default {
type: Number,
default: null,
},
+
},
setup(props, ctx) {
// const router = useRouter();
@@ -439,6 +441,7 @@ export default {
needEval: false,
switchC2: false,
assessmentVisible: false,
+ assessmentName:"",
});
const closeDrawer = () => {
ctx.emit("update:addliveVisible", false);
diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index 0850304e..d0270c04 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -460,7 +460,7 @@ export default {
}
}
message.destroy();
- message.info("在线课(" + tipStr + ")重复添加");
+ message.warning("在线课(" + tipStr + ")重复添加");
return;
} else {
state.addOnlineList.map((value) => {
@@ -521,7 +521,7 @@ export default {
}
}
message.destroy();
- message.info("在线课(" + tipStr + ")重复添加");
+ message.warning("在线课(" + tipStr + ")重复添加");
return;
} else {
state.addOnlineList.map((value) => {
diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue
index 23dc5b6c..bf00676c 100644
--- a/src/components/drawers/AddProject.vue
+++ b/src/components/drawers/AddProject.vue
@@ -466,7 +466,7 @@ export default {
closeSameModal();
closeDrawer();
message.destroy();
- message.info("添加成功");
+ message.warning("添加成功");
return;
}
if (origin.length == 0) {
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 2b2f5b5d..0128d5ea 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -48,6 +48,13 @@
+
+

+
+
+
+
+

+
选择考试
-
+
+
- 删除考试
+ {{paperName}}
@@ -130,6 +122,12 @@
+
+

+
+
+

+
{
- if (!value) {
- return Promise.reject("请输入考试名称");
- }
- };
- /*
- let checkChoosedTest = async (_rule, value) => {
- if (!value) {
- return Promise.reject("请选择考试");
- }
- };*/
- let checkChoosedTime = async (_rule, value) => {
- if (!value.length) {
- return Promise.reject("请选择时间");
- }
- };
-
- let checkExaminationDuration = async (_rule, value) => {
- if (!value) {
- return Promise.reject("请输入考试时长");
- }
- };
- let checkLimit = async (_rule, value) => {
- if (!value) {
- return Promise.reject("请输入考试限制");
- }
- };
- let checkShowAnswers = async (_rule, value) => {
- if (!value) {
- return Promise.reject("请输入作业名称");
- }
- };
- let checkShowAnalysis = async (_rule, value) => {
- if (!value) {
- return Promise.reject("请输入作业名称");
- }
- };
- let checkScoringModel = async (_rule, value) => {
- if (!value) {
- return Promise.reject("请输入作业名称");
- }
- };
-
- let checkQuestionArrangement = async (_rule, value) => {
- if (!value) {
- return Promise.reject("请输入作业名称");
- }
- };
- const rules = {
- examinationName: [
- {
- required: true,
- validator: checkExaminationName,
- trigger: "change",
- },
- ],
-
- /*
- choosedTest: [
- {
- required: true,
- validator: checkChoosedTest,
- trigger: "change",
- },
- ],*/
- choosedTime: [
- {
- required: true,
- validator: checkChoosedTime,
- trigger: "change",
- },
- ],
- examinationDuration: [
- {
- required: true,
- validator: checkExaminationDuration,
- trigger: "change",
- },
- ],
- limit: [
- {
- required: true,
- validator: checkLimit,
- trigger: "change",
- },
- ],
- showAnswers: [
- {
- validator: checkShowAnswers,
- trigger: "change",
- },
- ],
- showAnalysis: [
- {
- validator: checkShowAnalysis,
- trigger: "change",
- },
- ],
- scoringModel: [
- {
- validator: checkScoringModel,
- trigger: "change",
- },
- ],
-
- questionArrangement: [
- {
- validator: checkQuestionArrangement,
- trigger: "change",
- },
- ],
- };
const options1 = ref([
{
label: "math",
@@ -644,7 +529,7 @@ export default {
updateTest();
};
const handleFinishFailed = () => {
- message.error("handleFinishFailed");
+ // message.error("handleFinishFailed");
};
const resetForm = () => {
formRef.value.resetFields();
@@ -747,10 +632,24 @@ export default {
examinationTestId: state.paperId,
examinationTestName: state.paperName,
};
- if (!(state.paperId > 0)) {
+
+ if (!formState.examinationName) {
message.destroy();
- return message.error("请选择考试");
+ return message.warning("请输入考试名称");
}
+ if (!state.paperId) {
+ message.destroy();
+ return message.warning("请输入选择考试");
+ }
+ if (!formState.choosedTime) {
+ message.destroy();
+ return message.warning("请输入开始结束时间");
+ }
+ if (!formState.examinationDuration) {
+ message.destroy();
+ return message.warning("请输入考试时长");
+ }
+
if (props.edit) {
// 编辑任务
updateExamination(obj)
@@ -862,12 +761,8 @@ export default {
const changeOuter = (value) => {
state.isOuter = value;
};
- const chooseTest = (index) => {
- for (let i in state.choosedTestList) {
- if (state.choosedTestList[i].key == formState.choosedTest[index].key)
- return;
- }
- state.choosedTestList.push(formState.choosedTest[index]);
+ const chooseTest = () => {
+
};
const closeTag = (removedTag) => {
const tags = state.choosedTestList.filter(
@@ -900,7 +795,7 @@ export default {
formRef,
delTag,
// layout,
- rules,
+
updateTest,
queryTest,
changeOuter,
diff --git a/src/components/drawers/AddVotebak.vue b/src/components/drawers/AddVotebak.vue
index 49da2ff7..bd07dd52 100644
--- a/src/components/drawers/AddVotebak.vue
+++ b/src/components/drawers/AddVotebak.vue
@@ -305,7 +305,7 @@ export default {
const updateVoteInfo = () => {
if (!state.inputV1) {
message.destroy();
- return message.info("请输入投票名称");
+ return message.warning("请输入投票名称");
}
if (state.basevote == "") {
diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue
index 109f2c2f..72541977 100644
--- a/src/components/drawers/CreVote.vue
+++ b/src/components/drawers/CreVote.vue
@@ -215,19 +215,19 @@ export default {
const createQueTit = () => {
if (!state.inputV1) {
message.destroy();
- return message.info("请输入投票名称");
+ return message.warning("请输入投票名称");
}
for (let i = 0; i < state.questions.length; i++) {
if (!state.questions[i].inputV) {
message.destroy();
- return message.info("请输入题干");
+ return message.warning("请输入题干");
}
}
for (let i = 0; i < state.questions.length; i++) {
for (let k = 0; k < state.questions[i].options.length; k++) {
if (!state.questions[i].options[k].opvalue) {
message.destroy();
- return message.info("请输入选项");
+ return message.warning("请输入选项");
}
}
}
diff --git a/src/components/drawers/SelectTest.vue b/src/components/drawers/SelectTest.vue
index ea5f1e99..87ff0335 100644
--- a/src/components/drawers/SelectTest.vue
+++ b/src/components/drawers/SelectTest.vue
@@ -65,7 +65,7 @@
:row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
- hideSelectAll: true,
+ type: 'radio',
}"
:scroll="{ x: 900 }"
:pagination="false"
@@ -215,9 +215,6 @@ export default {
};
const onSelectChange = (selectedRowKeys, selectedRows) => {
- if (selectedRowKeys.length > 1) {
- return;
- }
state.selectedRowKeys = selectedRowKeys;
state.SelectTestData = selectedRows[0];
};
diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index 0c87fcd5..993efd68 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -403,11 +403,11 @@ export default {
const updateVoteInfo = () => {
if (!state.inputV1) {
message.destroy();
- return message.info("请输入投票名称");
+ return message.warning("请输入投票名称");
}
if (!state.ballotId) {
message.destroy();
- return message.info("请创建题干信息");
+ return message.warning("请创建题干信息");
}
if (!state.time) {
@@ -415,7 +415,7 @@ export default {
return message.warning("请输入直播时间");
}
if (!state.basevote) {
- return message.info("请上传投票基数");
+ return message.warning("请上传投票基数");
}
if (state.time != undefined) {
state.startTime = dayjs(state.time[0]).format("YYYY-MM-DD");
diff --git a/src/views/projectcenter/ClassAdd.vue b/src/views/projectcenter/ClassAdd.vue
index 404af865..b23dc47d 100644
--- a/src/views/projectcenter/ClassAdd.vue
+++ b/src/views/projectcenter/ClassAdd.vue
@@ -621,7 +621,7 @@ export default {
const beforeUpload1 = () => {
return new Promise((resovle, reject) => {
if (uplodaFileCount) {
- message.info("上传文件数量已达最大数量");
+ message.warning("上传文件数量已达最大数量");
return reject(false);
}
return resovle(true);
diff --git a/src/views/projectcenter/SonProject.vue b/src/views/projectcenter/SonProject.vue
index 8e1fa816..35fcb067 100644
--- a/src/views/projectcenter/SonProject.vue
+++ b/src/views/projectcenter/SonProject.vue
@@ -621,7 +621,7 @@ export default {
const beforeUpload1 = () => {
return new Promise((resovle, reject) => {
if (uplodaFileCount) {
- message.info("上传文件数量已达最大数量");
+ message.warning("上传文件数量已达最大数量");
return reject(false);
}
return resovle(true);
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index 0d1050b7..a8ccf876 100644
--- a/src/views/projectcenter/templateAdd.vue
+++ b/src/views/projectcenter/templateAdd.vue
@@ -488,7 +488,7 @@ export default {
const beforeUpload1 = () => {
return new Promise((resovle, reject) => {
if (uplodaFileCount) {
- message.info("上传文件数量已达最大数量");
+ message.warning("上传文件数量已达最大数量");
return reject(false);
}
return resovle(true);
diff --git a/src/views/research/components/ResearchAddPin.vue b/src/views/research/components/ResearchAddPin.vue
index ea4caa3e..c56d9e4f 100644
--- a/src/views/research/components/ResearchAddPin.vue
+++ b/src/views/research/components/ResearchAddPin.vue
@@ -212,7 +212,7 @@ export default {
const minChange = (e) => {
if (e > curItem.value.maxScore)
- return message.info("最低分不能超过最高分");
+ return message.warning("最低分不能超过最高分");
curItem.value.minScore = e;
let arr = state.scoreListClone.concat([]);
arr.map((value, index) => {
@@ -224,7 +224,7 @@ export default {
};
const maxChange = (e) => {
if (e < curItem.value.minScore)
- return message.info("最高分不能低于最低分");
+ return message.warning("最高分不能低于最低分");
curItem.value.maxScore = e;
let arr = state.scoreListClone.concat([]);
arr.map((value, index) => {