feat:修改版本号

This commit is contained in:
lixg
2022-12-09 08:52:11 +08:00
12 changed files with 990 additions and 887 deletions

View File

@@ -141,6 +141,28 @@ export default defineComponent({
}); });
</script> </script>
<style lang="scss"> <style lang="scss">
//.ant-modal {
//
// .ant-modal-content {
// background-image: linear-gradient(
// 180deg, rgba(103, 64, 255, .2), rgba(166, 168, 255, 0), rgba(166, 168, 255, 0)) !important;
// border-radius: 4px;
//
// .ant-modal-body {
// .ant-btn {
// border-radius: 8px;
// width: 100px;
// height: 40px;
// }
//
// .ant-btn-primary {
// background: #4ea6ff;
// color: #fff;
// }
// }
// }
//}
#app { #app {
// font-family: MicrosoftYaHei, Microsoft YaHei, Avenir, Helvetica, Arial, // font-family: MicrosoftYaHei, Microsoft YaHei, Avenir, Helvetica, Arial,
// sans-serif; // sans-serif;

View File

@@ -71,7 +71,13 @@ export const queryEvaluationDetailById = (obj) =>
"Content-Type": "application/x-www-form-urlencoded;charset=UTF-8", "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
}, },
}); });
export const queryEvaluationMessageById = (obj) =>
http.post("/evaluation/queryEvaluationMessageById", obj, {
headers: {
token: "123",
"Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
},
});
//修改测评信息 //修改测评信息
export const updateEvaluation = (obj) => export const updateEvaluation = (obj) =>
http.post("/evaluation/updateEvaluation", obj); http.post("/evaluation/updateEvaluation", obj);

4
src/api/student.js Normal file
View File

@@ -0,0 +1,4 @@
import http from "./config";
export const studentDelAll = (params) => http.get('/admin/student/del', {params})

View File

