style:项目下作业面授导出参数错误,隐藏部分按钮

This commit is contained in:
zhangyc
2023-01-12 02:31:37 +08:00
parent e4e6682f62
commit e8d4c179f5
8 changed files with 48 additions and 43 deletions

View File

@@ -869,7 +869,7 @@ 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=0` }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=2&thirdType=2`
); );
// api // api
// .exportTaskStudent({ // .exportTaskStudent({

View File

@@ -274,7 +274,7 @@ export default {
title: "工号", title: "工号",
dataIndex: "studentUserNo", dataIndex: "studentUserNo",
key: "studentUserNo", key: "studentUserNo",
width: 50, width: '15%',
align: "left", align: "left",
className: "h head", className: "h head",
customRender: (text) => { customRender: (text) => {
@@ -291,8 +291,8 @@ export default {
title: "姓名", title: "姓名",
dataIndex: "studentName", dataIndex: "studentName",
key: "studentName", key: "studentName",
width: 50, width: '10%',
align: "left", align: "center",
className: "h head", className: "h head",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -308,7 +308,7 @@ export default {
title: "所在部门", title: "所在部门",
dataIndex: "studentDepartName", dataIndex: "studentDepartName",
key: "studentDepartName", key: "studentDepartName",
width: 60, width: '15%',
align: "center", align: "center",
className: "h", className: "h",
ellipsis: true, ellipsis: true,
@@ -328,7 +328,7 @@ export default {
title: "所在岗位", title: "所在岗位",
dataIndex: "studentJobName", dataIndex: "studentJobName",
key: "studentJobName", key: "studentJobName",
width: 60, width: '10%',
align: "center", align: "center",
ellipsis: true, ellipsis: true,
className: "h", className: "h",
@@ -348,7 +348,7 @@ export default {
title: "作业成绩", title: "作业成绩",
dataIndex: "workScore", dataIndex: "workScore",
key: "workScore", key: "workScore",
width: 60, width: '10%',
align: "center", align: "center",
ellipsis: true, ellipsis: true,
className: "h", className: "h",
@@ -368,7 +368,7 @@ export default {
title: "考试成绩", title: "考试成绩",
dataIndex: "examinationScore", dataIndex: "examinationScore",
key: "examinationScore", key: "examinationScore",
width: 60, width: '10%',
align: "center", align: "center",
ellipsis: true, ellipsis: true,
className: "h", className: "h",
@@ -389,7 +389,7 @@ export default {
title: "评分", title: "评分",
dataIndex: "assessmentScore", dataIndex: "assessmentScore",
key: "assessmentScore", key: "assessmentScore",
width: 60, width: '10%',
align: "center", align: "center",
ellipsis: true, ellipsis: true,
className: "h", className: "h",
@@ -410,7 +410,7 @@ export default {
title: "任务状态", title: "任务状态",
dataIndex: "finishStatus", dataIndex: "finishStatus",
key: "finishStatus", key: "finishStatus",
width: 60, width: '10%',
align: "center", align: "center",
ellipsis: true, ellipsis: true,
className: "h", className: "h",
@@ -617,7 +617,7 @@ export default {
currentStageId: props.projectTaskInfo.stageId, currentStageId: props.projectTaskInfo.stageId,
type: 1, type: 1,
pid: props.projectTaskInfo.projectId, pid: props.projectTaskInfo.projectId,
status: Number(state.projectName), status: state.projectName,
studentName: state.name, studentName: state.name,
taskId: props.projectTaskInfo.projectTaskId, taskId: props.projectTaskInfo.projectTaskId,
}); });
@@ -628,7 +628,7 @@ export default {
currentStageId: props.projectTaskInfo.stageId, currentStageId: props.projectTaskInfo.stageId,
type: 1, type: 1,
pid: props.projectTaskInfo.projectId, pid: props.projectTaskInfo.projectId,
status: Number(state.projectName), status: state.projectName,
studentName: state.name, studentName: state.name,
taskId: props.projectTaskInfo.projectTaskId, taskId: props.projectTaskInfo.projectTaskId,
taskType: props.projectTaskInfo.type, taskType: props.projectTaskInfo.type,
@@ -683,7 +683,7 @@ export default {
`${ `${
process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${ process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${
props.projectTaskInfo.stageId props.projectTaskInfo.stageId
}&type=${1}&pid=${props.projectTaskInfo.projectId}taskType=2` }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=2`
); );
// api // api
// .exportTaskStudent({ // .exportTaskStudent({
@@ -716,12 +716,12 @@ export default {
api api
.exportHomeWork(obj) .exportHomeWork(obj)
.then((res) => { .then((res) => {
console.log("导出作业", JSON.parse(res.data).data); console.log("导出作业",res.data.data);
if (JSON.parse(res.data).code === 200) { if (res.data.code === 200) {
message.destroy(); //message.destroy();
message.success("导出作业成功"); //message.success("导出作业成功");
state.exportHomeWorkV = true; state.exportHomeWorkV = true;
state.downloadUrl = JSON.parse(res.data).data; state.downloadUrl = res.data.data;
} }
}) })
.catch((err) => { .catch((err) => {

View File

@@ -503,7 +503,7 @@ export default {
currentStageId: props.projectTaskInfo.stageId, currentStageId: props.projectTaskInfo.stageId,
type: 1, type: 1,
pid: props.projectTaskInfo.projectId, pid: props.projectTaskInfo.projectId,
status: Number(state.projectName), status: state.projectName,
studentName: state.name, studentName: state.name,
taskId: props.projectTaskInfo.projectTaskId, taskId: props.projectTaskInfo.projectTaskId,
taskType: props.projectTaskInfo.type, taskType: props.projectTaskInfo.type,
@@ -515,7 +515,7 @@ export default {
currentStageId: props.projectTaskInfo.stageId, currentStageId: props.projectTaskInfo.stageId,
type: 1, type: 1,
pid: props.projectTaskInfo.projectId, pid: props.projectTaskInfo.projectId,
status: Number(state.projectName), status: state.projectName,
studentName: state.name, studentName: state.name,
taskId: props.projectTaskInfo.projectTaskId, taskId: props.projectTaskInfo.projectTaskId,
taskType: props.projectTaskInfo.type, taskType: props.projectTaskInfo.type,
@@ -569,7 +569,7 @@ export default {
`${ `${
process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${ process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${
props.projectTaskInfo.stageId props.projectTaskInfo.stageId
}&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=4` }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=${4}`
); );
// api // api
// .exportTaskStudent({ // .exportTaskStudent({
@@ -601,12 +601,12 @@ export default {
api api
.exportHomeWork(obj) .exportHomeWork(obj)
.then((res) => { .then((res) => {
console.log("导出作业", JSON.parse(res.data).data); console.log("导出作业", res.data.data);
if (JSON.parse(res.data).code === 200) { if (res.data.code === 200) {
// message.destroy(); // message.destroy();
//message.success("导出作业成功"); //message.success("导出作业成功");
state.exportHomeWorkV = true; state.exportHomeWorkV = true;
state.downloadUrl = JSON.parse(res.data).data; state.downloadUrl = res.data.data;
} }
}) })
.catch((err) => { .catch((err) => {

View File

@@ -624,7 +624,7 @@ export default {
`${ `${
process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${ process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${
props.datasource.chapterId props.datasource.chapterId
}&type=${2}&pid=${props.datasource.routerId}&taskType=2` }&type=${2}&pid=${props.datasource.routerId}&taskType=${1}`
); );
// api // api
// .exportTaskStudent({ // .exportTaskStudent({
@@ -657,12 +657,12 @@ export default {
api api
.exportHomeWork(obj) .exportHomeWork(obj)
.then((res) => { .then((res) => {
console.log("导出作业", JSON.parse(res.data).data); console.log("导出作业", res.data.data);
if (JSON.parse(res.data).code === 200) { if (res.data.code === 200) {
message.destroy(); // message.destroy();
message.success("导出作业成功"); // message.success("导出作业成功");
state.exportHomeWorkV = true; state.exportHomeWorkV = true;
state.downloadUrl = JSON.parse(res.data).data; state.downloadUrl = res.data.data;
} }
}) })
.catch((err) => { .catch((err) => {

View File

@@ -560,7 +560,7 @@ export default {
`${ `${
process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${ process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${
props.datasource.chapterId props.datasource.chapterId
}&type=${2}&pid=${props.datasource.routerId}&taskType=4` }&type=${2}&pid=${props.datasource.routerId}&taskType=${4}`
); );
// api // api
// .exportTaskStudent({ // .exportTaskStudent({
@@ -592,12 +592,12 @@ export default {
api api
.exportHomeWork(obj) .exportHomeWork(obj)
.then((res) => { .then((res) => {
console.log("导出作业", JSON.parse(res.data).data); console.log("导出作业", res.data.data);
if (JSON.parse(res.data).code === 200) { if (res.data.code === 200) {
// message.destroy(); // message.destroy();
// message.success("导出作业成功"); // message.success("导出作业成功");
state.exportHomeWorkV = true; state.exportHomeWorkV = true;
state.downloadUrl = JSON.parse(res.data).data; state.downloadUrl = res.data.data;
} }
}) })
.catch((err) => { .catch((err) => {

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"
@@ -23,6 +23,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="部门:">
<div class="select in" style="width: 270px"> <div class="select in" style="width: 270px">
@@ -98,9 +99,10 @@
导入学员 导入学员
</a-button> </a-button>
</a-col> </a-col>
<!--
<a-col :span="1.5" v-if="type === 1"> <a-col :span="1.5" v-if="type === 1">
<a-button class="cus-btn white"> 批量换组 </a-button> <a-button class="cus-btn white"> 批量换组 </a-button>
</a-col> </a-col>-->
<a-col :span="1.5" v-if="type === 1"> <a-col :span="1.5" v-if="type === 1">
<a-button class="cus-btn white" @click="exportTaskStu"> <a-button class="cus-btn white" @click="exportTaskStu">
导出学习信息 导出学习信息
@@ -199,7 +201,7 @@
<a-col> <a-col>
<slot name="extension" v-bind:data="{ record }"></slot> <slot name="extension" v-bind:data="{ record }"></slot>
</a-col> </a-col>
<!-- 新加 换组 通过 拒绝--> <!-- 新加 换组 通过 拒绝
<a-col v-if="type === 1"> <a-col v-if="type === 1">
<div <div
style=" style="
@@ -213,6 +215,7 @@
换组 换组
</div> </div>
</a-col> </a-col>
-->
<a-col v-if="type === 3"> <a-col v-if="type === 3">
<div <div
style=" style="
@@ -683,8 +686,8 @@ const exportHomeWorkShow = () => {
.exportHomeWork(obj) .exportHomeWork(obj)
.then((res) => { .then((res) => {
console.log("导出作业", res.data.data); console.log("导出作业", res.data.data);
message.destroy(); //message.destroy();
message.success("导出作业成功"); // message.success("导出作业成功");
exportHomeWorkV.value = true; exportHomeWorkV.value = true;
downloadUrl.value = res.data.data; downloadUrl.value = res.data.data;
}) })

View File

@@ -1362,10 +1362,10 @@
> >
删除 删除
</a-menu-item> </a-menu-item>
<!--新加 二维码 --> <!--新加 二维码
<a-menu-item @click="qrcodeVisible(record, 1)"> <a-menu-item @click="qrcodeVisible(record, 1)">
二维码 二维码
</a-menu-item> </a-menu-item>-->
</a-menu> </a-menu>
</template> </template>
<div class="fb" style="margin-left: -20px"> <div class="fb" style="margin-left: -20px">

View File

@@ -1859,9 +1859,10 @@ export default {
title: "最近学习时间", title: "最近学习时间",
dataIndex: "lastStudyTime", dataIndex: "lastStudyTime",
key: "lastStudyTime", key: "lastStudyTime",
width: 80, width: 120,
align: "center", align: "center",
className: "h", className: "h",
ellipsis: true,
}, },
], ],
loading: false, loading: false,
@@ -3074,6 +3075,7 @@ export default {
width: "20%", width: "20%",
align: "center", align: "center",
className: "h", className: "h",
ellipsis: true,
// sorter: { // sorter: {
// compare: (a, b) => a.stutime - b.stutime, // compare: (a, b) => a.stutime - b.stutime,
// multiple: 3, // multiple: 3,