diff --git a/src/api/config.js b/src/api/config.js
index c045783a..c348cf6d 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -32,7 +32,7 @@ http.interceptors.request.use(
// 此处测试默认配置token
config.headers.token = "123456";
- // config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkyMTE4MzMsImV4cCI6MTY2OTIxOTAzMywiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.40067eca3be5d50857448005a673cbe1a48f560ff8e9c7aea4e7ff12f59c7962";
+ // config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkyODg3MzIsImV4cCI6MTY2OTI5NTkzMiwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.af724ca2f4c530868cf923daa2e1a4a3733ee97430b830039ace513d628dfb42";
}
return config;
},
diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index a61dff5b..b0cf6f14 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -199,20 +199,39 @@ export default {
const getTableDate = (tableData) => {
let data = tableData;
let array = [];
- data.map((value, index) => {
- let obj = {
- key: index,
- authorId:value.authorId,
- authorName:value.authorName,
- companyId:value.companyId,
- coverUrl:value.coverUrl,
- caseid:value.id,
- title:value.title,
- };
- array.push(obj);
- });
- state.tableData = array;
- console.log('get下来的数据',state.tableData);
+ if(state.inputV1 == ""){
+ 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,
+ };
+ array.push(obj);
+ });
+ 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 = () => {
@@ -227,7 +246,7 @@ export default {
})
.then((res) => {
if (res.status === 200) {
- getTableDate(res.data.data);
+ getTableDate(res.data.data);
}
})
.catch(() => {
@@ -238,7 +257,7 @@ export default {
for(let i = 0;i < state.apiTaskList.length;i++){
RouterEditTask({
chapterId: props.isactive,
- courseId: state.apiTaskList[i].caseid,
+ courseId: state.apiTaskList[i].id,
name: state.apiTaskList[i].caseName,
routerId: props.routerId,
routerTaskId: props.routerTaskId || 0,
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index 128063da..e955613c 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -91,7 +91,7 @@
-
+
{
state.EvalListVisible = true;
};
+ //向关卡或阶段渲染
const updateTask = (value) => {
if (props.isLevel == 1) {
RouterEditTask({
@@ -223,9 +228,11 @@ export default {
type: 10,
})
.then(( ) => {
+ message.destroy()
message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
})
.catch(( ) => {
+ message.destroy()
message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
} else if (props.isLevel == 3) {
@@ -255,6 +262,60 @@ export default {
message.error("获取测量平信息失败");
});
}
+ const creoredit = ()=> {
+ if(props.edit){
+ editInvistText
+ }else{
+ createEvalText
+ }
+ }
+ const editInvistText = ()=> {
+ if (!state.inputV1) {
+ message.destroy();
+ return message.info("请输入测评名称");
+ }
+ if (!state.evaluationTypeId) {
+ message.destroy();
+ return message.info("请选择测评");
+ }
+ let objei = {
+ // "createTime": "",
+ // "createUser": 0,
+ // "evaluationEndTime": "",
+ // "evaluationFlag": "",
+ // "evaluationId": "",
+ // "evaluationName": "",
+ // "evaluationPictureAddress": "",
+ // "evaluationStartTime": "",
+ // "evaluationTag": "",
+ // "evaluationTypeId": 0,
+ // "evaluationTypeName": "",
+ // "updateTime": "",
+ // "updateUser": 0
+ evaluationName: state.inputV1,
+ evaluationEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"),
+ evaluationId: props.edit ? props.evaluationId : 0,
+ evaluationStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"),
+ evaluationTypeId: state.evaluationTypeId,
+ evaluationTypeName: state.evaluationTypeName,
+ evaluationFlag: "",
+ evaluationPictureAddress: "",
+ evaluationTag: "",
+ updateTime: "",
+ }
+ api
+ .updateEvaluation(objei)
+ .then((res) => {
+ updateTask(res.data.data);
+ console.log('编辑后的测评信息 编辑后的测评id还和之前一样么?',res.data.data);
+ message.success("编辑测评信息成功");
+ closeDrawer();
+ ctx.emit("changeData", false);
+ })
+ .catch(() => {
+ message.error("编辑测评信息创建失败");
+ });
+ }
//创建测评信息
const createEvalText = () => {
if (!state.inputV1) {
@@ -296,8 +357,10 @@ export default {
checkFinish,
closeDrawer,
//增改
+ creoredit,
createEvalText,
queryInvistById,
+ editInvistText,
showEvalDrawer,
updateTask,
};
diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue
index 929bfa48..5576bb79 100644
--- a/src/components/drawers/EvList.vue
+++ b/src/components/drawers/EvList.vue
@@ -29,7 +29,6 @@
/>
-
-
{
let obj = {
- name: "",
+ // name: "",
pageNo: state.pageNo,
pageSize: state.pageSize,
- projectId: 27,
+ // projectId: 27,
projectTaskId: props.projectTaskId,
- status: -1,
+ status: 0,
};
api
.taskStudentList(obj)
@@ -425,12 +426,12 @@ export default {
//搜索任务列表
const searchTaskList = () => {
let objser = {
- name: "",
+ // name: "",
pageNo: state.pageNo,
pageSize: state.pageSize,
- projectId: 27,
+ // projectId: 27,
projectTaskId: props.projectTaskId,
- status: -1,
+ status: 0,
};
if (state.name !== "" || state.projectName !== "") {
api
diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue
index 1ac8904c..67271f97 100644
--- a/src/components/drawers/TestManage.vue
+++ b/src/components/drawers/TestManage.vue
@@ -126,6 +126,8 @@
+
+
@@ -133,8 +135,12 @@
import { toRefs, reactive } from "vue";
import { message } from 'ant-design-vue';
import * as api from "../../api/index";
+import CQue from './CheckQue.vue'
export default {
- name: "TestManage",
+ name: "TestManage",
+ components: {
+ CQue,
+ },
props: {
TMvisible: {
type: Boolean,
@@ -158,6 +164,7 @@ export default {
const state = reactive({
name: null,
open: false,
+ CQvisible:false, //查看答卷抽屉
pageNo: 1,
pageSize: 10,
currentPage: 1,
@@ -180,18 +187,7 @@ export default {
label: "已完成",
},
],
- tabledata: [
- {
- workNum:1,
- status:"已完成",
- operation:"",
- },
- {
- workNum:1,
- status:"未完成",
- operation:"",
- }
- ],
+ tabledata: [],
selectedRowKeys:[],
});
const tableDataFunc = () => {
@@ -325,15 +321,12 @@ export default {
title: "操作",
dataIndex: "operation",
key: "operation",
- width: 60,
+ width: 90,
align: "center",
- className: "h",
},
]
return columns;
}
-
-
};
//考试管理列表操作
const ListOpera = () => {
@@ -354,7 +347,7 @@ export default {
class="operation"
style="cursor:pointer;margin-right:10px;"
onClick={() => {
- console.log('123')
+ state.CQvisible = true
}}
>
查看
@@ -434,16 +427,17 @@ export default {
array.push(obj)
})
state.tabledata = array
+ ListOpera();
}
//获取任务管理列表
const getManageList = () => {
let obj = {
- name: "",
+ // name: "",
pageNo: state.pageNo,
pageSize: state.pageSize,
- projectId: 27,
+ // projectId: 27,
projectTaskId: props.projectTaskId,
- status: -1,
+ status: 0,
};
api
.taskStudentList(obj)
@@ -461,12 +455,12 @@ export default {
//搜索任务列表
const searchTaskList = () => {
let objser = {
- name: "",
+ // name: "",
pageNo: state.pageNo,
pageSize: state.pageSize,
- projectId: 27,
+ // projectId: 27,
projectTaskId: props.projectTaskId,
- status: -1,
+ status: 0,
};
if (state.name !== "" || state.projectName !== "") {
api
diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue
index c4a18e21..624f16f2 100644
--- a/src/components/drawers/TimeManage.vue
+++ b/src/components/drawers/TimeManage.vue
@@ -364,36 +364,37 @@ export default {
//获取任务管理列表
const getManageList = () => {
let obj = {
- name: "",
+ // name: "",
pageNo: state.pageNo,
pageSize: state.pageSize,
- projectId: 27,
+ // projectId: 27,
projectTaskId: props.projectTaskId,
- status: -1,
+ status: 0,
};
api
.taskStudentList(obj)
.then((res) => {
state.pageNo = res.data.data.pageNo;
state.pageSize = res.data.data.pageSize;
- state.pageSize = res.data.data.pageSize;
for (let i = 0; i < res.data.data.rows.length; i++) {
state.tabledata.push(res.data.data.rows[i].userInfoBo);
}
+ ListOpera();
})
- .catch(() => {
+ .catch((err) => {
+ console.log(err,'sss');
});
};
//搜索任务列表
const searchTaskList = () => {
let objser = {
- name: "",
+ // name: "",
pageNo: state.pageNo,
pageSize: state.pageSize,
- projectId: 27,
+ // projectId: 27,
projectTaskId: props.projectTaskId,
- status: -1,
+ status: 0,
};
if (state.name !== "" || state.projectName !== "") {
api
diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue
index 8916b350..7a04624b 100644
--- a/src/components/drawers/WorkManage.vue
+++ b/src/components/drawers/WorkManage.vue
@@ -323,12 +323,12 @@ export default {
//获取任务管理列表
const getManageList = () => {
let obj = {
- name: "",
+ // name: "",
pageNo: state.pageNo,
pageSize: state.pageSize,
- projectId: 27,
+ // projectId: 27,
projectTaskId: props.projectTaskId,
- status: -1,
+ status: 0,
};
api
.taskStudentList(obj)
@@ -339,6 +339,7 @@ export default {
for (let i = 0; i < res.data.data.rows.length; i++) {
state.tabledata.push(res.data.data.rows[i].userInfoBo);
}
+ ListOpera();
})
.catch(() => {
});
@@ -347,12 +348,12 @@ export default {
//搜索任务列表
const searchTaskList = () => {
let objser = {
- name: "",
+ // name: "",
pageNo: state.pageNo,
pageSize: state.pageSize,
- projectId: 27,
+ // projectId: 27,
projectTaskId: props.projectTaskId,
- status: -1,
+ status: 0,
};
if (state.name !== "" || state.projectName !== "") {
api
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 338437fd..fdb9f40a 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -1189,51 +1189,9 @@ export default {
},
],
//项目抽屉、列表参数
- 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',
- },
- ],
+ drawertableData: [],
selectedProjRowKeys:[],
+ projListData:[],
currentPage: 1,
tableDataTotal: 0,
pageSize: 10,
@@ -1444,6 +1402,7 @@ export default {
state.addevalvisible = true;
state.EditEvalId = id;
state.routerTaskId = eleId;
+ console.log('id我编辑的测评id',id);
};
//评估抽屉
const showDrawerAddInvist = (id, eleId) => {
@@ -1950,13 +1909,8 @@ export default {
//项目抽屉用的
const onProjSelectChange = (selectedRowKeys,selectedRows) => {
state.selectedProjRowKeys = selectedRowKeys
- // if(selectedRowKeys.length>1){
- // return
- // }
- state.projId = selectedRows[0].projectId
- state.projName = selectedRows[0].name
- console.log(state.projId,'------------------');
- // console.log(selectedRowKeys,selectedRows);
+ state.projListData = selectedRows
+ console.log(selectedRows,state.projListData);
}
const getTableDate = (data) => {
let array = []
@@ -2012,17 +1966,19 @@ export default {
};
//添加关卡项目
const updateTask = () => {
- RouterEditTask({
+ state.projListData.map((value)=>{
+ console.log('--------',value);
+ RouterEditTask({
duration: 0,
flag: true,
- chapterId: state.isactive,
- courseId: Number(state.projId),
- name: state.projName,
+ chapterId: Number(state.isactive),
+ courseId: Number(value.projectId),
+ name: value.name,
routerId: state.routerId,
routerTaskId: state.routerTaskId,
type: 13,
})
- .then(( ) => {
+ .then(() => {
message.success(`${state.editproj ? "编辑" : "新增"}关卡任务成功`);
// ctx.emit("changeData", false);
leaveProjDrawer()
@@ -2032,6 +1988,7 @@ export default {
message.destroy()
message.error("添加关卡任务失败")
});
+ })
};
//显示切换模式抽屉