diff --git a/src/api/config.js b/src/api/config.js
index 414e5c3b..c045783a 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.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2Njg4NjI2MTAsImV4cCI6MTY2ODg2OTgxMCwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.defa91ecb2b61d9b20d858db0c2c8d7d80dea4613cb2559a22569b7df36b3f6b";
+ // config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkyMTE4MzMsImV4cCI6MTY2OTIxOTAzMywiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.40067eca3be5d50857448005a673cbe1a48f560ff8e9c7aea4e7ff12f59c7962";
}
return config;
},
diff --git a/src/api/index1.js b/src/api/index1.js
index bc2d71bd..720203bd 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -7,8 +7,7 @@
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
import http from "./config";
-import qs from 'qs';
-
+import qs from "qs";
/**
* 接口传参数方式(get)
@@ -33,7 +32,7 @@ import qs from 'qs';
* (request的Header:'Content-Type'= 'application/x-www-form-urlencoded')
* let data = {"code":"1234","name":"yyyy"};
* axios.post(`${this.$url}/test/testRequest`,qs.stringify({data})).then()
- *
+ *
*
* 3.'Content-Type'= 'application/json,传参格式为 raw (JSON格式)。
* (全局请求头:'Content-Type'= 'application/x-www-form-urlencoded')
@@ -44,59 +43,65 @@ import qs from 'qs';
*/
//上传文件
-export const uploadFile = (obj) => http.post('/test/testRequest', qs.stringify({ obj }));
+export const uploadFile = (obj) =>
+ http.post("/test/testRequest", qs.stringify({ obj }));
// 接口-请求
//创建学习路径
-export const createLearnPath = (obj) => http.post('/admin/router/edit', obj);
+export const createLearnPath = (obj) => http.post("/admin/router/edit", obj);
// 获取学习路径图列表
-export const getLearnPath = (obj) => http.post('/admin/router/list', obj);
+export const getLearnPath = (obj) => http.post("/admin/router/list", obj);
//学习路径图的发布、停用、删除
-export const handleLearnPath = (obj) => http.post('/admin/router/handle', obj);
+export const handleLearnPath = (obj) => http.post("/admin/router/handle", obj);
//获取路径图统计数据
-export const getLearnCount = (routerId) => http.get('/admin/router/getCount', { params: { routerId: routerId } })
-
+export const getLearnCount = (routerId) =>
+ http.get("/admin/router/getCount", { params: { routerId: routerId } });
//新建或编辑关卡
-export const editChapter = (obj) => http.post('/admin/router/editChapter', obj);
+export const editChapter = (obj) => http.post("/admin/router/editChapter", obj);
// 编辑路径图设置
-export const setConfig = (obj) => http.post('/admin/router/setConfig', obj);
+export const setConfig = (obj) => http.post("/admin/router/setConfig", obj);
//获取学员列表
-export const getStudent = (obj) => http.post('/admin/router/studentList', obj);
+export const getStudent = (obj) => http.post("/admin/router/studentList", obj);
//获取路径图详情-包含关卡及任务列表
-export const getRouterDetail = (routerId) => http.get('/admin/router/detail', {
- params: {
- routerId: routerId,
- }
-});
+export const getRouterDetail = (routerId) =>
+ http.get("/admin/router/detail", {
+ params: {
+ routerId: routerId,
+ },
+ });
//添加学员
-export const addStudent = (obj) => http.post('/admin/router/addStudent', obj);
+export const addStudent = (obj) => http.post("/admin/router/addStudent", obj);
//删除学员
-export const delStudent = (obj) => http.post('/admin/router/deleteStudent', obj);
+export const delStudent = (obj) =>
+ http.post("/admin/router/deleteStudent", obj);
// 获取学员路径图进度明细
-export const stuProgress = (obj) => http.post('/admin/router/studentProcess', obj);
-
+export const stuProgress = (obj) =>
+ http.post("/admin/router/studentProcess", obj);
//项目基础信息-----------------------------------
//项目积分榜单
-export const scoreRank = (obj) => http.post('/admin/project/scoreRank', obj);
+export const scoreRank = (obj) => http.post("/admin/project/scoreRank", obj);
//排行榜
-export const billboard = (obj) => http.post('/admin/project/billboard', obj);
+export const billboard = (obj) => http.post("/admin/project/billboard", obj);
//项目基础信息-----------------------------------
//获取字典信息
-export const getDict = (obj) => http.post('/dict/getList', obj)
+export const getDict = (obj) => http.post("/dict/getList", obj);
//获取组织树
-export const getOrgTree = (obj) => http.post('/admin/router/orgList', obj)
-
+export const getOrgTree = (obj) => http.post("/admin/router/orgList", obj);
// 获取组织结构树
-export const orgtree = () => http.get('/org/tree');
-
+export const orgtree = () => http.get("/org/tree");
//获取积分列表
-export const noticeList = (projectId) => http.post(`http://localhost:8080/api/admin/project/noticeList?projectId=` + projectId + ``)
+export const noticeList = (projectId) =>
+ http.post(
+ `http://localhost:8080/api/admin/project/noticeList?projectId=` +
+ projectId +
+ ``
+ );
// 测试方法
// import * as api from '../../api/index'
@@ -106,5 +111,4 @@ export const noticeList = (projectId) => http.post(`http://localhost:8080/api/ad
// console.log(err)
// })
-
-// export const choiceEvaluation = (obj) => http.post('/evaluation/choiceEvaluation', obj);
\ No newline at end of file
+// export const choiceEvaluation = (obj) => http.post('/evaluation/choiceEvaluation', obj);
diff --git a/src/api/indexInvist.js b/src/api/indexInvist.js
index 31bb417f..77be057e 100644
--- a/src/api/indexInvist.js
+++ b/src/api/indexInvist.js
@@ -38,16 +38,15 @@ import http from "./config";
// 接口-请求
//创建评估
-export const createAppraiseMessage = (obj) => http.post('/survey/createAppraiseMessage', obj,);
-//删除评估信息
-export const deleteAppraise = (obj) => http.post('/survey/deleteAppraise', { params: obj })
//根据ID获取评估信息详情
-export const queryAppraiseDetailById = (obj) => http.post('/survey/queryAppraiseDetailById', { params: obj })
-
-//修改评估信息
-export const updateAppraiseMessage = (obj) => http.post('/survey/updateAppraiseMessage', obj)
+export const queryAppraiseDetailById = (obj) => http.post('/assessment/queryAssessmentDetailById', obj,{
+ headers: {
+ 'token': '123',
+ 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
+ }
+ })
//获取全部评估信息接口
export const queryAssessmentDetailList = (obj) => http.post('/assessment/queryAssessmentDetailList', obj)
diff --git a/src/api/indexTaskadd.js b/src/api/indexTaskadd.js
index b88140e7..3a4567d3 100644
--- a/src/api/indexTaskadd.js
+++ b/src/api/indexTaskadd.js
@@ -25,4 +25,6 @@ export const setScoreRule = (obj) => http.post('/admin/project/setScoreRule', ob
export const planList = (obj) => http.post('/admin/offcourse/planList', obj)
//获取面授课列表
-export const list = (obj) => http.post('/admin/offcourse/list', obj)
\ No newline at end of file
+export const list = (obj) => http.post('/admin/offcourse/list', obj)
+
+export const addTempTask = (obj) => http.post('/admin/project//template/editTask', obj)
\ No newline at end of file
diff --git a/src/api/indexTemplate.js b/src/api/indexTemplate.js
index be42523c..ef8b4745 100644
--- a/src/api/indexTemplate.js
+++ b/src/api/indexTemplate.js
@@ -19,3 +19,6 @@ export const editTask = (obj) => http.post('/admin/project/template/editTask',ob
export const handleTemplates = (obj) => http.post('/admin/project/template/handle',obj);
// 模板库列表
export const templateList = (obj) => http.post(`/admin/project/template/list`,obj);
+// 发布项目公告
+export const publishNotice = (obj) => http.post(`/admin/project/template/publishNotice`,obj);
+
diff --git a/src/components/drawers/ AssessmentList.vue b/src/components/drawers/ AssessmentList.vue
index 234da65a..bb3b9803 100644
--- a/src/components/drawers/ AssessmentList.vue
+++ b/src/components/drawers/ AssessmentList.vue
@@ -86,6 +86,10 @@ export default {
type: Number,
default: null,
},
+ titleTag: {
+ type: Boolean,
+ default: false,
+ }
},
setup(props, ctx) {
const state = reactive({
@@ -100,9 +104,10 @@ export default {
});
const closeDrawer = () => {
ctx.emit("update:assessmentVisible", false);
+ ctx.emit("update:titleTag", true);
};
const afterVisibleChange = (bool) => {
- console.log("state getAllInvistText", bool);
+ console.log("state getAllInvistText", bool,"======",props.titleTag);
if (props.assessmentVisible) {
getAllInvistText();
}
diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index 3951753b..16281b21 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -380,6 +380,23 @@ export default {
message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
} else if (props.isLevel == 3) {
+ apiTask
+ .addTempTask({
+ courseId: res.data.data.activityId,
+ duration: res.data.data.activityDuration,
+ name: res.data.data.activityName,
+ projectTemplateId: props.projectTemplateId,
+ projectTaskId: props.projectTaskId || 0,
+ stageId: props.chooseStageId,
+ type: 9,
+ })
+ .then(() => {
+ message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
+ })
+ .catch(() => {
+ message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
+ });
+
console.log("");
}
};
diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index 22c806dc..a61dff5b 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -49,7 +49,7 @@
:row-class-name="
(_record, index) => (index % 2 === 1 ? 'table-striped' : null)
"
- :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,onSelect:onSelect }"
+ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:columns="tableDataFunc()"
:data-source="tableData"
:loading="tableDataTotal === -1 ? true : false"
@@ -189,11 +189,8 @@ export default {
}
state.selectedRowKeys = selectedRowKeys;
state.apiTaskList = selectedRows;
+ console.log('-------------%o-%o',state.apiTaskList, state.apiTaskList.length);
};
- const onSelect = ( record ) => {
- state.caseId = record.caseid;
- state.caseName = record.title;
- }
const handelChangePage = (page, pageSize) => {
state.currentPage = page;
state.pageSize = pageSize;
@@ -215,6 +212,7 @@ export default {
array.push(obj);
});
state.tableData = array;
+ console.log('get下来的数据',state.tableData);
};
//获取全部案例信息接口
const getAllCaseText = () => {
@@ -237,29 +235,32 @@ export default {
};
const updateTask = () => {
if (props.isLevel == 1) {
- RouterEditTask({
- chapterId: props.isactive,
- courseId: state.caseId,
- name: state.caseName,
- routerId: props.routerId,
- routerTaskId: props.routerTaskId || 0,
- type: 3,
- })
- .then(() => {
- message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
- ctx.emit("changeData", false);
- closeDrawer();
- state.addLoading = false;
+ for(let i = 0;i < state.apiTaskList.length;i++){
+ RouterEditTask({
+ chapterId: props.isactive,
+ courseId: state.apiTaskList[i].caseid,
+ name: state.apiTaskList[i].caseName,
+ routerId: props.routerId,
+ routerTaskId: props.routerTaskId || 0,
+ type: 3,
})
- .catch(() => {
- message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
- });
+ .then(() => {
+ message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+ ctx.emit("changeData", false);
+ closeDrawer();
+ state.addLoading = false;
+ })
+ .catch(() => {
+ message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
+ });
+ }
} else if (props.isLevel == 2) {
- if(state.apiTaskList.length > 1){
- for(let i = 0;i <= state.apiTaskList.length;i++){
+ console.log("state api task list: %o-length: %o", state.apiTaskList, state.apiTaskList.length )
+ for(let i = 0;i < state.apiTaskList.length;i++){
+ console.log(state.apiTaskList[i],'state.apiTaskList[i].caseIdstate.apiTaskList[i].caseId');
apiTask
.addTask({
- "courseId": state.apiTaskList[i].caseId,
+ "courseId": state.apiTaskList[i].caseid,
"duration": 0,
"flag": true,
"name": state.apiTaskList[i].caseName,
@@ -279,27 +280,6 @@ export default {
message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
}
- } else {
- apiTask
- .addTask({
- "courseId": state.caseId,
- "duration": 0,
- "flag": true,
- "name": state.caseName,
- "projectId": props.projectId,
- "projectTaskId": props.projectTaskId,
- "stageId": props.chooseStageId,
- "type": 3,
- })
- .then(() => {
- message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
- ctx.emit("changeData", false);
- closeDrawer();
- })
- .catch(() => {
- message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
- });
- }
} else if (props.isLevel == 3) {
console.log("");
}
@@ -315,7 +295,6 @@ export default {
closeDrawer,
tableDataFunc,
onSelectChange,
- onSelect,
handelChangePage,
getTableDate,
updateTask,
diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index ca05cb6c..f2440d46 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -192,10 +192,12 @@ export default {
});
} else if (props.isLevel == 2) {
apiTask.addTask({
- courseId: res.data.data.discussId,
- name: res.data.data.discussName,
- routerId: props.routerId,
- routerTaskId: props.routerTaskId || 0,
+ 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: 8,
});
} else if (props.isLevel == 3) {
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index 2f3ece39..128063da 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -51,6 +51,14 @@
+
+
+