From 2e6e4be362e29ab32adf29c7a415c182e5dd975f Mon Sep 17 00:00:00 2001 From: dongwug Date: Mon, 7 Nov 2022 12:01:03 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat:=E6=B5=8B=E8=AF=84=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskAdd.vue | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 3da1a420..6424e397 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -1521,6 +1521,17 @@ export default { updateTime: "", updateUser: 0, }; + apieval + .queryEvaluationDetailById(obj.evaluationId) + .then((res) => { + setTimeout(() => { + console.log("获取成功", res,obj.evaluationId); + message.success("获取成功"); + }, 1000); + }) + .catch((err) => { + console.log("获取失败", err); + }); apieval .updateEvaluation(obj) .then((res) => { From d3f685a0d5aa0c03bead11e811356a09fceac20f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Mon, 7 Nov 2022 12:11:30 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat:=E7=A7=BB=E5=8A=A8=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=88=B0=E9=98=B6=E6=AE=B5,=E5=85=B3=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAddDetail.vue | 2 +- src/views/projectcenter/TaskAdd.vue | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index e483883d..3772e175 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -1690,7 +1690,7 @@ export default { console.log("value:",value); let obj = { chapterId: state.isactive, - routerTaskIdList: value, + routerTaskIdList: [value], } api .moveTask(obj) diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index a4e3a6a8..d9266074 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -1715,17 +1715,19 @@ export default { let arr = state.selectRow; console.log("选择的行信息", arr); arr.map((value) => { - console.log("value:", value); + //console.log("value:", value); let obj = { - chapterId: state.chooseStageId, - routerTaskIdList: value, + stageId: state.chooseStageId, + projectTaskId: [value], } + console.log("routerTaskIdList",obj.routerTaskIdList); apimove .moveTask(obj) .then((res) => { console.log("移动成功",res); message.destroy(); message.success("移动成功"); + getTask(); }) .catch((err) => { console.log("移动失败", err); From 9db662419758c6c030cd94860730fa8e2a45ac56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Mon, 7 Nov 2022 14:29:51 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAddDetail.vue | 18 +++------ src/views/projectcenter/TaskAdd.vue | 46 +++++++++++------------ 2 files changed, 27 insertions(+), 37 deletions(-) diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 3772e175..fd0d8140 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -1683,16 +1683,11 @@ export default { } //移动任务到关卡 const moveTask = () => { - let arr = state.selectRow; - console.log("选择的行信息",arr); - console.log("选择的关卡id",state.isactive); - arr.map( value => { - console.log("value:",value); - let obj = { - chapterId: state.isactive, - routerTaskIdList: [value], - } - api + let obj = { + chapterId: state.isactive, + routerTaskIdList: state.selectRow, + } + api .moveTask(obj) .then((res) => { console.log("移动成功",res); @@ -1702,8 +1697,7 @@ export default { .catch((err) => { console.log("移动失败",err); }) - }) - }; + } return { ...toRefs(state), tableDataFunc, diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 1f13be39..47226ae2 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -1715,36 +1715,31 @@ export default { }; //移动任务到阶段 const moveTask = () => { - let arr = state.selectRow; - console.log("选择的行信息", arr); - arr.map((value) => { - //console.log("value:", value); - let obj = { - stageId: state.chooseStageId, - projectTaskId: [value], - } - console.log("routerTaskIdList",obj.routerTaskIdList); - apimove - .moveTask(obj) - .then((res) => { - console.log("移动成功",res); + let obj ={ + stageId: state.chooseStageId, + projectTaskId: state.selectRow, + } + apimove + .moveTask(obj) + .then((res) => { + console.log("移动成功",res); message.destroy(); message.success("移动成功"); getTask(); - }) - .catch((err) => { - console.log("移动失败", err); - }); - }); - }; + }) + .catch((err) => { + console.log("移动失败", err); + }) + } //批量删除 const deleteTaskAll = () => { - //let arr = state.selectRow; - console.log("selectRow数组",state.selectRow); - let obj = { - projectTaskIds: state.selectRow, - } - api + let arr = state.selectRow; + console.log("选择的行信息", arr); + arr.map((value) => { + let obj = { + projectTaskIds: value, + }; + api .deleteTask(obj) .then((res) => { console.log(res); @@ -1755,6 +1750,7 @@ export default { .catch((err) => { console.log(err); }); + }) } const onSelectChange = (selectedRowKeys) => { console.log("selectedRowKeys changed: ", selectedRowKeys); From e9e1444fda9b3650e3fc74d7bd6f7588e178135c Mon Sep 17 00:00:00 2001 From: dongwug Date: Mon, 7 Nov 2022 14:31:22 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feat:=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E6=B5=8B=E8=AF=84=E7=BC=96=E8=BE=91=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddEval.vue | 92 +++++++++++++++++++++++++++- src/components/drawers/AddInvist.vue | 4 +- src/components/drawers/AddVote.vue | 4 +- src/views/projectcenter/TaskAdd.vue | 20 ++++++ 4 files changed, 116 insertions(+), 4 deletions(-) diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index d710b0a4..a716691d 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -208,6 +208,50 @@ export default { return isJpgOrPng && isLt2M; }; + + //编辑测评信息 + // const editEvalPath = () => { + // let obj = { + // createTime: "", + // createUser: 0, + // evaluationEndTime: "", + // evaluationFlag: "", + // evaluationId: 125, + // evaluationName: "", + // evaluationPictureAddress: "", + // evaluationStartTime: "", + // evaluationTag: "", + // evaluationTypeId: 0, + // evaluationTypeName: "", + // updateTime: "", + // updateUser: 0, + // }; + // apieval + // .queryEvaluationDetailById(obj.evaluationId) + // .then((res) => { + // setTimeout(() => { + // console.log("获取成功", res,obj.evaluationId); + // message.success("获取成功"); + // }, 1000); + // }) + // .catch((err) => { + // console.log("获取失败", err); + // }); + // apieval + // .updateEvaluation(obj) + // .then((res) => { + // setTimeout(() => { + // console.log("修改成功", res); + // message.success("修改成功"); + // }, 1000); + // }) + // .catch((err) => { + // console.log("修改失败", err); + // // state.createLoading = false; + // //重新获取列表 + // // getTask(); + // }); + // }; //创建测评信息 const createEvalText = () => { if (!state.inputV1) { @@ -244,13 +288,29 @@ export default { updateTime: "", updateUser: 0, }; + let objedit = { + createTime: "", + createUser: 0, + evaluationEndTime: "", + evaluationFlag: "", + evaluationId: 125, + evaluationName: "", + evaluationPictureAddress: "", + evaluationStartTime: "", + evaluationTag: "", + evaluationTypeId: 0, + evaluationTypeName: "", + updateTime: "", + updateUser: 0, + }; + if (props.edit == false) { api .createEvaluation(obj) .then((res) => { console.log("创建成功", res); message.success("创建成功"); closeDrawer(); - //渲染到学历路径列表 + //渲染到学历路径 if (props.learn == 0) apitaskadd .addTask({ @@ -274,7 +334,7 @@ export default { .catch((err) => { console.log(err); }); - //渲染到项目列表 + //渲染到项目列表 else { let editObj1 = { chapterId: 36, @@ -293,6 +353,34 @@ export default { console.log("创建失败", err); // state.createLoading = false; }); + } + else { + api + .queryEvaluationDetailById(objedit.evaluationId) + .then((res) => { + setTimeout(() => { + console.log("获取成功", res,objedit.evaluationId); + message.success("获取成功"); + }, 1000); + }) + .catch((err) => { + console.log("获取失败", err); + }); + api + .updateEvaluation(objedit) + .then((res) => { + setTimeout(() => { + console.log("修改成功", res); + message.success("修改成功"); + }, 1000); + }) + .catch((err) => { + console.log("修改失败", err); + // state.createLoading = false; + //重新获取列表 + // getTask(); + }); + } }; return { diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index f7cfbcd0..b4fc7bc8 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -9,7 +9,8 @@ >
-
添加评估
+
编辑评估
+
添加评估
{ ctx.emit("update:addinvistVisible", false); + ctx.emit("update:edit", false); state.inputV1 = ""; }; const afterVisibleChange = (bool) => { diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVote.vue index eb13065c..99acd182 100644 --- a/src/components/drawers/AddVote.vue +++ b/src/components/drawers/AddVote.vue @@ -9,7 +9,8 @@ >
-
添加投票
+
编辑投票
+
添加投票
{ ctx.emit("update:addvoteVisible", false); + ctx.emit("update:edit", false); }; const afterVisibleChange = (bool) => { console.log("state", bool); diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 6424e397..02cd2a83 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -247,6 +247,7 @@ @@ -266,6 +267,7 @@ @@ -284,6 +286,7 @@ @@ -490,6 +493,7 @@ margin-right: 25px; cursor: pointer; " + @click="decideType(element.lei,element.courseId)" > 编辑 @@ -976,6 +980,7 @@ export default { selectedRowKeys: [], valuesname: "", valuesnotice: "", + edit: false, confirmModal: false, //确认添加阶段弹窗 cC: false, cancelModal: false, //确认取消阶段弹窗 @@ -1939,6 +1944,20 @@ export default { const showDrawerEditRef = () => { state.addrefvisible = true; }; + + const decideType = (type, id) => { + state.edit = true, + console.log(type, id); + if (type == "测评") { + showDrawerAddEval(id) + } + else if (type == "评估") { + showDrawerAddInvist(id) + } + else if (type == "投票") { + showDrawerAddVote(id) + } + } return { ...toRefs(state), selectProjectName, @@ -2000,6 +2019,7 @@ export default { deleteTest, deleteWork, showDrawerEditRef, + decideType, }; }, }; From e688448cf96cc734ebbcffcbc642bf12517c0f32 Mon Sep 17 00:00:00 2001 From: dongwug Date: Mon, 7 Nov 2022 15:39:43 +0800 Subject: [PATCH 5/6] =?UTF-8?q?feat=EF=BC=9A=E8=AE=A8=E4=B9=B1=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddDiscuss.vue | 10 +- src/components/drawers/AddEval.vue | 154 ++++++++-------------- src/views/learningpath/LevelAddDetail.vue | 2 + src/views/projectcenter/TaskAdd.vue | 4 + 4 files changed, 72 insertions(+), 98 deletions(-) diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index 8c6548ea..8c92c0e3 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -7,8 +7,9 @@ @after-visible-change="afterVisibleChange" >
-
-
添加讨论
+
+
编辑讨论
+
添加讨论
{ ctx.emit("update:adddiscussVisible", false); + ctx.emit("update:edit", false); state.inputV1 = ""; state.textV1 = ""; }; diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index a716691d..4ace14c4 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -139,6 +139,14 @@ export default { type: Number, default: null, }, + isactive: { + type: Number, + default: null, + }, + routerId: { + type: Number, + default: null, + }, }, setup(props, ctx) { const state = reactive({ @@ -209,50 +217,8 @@ export default { }; - //编辑测评信息 - // const editEvalPath = () => { - // let obj = { - // createTime: "", - // createUser: 0, - // evaluationEndTime: "", - // evaluationFlag: "", - // evaluationId: 125, - // evaluationName: "", - // evaluationPictureAddress: "", - // evaluationStartTime: "", - // evaluationTag: "", - // evaluationTypeId: 0, - // evaluationTypeName: "", - // updateTime: "", - // updateUser: 0, - // }; - // apieval - // .queryEvaluationDetailById(obj.evaluationId) - // .then((res) => { - // setTimeout(() => { - // console.log("获取成功", res,obj.evaluationId); - // message.success("获取成功"); - // }, 1000); - // }) - // .catch((err) => { - // console.log("获取失败", err); - // }); - // apieval - // .updateEvaluation(obj) - // .then((res) => { - // setTimeout(() => { - // console.log("修改成功", res); - // message.success("修改成功"); - // }, 1000); - // }) - // .catch((err) => { - // console.log("修改失败", err); - // // state.createLoading = false; - // //重新获取列表 - // // getTask(); - // }); - // }; - //创建测评信息 + + //创建或编辑测评信息 const createEvalText = () => { if (!state.inputV1) { message.destroy(); @@ -294,7 +260,7 @@ export default { evaluationEndTime: "", evaluationFlag: "", evaluationId: 125, - evaluationName: "", + evaluationName: state.inputV1, evaluationPictureAddress: "", evaluationStartTime: "", evaluationTag: "", @@ -304,62 +270,62 @@ export default { updateUser: 0, }; if (props.edit == false) { - api - .createEvaluation(obj) - .then((res) => { - console.log("创建成功", res); - message.success("创建成功"); - closeDrawer(); - //渲染到学历路径 - if (props.learn == 0) - apitaskadd - .addTask({ + api + .createEvaluation(obj) + .then((res) => { + console.log("创建成功", res); + message.success("创建成功"); + closeDrawer(); + //渲染到学历路径 + if (props.learn == 0) + apitaskadd + .addTask({ + courseId: 0, + duration: 0, + flag: true, + name: obj.evaluationName, + projectId: props.projectId, + projectTaskId: 0, + stageId: props.chooseStageId, + type: 10, + }) + .then((res) => { + console.log("调用项目添加接口后", res.data); + //自定义事件给父组件传值 + ctx.emit("changeData", false); + //重新获取任务列表 + // apiTask.getTask({ projectId: 28 }); + // router.push("/taskadd"); + }) + .catch((err) => { + console.log(err); + }); + //渲染到项目列表 + else { + let editObj1 = { + chapterId: props.isactive, courseId: 0, duration: 0, flag: true, name: obj.evaluationName, - projectId: props.projectId, - projectTaskId: 0, - stageId: props.chooseStageId, + routerId: props.routerId, + routerTaskId: 0, type: 10, - }) - .then((res) => { - console.log("调用项目添加接口后", res.data); - //自定义事件给父组件传值 - ctx.emit("changeData", false); - //重新获取任务列表 - // apiTask.getTask({ projectId: 28 }); - // router.push("/taskadd"); - }) - .catch((err) => { - console.log(err); - }); - //渲染到项目列表 - else { - let editObj1 = { - chapterId: 36, - courseId: 0, - duration: 0, - flag: true, - name: obj.evaluationName, - routerId: 92, - routerTaskId: 0, - type: 10, - }; - RouterEditTask(editObj1) - } - }) - .catch((err) => { - console.log("创建失败", err); - // state.createLoading = false; - }); + }; + RouterEditTask(editObj1) + } + }) + .catch((err) => { + console.log("创建失败", err); + // state.createLoading = false; + }); } else { api - .queryEvaluationDetailById(objedit.evaluationId) + .queryEvaluationDetailById(obj.evaluationId) .then((res) => { setTimeout(() => { - console.log("获取成功", res,objedit.evaluationId); + console.log("获取成功", res,obj.evaluationId); message.success("获取成功"); }, 1000); }) @@ -387,12 +353,8 @@ export default { ...toRefs(state), afterVisibleChange, closeDrawer, - //增删改查 + //增改 createEvalText, - // getEvalPath, - // changePagination, - // deleteEvalPath, - // editEvalPath, //上传组件 fileList, loading, diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index fd0d8140..1223de1b 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -280,6 +280,8 @@ v-model:addevalVisible="addevalvisible" v-model:edit="edit" v-model:learn="learn" + v-model:isactive="isactive" + v-model:routerId="routerId" />
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index c115aec3..a978fea0 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -209,6 +209,7 @@
Date: Mon, 7 Nov 2022 15:59:58 +0800 Subject: [PATCH 6/6] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=9A=84=E5=AD=A6=E5=91=98=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index1.js | 12 ++++- src/components/drawers/ProjectScore.vue | 72 +++++++++++++++++++++++-- src/views/projectcenter/TaskAdd.vue | 7 ++- 3 files changed, 81 insertions(+), 10 deletions(-) diff --git a/src/api/index1.js b/src/api/index1.js index 16e7ee9d..cab6920e 100644 --- a/src/api/index1.js +++ b/src/api/index1.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-04 22:45:31 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-11-06 16:48:50 + * @LastEditTime: 2022-11-07 11:12:01 * @FilePath: /fe-manage/src/api/index1.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -72,12 +72,22 @@ export const addStudent = (obj) => http.post('/admin/router/addStudent', obj); //项目基础信息----------------------------------- +//学员获取 +export const getProjectStudent=(obj)=>http.post('/admin/project/studentList',obj) //项目积分榜单 export const scoreRank = (obj) => http.post('/admin/project/scoreRank', obj); +//获取规则 +export const scoreRule=(projectId)=>http.get('/admin/project/scoreRule',{ + params: { + projectId: projectId, + } +}) //排行榜 export const billboard = (obj) => http.post('/admin/project/billboard', obj); + //项目基础信息----------------------------------- + // 测试方法 // import * as api from '../../api/index' // api.getLearnPath({}).then(res => { diff --git a/src/components/drawers/ProjectScore.vue b/src/components/drawers/ProjectScore.vue index 0ba76354..ea35085c 100644 --- a/src/components/drawers/ProjectScore.vue +++ b/src/components/drawers/ProjectScore.vue @@ -9,16 +9,16 @@
姓名：
-
+
搜索
-
+
重置
@@ -367,13 +367,17 @@ export default { activeKeyScore: "2", stuName: "请输入姓名", todayvalue: "1", - tableDataTotal: 30, + stuValue: false, Svisible: false, score1: 5, score2: 5, edit: true, searchRankName:null,//榜单搜索名称 + studentName:null,//学员搜索名称 + pageSize:10, + currentPage:1, + tableDataTotal: -1, }); const getTableData = () => { let datas = state.tabledataStu; @@ -399,21 +403,59 @@ export default { getTableData(); const tabsChange = (e) => { + if (e == 1) { + // console.log('获取项目积分-学员') + getProjectStudent(); + } if (e == 2) { // console.log('获取项目积分-榜单') scoreRank(1, 1); } + if(e==3){ + scoreRule() + } + projectStudentReset() rankReset() state.todayvalue='1' state.stuValue=1 }; + // start -------学员---------------学员------------学员------------------学员--------- + //重置 + const projectStudentReset=()=>{ + state.studentName=null + } + //搜索 + const searchProjectStudent = () => { + state.currentPage=1 + getProjectStudent() + }; + //项目积分榜单 + const getProjectStudent = () => { + console.log("projectId", props.projectId,state.studentName); + let obj = { + projectId:props.projectId, + pageSize:state.pageSize, + pageNo:state.currentPage, + name:state.studentName, + }; + api + .getProjectStudent(obj) + .then((res) => { + console.log("获取项目积分-学员", res); + }) + .catch((err) => { + console.log("获取项目积分-学员", err); + }); + }; + // end -----学员----------------学员----------------------学员-----------学员---------- + + // start -------榜单---------------榜单------------榜单------------------榜单--------- //重置 const rankReset=()=>{ state.searchRankName=null } - // start -------榜单---------------榜单------------榜单------------------榜单--------- //学员积分还是小组积分 const typeChange = (num) => { state.stuValue = num; @@ -449,6 +491,22 @@ export default { }); }; // end -----榜单----------------榜单----------------------榜单-----------榜单---------- + + // start -------获取规则---------------获取规则------------获取规则------------------获取规则--------- + + //获取规则 + const scoreRule = () => { + console.log("projectId", props.projectId); + api + .scoreRule(props.projectId) + .then((res) => { + console.log("获取项目积分-获取规则", res); + }) + .catch((err) => { + console.log("获取项目积分-获取规则", err); + }); + }; + // end -----获取规则----------------获取规则----------------------获取规则-----------获取规则---------- return { ...toRefs(state), typeChange, @@ -456,7 +514,11 @@ export default { searchRank, rankReset, tabsChange, + projectStudentReset, + searchProjectStudent, + getProjectStudent, scoreRank, + scoreRule, }; }, computed: { diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 00176535..9c7179dc 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -1060,7 +1060,6 @@ export default { const getStageData = (tableData) => { let data = tableData; let array = []; - console.log('tableData',data) data.map((value) => { let obj = { id: value.stageId, @@ -2350,9 +2349,9 @@ export default { display: flex; flex-direction: column; align-items: center; // background-color: #bfa; - .chosen { - // background-color: pink; - } + // .chosen { + // // background-color: pink; + // } .ghost { // background-color: red; opacity: 0 !important;