feat:修改签到二维码

This commit is contained in:
lixg
2023-01-12 12:16:24 +08:00
parent f2edf38e97
commit 7235dac9b8
4 changed files with 56 additions and 56 deletions

View File

@@ -109,7 +109,7 @@
<div class="wz">导出数据</div> <div class="wz">导出数据</div>
</div> </div>
</div> </div>
<!-- <div class="line"> <!-- <div class="line">
<div class="inline"> <div class="inline">
<div class="left"> <div class="left">
<div class="img"></div> <div class="img"></div>
@@ -173,7 +173,7 @@
/> />
</div> --> </div> -->
</div> </div>
<!-- <!--
<div class="btnn"> <div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button> <button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button> <button class="btn2" @click="closeDrawer">确定</button>
@@ -434,7 +434,7 @@ export default {
process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BOE_API_URL +
`/admin/student/studentSign?taskId=${ `/admin/student/studentSign?taskId=${
props.projectTaskInfo.projectTaskId props.projectTaskInfo.projectTaskId
}&type=${1}`, }&taskType=${props.projectTaskInfo.type}&type=${1}`,
}; };
console.log("codeInfo", state.codeInfo); console.log("codeInfo", state.codeInfo);
state.codeIndex = 0; state.codeIndex = 0;
@@ -869,7 +869,9 @@ export default {
process.env.VUE_APP_BASE_API process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?currentStageId=${ }/admin/student/exportTaskStudent?currentStageId=${
props.projectTaskInfo.stageId props.projectTaskInfo.stageId
}&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=2&thirdType=2` }&type=${1}&pid=${
props.projectTaskInfo.projectId
}&taskType=2&thirdType=2`
); );
// api // api
// .exportTaskStudent({ // .exportTaskStudent({

View File

@@ -167,7 +167,7 @@
/> />
</div> --> </div> -->
</div> </div>
<!-- <!--
<div class="btnn"> <div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button> <button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button> <button class="btn2" @click="closeDrawer">确定</button>
@@ -849,7 +849,7 @@ export default {
process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BOE_API_URL +
`/admin/student/studentSign?taskId=${ `/admin/student/studentSign?taskId=${
props.datasource.routerTaskId props.datasource.routerTaskId
}&type=${2}`, }&taskType=${props.datasource.type}&type=${2}`,
}; };
console.log("codeInfo", state.codeInfo); console.log("codeInfo", state.codeInfo);
state.codeIndex = 0; state.codeIndex = 0;

View File

