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

添加面授任务

Browse Source
This commit is contained in:
zhangyc
2022-11-27 16:39:22 +08:00
parent 339d77fd1d
commit a586bf108e
11 changed files with 562 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package-lock.json generated
View File

@@ -19867,7 +19867,7 @@
},
"sortablejs": {
"version": "1.15.0",
"resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.0.tgz",
"resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.15.0.tgz",
"integrity": "sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w=="
},
"source-map": {
@@ -20676,7 +20676,7 @@
},
"vuedraggable": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-4.1.0.tgz",
"resolved": "https://registry.npmmirror.com/vuedraggable/-/vuedraggable-4.1.0.tgz",
"integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==",
"requires": {
"sortablejs": "1.14.0"
@@ -20684,7 +20684,7 @@
"dependencies": {
"sortablejs": {
"version": "1.14.0",
"resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz",
"resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.14.0.tgz",
"integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w=="
}
}

32
src/api/indexVote.js
View File

@@ -42,10 +42,16 @@ import qs from 'qs';
// 接口-请求
//基础票数上传接口
export const baseVoteupload = (obj) => http.post('/vote/baseVoteupload', obj)
export const baseVoteupload = (obj) => http.post('/vote/baseVoteupload', obj,{
headers: {
'token': '123',
'Content-Type' : 'multipart/form-data',
}
})
//创建题干信息接口
export const createOptionMessage = (obj) => http.post('/vote/createOptionMessage', obj)
export const createStemMessage = (obj) => http.post('/vote/createOptionMessage', obj)
//投票信息创建接口
export const createVote = (obj) => http.post('/vote/createVote', obj)
@@ -54,7 +60,12 @@ export const createVote = (obj) => http.post('/vote/createVote', obj)
export const deleteVoteMessage = (obj) => http.post('/vote/deleteVoteMessage', { params: obj })
//删除题干信息接口
export const deleteVoteStem = (obj) => http.post('/vote/deleteVoteStem', { params: obj })
export const deleteVoteStem = (obj) => http.post('/vote/deleteVoteStem', obj,{
headers: {
'token': '123',
'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
}
})
//删除题选项息接口
export const deleteVoteStemOption = (obj) => http.post('/vote/deleteVoteStemOption', { params: obj })
@@ -64,15 +75,24 @@ export const editVote = (obj) => http.post('/vote/editVote', obj)
//根据题干ID获取题干信息
export const queryStemByStemId = (obj) => http.post('/vote/queryStemByStemId', obj,{
headers: {'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'}
})
headers: {
'token': '123',
'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
}
})
//修改题干信息接口
export const updateStemMessage = (obj) => http.post('/vote/updateStemMessage', obj);
//上传组件
export const fileUp = (obj) => http.post('/file/upload', obj, qs.stringify({ obj }));
//根据题干ID获取投票任务
export const queryVoteDetailById = (obj) => http.post('/vote/queryVoteDetailById', obj,{
headers: {
'token': '123',
'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
}
})
// 测试方法
// import * as api from '../../api/index'

16
src/components/drawers/ AssessmentList.vue
View File