@@ -24,7 +24,7 @@
<div class="file_img"></div> <div class="file_img"></div>
<div class="file_detail"> <div class="file_detail">
<div class="file_name"> <div class="file_name">
<span style="color: #6f6f6f">{{ item.name }}</span> <span style="color: #6f6f6fwidth:200px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">{{ item.name }}</span>
</div> </div>
<!-- <div class="file_size">--> <!-- <div class="file_size">-->
<!-- <span style="color: #999ba3">{{ item.size }}</span>--> <!-- <span style="color: #999ba3">{{ item.size }}</span>-->
@@ -167,21 +167,21 @@ function del(i) {
.updataxq { .updataxq {
position: absolute; position: absolute;
right: 2px; right: -62px;
top: -30px; top: -30px;
color: #57c887; color: #57c887;
} }
.updataxq1 { .updataxq1 {
position: absolute; position: absolute;
right: 2px; right: -62px;
top: -30px; top: -30px;
color: #388be1; color: #388be1;
} }
.updataxq2 { .updataxq2 {
position: absolute; position: absolute;
right: 2px; right: -62px;
top: -30px; top: -30px;
color: #ff7474; color: #ff7474;
} }

View File

@@ -237,14 +237,14 @@ export default {
.then((res) => { .then((res) => {
message.destroy() message.destroy()
message.success("获取测评信息成功"); message.success("获取测评信息成功");
state.inputV1 = res.data.data.evaluationName state.inputV1 = res.data.data.evaluationName;
state.evaluationTypeName = res.data.data.evaluationTypeName state.evaluationTypeName = res.data.data.evaluationTypeName;
state.evaluationTypeId = res.data.data.evaluationTypeId; state.evaluationTypeId = res.data.data.evaluationTypeId;
state.time = res.data.data.evaluationStartTime ? [ state.time = res.data.data.evaluationStartTime ? [
dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD"), dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD"),
dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD"), dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD"),
] : undefined; ] : undefined;
state.description = res.data.data.evaluationExplain state.description = res.data.data.evaluationExplain;
}) })
.catch((err) => { .catch((err) => {
message.destroy() message.destroy()

View File

@@ -352,11 +352,9 @@
<div class="signbox"> <div class="signbox">
<span style="margin-right: 3px">已选考试:</span> <span style="margin-right: 3px">已选考试:</span>
</div> </div>
<div class="btnbox" @click="showDrawerAddTest"> <div class="btnbox">
<a-tag closable color="processing" @close="logT"> <a-tag closable color="processing" @close="logT">
<span style="font-size: 14px; line-height: 33px">{{ <span style="font-size: 14px; line-height: 33px">{{testName}}</span>
testName
}}</span>
</a-tag> </a-tag>
</div> </div>
</div> </div>
@@ -396,10 +394,15 @@ import { debounce } from "lodash-es";
import { queryFaceDetailById, editPlan } from "../../api/indexFace"; import { queryFaceDetailById, editPlan } from "../../api/indexFace";
import dayjs from "dayjs"; import dayjs from "dayjs";
import AssessmentList from "../drawers/ AssessmentList.vue"; import AssessmentList from "../drawers/ AssessmentList.vue";
// import { toDate } from "../../api/method";、 // import { toDate } from "../../api/method";、
import { addTempTask } from "../../api/indexTaskadd"; import { addTempTask } from "../../api/indexTaskadd";
import ProjectManager from "@/components/project/ProjectManagerNew"; import ProjectManager from "@/components/project/ProjectManagerNew";
import { detail } from "../../api/indexCourse";
import { queryAppraiseDetailById } from "../../api/indexInvist";
import {queryWorkDetailById} from "@/api/indexWork";
import {queryExaminationDetailById} from "@/api/indexExam";
export default { export default {
name: "AddFaceteach", name: "AddFaceteach",
components: { components: {
@@ -495,6 +498,7 @@ export default {
EditTestId: null, EditTestId: null,
EditWorkId: null, EditWorkId: null,
workName: null, workName: null,
testName: null,
assessmentVisible: false, assessmentVisible: false,
needEval: false, needEval: false,
onlySign: false, onlySign: false,
@@ -588,7 +592,6 @@ export default {
state.before = result.beforeStart; state.before = result.beforeStart;
state.afterStartValue = result.afterStart; state.afterStartValue = result.afterStart;
state.fileList = JSON.parse(result.attach); state.fileList = JSON.parse(result.attach);
state.EditWorkId = result.homeWorkId;
state.onlySign = state.onlySign =
result.completeType.split(",")[0] == "1" ? true : false; result.completeType.split(",")[0] == "1" ? true : false;
state.completeLeave = state.completeLeave =
@@ -602,7 +605,19 @@ export default {
state.EditWorkId = result.homeWorkId; state.EditWorkId = result.homeWorkId;
state.assessmentId = result.evaluateId; state.assessmentId = result.evaluateId;
state.needEval = result.evaluateId; state.needEval = result.evaluateId;
detail({offcourseId:result.offcourseId}).then((res)=>{
state.chooseCourseName =res.data.data.name;
});
queryAppraiseDetailById({assessmentId:result.evaluateId}).then((res)=>{
state.assessmentName =res.data.data.assessmentName;
});
queryWorkDetailById({workId:result.homeWorkId}).then((res)=>{
state.workName = res.data.data.workName;
});
queryExaminationDetailById({ examinationId: result.testId }).then((res)=>{
state.testName = res.data.data.examinationName;
});
console.log("state=======", state); console.log("state=======", state);
}); });
}; };

View File

@@ -338,6 +338,7 @@ import { fileUp } from "../../api/indexEval";
import AssessmentList from "../drawers/ AssessmentList.vue"; import AssessmentList from "../drawers/ AssessmentList.vue";
import { debounce } from "lodash-es"; import { debounce } from "lodash-es";
import ProjectManager from "@/components/project/ProjectManagerNew"; import ProjectManager from "@/components/project/ProjectManagerNew";
import { queryAppraiseDetailById } from "../../api/indexInvist";
// import { useRouter } from "vue-router"; // import { useRouter } from "vue-router";
function getBase64(img, callback) { function getBase64(img, callback) {
@@ -519,6 +520,9 @@ export default {
value: res.data.data.liveTeacherId || "", value: res.data.data.liveTeacherId || "",
label: res.data.data.liveTeacherName || "", label: res.data.data.liveTeacherName || "",
}; };
queryAppraiseDetailById({assessmentId:res.data.data.assessmentId}).then((res)=>{
state.assessmentName =res.data.data.assessmentName;
});
}) })
.catch(() => { .catch(() => {
//message.error(`查询失败`); //message.error(`查询失败`);

View File

@@ -554,6 +554,7 @@ export default {
console.log("formState.testName", state.testName); console.log("formState.testName", state.testName);
localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive); localStorage.setItem("chapterId", props.isactive);
state.addLoading = false;
resetForm(); resetForm();
}; };
const closeDrawer2 = () => { const closeDrawer2 = () => {
@@ -561,6 +562,7 @@ export default {
ctx.emit("update:edit", false); ctx.emit("update:edit", false);
ctx.emit("update:addtestVisible", false); ctx.emit("update:addtestVisible", false);
resetForm(); resetForm();
state.addLoading = false;
}; };
const afterVisibleChange = () => { const afterVisibleChange = () => {
console.log("props", props); console.log("props", props);
@@ -597,7 +599,6 @@ export default {
state.paperName = res.data.data.examinationTestName; state.paperName = res.data.data.examinationTestName;
// state.paperId= // state.paperId=
state.paperId = res.data.data.examinationTestId; state.paperId = res.data.data.examinationTestId;
state.paperName = res.data.data.examinationTestName;
if ( if (
res.data.data.examinationEndTime && res.data.data.examinationEndTime &&
res.data.data.examinationStartTime res.data.data.examinationStartTime
@@ -617,6 +618,7 @@ export default {
}; };
const updateTest = () => { const updateTest = () => {
//state.addLoading = true;updateTask //state.addLoading = true;updateTask
let obj = { let obj = {
examinationDuration: formState.examinationDuration, examinationDuration: formState.examinationDuration,
examinationEndTime: dayjs(formState.choosedTime[1]).format( examinationEndTime: dayjs(formState.choosedTime[1]).format(
@@ -656,7 +658,7 @@ export default {
message.destroy(); message.destroy();
return message.warning("请输入考试时长"); return message.warning("请输入考试时长");
} }
state.addLoading = true;
if (props.edit) { if (props.edit) {
// 编辑任务 // 编辑任务
updateExamination(obj) updateExamination(obj)
@@ -685,6 +687,8 @@ export default {
state.EditTestId = res.data.data.examinationId; state.EditTestId = res.data.data.examinationId;
if (props.faceLevel) { if (props.faceLevel) {
state.EditTestId = res.data.data.examinationId; state.EditTestId = res.data.data.examinationId;
closeDrawer();
} else { } else {
if (props.isLevel == 1) { if (props.isLevel == 1) {
let editObj1 = { let editObj1 = {
@@ -701,7 +705,7 @@ export default {
console.log("props.edit", props.edit); console.log("props.edit", props.edit);
message.success(`${props.edit ? "编辑" : "新增"}任务成功`); message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
ctx.emit("changeData", false); ctx.emit("changeData", false);
state.addLoading = false;
closeDrawer(); closeDrawer();
}) })
.catch(() => { .catch(() => {

View File

@@ -221,7 +221,7 @@
</div> </div>
</a-radio-group> </a-radio-group>
</div> </div>
<!--
<div class="b_sup" :style="{ display: bs_hs ? 'block' : 'none' }"> <div class="b_sup" :style="{ display: bs_hs ? 'block' : 'none' }">
<div class="ofmb_items"> <div class="ofmb_items">
<div class="signbox"> <div class="signbox">
@@ -257,7 +257,7 @@
</div> </div>
</a-radio-group> </a-radio-group>
</div> </div>
</div> --> </div>
<div class="b_footer"> <div class="b_footer">
<div class="btn btn5" @click="of_exit1"> <div class="btn btn5" @click="of_exit1">
<div class="btnText">取消</div> <div class="btnText">取消</div>
@@ -2979,29 +2979,7 @@ const columns6 = [
return index + 1 + pageNum; return index + 1 + pageNum;
}, },
}, },
{ {
title: "创建人",
dataIndex: "createName",
key: "createName",
width: "10%",
align: "center",
ellipsis: true,
customRender: ({ text }) => {
return text ? text : "-";
},
},
{
title: "教师名称",
dataIndex: "teacher",
key: "teacher",
width: "10%",
align: "center",
ellipsis: true,
customRender: ({ text }) => {
return text ? text : "-";
},
},
{
title: "课程名称", title: "课程名称",
dataIndex: "organization", dataIndex: "organization",
key: "organization", key: "organization",
@@ -3012,7 +2990,7 @@ const columns6 = [
return text ? text : "-"; return text ? text : "-";
}, },
}, },
{ {
title: "场地", title: "场地",
dataIndex: "address", dataIndex: "address",
key: "saddress", key: "saddress",
@@ -3023,6 +3001,21 @@ const columns6 = [
return text ? text : "-"; return text ? text : "-";
}, },
}, },
{
title: "教师名称",
dataIndex: "teacher",
key: "teacher",
width: "10%",
align: "center",
ellipsis: true,
customRender: ({ text }) => {
return text ? text : "-";
},
},
{ {
title: "开始时间", title: "开始时间",
dataIndex: "starttime", dataIndex: "starttime",
@@ -3046,6 +3039,17 @@ const columns6 = [
// return text ? getdateToTime(text * 1000) : "-"; // return text ? getdateToTime(text * 1000) : "-";
return text ? text : "-"; return text ? text : "-";
}, },
},
{
title: "创建人",
dataIndex: "createName",
key: "createName",
width: "10%",
align: "center",
ellipsis: true,
customRender: ({ text }) => {
return text ? text : "-";
},
}, },
{ {
title: "操作", title: "操作",
@@ -3361,7 +3365,7 @@ export default defineComponent({
faceManageTab: "1", faceManageTab: "1",
of_hs: false, of_hs: false,
hideshow: true, hideshow: true,
bs_hs: true, bs_hs: false,
ft_hs: false, ft_hs: false,
lookMs: false, lookMs: false,
om_1: false, om_1: false,
@@ -4741,7 +4745,7 @@ export default defineComponent({
completeType: item.completeType, completeType: item.completeType,
endTime: new Date(item.endTime) / 1000, endTime: new Date(item.endTime) / 1000,
evalFlag: item.evalFlag, evalFlag: item.evalFlag,
name: '复制'+item.name, name: item.name+'1',
signFlag: item.signFlag, //是否允许未报名的签到:1是0否 signFlag: item.signFlag, //是否允许未报名的签到:1是0否
//signWordFlag: item.signWordFlag, //签到是否需要口令:1是0否 //signWordFlag: item.signWordFlag, //签到是否需要口令:1是0否
teacherId: item.teacherId, teacherId: item.teacherId,
@@ -4765,7 +4769,7 @@ export default defineComponent({
}); });
const postData = { const postData = {
offcourseId: null, //不传代表新增 offcourseId: null, //不传代表新增
name: '复制'+item.name, name: item.name+'1',
picUrl: item.picUrl, picUrl: item.picUrl,
targetUser: item.targetUser, targetUser: item.targetUser,
meaning: item.meaning, meaning: item.meaning,

View File

@@ -666,6 +666,16 @@ export default defineComponent({
: "-"; : "-";
console.log("state.auditDescription", state.auditDescription); console.log("state.auditDescription", state.auditDescription);
} }
api2.auditList(obj).then((res)=>{
if(res.data.data.rows &&res.data.data.rows.length > 0){
let i =res.data.data.rows.length ;
state.auditDescription = res.data.data.rows[i-1].description?res.data.data.rows[i-1].description :"-";
console.log("state.auditDescription",state.auditDescription);
}
})
} }
state.qdms_inputV1 = item.name; state.qdms_inputV1 = item.name;
@@ -678,7 +688,13 @@ export default defineComponent({
state.qdms_inputV6 = item.intro; state.qdms_inputV6 = item.intro;
state.member = { value: item.teacherId, name: item.teacher }; state.member = { value: item.teacherId, name: item.teacher };
valueHtml.value = item.outline; valueHtml.value = item.outline;
state.attach = item.attach; let arrss = item.attach.split(',')
let str =''
for(let i=0;i<arrss.length;i++){
i == arrss.length -1 ? str += arrss[i].slice(arrss[i].lastIndexOf('/')+1) : str += arrss[i].slice(arrss[i].lastIndexOf('/')+1) + ','
}
console.log(str)
state.attach = str;
}; };
const handleTagChange = () => { const handleTagChange = () => {

View File

@@ -635,6 +635,7 @@
<span class="th">{{ stuTotal }}</span> <span class="th">{{ stuTotal }}</span>
<span class="yi"> </span> <span class="yi"> </span>
</div> </div>
<div class="clear" @click="clearChooseStu">清空</div>
</div> </div>
<div class="tableBox" style="margin-top: 30px"> <div class="tableBox" style="margin-top: 30px">
<a-table <a-table
@@ -1288,6 +1289,7 @@ import * as api from "../../api/index1";
import { editRoutered } from "../../api/indexLearningPath"; import { editRoutered } from "../../api/indexLearningPath";
import { codeUrl } from "../../api/method"; import { codeUrl } from "../../api/method";
import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue"; import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
// import * as student from "@/api/student";
export default { export default {
name: "LevelAdd", name: "LevelAdd",
components: { components: {
@@ -2307,9 +2309,22 @@ export default {
}; };
state.codeInfo = obj; state.codeInfo = obj;
}; };
//清空所选的学员
const clearChooseStu = () => {
Modal.confirm({
title: '确定清空所有学员吗?', onOk: async () => {
state.addAuthList = []
// student.studentDelAll({id: state.routerId, type: 2})
// state.tabledata = []
// state.tableDataTotal = 0;
}, bodyStyle: 'margin-top:70%'
});
};
return { return {
...toRefs(state), ...toRefs(state),
...toRefs(levelList), ...toRefs(levelList),
clearChooseStu,
showDeleteALLModal, showDeleteALLModal,
closeDeleteALLModal, closeDeleteALLModal,
tableDataFunc, tableDataFunc,
@@ -2369,6 +2384,14 @@ export default {
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
.clear {
cursor: pointer;
font-size: 14px;
color: #387df7;
line-height: 24px;
position: absolute;
right: 60px;
}
.pub { .pub {
.ant-modal { .ant-modal {
.ant-modal-body { .ant-modal-body {

File diff suppressed because it is too large Load Diff