@@ -14,7 +14,7 @@
/> />
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- <a-col v-if="type === 1"> <!-- <a-col v-if="type === 1">
<a-form-item title="小组名称:"> <a-form-item title="小组名称:">
<a-input <a-input
class="cus-input" class="cus-input"
@@ -50,7 +50,11 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col> <a-col>
<a-button class="cus-btn" style="width: 100px" @click="getStuList"> <a-button
class="cus-btn"
style="background: #4ea6ff; color: #fff; width: 100px"
@click="getStuList"
>
<template #icon> <template #icon>
<img <img
style="margin-right: 10px" style="margin-right: 10px"
@@ -78,7 +82,7 @@
@finash="submitCall" @finash="submitCall"
:stage="stage" :stage="stage"
> >
<a-button class="cus-btn"> <a-button class="cus-btn" style="background: #4ea6ff; color: #fff">
<template #icon <template #icon
><img ><img
style="margin-right: 10px" style="margin-right: 10px"
@@ -146,9 +150,10 @@
<div class="btn4_tit" @click="showEScoreModal"> <div class="btn4_tit" @click="showEScoreModal">
<span>批量录入成绩</span> <span>批量录入成绩</span>
</div> </div>
<div class="btn4_op1" @click="updateStatus(1)"> <!--2023-1-12 隐藏 后面放开 -->
<!-- <div class="btn4_op1" @click="updateStatus(1)">
<span>批量结业</span> <span>批量结业</span>
</div> </div> -->
<div class="btn4_op2" @click="updateStatus(0)"> <div class="btn4_op2" @click="updateStatus(0)">
<span>批量通过</span> <span>批量通过</span>
</div> </div>
@@ -506,7 +511,8 @@ function exportTaskStu() {
console.log("props.datasource", props.datasource); console.log("props.datasource", props.datasource);
window.open( window.open(
`${ `${
process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?type=${1}&pid=${props.id}&taskType=0` process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?type=${1}&pid=${props.id}&taskType=0`
); );
} }
@@ -682,15 +688,13 @@ const exportHomeWorkShow = () => {
taskType: 0, taskType: 0,
type: 3, type: 3,
}; };
api api.exportHomeWork(obj).then((res) => {
.exportHomeWork(obj) console.log("导出作业", res.data.data);
.then((res) => { //message.destroy();
console.log("导出作业", res.data.data); // message.success("导出作业成功");
//message.destroy(); exportHomeWorkV.value = true;
// message.success("导出作业成功"); downloadUrl.value = res.data.data;
exportHomeWorkV.value = true; });
downloadUrl.value = res.data.data;
})
}; };
// //导出作业 // //导出作业
// const exportHomeWork = () => { // const exportHomeWork = () => {
@@ -704,7 +708,8 @@ const exportHomeWorkShow = () => {
const exportStu = () => { const exportStu = () => {
window.open( window.open(
`${ `${
process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?type=${3}&pid=${props.id}&thirdType=2` process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?type=${3}&pid=${props.id}&thirdType=2`
); );
}; };

View File

@@ -2030,7 +2030,11 @@
<div class="qrm_btn btn1" @click="rg_exit"> <div class="qrm_btn btn1" @click="rg_exit">
<div class="btnText">取消</div> <div class="btnText">取消</div>
</div> </div>
<div class="qrm_btn btn2" @click="handleJoin"> <div
class="qrm_btn btn2"
style="background-color: #4ea6ff; color: #ffffff"
@click="handleJoin"
>
<div class="btnText">确定</div> <div class="btnText">确定</div>
</div> </div>
</div> </div>
@@ -3067,7 +3071,8 @@ export default defineComponent({
dataIndex: "evastatus", dataIndex: "evastatus",
key: "8", key: "8",
align: "center", align: "center",
customRender: ({record}) => record.assessmentStatus ? '已评估' : '未评估' customRender: ({ record }) =>
record.assessmentStatus ? "已评估" : "未评估",
}, },
{ {
title: "作业成绩", title: "作业成绩",
@@ -3118,14 +3123,15 @@ export default defineComponent({
key: "8", key: "8",
align: "center", align: "center",
}, },
{ // 2023-1-12 隐藏 后面放开
title: "结业状态", // {
width: "15%", // title: "结业状态",
dataIndex: "completionStatus", // width: "15%",
key: "8", // dataIndex: "completionStatus",
align: "center", // key: "8",
customRender: ({ record }) => <div>{{1:'结业'}[record.completionStatus] || '-'}</div>, // align: "center",
}, // customRender: ({ record }) => <div>{{1:'结业'}[record.completionStatus] || '-'}</div>,
// },
], ],
shipType: 1, shipType: 1,
addLoading: false, addLoading: false,
@@ -4755,7 +4761,7 @@ export default defineComponent({
}; };
const handleJoin = async () => { const handleJoin = async () => {
state.lrcj_inputV1 || message.error("请输入成绩") state.lrcj_inputV1 || message.error("请输入成绩");
if (state.rg_hs) { if (state.rg_hs) {
if (state.piliang) { if (state.piliang) {
api1.updateStudent({ api1.updateStudent({
@@ -5840,8 +5846,6 @@ export default defineComponent({
} }
.btn1 { .btn1 {
.search { .search {
background-image: url("../../assets/images/courseManage/search0.png"); background-image: url("../../assets/images/courseManage/search0.png");
} }
@@ -5850,7 +5854,7 @@ export default defineComponent({
color: #ffffff; color: #ffffff;
} }
} }
/** /**
.btn1:active { .btn1:active {
background: #0982ff; background: #0982ff;
} }
@@ -5894,11 +5898,7 @@ export default defineComponent({
} }
} }
.btn3 { .btn3 {
.search { .search {
width: 17px; width: 17px;
height: 18px; height: 18px;
@@ -5909,7 +5909,6 @@ export default defineComponent({
color: #ffffff; color: #ffffff;
} }
} }
} }
} }
@@ -6951,7 +6950,7 @@ export default defineComponent({
} }
} }
.btn2{ .btn2 {
background: rgba(64, 158, 255, 1); background: rgba(64, 158, 255, 1);
.search { .search {
@@ -7571,9 +7570,7 @@ export default defineComponent({
} }
} }
.btn1{ .btn1 {
.search { .search {
background-image: url("../../assets/images/courseManage/search0.png"); background-image: url("../../assets/images/courseManage/search0.png");
} }
@@ -7582,7 +7579,7 @@ export default defineComponent({
color: #ffffff; color: #ffffff;
} }
} }
/** /**
.btn1:active { .btn1:active {
background: #0982ff; background: #0982ff;
} }
@@ -7624,19 +7621,15 @@ export default defineComponent({
margin-left: 5px; margin-left: 5px;
} }
.btn2 { .btn2 {
margin-right: 0px; margin-right: 0px;
.img2 { .img2 {
width: 17px; width: 17px;
height: 18px; height: 18px;
background-image: url(../../assets/images/coursewareManage/export1.png); background-image: url(../../assets/images/coursewareManage/export1.png);
}
} }
} }
}
} }
} }