@@ -82,7 +82,7 @@ export default {
type: Boolean,
default: false,
},
isface: {
assessmentId: {
type: Number,
default: null,
},
@@ -101,10 +101,12 @@ export default {
tableDataTotal: 0,
tableData: [],
selectedRowKeys: [],
assessmentId:null,
});
const closeDrawer = () => {
ctx.emit("update:assessmentVisible", false);
ctx.emit("update:titleTag", true);
};
const afterVisibleChange = (bool) => {
console.log("state getAllInvistText", bool,"======",props.titleTag);
@@ -150,14 +152,10 @@ export default {
const rowSelection = {
type: "radio",
onSelect: (selectedRows) => {
state.assessment = selectedRows;
console.log("selectedRows=======", state.assessment);
if (props.isface == 1) {
ctx.emit("faceAssess", state.assessment);
} else {
ctx.emit("checkedAss", state.assessment);
}
state.assessment =selectedRows;
state.assessmentId = selectedRows.assessmentId;
ctx.emit("checkedAss", state.assessment);
ctx.emit("update:assessmentId", state.assessmentId);
state.selectedRowKeys = [];
closeDrawer();
},

244
src/components/drawers/AddFaceteach.vue
View File

@@ -49,29 +49,20 @@
</div>
<div class="btnbox" @click="showDrawerSelFacet">
<button class="xkbtn">
{{ chooseCourse == null ? "授课" : "修改" }}课程
{{ chooseCourse == null ? "选择" : "修改" }}面授课
</button>
<a-tag
style="
width: 104px;
height: 32px;
border-radius: 4px;
color: #388be1;
display: flex;
align-items: center;
"
color="#ECF3FC"
v-if="chooseCourse !== null"
closable
@close="closeTag"
>{{ chooseCourseName }}</a-tag
>
<div v-if = "chooseCourse > 0">
<a-tag closable color="processing" @close="logC">
<span style="font-size:14px;line-height: 33px;" >删除课程</span>
</a-tag></div>
</div>
<!-- 选择面授侧弹窗 -->
<div>
<sel-facet
v-model:selfacetVisible="selfacetvisible"
@getData="upDateTable"
v-model:chooseCourse="chooseCourse"
/>
</div>
<!-- 选择面授侧弹窗 -->
@@ -211,9 +202,11 @@
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
</div>
<div class="qdqtbox">
<div class="qtbtn"><div class="btntext">签退</div></div>
</div>
</div>
<div class="setbox">
<div class="timerbox">
<span>结束前：</span>
@@ -225,8 +218,7 @@
width: 88px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
overflow: hidden; "
:v-model:value="inputV7"
></a-input-number>
<span style="color: #999999; margin-left: 8px"
@@ -245,9 +237,10 @@
<a-radio v-model:checked="checked" :value="1" @click="cloradio1"
>仅签到</a-radio
>
<!--
<a-radio v-model:checked="checked" :value="2" @click="cloradio1"
>签到、签退全部完成</a-radio
>
>-->
</a-radio-group>
</div>
</div>
@@ -276,6 +269,9 @@
</a-radio-group>
</div>
</div>
<div class="main_item2">
<div class="signbox">
<span style="margin-right: 3px">评估：</span>
@@ -284,24 +280,30 @@
<a-checkbox v-model:checked="checkedAssessment"
>需要评估</a-checkbox
>
<button class="xkbtn" @click="showAssessment">选择评估</button>
<a-tag
style="
width: 104px;
height: 32px;
border-radius: 4px;
color: #388be1;
display: flex;
align-items: center;
"
color="#ECF3FC"
v-if="chooseMent !== null"
closable
@close="closeTag"
>{{ chooseMentName }}</a-tag
>
</div>
</div>
<div class="main_item">
<div class="signbox">
</div>
<div class="btnbox">
<button class="xkbtn" @click="showAssessment">选择评估</button>
<div v-if = "assessmentId >0 ">
<a-tag closable color="processing" @close="logA">
<span style="font-size:14px;line-height: 33px;" >删除评估</span>
</a-tag></div>
<AssessmentList
v-model:assessmentVisible="assessmentVisible"
v-model:titleTag="titleTag"
v-model:assessmentId="assessmentId"
/>
</div>
</div>
</div>
<div class="main_right">
<div class="main_item">
@@ -310,6 +312,11 @@
</div>
<div class="btnbox" @click="showDrawerAddHomework">
<button class="xkbtn">配置</button>
<div v-if = "EditWorkId >0">
<a-tag closable color="processing" @close="logW">
<span style="font-size:14px;line-height: 33px;" >删除作业</span>
</a-tag></div>
</div>
<!-- 添加作业侧弹窗 -->
@@ -317,28 +324,14 @@
<add-homework
v-model:addhomeworkVisible="addhomeworkvisible"
@getWork="getWork"
v-model:face="face"
:faceLevel="true"
v-model:EditWorkId="EditWorkId"
/>
</div>
<!-- 添加作业侧弹窗 -->
</div>
<div>
<a-tag
style="
width: 104px;
height: 32px;
border-radius: 4px;
color: #388be1;
display: flex;
align-items: center;
margin-left: 120px;
"
color="#ECF3FC"
v-if="chooseWork !== null"
closable
@close="closeTagWork"
>{{ chooseWorkName }}</a-tag
>
</div>
<div class="main_item">
<div class="signbox">
@@ -346,10 +339,16 @@
</div>
<div class="btnbox" @click="showDrawerAddTest">
<button class="xkbtn">配置</button>
<div v-if = "EditTestId >0">
<a-tag closable color="processing" @close="logT">
<span style="font-size:14px;line-height: 33px;" >删除考试</span>
</a-tag></div>
</div>
<!-- 添加考试侧弹窗 -->
<div>
<add-test v-model:addtestVisible="addtestvisible" />
<add-test v-model:addtestVisible="addtestvisible"
v-model:EditTestId ="EditTestId"/>
</div>
<!-- 添加考试侧弹窗 -->
</div>
@@ -373,11 +372,7 @@
<button class="btn1">取消</button>
<button class="btn2" @click="updateFaceTeach">确定</button>
</div>
<assessment-list
v-model:assessmentVisible="assessmentVisible"
v-model:isface="isface"
@faceAssess="faceAssess"
/>
</div>
</a-drawer>
</template>
@@ -394,8 +389,7 @@ import { debounce } from "lodash-es";
import { queryFaceDetailById, editPlan } from "../../api/indexFace";
import dayjs from "dayjs";
import AssessmentList from "../drawers/ AssessmentList.vue";
// import { toDate } from "../../api/method";
import { queryWorkDetailById } from "../../api/indexWork";
// import { toDate } from "../../api/method";、
import { addTempTask } from "../../api/indexTaskadd";
export default {
name: "AddFaceteach",
@@ -481,15 +475,13 @@ export default {
chooseTime: [],
fileList: [],
chooseCourse: null, //选择的在线课程
chooseCourseName: null, //选择的课程的名字
face: true, //面授传给配置作业的标识
chooseWork: null, //配置的work
chooseWorkName: null, //配置的work名字
chooseWorkId: null, //配置的work ID
chooseMent: null,
chooseMentName: null,
assessmentId:null,
EditTestId:null,
EditWorkId:null,
assessmentVisible: false,
isface: 1,
checkedAssessmentId:null,
isface: 1
});
const clear = () => {
state.inputV1 = null;
@@ -505,12 +497,11 @@ export default {
state.radioV2 = "";
state.checkedHolidy = false;
state.checkedAssessment = false;
state.chooseMent = null;
state.chooseWork = null;
state.chooseWorkId = null;
state.chooseWorkName = null;
state.chooseCourse = null;
state.chooseCourseName = null;
state.EditTestId =null;
state.assessmentId=null;
state.EditWorkId=null;
};
const closeDrawer = () => {
ctx.emit("update:addfaceteachVisible", false);
@@ -524,13 +515,33 @@ export default {
if (bool && props.edit) {
// 该页面显示同时 edit为true 时，发送查询请求,
queryFaceTeach();
}
};
const logC= e => {
state.chooseCourse=null;
console.log(e);
};
const logW = e => {
state.EditWorkId=null;
console.log(e);
};
const logT= e => {
state.EditTestId=null;
console.log(e);
};
const logA= e => {
state.EditEvalId=null;
console.log(e);
};
const showDrawerSelFacet = () => {
state.selfacetvisible = true;
};
const showDrawerAddHomework = () => {
state.addhomeworkvisible = true;
};
const showDrawerAddTest = () => {
state.addtestvisible = true;
@@ -545,6 +556,11 @@ export default {
state.radioV2 = "";
}
};
/*
const getCheckedAss = (ass) => {
state.assessment = ass;
state.assessmentId = ass.assessmentId
};*/
//查询面授
const queryFaceTeach = () => {
//暂时写一个假的offcoursePlanId
@@ -569,7 +585,7 @@ export default {
state.inputV6 = result.afterStart;
state.inputV7 = result.beforeEnd;
state.fileList = JSON.parse(result.attach);
state.chooseWorkId = result.homeWorkId;
state.EditWorkId = result.homeWorkId;
// state.radioV1 = result.
state.checkedHolidy =
result.completeType == 1
@@ -592,18 +608,24 @@ export default {
state.radioV1 = "2";
}
state.checkedAssessment = result.evalFlag == 1 ? true : false;
/*
if (state.chooseWorkId) {
queryWorkDetailById({ workId: state.chooseWorkId }).then((res) => {
state.chooseWork = res.data.data;
state.chooseWorkName = res.data.data.workName;
});
}
}*/
state.chooseCourse =result.offcourseId;
state.EditTestId = result.testId;
state.EditWorkId=result.homeWorkId;
state.assessmentId =result.evaluateId;
});
};
//新建或编辑面授
// 新增任务
const updateFaceTeach = () => {
console.log("==========",state.chooseCourse,"hha");
if (
state.inputV1 == "" ||
state.chooseCourse == null ||
@@ -633,47 +655,35 @@ export default {
endTime: parseInt(new Date(state.chooseTime[1].$d).getTime() / 1000),
// endTime: "",
evalFlag: state.checkedAssessment == true ? 1 : 0,
evaluateId:
state.chooseMent == null ? 0 : state.chooseMent.assessmentId,
homeWorkId: state.chooseWorkId || 0,
evaluateId:state.assessmentId,
homeWorkId: state.EditWorkId,
name: state.inputV1,
noProjectMember: state.radioV2 == "1" ? 0 : 1,
offcourseId: 0,
offcoursePlanId: props.edit ? props.EditFaceId : 0,
projectMember: state.radioV2 == "1" ? 1 : 0,
offcourseId:state.chooseCourse,
offcoursePlanId:props.edit ? props.EditFaceId : 0,
projectMember:state.radioV2 == "1" ? 1 : 0,
signFlag: 0,
signWordFlag: 0,
teacherId: state.memberId,
testId: 0,
testId: state.EditTestId,
// teacher: state.inputV2,
};
if (props.edit) {
editPlan(obj)
editPlan(obj)
.then((res) => {
updateTask(res);
closeDrawer();
})
.catch((err) => {
}).catch((err) => {
message.error(`添加失败${err}`);
});
} else {
editPlan(obj)
.then((res) => {
updateTask(res);
closeDrawer();
})
.catch((err) => {
message.error(`添加失败${err}`);
});
}
}
};
const upDateTable = (value) => {
console.log("gg", value);
console.log("gg", value[0].name);
state.chooseCourse = value[0];
state.chooseCourseName = value[0].name;
// state.chooseCourse = value[0];
//state.chooseCourseName = value[0].name;
};
//更新任务列表
@@ -724,8 +734,8 @@ export default {
courseId: res.data.data.offcoursePlanId,
duration: 0,
name: res.data.data.name,
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
projectTemplateId: props.projectTemplateId,
projectTemplateTaskId: props.projectTemplateTaskId || 0,
stageId: props.chooseStageId,
type: 2,
})
@@ -740,23 +750,7 @@ export default {
});
}
};
const closeTag = () => {
state.chooseCourse = null;
state.chooseCourseName = null;
};
const closeTagWork = () => {
state.chooseWork = null;
state.chooseWorkName = null;
state.chooseWorkId = null;
};
const getWork = (value) => {
console.log("getWork", value);
state.chooseWork = value;
state.chooseWorkName = value.workName;
state.chooseWorkId = value.workId;
// console.log("getWorkName", value.workName);
};
const handleChange = ({ file, fileList }) => {
if (file.status !== "uploading") {
console.log(file, fileList);
@@ -764,6 +758,7 @@ export default {
};
const showAssessment = () => {
state.assessmentVisible = true;
};
const faceAssess = (value) => {
console.log(value);
@@ -842,9 +837,6 @@ export default {
updateFaceTeach,
updateTask,
upDateTable,
closeTag,
getWork,
closeTagWork,
clear,
handleChange,
showAssessment,
@@ -855,6 +847,11 @@ export default {
handleSearch,
handleChange2,
templateScroll,
logC,
logT,
logW,
logA,
};
},
};
@@ -980,15 +977,14 @@ export default {
.xkbtn {
cursor: pointer;
width: 130px;
width: 130px;
height: 40px;
background: #388be1;
border-radius: 8px;
border: 0;
margin-right: 16px 8px 32px 0;
color: #fff;
margin-top: 16px;
margin-bottom: 60px;
}
}
}

134
src/components/drawers/AddHomework.vue
View File

@@ -165,7 +165,7 @@ export default {
type: Number,
default: null,
},
face: {
faceLevel: {
type: Boolean,
default: false,
},
@@ -259,18 +259,21 @@ export default {
const fileList = ref([]);
const closeDrawer = () => {
resetForm();
fileList.value = [];
formState.choosedTime = "";
ctx.emit("update:addhomeworkVisible", false);
ctx.emit("update:edit", false);
ctx.emit("changeData", false);
ctx.emit("update:EditWorkId", state.EditWorkId);
console.log("state.EditWorkId==============",state.EditWorkId);
localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive);
fileList.value = [];
resetForm();
};
const afterVisibleChange = () => {
if (props.addhomeworkVisible && props.edit) {
// 该页面显示同时 edit为true 时，发送查询请求,
if (props.EditWorkId >0) {
state.EditWorkId = props.EditWorkId;
queryWork();
}
};
@@ -285,7 +288,7 @@ export default {
workName: formState.workName,
workRequirement: formState.workRequirement,
};
if (props.edit) {
if (props.EditWorkId >0) {
updateWorkTaskUsing(obj)
.then((res) => {
updateTask(res);
@@ -325,62 +328,69 @@ export default {
};
// 新增编辑或新增项目任务
const updateTask = (res) => {
if (props.isLevel == 1) {
let editObj1 = {
chapterId: props.isactive,
courseId: res.data.data.workId,
name: res.data.data.workName,
routerId: props.routerId,
routerTaskId: props.routerTaskId || 0,
type: 4,
};
if(props.faceLevel){
state.EditWorkId = res.data.data.workId
}else{
if (props.isLevel == 1) {
let editObj1 = {
chapterId: props.isactive,
courseId: res.data.data.workId,
name: res.data.data.workName,
routerId: props.routerId,
routerTaskId: props.routerTaskId || 0,
type: 4,
};
RouterEditTask(editObj1)
.then(() => {
message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
ctx.emit("changeData", false);
state.addLoading = false;
})
.catch(() => {
message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
} else if (props.isLevel == 2) {
let editObj = {
courseId: res.data.data.workId,
name: res.data.data.workName,
projectId: props.edit ? props.projectId : 0,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId,
type: 4,
};
ProjectEditTask(editObj)
.then(() => {
message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false);
state.addLoading = false;
})
.catch(() => {
message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
} else if (props.isLevel == 3) {
console.log("");
addTempTask({
courseId: res.data.data.workId,
name: res.data.data.workName,
projectId: props.edit ? props.projectId : 0,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId,
type: 4,
})
.then(() => {
message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false);
state.addLoading = false;
})
.catch(() => {
message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
RouterEditTask(editObj1)
.then(() => {
message.success(`${props.EditWorkId > 0 ? "编辑" : "新增"}关卡任务成功`);
ctx.emit("changeData", false);
state.addLoading = false;
})
.catch(() => {
message.error(`${props.EditWorkId > 0 ? "编辑" : "新增"}关卡任务失败`);
});
} else if (props.isLevel == 2) {
let editObj = {
courseId: res.data.data.workId,
name: res.data.data.workName,
projectId: props.EditWorkId > 0 ? props.projectId : 0,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId,
type: 4,
};
ProjectEditTask(editObj)
.then(() => {
message.success(`${props.EditWorkId > 0 ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false);
state.addLoading = false;
})
.catch(() => {
message.error(`${props.EditWorkId > 0 ? "编辑" : "新增"}阶段任务失败`);
});
} else if (props.isLevel == 3) {
console.log("");
addTempTask({
courseId: res.data.data.workId,
name: res.data.data.workName,
projectId: props.EditWorkId > 0 ? props.projectId : 0,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId,
type: 4,
})
.then(() => {
message.success(`${props.EditWorkId > 0 ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false);
state.addLoading = false;
})
.catch(() => {
message.error(`${props.EditWorkId > 0 ? "编辑" : "新增"}阶段任务失败`);
});
}
}
};
const cle = () => {
@@ -389,7 +399,7 @@ export default {
submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
workEnclosureAddress: "",
workId: props.edit ? props.EditWorkId : 0,
workId: props.EditWorkId > 0 ? props.EditWorkId : 0,
workName: formState.workName,
workRequirement: formState.workRequirement,
};

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

@@ -15,6 +15,7 @@
@click="closeDrawer"
/>
</div>
<div style="display: flex; flex-direction: row">
<button
style="width: 100px"
@@ -77,7 +78,7 @@
</div>
<div class="main_item">
<div class="btnbox">
<a-form-item has-feedback label="选择试卷" name="choosedTest">
<a-form-item has-feedback label="选择考试" name="choosedTest">
<a-button
type="primary"
style="width: 100px; margin-left: 35px"
@@ -85,7 +86,7 @@
@click.prevent
@click="selectTest()"
>
选择试卷
选择考试
</a-button>
<!-- <a-dropdown>
<a-button
@@ -385,7 +386,7 @@ export default {
examinationName: "",
examinationDuration: "",
examinationLimit: "",
passLine: 60,
passLine:null,
examinationEndTime: "",
examinationExplain: "",
questionArrangement: 1,
@@ -432,11 +433,12 @@ export default {
return Promise.reject("请输入考试说明");
}
};
/*
let checkChoosedTest = async (_rule, value) => {
if (!value) {
return Promise.reject("请选择考试");
}
};
};*/
let checkChoosedTime = async (_rule, value) => {
if (!value.length) {
return Promise.reject("请选择时间");
@@ -467,11 +469,7 @@ export default {
return Promise.reject("请输入作业名称");
}
};
let checkPassLine = async (_rule, value) => {
if (!value) {
return Promise.reject("请输入及格线");
}
};
let checkQuestionArrangement = async (_rule, value) => {
if (!value) {
return Promise.reject("请输入作业名称");
@@ -491,13 +489,14 @@ export default {
trigger: "change",
},
],
/*
choosedTest: [
{
required: true,
validator: checkChoosedTest,
trigger: "change",
},
],
],*/
choosedTime: [
{
required: true,
@@ -537,13 +536,7 @@ export default {
trigger: "change",
},
],
passLine: [
{
required: true,
validator: checkPassLine,
trigger: "change",
},
],
questionArrangement: [
{
validator: checkQuestionArrangement,
@@ -598,7 +591,7 @@ export default {
};
const queryTest = () => {
state.addLoading = true;
// state.addLoading = true;
queryExaminationDetailById({ examinationId: props.EditTestId })
.then((res) => {
formState.examinationName = res.data.data.examinationName;
@@ -631,7 +624,7 @@ export default {
});
};
const updateTest = () => {
state.addLoading = true;
//state.addLoading = true;
let obj = {
examinationDuration: formState.examinationDuration,
examinationEndTime: dayjs(formState.choosedTime[1]).format(
@@ -642,7 +635,7 @@ export default {
examinationLimit: formState.examinationLimit,
examinationName: formState.examinationName,
examinationPaperId: 0,
examinationPaperName: formState.choosedTest,
// examinationPaperName: formState.choosedTest,
examinationStartTime: dayjs(formState.choosedTime[0]).format(
"YYYY-MM-DD"
),
@@ -877,7 +870,7 @@ export default {
cursor: pointer;
width: 130px;
height: 40px;
background: #388be1;
background: #4ea6ff;
border-radius: 8px;
border: 0;
margin-right: 8px;
@@ -924,7 +917,7 @@ export default {
cursor: pointer;
width: 130px;
height: 40px;
background: #388be1;
background: #4ea6ff;
border-radius: 8px;
border: 0;
margin-right: 16px 8px 32px 0;

237
src/components/drawers/SelFacet.vue
View File

@@ -20,29 +20,29 @@
<div class="main_items">
<div class="mi_ipts">
<div class="mii_ipt">
<div class="ipt_name">课程编号：</div>
<div class="ipt_name">课程信息：</div>
<div class="fi_input">
<a-input
v-model:value="valueClass"
v-model:value="name"
style="width: 240px; height: 40px; border-radius: 8px"
placeholder="请输入项目名称"
/>
</div>
</div>
<div class="mii_ipt">
<div class="ipt_name">内容分类：</div>
<div class="select">
<a-select
dropdownClassName="dropdown-style"
style="width: 240px"
placeholder="请选择"
:options="options1"
@change="handleChange"
v-model:value="valueContent"
allowClear
showSearch
/>
</div>
<div class="ipt_name">课程状态：</div>
<div class="select fitems">
<a-select
v-model:value="auditStatus"
dropdownClassName="dropdown-style"
style="width: 200px"
placeholder="请选择状态"
:options="options1"
allowClear
showSearch
>
</a-select>
</div>
</div>
</div>
<div class="mi_btns">
@@ -56,18 +56,58 @@
</div>
</div>
</div>
<div class="main_notice">
<div class="mntc_left">
<div class="notice_icon"></div>
<div v-if="offcourse == null">
<span class="title"
>已选择 <span class="data">0</span> 条</span
>
</div>
<div v-else>
<span class="title"
>已选择 <span class="data">1</span> 条;</span
>
<span class="title"
>课程编号：
<span class="data">{{ offcourse.offcourseId }}</span>
</span>
<span class="title"
>名称：
<span class="data">{{
offcourse.name
}}</span>
</span>
<span class="title"
>分类：
<span class="data">{{
offcourse.categoryId
}}</span>
</span>
<span class="title"
>授课老师：
<span class="data">{{
offcourse.teacherId
}}</span>
</span>
<span class="title"
>创建人：
<span class="data">{{ offcourse.createUser }}</span>
</span>
</div>
</div>
</div>
<div class="main_table">
<a-table
class="ant-table-striped"
:row-class-name="
(_record, index) => (index % 2 === 1 ? 'table-striped' : null)
"
:row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
type: 'radio',
}"
:row-selection="rowSelection"
:columns="columns1"
:data-source="classTableData"
:loading="tableDataTotal === -1 ? true : false"
@@ -88,28 +128,18 @@
</div>
</div>
</div>
<div class="main_btns">
<button class="btn1">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
</div>
</div>
</a-drawer>
</template>
<script>
//import { ApiFilled } from "@ant-design/icons-vue";
import { reactive, toRefs, ref } from "vue";
// import { planList } from "../../api/indexTaskadd";
import {detail} from "../../api/indexCourse";
import { list } from "../../api/indexTaskadd";
import { toDate } from "../../api/method";
const options1 = ref([
{
value: "value1",
label: "通用",
},
{
value: "value2",
label: "领导",
},
]);
const columns1 = [
{
title: "课程编号",
@@ -162,6 +192,14 @@ export default {
type: Boolean,
default: false,
},
chooseCourse: {
type: Number,
default: null,
},
titleTag: {
type: Boolean,
default: false,
},
},
setup(props, ctx) {
const state = reactive({
@@ -183,46 +221,55 @@ export default {
valueContent: null, //内容分类
selectedRows: [], //选择的数据
selectedRowKeys: [],
titleTag:false,
offcourse:null,
auditStatus:null,
name:null,
});
const onSelectChange = (selectedRowKeys, selectedRows) => {
console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys;
state.selectedRows = selectedRows;
console.log("选择了", state.selectedRows[0].name);
const rowSelection = {
type: "radio",
onSelect: (selectedRows) => {
state.chooseCourse=selectedRows.num;
console.log(selectedRows,"==========",state.chooseCourse);
closeDrawer();
},
};
const closeDrawer = () => {
ctx.emit("update:selfacetVisible", false);
ctx.emit("getData", state.selectedRows);
ctx.emit("update:chooseCourse", state.chooseCourse);
};
const afterVisibleChange = (bool) => {
console.log("state", bool);
if(bool){
state.chooseCourse=props.chooseCourse;
getClassList();
getFaceInfo();
}
};
// const showDrawerSelFacet = () => {
// state.selfacetvisible = true;
// };
const getFaceInfo =()=>{
detail({offcourseId:36}).then((res) => {
state.chooseCourse = res.data.data;
}).catch();
}
//获取面授课列表
const getClassList = (obj) => {
let objn = obj || {
auditStatus: 0,
// beginTime: 0,
categoryId: 0,
createName: "",
// endTime: 0,
name: "",
pageNo: state.currentPage,
pageSize: 10,
projectName: "",
auditStatus:state.auditStatus,
name:state.name,
pageNo:state.currentPage,
pageSize:state.pageSize
};
list(objn)
.then((res) => {
console.log(res.data.data.rows);
let result = res.data.data;
state.tableDataTotal = result.total;
if (result.total > 0) {
getClassData(result.rows);
}
getClassData(result.rows);
})
.catch((err) => {
console.log("获取列表失败", err.data);
@@ -248,32 +295,41 @@ export default {
state.classTableData = array;
};
const options1 = ref([
{
value: 0,
label: "未提交",
},
{
value: 1,
label: "待审核",
},
{
value: 2,
label: "已审核",
},
{
value: -1,
label: "审核未通过",
},
]);
const handleChange = (value, option) => {
console.log("改变了", value, option);
console.log(state.valueContent);
};
//重置
const reset = () => {
state.valueClass = null;
state.valueContent = null;
//搜索
const search = () => {
//重新获取列表
getClassList();
};
//搜索
const search = () => {
let obj = {
auditStatus: 0,
// beginTime: 0,
categoryId: 0, //分类
createName: "",
// endTime: 0,
name: state.valueClass,
pageNo: state.currentPage,
pageSize: 10,
projectName: "",
};
getClassList(obj);
//重置
const reset = () => {
state.name = null;
state.auditStatus = null;
//重新获取列表
getClassList();
};
const changePaginationStu = (page) => {
state.currentPage = page;
getClassList();
@@ -289,9 +345,9 @@ export default {
handleChange,
reset,
getClassList,
search,
changePaginationStu,
onSelectChange,
rowSelection,
search,
// change,
};
},
@@ -323,6 +379,7 @@ export default {
display: flex;
justify-content: space-between;
margin-bottom: 12px;
margin-top: 32px;
flex-wrap: wrap;
.mi_ipts {
display: flex;
@@ -403,6 +460,36 @@ export default {
}
}
}
.main_notice {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 32px;
height: 40px;
background-color: #e9f6fe;
.mntc_left {
display: flex;
align-items: center;
.title {
color: rgba(0, 0, 0, 0.65);
margin-right: 17px;
}
.data {
color: #388be1;
}
.notice_icon {
width: 14px;
height: 14px;
margin-right: 9px;
margin-left: 9px;
background-image: url(@/assets/images/coursewareManage/gan.png);
background-size: 100% 100%;
}
}
.mntc_right {
cursor: pointer;
}
}
}
.main_btns {

154
src/components/vote/AddVote.vue
View File

@@ -51,12 +51,16 @@
<div class="btnbox">
<button
class="xkbtn"
:style="{ display: creVote ? 'none' : 'block' }"
@click="showDrawerCreVote"
>
创建投票
{{ ballotId ? "编辑" : "添加" }}投票
</button>
<a @click="queryStem">查看投票</a>
<div v-if = "ballotId>0">
<a-tag closable color="processing" @close="log">
<span style="font-size:14px;line-height: 33px;" >删除投票</span>
</a-tag></div>
<div>
<CreateVote
v-model:createVoteVisible="createVoteVisible"
@@ -78,9 +82,6 @@
</div>
</div>
</div>
<!-- 创建投票侧弹窗 -->
<div>
@@ -111,10 +112,13 @@
<div class="btnbox">
<a-upload
@change="handleChange"
action="/vote/baseVoteupload"
:multiple="true"
:max-count="1"
action="/manageApi/vote/baseVoteupload"
v-model:file-list="fileList"
>
<button class="xkbtn">点击上传</button></a-upload>
<div v-if="voteCount > 0"><a-tag color="processing"> <span style="font-size:14px;line-height: 33px;" >{{voteCount}}票</span></a-tag></div>
</div>
</div>
<div class="main_item" style="margin-top: -25px">
@@ -159,7 +163,7 @@ export default {
name: "AddVote",
components: {
CreateVote
},
props: {
addvoteVisible: {
@@ -225,6 +229,8 @@ export default {
addStemVisible:false, //
editChild:false,
fileList: [],
voteCount:null,
});
const closeDrawer = () => {
state.inputV1 = "",
@@ -240,6 +246,8 @@ export default {
}
};
const showDrawerCreVote = () => {
state.createVoteVisible = true;
state.editChild = props.edit;
@@ -248,12 +256,22 @@ export default {
};
const handleChange = info => {
if (info.file.status !== "uploading") {
console.log("基础票数rinfo======",info);
}
};
let resFileList = [...info.fileList];
resFileList.map(file => {
if (file.response) {
// Component will show file.url as link
file.url = file.response.url;
console.log("file========",file);
console.log("file========",file.response);
state.voteCount = file.response.data;
}
});
//fileList.value = resFileList;
};
//删除题干信息接口
const dleVoteStem = () => {
api.deleteVoteStem({voteStemId:state.ballotId})
@@ -400,6 +418,10 @@ export default {
const closeStem = () => {
state.addStemVisible = false;
};
const log = e => {
state.ballotId=null;
console.log(e);
};
return {
...toRefs(state),
showDrawerCreVote,
@@ -411,11 +433,117 @@ export default {
queryStem,
closeStem,
handleChange,
log,
};
},
};
</script>
<style lang="scss">
.ConfirmModal {
.ant-modal {
width: 424px !important;
height: 258px !important;
.ant-modal-content {
width: 424px !important;
height: 258px !important;
.ant-modal-body {
width: 424px !important;
height: 258px !important;
padding: 0 !important;
.delete {
z-index: 999;
width: 424px;
height: 258px;
background: #ffffff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
border-radius: 4px;
.del_header {
position: absolute;
width: calc(100%);
height: 40px;
background: linear-gradient(
rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%
);
}
.del_main {
width: 100%;
position: relative;
.header {
display: flex;
align-items: center;
padding-top: 20px;
padding-left: 26px;
font-size: 16px;
.icon {
width: 16px;
height: 16px;
margin-right: 10px;
background-image: url(@/assets/images/coursewareManage/QR.png);
background-size: 100% 100%;
}
.close_exit {
position: absolute;
right: 42px;
cursor: pointer;
width: 20px;
height: 20px;
background-image: url(@/assets/images/coursewareManage/close.png);
background-size: 100% 100%;
}
}
.body {
width: 100%;
margin: 34px auto 56px auto;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
position: relative;
.back {
position: absolute;
top: 30px;
font-size: 12px;
font-weight: 400;
color: #666666;
}
}
.del_btnbox {
display: flex;
margin: 30px auto;
justify-content: center;
.del_btn {
width: 100px;
height: 40px;
background: rgba(64, 158, 255, 0);
border-radius: 8px;
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
cursor: pointer;
.btnText {
font-size: 14px;
font-weight: 400;
line-height: 40px;
}
}
.btn1 {
border: 1px solid rgba(64, 158, 255, 1);
color: #4ea6ff;
margin-right: 14px;
}
.btn2 {
background-color: #4ea6ff;
color: #ffffff;
}
}
}
}
}
}
}
}
.ant-table-striped :deep(.table-striped) td {
background-color: #fafafa !important;
}

15
src/components/vote/CreateVote.vue
View File

@@ -130,15 +130,13 @@ export default {
});
// const router = useRouter();
const afterVisibleChange = () => {
getInfoDate();
/*
if(){
if(state.ballotId>0){
getInfoDate();
}else{
handleTypes();
}
*/
};
const closeDrawer = () => {
ctx.emit("update:createVoteVisible", false);
@@ -286,6 +284,11 @@ export default {
inputVal: "",
imgVal: "",
},
{
id: 2,
inputVal: "",
imgVal: "",
},
],
};
state.allFormsData.push(obj);

7
src/components/vote/VoteQuestion.vue
View File

@@ -51,6 +51,7 @@
<script>
import VoteQuestionItem from "./VoteQuestionItem.vue";
import { ref } from "vue";
import * as api from "../../api/indexVote";
export default {
name: "CreateVote",
components: {
@@ -76,6 +77,12 @@ export default {
const curItem = ref(props.item);
const handleTypesDel = () => {
emit("del", { id: curItem.value.id, curItem: curItem.value });
console.log("删除题干======",{ id: curItem.value.id, curItem: curItem.value });
api.deleteVoteStem({voteStemId:3})
.then(() => {
// message.success('删除题干信息成功')
})
};

4
src/views/courselibrary/CoursewareManage.vue
View File

@@ -3922,10 +3922,6 @@ export default defineComponent({
};
const options1 = ref([
// {
// value: "value1",
// label: "请选择状态",
// },
{
value: 0,
label: "未提交",