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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yuping
2022-12-15 22:17:43 +08:00
parent 6f00cb21c2 e98d3cd5ea
commit ba0106957a
8 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/drawers/AddOnline.vue
View File

@@ -108,7 +108,7 @@
:loading="tableDataTotal === -1 ? true : false"
:pagination="false"
/>
<div class="tableBox">
<div class="tableBox" style="margin-top:85px;">
<div class="pa">
<a-pagination
v-if="tableDataTotal > 10"

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

@@ -244,7 +244,7 @@
<div class="main_item">
<div class="main_item">
<div class="signbox">
<span style="margin-right: 3px">作业要求：</span>
<span style="margin-right: 3px">试题排序：</span>
</div>
<div class="btnbox">
<a-radio-group

6
src/components/drawers/AssessmentAll.vue
View File

@@ -93,7 +93,7 @@
}"
filterMultiple:false
/>
<div class="tableBox">
<div class="tableBox" style="margin-top:85px;">
<div class="pa">
<a-pagination
:showSizeChanger="false"
@@ -208,6 +208,7 @@ export default {
key: "num",
width: "20%",
align: "center",
ellipsis: true,
},
{
title: "创建人",
@@ -215,6 +216,7 @@ export default {
key: "creator",
width: "20%",
align: "center",
ellipsis: true,
},
{
title: "创建时间",
@@ -222,6 +224,7 @@ export default {
key: "time",
width: "20%",
align: "center",
ellipsis: true,
},
];
return columns;
@@ -274,6 +277,7 @@ export default {
assessmentName: state.inputV1,
pageNo: state.currentPage,
pageSize: state.pageSize,
releaseStatus:2,
})
.then((res) => {
let arr = res.data.data.rows;

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

@@ -51,7 +51,7 @@
:row-selection="rowSelection"
filterMultiple:false
/>
<div class="tableBox">
<div class="tableBox" style="margin-top:85px;">
<div class="pa">
<a-pagination
:showSizeChanger="false"
@@ -136,6 +136,7 @@ export default {
key: "num",
width: "20%",
align: "center",
ellipsis: true,
},
{
title: "创建人",
@@ -143,6 +144,7 @@ export default {
key: "creator",
width: "20%",
align: "center",
ellipsis: true,
},
{
title: "创建时间",
@@ -150,6 +152,7 @@ export default {
key: "time",
width: "20%",
align: "center",
ellipsis: true,
},
];
return columns;
@@ -182,8 +185,15 @@ export default {
let obj = {
key: index,
assessmentId: value.assessmentId,
num: Number(value.essayQuestionVoList.length)+Number(value.multipleStemVoList.length)+Number(value.scoringQuestionVoList
.length)+Number(value.singleStemVoList.length),
num:value.essayQuestionVoList
? Number(value.essayQuestionVoList.length)
: 0 + value.multipleStemVoList
? Number(value.multipleStemVoList.length)
: 0 + value.scoringQuestionVoList
? Number(value.scoringQuestionVoList.length)
: 0 + value.singleStemVoList
? Number(value.singleStemVoList.length)
: 0,
name: value.assessmentName ? value.assessmentName : "-",
creator: value.createUser ? value.createUser : "-",
time: dayjs(value.createTime).format("YYYY-MM-DD"),

5
src/components/drawers/EvList.vue
View File

@@ -54,7 +54,7 @@
onChange: onSelectChange,
}"
/>
<div class="tableBox">
<div class="tableBox" style="margin-top:85px;">
<div class="pa">
<a-pagination
v-if="tableDataTotal > 10"
@@ -113,6 +113,7 @@ export default {
width: "20%",
dataIndex: "quiz_code",
key: "code",
ellipsis: true,
},
{
title: "测评名称",
@@ -120,6 +121,7 @@ export default {
dataIndex: "title",
key: "title",
align: "center",
ellipsis: true,
},
{
title: "备注",
@@ -149,6 +151,7 @@ export default {
dataIndex: "quiz_range",
key: "time",
align: "center",
ellipsis: true,
},
],
});

2
src/components/drawers/SelectTest.vue
View File

@@ -70,7 +70,7 @@
:scroll="{ x: 900 }"
:pagination="false"
/>
<div class="tableBox">
<div class="tableBox" style="margin-top:85px;">
<div class="pa">
<a-pagination
v-if="tableDataTotal>10"

6
src/views/projectcenter/TaskPage.vue
View File

@@ -3583,9 +3583,12 @@ export default {
console.log("get task", res.data.data);
if (res.data.code === 200) {
// 判断当前审核是否通过
if (res.data.data.projectAuditLogDtoList !== null) {
if (res.data.data.status == -5 && res.data.data.projectAuditLogDtoList !== null) {
console.log("审核信息是什么", res.data.data.projectAuditLogDtoList);
let dataset = res.data.data.projectAuditLogDtoList;
state.passInfo = dataset[dataset.length-1];
/**
for (let i = 0; i < dataset.length; i++) {
if (dataset[i].status == -5) {
state.isPass = true;
@@ -3593,6 +3596,7 @@ export default {
}
// isPass passInfo
}
*/
}
let info = res.data.data.projectInfo;

8
src/views/projectcenter/temTask.vue
View File

@@ -1580,7 +1580,7 @@ export default {
console.log("zhaodaole", stage);
// console.log("stage",Object.prototype.toString.call(stage))
getStageData(res.data.data.stageList);
if (stage !== "null") {
if (stage !== null) {
console.log(stage);
let stageList = res.data.data.stageList; //阶段数组
let result = stageList.find(
@@ -1773,18 +1773,18 @@ export default {
api
.editStage(obj)
.then((res) => {
console.log("修改阶段成功", res);
console.log("操作成功", res);
state.valuesname = "";
state.valuesnotice = "";
closeModal();
state.updateStageID = null;
message.destroy();
message.success("修改阶段成功");
message.success("操作成功");
getTask();
state.addLoading = false;
})
.catch((err) => {
console.log("添加阶段失败", err);
console.log("操作失败", err);
});
};