fix:修改创建评估及编辑评估回显

This commit is contained in:
lixg
2022-12-14 11:55:48 +08:00
parent a70b55906f
commit ea3315ac32
3 changed files with 272 additions and 240 deletions

View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 14:32:52
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-13 15:30:27
* @LastEditTime: 2022-12-14 09:04:31
* @FilePath: /fe-manage/src/api/config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@@ -56,7 +56,7 @@ http.interceptors.response.use(
return response;
} else {
if (code === 1000) {
window.open("https://u-pre.boe.com/web/", '_self');
// window.open("https://u-pre.boe.com/web/", '_self');
// window.open("http://111.231.196.214:12013/manage/login", '_self');
}
console.log("api %o", msg);

View File

@@ -24,13 +24,9 @@
v-model:assessmentVisible="assessmentVisible"
v-model:assessmentId="assessmentId"
v-model:assessmentName="assessmentName"
/>
</div>
</div>
</div>
<div class="main_btns">
<button class="btn1" @click="closeDrawer">取消</button>
@@ -138,7 +134,6 @@ export default {
// ctx.emit("changeData", false);
localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive);
};
const checkAssDrawer = () => {
state.assessmentVisible = true;
@@ -151,16 +146,19 @@ export default {
state.assessmentId = null;
state.assessmentName = null;
}
};
const updateTask = () => {
console.log("state.assessmentId ",state.assessmentId ,state.assessmentName );
console.log(
"state.assessmentId ",
state.assessmentId,
state.assessmentName
);
if (!state.assessmentId) {
return message.warning("请选择评估");
}
let l_data_id = [];
l_data_id.push(Number(state.assessmentId))
l_data_id.push(Number(state.assessmentId));
console.log("state.assessment", state.assessment, state.assessmentId);
if (props.isLevel == 1) {
if (!props.isactive) {
@@ -174,7 +172,7 @@ export default {
type: 11,
})
.then((res) => {
console.log('shifouchongfu',res)
console.log("shifouchongfu", res);
console.log("路径图中是否包含此评估了", res);
if (res.data.data.length) {
let strdata = res.data.data;
@@ -200,7 +198,9 @@ export default {
})
.then(() => {
message.destroy();
message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
message.success(
`${props.edit ? "编辑" : "新增"}关卡任务成功`
);
ctx.emit("changeData", false);
closeDrawer();
state.addLoading = false;
@@ -210,19 +210,19 @@ export default {
message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
}
}).catch(err=>{
console.log(err)
})
.catch((err) => {
console.log(err);
});
} else if (props.isLevel == 2) {
IsExistenceProject({
courseTaskId: l_data_id,
projectId: props.projectId,
stageId: props.chooseStageId || 0,
type: 11,
}).then(res=>{
console.log(res)
})
.then((res) => {
console.log(res);
console.log("项目中是否包含此评估了", res);
if (res.data.data.length) {
let strdata = res.data.data;
@@ -256,10 +256,10 @@ export default {
message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
});
}
}).catch(err=>{
console.log(err)
})
.catch((err) => {
console.log(err);
});
} else if (props.isLevel == 3) {
IsExistenceProjectTemplate({
courseTaskId: l_data_id,
@@ -267,7 +267,7 @@ export default {
stageId: props.chooseStageId || 0,
type: 11,
}).then((res) => {
console.log(res)
console.log(res);
console.log("项目中是否包含此评估了", res);
if (res.data.data.length) {
let strdata = res.data.data;
@@ -303,7 +303,6 @@ export default {
});
}
});
}
};
@@ -313,7 +312,6 @@ export default {
closeDrawer,
updateTask,
checkAssDrawer,
};
},
};
@@ -339,7 +337,6 @@ export default {
}
}
.contentMain {
.main {
width: 100%;
.main_left {

View File

@@ -1,11 +1,10 @@
<!-- 评估列表 -->
<template>
<div class="main_item">
<div class="fi_input">
<a-input
v-model:value="inputV1"
style="width: 424px; height: 40px; border-radius: 8px;"
style="width: 424px; height: 40px; border-radius: 8px"
placeholder="请输入评估名称"
maxlength="20"
/>
@@ -23,18 +22,14 @@
<div class="mntc_left">
<div class="notice_icon"></div>
<div v-if="assessment == null">
<span class="title"
>已选择 <span class="data">0</span> </span
>
<span class="title">已选择 <span class="data">0</span> </span>
</div>
<div v-else>
<div>
<span class="title">已选择 <span class="data">1</span> ;</span>
<span class="title"
>已选择 <span class="data">1</span> ;</span
>
<span class="title"
>名称 <span class="data">{{ assessment.name }}</span>
</span><!--
>名称 <span class="data">{{ assessment.name }}</span> </span
><!--
<span class="title"
>题数 <span class="data">{{ assessment.essayQuestionVoList?Number(assessment.essayQuestionVoList.length):0
+Number(assessment.multipleStemVoList?assessment.multipleStemVoList.length:0)
@@ -110,12 +105,12 @@
class="pagination"
@change="handelChangePage"
/>
</div></div>
</div>
</div>
</div>
</template>
<script>
import { reactive, toRefs,onMounted } from "vue";
import { reactive, toRefs, onMounted, watch } from "vue";
import * as api from "../../api/indexInvist.js";
import dayjs from "dayjs";
export default {
@@ -154,7 +149,7 @@ export default {
};
//清空所选
const clearLine = () => {
console.log("state.selectedRowKeys",state.selectedRowKeys)
console.log("state.selectedRowKeys", state.selectedRowKeys);
state.selectedRowKeys = [];
state.addOnlineList = [];
};
@@ -168,9 +163,26 @@ export default {
api
.queryAppraiseDetailById({ assessmentId: props.assessmentId })
.then((res) => {
console.log(res);
console.log("查询评估xinxi ", res);
let info = res.data.data;
let obj = {
assessmentId: info.assessmentId,
name: info.assessmentName,
num: info.essayQuestionVoList
? Number(info.essayQuestionVoList.length)
: 0 + info.multipleStemVoList
? Number(info.multipleStemVoList.length)
: 0 + info.scoringQuestionVoList
? Number(info.scoringQuestionVoList.length)
: 0 + info.singleStemVoList
? Number(info.singleStemVoList.length)
: 0,
creator: info.createUser ? info.createUser : "-",
time: dayjs(info.createTime).format("YYYY-MM-DD"),
};
//更新讨论信息
state.assessment = res.data.data;
state.assessment = obj;
state.selectedRowKeys = [info.assessmentId];
// state.assessmentId = res.data.data.assessmentId;
})
.catch(() => {});
@@ -223,8 +235,7 @@ export default {
// ctx.emit("checkedAss", state.assessment);
ctx.emit("update:assessmentId", state.assessment.assessmentId);
ctx.emit("update:assessmentName", state.assessment.name);
}
};
const handelChangePage = (page, pageSize) => {
state.currentPage = page;
@@ -234,21 +245,27 @@ export default {
const getTableDate = (tableData) => {
let data = tableData;
let array = [];
data.map((value, index) => {
data.map((value) => {
let obj = {
key: index,
key: value.assessmentId,
assessmentId: value.assessmentId,
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,
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"),
};
array.push(obj);
});
(state.selectedRowKeys = []), (state.tableData = array);
state.selectedRowKeys = [];
state.tableData = array;
};
//获取全部评估信息接口
const getAllInvistText = () => {
@@ -279,15 +296,34 @@ export default {
};
onMounted(() => {
clearLine();
console.log("state.selectedRowKeys",state.selectedRowKeys)
console.log(
"state.selectedRowKeys",
state.selectedRowKeys,
state.assessmentId
);
if (!state.assessmentId) {
clearLine();
}
queryInfo();
getAllInvistText();
});
watch(
() => props.assessmentId,
() => {
if (!props.assessmentId) {
clearLine();
state.assessment = null;
} else {
queryInfo();
}
console.log("props.assessmentId", props.assessmentId);
},
{
deep: true,
}
);
return {
...toRefs(state),
onSelectChange,
@@ -322,7 +358,6 @@ export default {
}
}
.contentMain {
.main_left {
padding-right: 30px;
margin-top: 32px;