fix:清除案例和测评的测试无用数据和多余consolelog

This commit is contained in:
Ggysh-7
2022-11-25 07:21:58 +08:00
parent 18904331a2
commit dd67df4f0b
9 changed files with 51 additions and 182 deletions

View File

@@ -32,7 +32,7 @@ http.interceptors.request.use(
// 此处测试默认配置token // 此处测试默认配置token
config.headers.token = "123456"; config.headers.token = "123456";
// config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkyODg3MzIsImV4cCI6MTY2OTI5NTkzMiwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.af724ca2f4c530868cf923daa2e1a4a3733ee97430b830039ace513d628dfb42"; // config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkzMDA4MDksImV4cCI6MTY2OTMwODAwOSwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.bb3e0e031513761003d5c3bfeaf16e364bdf8fe7bc4cf691a05a74dc454afbfb";
} }
return config; return config;
}, },

View File

@@ -32,7 +32,7 @@
</div> </div>
</div> </div>
<div class="mi_btns"> <div class="mi_btns">
<div class="btn btn1"> <div class="btn btn1" @click="getAllCaseText">
<div class="search"></div> <div class="search"></div>
<div class="btnText">搜索</div> <div class="btnText">搜索</div>
</div> </div>
@@ -149,6 +149,8 @@ export default {
ctx.emit("update:edit", false); ctx.emit("update:edit", false);
localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive); localStorage.setItem("chapterId", props.isactive);
state.inputV1=""
state.selectedRowKeys=[]
}; };
const afterVisibleChange = (bol) => { const afterVisibleChange = (bol) => {
if ( bol == true ) { if ( bol == true ) {
@@ -189,7 +191,6 @@ export default {
} }
state.selectedRowKeys = selectedRowKeys; state.selectedRowKeys = selectedRowKeys;
state.apiTaskList = selectedRows; state.apiTaskList = selectedRows;
console.log('-------------%o-%o',state.apiTaskList, state.apiTaskList.length);
}; };
const handelChangePage = (page, pageSize) => { const handelChangePage = (page, pageSize) => {
state.currentPage = page; state.currentPage = page;
@@ -199,7 +200,6 @@ export default {
const getTableDate = (tableData) => { const getTableDate = (tableData) => {
let data = tableData; let data = tableData;
let array = []; let array = [];
if(state.inputV1 == ""){
data.map((value, index) => { data.map((value, index) => {
let obj = { let obj = {
key: index, key: index,
@@ -208,36 +208,18 @@ export default {
companyId:value.companyId, companyId:value.companyId,
coverUrl:value.coverUrl, coverUrl:value.coverUrl,
id:value.id, id:value.id,
casesId:value.casesId,
title:value.title, title:value.title,
}; };
array.push(obj); array.push(obj);
}); });
state.tableData = array; state.tableData = array;
console.log('get下来获取全部的的数据',state.tableData);
} else {
data.map((value, index) => {
let obj = {
key: index,
authorId:value.authorId,
authorName:value.authorName,
companyId:value.companyId,
coverUrl:value.coverUrl,
id:value.id,
title:value.title,
};
if(obj.title == state.inputV1){
array.push(obj);
}
});
state.tableData = array;
console.log('get下来搜索的的数据',state.tableData);
}
}; };
//获取全部案例信息接口 //获取全部案例信息接口
const getAllCaseText = () => { const getAllCaseText = () => {
api api
.queryCasesDetailList({ .queryCasesDetailList({
"keyWord": "", "keyWord": state.inputV1,
"orderAsc": true, "orderAsc": true,
"orderField": "", "orderField": "",
"pageIndex": 0, "pageIndex": 0,
@@ -257,8 +239,8 @@ export default {
for(let i = 0;i < state.apiTaskList.length;i++){ for(let i = 0;i < state.apiTaskList.length;i++){
RouterEditTask({ RouterEditTask({
chapterId: props.isactive, chapterId: props.isactive,
courseId: state.apiTaskList[i].id, courseId: state.apiTaskList[i].casesId,
name: state.apiTaskList[i].caseName, name: state.apiTaskList[i].title,
routerId: props.routerId, routerId: props.routerId,
routerTaskId: props.routerTaskId || 0, routerTaskId: props.routerTaskId || 0,
type: 3, type: 3,
@@ -274,18 +256,16 @@ export default {
}); });
} }
} else if (props.isLevel == 2) { } else if (props.isLevel == 2) {
console.log("state api task list: %o-length: %o", state.apiTaskList, state.apiTaskList.length )
for(let i = 0;i < state.apiTaskList.length;i++){ for(let i = 0;i < state.apiTaskList.length;i++){
console.log(state.apiTaskList[i],'state.apiTaskList[i].caseIdstate.apiTaskList[i].caseId');
apiTask apiTask
.addTask({ .addTask({
"courseId": state.apiTaskList[i].caseid, "courseId": state.apiTaskList[i].casesId,
"duration": 0, "duration": 0,
"flag": true, "flag": true,
"name": state.apiTaskList[i].caseName, "name": state.apiTaskList[i].title,
"projectId": props.projectId, "projectId": props.projectId,
"projectTaskId": props.projectTaskId, "projectTaskId": props.projectTaskId,
"stageId": props.chooseStageId, "stageId": Number(props.chooseStageId),
"type": 3, "type": 3,
}) })
.then(() => { .then(() => {

View File

@@ -56,6 +56,7 @@
class="tag-style" class="tag-style"
v-if="evaluationTypeName != ''" v-if="evaluationTypeName != ''"
:closable="true" :closable="true"
@close="delTag"
>{{ evaluationTypeName }}</a-tag >{{ evaluationTypeName }}</a-tag
> >
</span> </span>
@@ -149,11 +150,6 @@ export default {
type: Number, type: Number,
default: null, default: null,
}, },
projectTaskId: {
// 要编辑的projectId
type: Number,
default: null,
},
routerId: { routerId: {
type: Number, type: Number,
default: null, default: null,
@@ -198,6 +194,11 @@ export default {
const showEvalDrawer = () => { const showEvalDrawer = () => {
state.EvalListVisible = true; state.EvalListVisible = true;
}; };
//删除标签要清除子组件传过来的参数
const delTag = ()=> {
state.evaluationTypeId= 0
state.evaluationTypeName= ""
}
//向关卡或阶段渲染 //向关卡或阶段渲染
const updateTask = (value) => { const updateTask = (value) => {
if (props.isLevel == 1) { if (props.isLevel == 1) {
@@ -257,16 +258,17 @@ export default {
dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD"), dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD"),
]; ];
}) })
.catch(() => { .catch((err) => {
message.destroy() message.destroy()
message.error("获取测量平信息失败"); message.error("获取测量平信息失败");
console.log(err,"erererrerererererer");
}); });
} }
const creoredit = ()=> { const creoredit = ()=> {
if(props.edit){ if(props.edit){
editInvistText editInvistText()
}else{ }else{
createEvalText createEvalText()
} }
} }
const editInvistText = ()=> { const editInvistText = ()=> {
@@ -279,22 +281,9 @@ export default {
return message.info("请选择测评"); return message.info("请选择测评");
} }
let objei = { let objei = {
// "createTime": "",
// "createUser": 0,
// "evaluationEndTime": "",
// "evaluationFlag": "",
// "evaluationId": "",
// "evaluationName": "",
// "evaluationPictureAddress": "",
// "evaluationStartTime": "",
// "evaluationTag": "",
// "evaluationTypeId": 0,
// "evaluationTypeName": "",
// "updateTime": "",
// "updateUser": 0
evaluationName: state.inputV1, evaluationName: state.inputV1,
evaluationEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"), evaluationEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"),
evaluationId: props.edit ? props.evaluationId : 0, evaluationId: props.edit ? Number(props.EditEvalId) : 0,
evaluationStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"), evaluationStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"),
evaluationTypeId: state.evaluationTypeId, evaluationTypeId: state.evaluationTypeId,
evaluationTypeName: state.evaluationTypeName, evaluationTypeName: state.evaluationTypeName,
@@ -307,13 +296,11 @@ export default {
.updateEvaluation(objei) .updateEvaluation(objei)
.then((res) => { .then((res) => {
updateTask(res.data.data); updateTask(res.data.data);
console.log('编辑后的测评信息 编辑后的测评id还和之前一样么?',res.data.data);
message.success("编辑测评信息成功");
closeDrawer(); closeDrawer();
ctx.emit("changeData", false); ctx.emit("changeData", false);
}) })
.catch(() => { .catch((err) => {
message.error("编辑测评信息创建失败"); console.log(err,'errrrrrrrrrrrrrrrrrrrrr');
}); });
} }
//创建测评信息 //创建测评信息
@@ -329,7 +316,7 @@ export default {
let obj = { let obj = {
evaluationName: state.inputV1, evaluationName: state.inputV1,
evaluationEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"), evaluationEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"),
evaluationId: props.edit ? props.evaluationId : 0, evaluationId: props.evaluationId ,
evaluationStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"), evaluationStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"),
evaluationTypeId: state.evaluationTypeId, evaluationTypeId: state.evaluationTypeId,
evaluationTypeName: state.evaluationTypeName, evaluationTypeName: state.evaluationTypeName,
@@ -342,12 +329,10 @@ export default {
.createEvaluation(obj) .createEvaluation(obj)
.then((res) => { .then((res) => {
updateTask(res.data.data); updateTask(res.data.data);
message.success("创建成功");
closeDrawer(); closeDrawer();
ctx.emit("changeData", false); ctx.emit("changeData", false);
}) })
.catch(() => { .catch(() => {
message.error("创建失败");
}); });
}; };
@@ -356,6 +341,7 @@ export default {
afterVisibleChange, afterVisibleChange,
checkFinish, checkFinish,
closeDrawer, closeDrawer,
delTag,
//增改 //增改
creoredit, creoredit,
createEvalText, createEvalText,

View File

@@ -213,8 +213,6 @@
</template> </template>
<script> <script>
import { reactive, toRefs } from "vue"; import { reactive, toRefs } from "vue";
import * as apiTask from "../../api/indexTaskadd";
import { RouterEditTask } from "@/api/indexTask"; import { RouterEditTask } from "@/api/indexTask";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import * as apiProj from "../../api/index.js"; import * as apiProj from "../../api/index.js";
@@ -285,100 +283,13 @@ export default {
sameModal: false, sameModal: false,
sameCopy: false, sameCopy: false,
sameProj: null, sameProj: null,
tableData: [
{
key: 1,
parentId: 1,
name: "123",
manager: "afssfa",
children: [
{
key: 5,
parentId: 1,
name: "123",
manager: "afssfa",
},
],
},
{
key: 2,
parentId: 2,
name: "123",
manager: "afssfa",
children: [
{
key: 7,
parentId: 1,
name: "123",
manager: "afssfa",
children: [
{
key: 9,
parentId: 1,
name: "123",
manager: "afssfa",
},
],
},
],
},
{
key: 3,
parentId: 3,
name: "123",
manager: "afssfa",
},
],
selectedRowKeys: [], selectedRowKeys: [],
selectedRows: [], selectedRows: [],
currentPage: 1, currentPage: 1,
tableDataTotal: 0, tableDataTotal: 0,
pageSize: 10, pageSize: 10,
//项目抽屉、列表参数 //项目抽屉、列表参数
drawertableData: [ drawertableData: [],
{
key: 1,
parentId: 1,
name: "123",
manager: "afssfa",
children: [
{
key: 5,
parentId: 1,
name: "123",
manager: "afssfa",
},
],
},
{
key: 2,
parentId: 2,
name: "123",
manager: "afssfa",
children: [
{
key: 7,
parentId: 1,
name: "123",
manager: "afssfa",
children: [
{
key: 9,
parentId: 1,
name: "123",
manager: "afssfa",
},
],
},
],
},
{
key: 3,
parentId: 3,
name: "123",
manager: "afssfa",
},
],
}); });
const tableDataFunc = () => { const tableDataFunc = () => {
@@ -524,6 +435,7 @@ export default {
state.selectedRows.forEach((item) => { state.selectedRows.forEach((item) => {
let origin = JSON.parse(props.chooseProjectList); let origin = JSON.parse(props.chooseProjectList);
console.log("ccxx", origin); console.log("ccxx", origin);
if (origin.length == 0) { if (origin.length == 0) {
//可以直接添加到任务列表里 //可以直接添加到任务列表里
updateTask(item); updateTask(item);
@@ -562,18 +474,6 @@ export default {
.catch(() => { .catch(() => {
message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
}); });
} else if (props.isLevel == 2) {
apiTask.addTask({
courseId: res.data.data.discussId,
duration: res.data.data.discussExplain,
name: res.data.data.discussName,
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId,
type: 13,
});
} else if (props.isLevel == 3) {
console.log("");
} }
}; };
const onSelectChange = (selectedRowKeys, selectRow) => { const onSelectChange = (selectedRowKeys, selectRow) => {

View File

@@ -254,6 +254,7 @@ export default {
.queryExaminationPaper(obj) .queryExaminationPaper(obj)
.then((res) => { .then((res) => {
getTableDate(res.data.data); getTableDate(res.data.data);
message.success("获取选择考试列表成功");
}) })
.catch(() => { .catch(() => {
message.destroy(); message.destroy();

View File

@@ -187,7 +187,18 @@ export default {
label: "已完成", label: "已完成",
}, },
], ],
tabledata: [], tabledata: [
{
key:1,
status:"已完成",
operation:"",
},
{
key:2,
status:"未完成",
operation:"",
},
],
selectedRowKeys:[], selectedRowKeys:[],
}); });
const tableDataFunc = () => { const tableDataFunc = () => {
@@ -331,7 +342,6 @@ export default {
//考试管理列表操作 //考试管理列表操作
const ListOpera = () => { const ListOpera = () => {
let arr = state.tabledata; let arr = state.tabledata;
if(props.itemsType == 5){
arr.map((value) => { arr.map((value) => {
if(value.status == '已完成'){ if(value.status == '已完成'){
value.operation = ( value.operation = (
@@ -375,7 +385,6 @@ export default {
); );
} }
}) })
}
}; };
ListOpera(); ListOpera();
const onSelect = (record) => { const onSelect = (record) => {
@@ -391,7 +400,6 @@ export default {
if ( bol == true ) { if ( bol == true ) {
getManageList(); getManageList();
} }
}; };
const selectProjectName = (value, index) => { const selectProjectName = (value, index) => {
console.log("value", value, index); console.log("value", value, index);
@@ -427,7 +435,6 @@ export default {
array.push(obj) array.push(obj)
}) })
state.tabledata = array state.tabledata = array
ListOpera();
} }
//获取任务管理列表 //获取任务管理列表
const getManageList = () => { const getManageList = () => {

View File

@@ -339,7 +339,6 @@ export default {
for (let i = 0; i < res.data.data.rows.length; i++) { for (let i = 0; i < res.data.data.rows.length; i++) {
state.tabledata.push(res.data.data.rows[i].userInfoBo); state.tabledata.push(res.data.data.rows[i].userInfoBo);
} }
ListOpera();
}) })
.catch(() => { .catch(() => {
}); });

View File

@@ -263,6 +263,9 @@
<add-case <add-case
v-model:addcaseVisible="addcasevisible" v-model:addcaseVisible="addcasevisible"
@changeData="updateTableData" @changeData="updateTableData"
:isLevel="isLevel"
v-model:isactive="isactive"
v-model:routerId="routerId"
v-model:edit="edit" v-model:edit="edit"
v-model:projectId="projectId" v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId" v-model:chooseStageId="chooseStageId"
@@ -420,10 +423,13 @@
:isLevel="isLevel" :isLevel="isLevel"
@changeData="updateTableData" @changeData="updateTableData"
v-model:isactive="isactive" v-model:isactive="isactive"
v-model:routerTaskId="routerTaskId"
v-model:edit="edit" v-model:edit="edit"
v-model:routerId="routerId" v-model:routerId="routerId"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
v-model:projectTaskId="projectTaskId"
v-model:EditEvalId="EditEvalId" v-model:EditEvalId="EditEvalId"
v-model:routerTaskId="routerTaskId"
/> />
</div> </div>
<!-- 添加测评侧弹窗 --> <!-- 添加测评侧弹窗 -->
@@ -1165,13 +1171,9 @@ export default {
}, },
], ],
//项目抽屉、列表参数 //项目抽屉、列表参数
drawertableData: [],
selectedProjRowKeys:[],
projListData:[],
currentPage: 1, currentPage: 1,
tableDataTotal: 0, tableDataTotal: 0,
pageSize: 10, pageSize: 10,
visible: false,
//项目 //项目
editproj: false, editproj: false,
addprojvisible: false, addprojvisible: false,
@@ -1379,7 +1381,6 @@ export default {
state.addevalvisible = true; state.addevalvisible = true;
state.EditEvalId = id; state.EditEvalId = id;
state.routerTaskId = eleId; state.routerTaskId = eleId;
console.log('id我编辑的测评id',id);
}; };
//评估抽屉 //评估抽屉
const showDrawerAddInvist = (id, eleId) => { const showDrawerAddInvist = (id, eleId) => {
@@ -1424,10 +1425,6 @@ export default {
state.EditProjectId = id; state.EditProjectId = id;
state.routerTaskId = eleId; state.routerTaskId = eleId;
}; };
//关闭项目抽屉
const leaveProjDrawer = () => {
state.addprojvisible = false;
};
//tableData数据赋值方法 //tableData数据赋值方法
const dataAssignment = (id) => { const dataAssignment = (id) => {
console.log(state.level); console.log(state.level);
@@ -1919,7 +1916,6 @@ export default {
showDrawerAddLive, showDrawerAddLive,
showDrawerAddRef, showDrawerAddRef,
showDrawerAddProj, showDrawerAddProj,
leaveProjDrawer,
closeDeleteModel, closeDeleteModel,
clearEditData, clearEditData,
showDrawerAddDiscuss, showDrawerAddDiscuss,

View File

@@ -1988,11 +1988,9 @@ export default {
//打开测评的弹窗 //打开测评的弹窗
const showEditEvalDrawer = (id, eleId) => { const showEditEvalDrawer = (id, eleId) => {
console.log("222222222222222222222", id);
state.addevalvisible = true; state.addevalvisible = true;
state.projectTaskId = eleId; state.projectTaskId = eleId;
state.EditRefId = id; state.EditEvalId = id;
console.log(state.EditRefId);
}; };
//编辑的按钮 //编辑的按钮
const decideType = (type, id, eleId) => { const decideType = (type, id, eleId) => {
@@ -2020,6 +2018,8 @@ export default {
showDrawerOnline(id, eleId); showDrawerOnline(id, eleId);
} else if (type == "面授") { } else if (type == "面授") {
showDrawerFaceteach(id, eleId); showDrawerFaceteach(id, eleId);
} else if (type == "案例") {
showDrawerAddCase(id, eleId);
} }
}; };
const showdeAll = () => { const showdeAll = () => {