This commit is contained in:
zhangsir
2024-02-01 15:39:43 +08:00
parent 74942ee4cf
commit 0db1abf7a6
3 changed files with 52 additions and 23 deletions

View File

@@ -302,13 +302,15 @@
<div class="b_input" style="width: 88%;display: flex;flex-direction: column;">
<CheckBox v-model="formData.projectSignFlag"
:check-value="1"
:un-check-value="0">
:un-check-value="0"
@change="toggleCheckboxes('projectSignFlag')">
<span style="color: #6d7584">允许项目内人员临时到场参加(不在本场次培训的人员可以临时签到参加)</span>
</CheckBox>
<CheckBox v-model="formData.outSignFlag"
:check-value="1"
style="margin-left: 0px;"
:un-check-value="0">
:un-check-value="0"
@change="toggleCheckboxes('outSignFlag')">
<span style="color: #6d7584">允许项目外人员临时到场参加</span>
</CheckBox>
</div>
@@ -434,7 +436,17 @@ const props = defineProps({
const openCourseVisible = ref(false);
const offCourseNewVisiable = ref(false);
const tableRef = ref();
const toggleCheckboxes = (checkedName)=>{
if (checkedName === 'projectSignFlag') {
if(formData.value.projectSignFlag){
formData.value.outSignFlag = !formData.value.projectSignFlag;
}
} else if (checkedName === 'outSignFlag') {
if(formData.value.outSignFlag){
formData.value.projectSignFlag = !formData.value.outSignFlag;
}
}
}
const columns = ref([
{
title: "名称",

View File

@@ -904,9 +904,9 @@
<span v-else>新建开课</span>
<div class="close_exit" @click="handleCancelStu"></div>
</div>
<!-- <div class="cstm_title">
<div class="cstm_title">
<span>面授名称:{{ newCourseName }}</span>
</div> -->
</div>
<div class="cstm_items">
<div class="signbox">
<div class="sign">
@@ -3707,7 +3707,7 @@ function onFocusEnd(){
CourseModalRef.value.visibleOpen(null, state.xzinputV1);
state.valueE1 = "";
// state.teacher = "";
state.teacher = "";
state.teacherName = "";
state.qdms_inputV1 = state.xzinputV1;
@@ -5051,7 +5051,7 @@ function onFocusEnd(){
let teacherNames = record.offteachers?.filter(teacher => teacher.teacherName !== null).map(teacher => teacher.teacherName);
state.codeInfo = {
title: type == 1 ? "【课程】二维码" : "【签到】二维码",
name: record.name ? record.name : "",
name: record.name ? record.name+'签到' : "",
teacherName: teacherNames.length > 0 ? teacherNames.join(' ') : "",
url:
type == 1

View File

@@ -588,13 +588,13 @@
{{ item.type==2 ? item.createTime !== null ? item.createTime : "-" : item.startTime !== null ? item.startTime : "-" }}
</div>
</div>
<div class="progress">
<div class="progresstext">
<div class="progress" v-if="item.averageScore" style="display: flex;flex-grow: 0;margin: 0;">
<!-- <div class="progresstext">
{{ item.finishStuCnt || 0 }}/{{
item.totalStuCnt || 0
}}人
</div>
<div style="display: flex">
</div> -->
<!-- <div style="display: flex">
<a-progress
:showInfo="false"
:percent="
@@ -612,7 +612,11 @@
) || 0
}}%</span
>
</div> -->
<div>
{{ item.averageScore}}分
</div>
<div class="img_daoc" @click="exportScore(item)"></div>
</div>
<div class="operations">
<div class="operations_dropdown">
@@ -2435,6 +2439,9 @@ export default {
AddOpenCourse
},
setup() {
const exportScore = (item) => {
window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/export?assessmentIds=${item.assessmentIds}&pid=${item.id}`)
};
const coursePlanRef = ref();
const openCourse = async (item) => {
await apitl.getDraftTask({projectId: item.projectId}).then((item)=>{
@@ -2461,7 +2468,7 @@ export default {
if(qrCodeItems.value.length==1){
qrCode({
title: "【签到】二维码",
courseName: qrCodeItems.value[0].courseName,
courseName: state.name+'项目',
name: qrCodeItems.value[0].name+'课程签到',
createName:qrCodeItems.value[0].offteachers.map(teacher => teacher.teacherName).join(', ')||qrCodeItems.value[0].teacher,
url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${qrCodeItems.value[0].id}&taskType=${2}&type=${3}`,
@@ -2473,14 +2480,13 @@ export default {
})
}
function handleMenuClick({key}) {
const courseName = qrCodeItems.value[key].courseName;
const name = qrCodeItems.value[key].name;
const teacher = qrCodeItems.value[key].teacher;
const id = qrCodeItems.value[key].id;
const offteachers = qrCodeItems.value[key].offteachers.map(teacher => teacher.teacherName).join(', ');
qrCode({
title: "【签到】二维码",
courseName: courseName,
courseName: state.name+'项目',
name: name+'课程签到',
createName:offteachers||teacher,
url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${id}&taskType=${2}&type=${3}`,
@@ -2489,7 +2495,6 @@ export default {
const qrCodeItemspg = ref([]);
const visibleEwmpg = ref({});
const qrcodeAssement = async (item)=>{
console.log(item,'item')
if(qrCodeItemspg.value.length!=0){
qrCodeItemspg.value = []
}
@@ -2505,11 +2510,10 @@ export default {
courseName: item.name,
}));
qrCodeItemspg.value = qrCodeItemspgItem.filter(item => item.assessmentId !== null);
console.log(qrCodeItemspg.value,'长度')
if(qrCodeItemspg.value.length==1){
qrCode({
title: "【评估】二维码",
courseName: qrCodeItemspg.value[0].courseName,
courseName: state.name+'项目',
name: qrCodeItemspg.value[0].name+'课程评估',
createName:qrCodeItemspg.value[0].offteachers.map(teacher => teacher.teacherName).join(', ')||qrCodeItemspg.value[0].teacher,
url: `${location.protocol}//${location.host}/student-h5/investigatpage?id=${qrCodeItemspg.value[0].id}&type=3&infoId=${qrCodeItemspg.value[0].id}&courseId=${qrCodeItemspg.value[0].assessmentId}&chapterOrStageId=0`,
@@ -2518,7 +2522,6 @@ export default {
})
}
function handleMenuClickpg({key}) {
const courseName = qrCodeItemspg.value[key].courseName;
const name = qrCodeItemspg.value[key].name;
const offteachers = qrCodeItemspg.value[key].offteachers.map(teacher => teacher.teacherName).join(', ');
const teacher = qrCodeItemspg.value[key].teacher;
@@ -2526,7 +2529,7 @@ export default {
const assessmentId = qrCodeItemspg.value[key].assessmentId;
qrCode({
title: "【评估】二维码",
courseName: courseName,
courseName: state.name+'项目',
name: name+'课程评估',
createName:offteachers||teacher,
url: `${location.protocol}//${location.host}/student-h5/investigatpage?id=${id}&type=3&infoId=${id}&courseId=${assessmentId}&chapterOrStageId=0`,
@@ -5222,7 +5225,8 @@ export default {
visibleEwmpg,
handleMenuClickpg,
coursePlanRef,
openCourse
openCourse,
exportScore
@@ -6734,7 +6738,15 @@ export default {
margin-left: 10px;
margin-right: 50px;
flex-grow: 1;
.img_daoc {
cursor: pointer;
width: 16px;
height: 18px;
background-image: url(@/assets/images/coursewareManage/export1.png);
background-size: 100% 100%;
background-color: #4ea6ff;
margin-left: 7px;
}
.progresstext {
color: #ffc067;
font-size: 14px;
@@ -6744,9 +6756,14 @@ export default {
.operations {
display: flex;
width: 340px;
//flex-grow: 1;
flex-grow: 1;
.operations_dropdown{
padding: 10px;text-align: center;position: relative;margin-left: auto;margin-right: 10px;
padding: 10px;
text-align: center;
position: relative;
margin-left: auto;
margin-right: 10px;
min-width: 90px;
}
.operation {
color: #4ea6ff;