diff --git a/src/api/indexExam.js b/src/api/indexExam.js index 727dd42c..dbf1e0ab 100644 --- a/src/api/indexExam.js +++ b/src/api/indexExam.js @@ -1,17 +1,14 @@ import http from "./config"; // 创建考试信息接口 -export const createExamination = (obj) => http.post('/examination/createExamination',obj,{ - headers: { - 'token': '123' - } -}); +export const createExamination = (obj) => http.post('/examination/createExamination', obj); // 根据Id删除考试信息 -export const deleteExaminationById = (obj) => http.post('/examination/deleteExaminationById',obj); +export const deleteExaminationById = (obj) => http.post('/examination/deleteExaminationById', obj); // 根据ID获取考试信息详情 -export const queryExaminationDetailById = (obj) => http.post('/examination/queryExaminationDetailById',obj,{headers: { - 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' -} +export const queryExaminationDetailById = (obj) => http.post('/examination/queryExaminationDetailById', obj, { + headers: { + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' + } }); // 创建考试信息接口 -export const updateExamination = (obj) => http.post('/examination/updateExamination',obj); +export const updateExamination = (obj) => http.post('/examination/updateExamination', obj); diff --git a/src/api/indexLiveBroadcast.js b/src/api/indexLiveBroadcast.js index f855dcc0..0418e99c 100644 --- a/src/api/indexLiveBroadcast.js +++ b/src/api/indexLiveBroadcast.js @@ -4,25 +4,13 @@ import http from "./config"; export const getLiveBroadcastInfor = (obj) => http.get('/liveBroadcast', { params: obj }) //创建直播接口 -export const createLiveBroadcast = (obj) => http.post('/liveBroadcast/createLiveBroadcast', obj, { - headers: { - 'token': '123' - } -}) +export const createLiveBroadcast = (obj) => http.post('/liveBroadcast/createLiveBroadcast', obj) //直播信息删除接口 -export const deleteLiveBroadcast = (obj) => http.post('/liveBroadcast/deleteLiveBroadcast', obj, { - headers: { - 'token': '123' - } -}) +export const deleteLiveBroadcast = (obj) => http.post('/liveBroadcast/deleteLiveBroadcast', obj) //直播信息修改接口 -export const updateLiveBroadcastMessage = (obj) => http.post('/liveBroadcast/updateLiveBroadcastMessage', obj, { - headers: { - 'token': '123' - } -}) +export const updateLiveBroadcastMessage = (obj) => http.post('/liveBroadcast/updateLiveBroadcastMessage', obj) //获取全部评估信息接口 export const queryAssessmentDetailList = (obj) => http.post('/assessment/queryAssessmentDetailList', obj) \ No newline at end of file diff --git a/src/api/indexProjStu.js b/src/api/indexProjStu.js index b8dfc793..7d41cb19 100644 --- a/src/api/indexProjStu.js +++ b/src/api/indexProjStu.js @@ -25,4 +25,7 @@ export const topStudent = (obj) => http.post('/admin/project/topStudent', obj) export const overview = (obj) => http.get('/admin/project/overview', { params: obj }) //设置项目积分规则 -export const setScoreRule = (obj) => http.post('/admin/project/setScoreRule', obj) \ No newline at end of file +export const setScoreRule = (obj) => http.post('/admin/project/setScoreRule', obj) + +//获取学员积分明细列表 +export const studentScoreList = (obj) => http.post('/admin/project/studentScoreList', obj) \ No newline at end of file diff --git a/src/api/indexTaskadd.js b/src/api/indexTaskadd.js index 6b01be18..b88140e7 100644 --- a/src/api/indexTaskadd.js +++ b/src/api/indexTaskadd.js @@ -1,10 +1,6 @@ import http from "./config"; //获取任务列表 -export const getTask = (obj) => http.get('/admin/project/detail', { params: obj }, { - headers: { - 'token': '123' - } -}) +export const getTask = (obj) => http.get('/admin/project/detail', { params: obj }) //项目里的新建或编辑阶段任务 export const addTask = (obj) => http.post('/admin/project/editTask', obj) diff --git a/src/api/indexVote.js b/src/api/indexVote.js index fd1a7437..11b05e52 100644 --- a/src/api/indexVote.js +++ b/src/api/indexVote.js @@ -63,7 +63,9 @@ export const deleteVoteStemOption = (obj) => http.post('/vote/deleteVoteStemOpti export const editVote = (obj) => http.post('/vote/editVote', obj) //根据题干ID获取题干信息 -export const queryStemByStemId = (obj) => http.post('/vote/queryStemByStemId', { params: obj }) +export const queryStemByStemId = (obj) => http.post('/vote/queryStemByStemId', obj,{ + headers: {'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'} +}) //修改题干信息接口 export const updateStemMessage = (obj) => http.post('/vote/updateStemMessage', obj); diff --git a/src/api/indexWork.js b/src/api/indexWork.js index af189946..827bec68 100644 --- a/src/api/indexWork.js +++ b/src/api/indexWork.js @@ -1,18 +1,14 @@ import http from "./config"; // 创建作业信息接口 export const createWorkTask = (obj) => - http.post("/work/createWorkTask", obj, { - headers: { - token: "123", - }, - }); + http.post("/work/createWorkTask", obj); // 删除作业信息接口 export const deleteWorkTask = (obj) => http.post("/work/deleteWorkTask", obj); // 根据ID获取作业信息详情 -export const queryWorkDetailById = (obj) => http.post('/work/queryWorkDetailById',obj,{ - headers: { - 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' - } +export const queryWorkDetailById = (obj) => http.post('/work/queryWorkDetailById', obj, { + headers: { + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' + } }); // 修改作业信息接口 export const updateWorkTaskUsing = (obj) => diff --git a/src/components/drawers/ AssessmentList.vue b/src/components/drawers/ AssessmentList.vue index 3669d29c..ab7d1fff 100644 --- a/src/components/drawers/ AssessmentList.vue +++ b/src/components/drawers/ AssessmentList.vue @@ -97,7 +97,6 @@ export default { }); const closeDrawer = () => { ctx.emit("update:assessmentVisible", false); - }; const afterVisibleChange = (bool) => { console.log("state getAllInvistText", bool); diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue index 51b8fb33..b7ec2d8b 100644 --- a/src/components/drawers/ActiveAttendance.vue +++ b/src/components/drawers/ActiveAttendance.vue @@ -8,7 +8,7 @@ >
-
{{ title }}
+
【{{ title }}】考勤
+
+
签到二维码
+
批量签到
-
-
批量签退
-
导出数据
@@ -173,36 +173,7 @@
- - -
-
-
-
-
- 提示 -
-
-
- 您确定要批量签退吗 -
-
-
-
取消
-
-
-
确定
-
-
-
-
- +
+ + \ No newline at end of file diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index 70aa3844..7cd9a3c9 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -174,7 +174,9 @@ export default { state.inputV1 = ""; state.textV1 = ""; message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); + // ctx.emit("changeData", false); localStorage.setItem("stageId", props.chooseStageId); + localStorage.setItem("chapterId", props.isactive); }; const queryDiscuss = () => { if (props.edit) { diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index daf6e24b..b934924f 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -9,7 +9,7 @@ >
-
{{edit?'编辑':'添加'}}测评
+
{{ edit ? "编辑" : "添加" }}测评
选择测评：
- +
-
-
- +
+ +
@@ -78,8 +80,12 @@ 测评说明：
- - +
@@ -102,11 +108,11 @@ import * as api from "../../api/indexEval"; import * as apitaskadd from "../../api/indexTaskadd"; import { message } from "ant-design-vue"; import { RouterEditTask } from "@/api/indexTask"; -import dayjs from 'dayjs'; +import dayjs from "dayjs"; // const router = useRouter(); export default { name: "AddEval", - components: { + components: { EvList, }, props: { @@ -118,7 +124,8 @@ export default { type: Number, default: null, }, - edit: { // 是否为编辑 + edit: { + // 是否为编辑 type: Boolean, default: null, }, @@ -134,11 +141,13 @@ export default { type: Number, default: 0, }, - isLevel: { // 是否是关卡页面触发 + isLevel: { + // 是否是关卡页面触发 type: Number, default: null, }, - projectTaskId: { // 要编辑的projectId + projectTaskId: { + // 要编辑的projectId type: Number, default: null, }, @@ -157,10 +166,10 @@ export default { inputV2: "", time: undefined, EvalId: null, - evaluationTypeId:null, - evaluationTypeName:"", - description:"", - EvalListVisible:false, + evaluationTypeId: null, + evaluationTypeName: "", + description: "", + EvalListVisible: false, // addLoading:false, }); @@ -169,67 +178,72 @@ export default { ctx.emit("update:edit", false); state.inputV1 = ""; state.inputV2 = ""; + localStorage.setItem("stageId", props.chooseStageId); + localStorage.setItem("chapterId", props.isactive); }; const afterVisibleChange = (bool) => { - if(props.edit && bool){ + if (props.edit && bool) { queryEval(); } }; - const showEvalDrawer = () =>{ + const showEvalDrawer = () => { state.EvalListVisible = true; console.log("进来了吗"); }; - const queryEval = () =>{ + const queryEval = () => { api - .queryEvaluationDetailById({evaluationId:props.evaluationId}) - .then((res) => { - console.log("调用项目添加接口后", res.data.data); - state.inputV1 = res.data.data.evaluationName; - state.time = [dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD"), dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD")]; - state.evaluationTypeId = res.data.data.evaluationTypeId; - state.evaluationTypeName =res.data.data.evaluationTypeName; - //state.description = + .queryEvaluationDetailById({ evaluationId: props.evaluationId }) + .then((res) => { + console.log("调用项目添加接口后", res.data.data); + state.inputV1 = res.data.data.evaluationName; + state.time = [ + dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD"), + dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD"), + ]; + state.evaluationTypeId = res.data.data.evaluationTypeId; + state.evaluationTypeName = res.data.data.evaluationTypeName; + //state.description = }) .catch((err) => { console.log(err); }); - } - const updateTask = (res)=>{ - if(props.isLevel ==1){ + }; + const updateTask = (res) => { + if (props.isLevel == 1) { apitaskadd - .addTask({ - courseId: res.data.data.evaluationId, - name: res.data.data.evaluationName, - projectId: props.projectId, - projectTaskId: props.projectTaskId || 0, - stageId: props.chooseStageId, - type: 10, - }) - .then((res) => { - console.log("调用项目添加接口后", res.data); - - }) - .catch((err) => { - console.log(err); - }); - }else if(props.isLevel ==2){ + .addTask({ + courseId: res.data.data.evaluationId, + name: res.data.data.evaluationName, + projectId: props.projectId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + type: 10, + }) + .then((res) => { + console.log("调用项目添加接口后", res.data); + }) + .catch((err) => { + console.log(err); + }); + } else if (props.isLevel == 2) { RouterEditTask({ - chapterId: props.isactive, - courseId: res.data.data.evaluationId, - name: res.data.data.evaluationName, - routerId: props.routerId, - routerTaskId: props.routerTaskId || 0, - type: 10, - }).then((res) => { - console.log("调用项目添加接口后", res.data); - - }).catch((err) => { - console.log(err); - }); - }else if(props.isLevel ==3){ - console.log("模板库任务") + chapterId: props.isactive, + courseId: res.data.data.evaluationId, + name: res.data.data.evaluationName, + routerId: props.routerId, + routerTaskId: props.routerTaskId || 0, + type: 10, + }) + .then((res) => { + console.log("调用项目添加接口后", res.data); + }) + .catch((err) => { + console.log(err); + }); + } else if (props.isLevel == 3) { + console.log("模板库任务"); } - } + }; //创建或编辑测评信息 const createEvalText = () => { if (!state.inputV1) { @@ -248,36 +262,36 @@ export default { let obj = { evaluationName: state.inputV1, evaluationEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"), - evaluationId: props.edit?props.evaluationId:0, + evaluationId: props.edit ? props.evaluationId : 0, evaluationStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"), - evaluationTypeId:state.evaluationTypeId, - evaluationTypeName:state.evaluationTypeName, + evaluationTypeId: state.evaluationTypeId, + evaluationTypeName: state.evaluationTypeName, //state.description }; - if(props.edit){ + if (props.edit) { api - .createEvaluation(obj) - .then((res) => { - updateTask(res); - message.success("创建成功"); - closeDrawer(); - ctx.emit("changeData", false); - }) - .catch((err) => { - console.log(err); - }); - }else{ + .createEvaluation(obj) + .then((res) => { + updateTask(res); + message.success("创建成功"); + closeDrawer(); + ctx.emit("changeData", false); + }) + .catch((err) => { + console.log(err); + }); + } else { api - .updateEvaluation(obj) - .then((res) => { - updateTask(res); - message.success("创建成功"); - closeDrawer(); - ctx.emit("changeData", false); - }) - .catch((err) => { - console.log(err); - }); + .updateEvaluation(obj) + .then((res) => { + updateTask(res); + message.success("创建成功"); + closeDrawer(); + ctx.emit("changeData", false); + }) + .catch((err) => { + console.log(err); + }); } }; @@ -318,7 +332,7 @@ export default { display: flex; justify-content: space-between; .main_left { - margin-top:32px; + margin-top: 32px; padding-right: 30px; flex: 1; border-right: 1px solid #e8e8e8; diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 63c19be7..a6b099c3 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -48,11 +48,14 @@ 选择课程：
- +
- +
@@ -152,8 +155,15 @@
开始前： 分钟 @@ -161,29 +171,43 @@
开始后： 分钟
-
+ +
@@ -192,7 +216,9 @@
- 仅签到 + 仅签到 签到、签退全部完成 @@ -215,7 +241,9 @@
- 允许项目内人员临时到场参加 + 允许项目内人员临时到场参加 允许项目外人员临时到场参加 @@ -228,7 +256,7 @@
需要评估 - +
@@ -271,13 +299,13 @@
- +
+ \ No newline at end of file diff --git a/src/components/drawers/CheckWork.vue b/src/components/drawers/CheckWork.vue new file mode 100644 index 00000000..1dcf08c7 --- /dev/null +++ b/src/components/drawers/CheckWork.vue @@ -0,0 +1,154 @@ + + + + \ No newline at end of file diff --git a/src/components/drawers/ExportHWork.vue b/src/components/drawers/ExportHWork.vue new file mode 100644 index 00000000..f3ca86f8 --- /dev/null +++ b/src/components/drawers/ExportHWork.vue @@ -0,0 +1,243 @@ + + + + \ No newline at end of file diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue new file mode 100644 index 00000000..b1c4f91e --- /dev/null +++ b/src/components/drawers/ExportScore.vue @@ -0,0 +1,356 @@ + + + + + + \ No newline at end of file diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue index 317856a2..32bd2e00 100644 --- a/src/components/drawers/FaceManage.vue +++ b/src/components/drawers/FaceManage.vue @@ -117,10 +117,9 @@
- +
- + + + \ No newline at end of file diff --git a/src/components/drawers/StuScoreDetail.vue b/src/components/drawers/StuScoreDetail.vue index caf2d364..b137242c 100644 --- a/src/components/drawers/StuScoreDetail.vue +++ b/src/components/drawers/StuScoreDetail.vue @@ -1,35 +1,34 @@ \ No newline at end of file diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue index ca76fd5a..6cafdba1 100644 --- a/src/components/drawers/TestManage.vue +++ b/src/components/drawers/TestManage.vue @@ -74,7 +74,7 @@
{ + if(props.itemsType == 10){ + const columns = [ + { + title: "工号", + dataIndex: "workNum", + key: "workNum", + width: 50, + align: "center", + className: "h", + }, + { + title: "姓名", + dataIndex: "name", + key: "name", + width: 50, + align: "center", + className: "h", + }, + { + title: "所在部门", + dataIndex: "deptName", + key: "deptName", + width: 50, + align: "center", + className: "h", + }, + { + title: "所在岗位", + dataIndex: "jobName", + key: "jobName", + width: 50, + align: "center", + className: "h", + }, + { + title: "提交时间", + dataIndex: "cur", + key: "cur", + width: 110, + align: "center", + className: "h", + }, + { + title: "任务状态", + dataIndex: "state", + key: "state", + width: 50, + align: "center", + className: "h", + }, + { + title: "PDF状态", + dataIndex: "pdfstate", + key: "pdfstate", + width: 50, + align: "center", + className: "h", + }, + ]; + return columns; + } else if(props.itemsType == 5){ + const columns = [ + { + title: "工号", + dataIndex: "workNum", + key: "workNum", + width: 50, + align: "center", + className: "h head", + }, + { + title: "姓名", + dataIndex: "userName", + key: "userName", + width: 50, + align: "left", + className: "h head", + }, + { + title: "所在部门", + dataIndex: "deptName", + key: "deptName", + width: 60, + align: "center", + className: "h", + }, + { + title: "所在岗位", + dataIndex: "jobName", + key: "jobName", + width: 60, + align: "center", + className: "h", + }, + { + title: "考试次数", + dataIndex: "testNum", + key: "testNum", + width: 60, + align: "center", + className: "h", + }, + { + title: "成绩", + dataIndex: "score", + key: "score", + width: 60, + align: "center", + className: "h", + }, + { + title: "完成时间", + dataIndex: "time", + key: "time", + width: 100, + align: "center", + className: "h", + }, + { + title: "任务状态", + dataIndex: "status", + key: "status", + width: 60, + align: "center", + className: "h", + }, + { + title: "操作", + dataIndex: "operation", + key: "operation", + width: 60, + align: "center", + className: "h", + }, + ] + return columns; + } + + + }; + //考试、测评管理列表操作 + const ListOpera = () => { + let arr = state.tabledata; + console.log(arr,'-=-=-=-=-=-=-=-=--=-==----=-=-=-'); + arr.map((value) => { + value.operation = ( +
+
{ + console.log(state.tabledata,'++++++++++++'); + }} + > + 查看 +
+
+ ); + }); + state.tabledata = arr; + console.log(state.tabledata,'-----------'); + }; + ListOpera(); const selectProjectName = (value, index) => { console.log("value", value, index); state.projectName = value; @@ -291,8 +411,9 @@ export default { let timer; onMounted(() => { setTimeout(() => { - // getManageList(); + getManageList(); }, 1000); + timer = setInterval(() => { state.open = false; }, 3000); @@ -304,6 +425,7 @@ export default { ...toRefs(state), selectProjectName, closeDrawer, + tableDataFunc, showopen, onMounted, onUnmounted, @@ -317,26 +439,10 @@ export default { + diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue index 812d5f18..2b187118 100644 --- a/src/components/vote/AddVote.vue +++ b/src/components/vote/AddVote.vue @@ -56,6 +56,7 @@ > 创建投票 + 查看投票
+ + + + + +
- \ No newline at end of file diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index facaf22e..abbc4b6e 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -325,8 +325,9 @@
+ v-if="imgData.length >= 5" + class="learnBgItem" + >
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index cba94412..83c1647d 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -2,7 +2,8 @@
- + +
{{ styTitle }}
@@ -10,21 +11,65 @@
-
- -
发布
+
+ + +
+ {{ act }} +
+ +
+ {{ act }} +
+ +
-
+ +
更多
-
撤回
-
复制
+ +
复制
+
+
+ +
+ 更多 +
+
+
结束
+
复制
+
+
+ +
+ 更多 +
+
+ +
复制
@@ -53,10 +98,12 @@
快速创建项目详情
+
+
@@ -71,8 +118,9 @@
快速添加任务/关卡
+
@@ -84,7 +132,9 @@
-
+
添加学员
快速添加学员
@@ -110,7 +160,6 @@
-
关卡概览
@@ -170,16 +219,16 @@ stage2: item.stageId != choosedStageId, }" :key="item.stageId" - @click="choosedStageId = item.stageId" + @click="stageChange(item.name,item.stageId)" > - {{ item.stage }} + 关卡{{ item.stageId }}
关卡名称：
-
管理者进阶-腾飞班1第一关卡
+
{{stateName}}
@@ -515,14 +564,14 @@ style="width: 270px; height: 40px; border-radius: 8px" placeholder="关卡名称" /> -
+
-
搜索
+ 搜索
-
+
-
重置
+ 重置
@@ -533,8 +582,8 @@
@@ -543,12 +592,12 @@
已选择
- 3 + {{selectedRowKeys.length}}
项 列表选项总数： - 5 - 条 + {{tableData.length}} + 条
@@ -776,6 +825,13 @@
+ + +
+ + +
+
+ + 路径发布 +
+
+ +
+
+
+
产品经理上升路径
+ +
+
+
路径信息
+
当前路径共0个关卡，0个任务
+
+
+
学员信息
+
路径共{{ routeStudentsNum }}名学员
+
+
+ +
+ 取消 + 发布 +
+
+ + + +
+
+
+
+
+ 提示 +
+
+
+ 是否撤回路径 +
（路径撤回后学员进度保留，发布后可继续学习）
+
+
+
+
取消
+
+
+
确定
+
+
+
+
+ + + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要复制此路径吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+ + + +
+
+
+
+
+ 提示 +
+
+
+ + 是否结束项目 +
+ （项目结束后学员将无法继续学习，此操作不可逆） +
+
+
+
+
取消
+
+
+
确定
+
+
+
+
+ + \ No newline at end of file diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index 7b3536d8..a6f79a0c 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -200,7 +200,7 @@ : 'none', }" > - 考勤 +
- 二维码 +
- 管理 +
@@ -388,7 +388,7 @@
基本信息 - 编辑 + 编辑
@@ -593,6 +593,7 @@ import { ref, reactive, defineComponent, toRefs, onMounted} from "vue"; import { message } from "ant-design-vue"; import * as api from "@/api/indexTemplate" +import { useRouter } from "vue-router"; export default defineComponent({ name: "LibraryAdd", setup() { @@ -790,6 +791,7 @@ export default defineComponent({ const value = ref(""); const value2 = ref(""); const textnum = "150"; + const routered = useRouter(); const changeopclo = () => { state.hideshow = !state.hideshow; }; @@ -907,7 +909,15 @@ export default defineComponent({ console.log(err) }) } - + const toEdit = () => { + routered.push({ + path: "/templateAdd", + query: { + projectId: state.projectId, + name: state.name, + }, + }); + } // 新建或编辑阶段 const stateEdit = () => { let obj={ @@ -959,6 +969,7 @@ export default defineComponent({ taskDel, stateEdit, taskEdit, + toEdit, }; }, computed: { diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index ab10d80e..f7d78270 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -1501,6 +1501,7 @@ export default { //获取任务列表 const getTask = () => { + // console.log("state.projectId", state.projectId); let obj = { projectId: state.projectId, // projectId: 28, @@ -1515,28 +1516,30 @@ export default { state.picUrl = res.data.data.projectInfo.picUrl; let leng = res.data.data.stageList.length; if (leng > 0) { - // let stage = localStorage.getItem("stageId") - // ? localStorage.getItem("stageId") - // : null; - // if (stage !== null) { - // // console.log("找到了origin", originStageList); - // let originStageList = res.data.data.stageList.find((item) => { - // item.stageId == stage; - // }); - // getTableData(originStageList.taskList); - // console.log("找到了origin", originStageList); - // } else { - // let arr = res.data.data.stageList[0].taskList; - // console.log("任务列表", arr); - // getTableData(arr); - // } - let stage = localStorage.getItem("stageId") ? localStorage.getItem("stageId") : null; - let arr = res.data.data.stageList[0].taskList; - console.log("任务列表", stage, arr); - getTableData(arr); + console.log("zhaodaole", stage); + + if (stage !== null) { + let stageList = res.data.data.stageList; //阶段数组 + let result = stageList.find((item) => item.stageId == stage); + console.log("又找到了", result); + getTableData(result.taskList); + } else { + let arr = res.data.data.stageList[0].taskList; + console.log("任务列表", arr); + getTableData(arr); + } + // let stageList = res.data.data.stageList; //阶段数组 + // let result = stageList.find((item) => item.stageId == stage); + // console.log("又找到了", result); + // getTableData(result.taskList); + + // 每次都获取了第一条taskList + // let arr = res.data.data.stageList[0].taskList; + // console.log("任务列表", stage, arr); + // getTableData(arr); } let stagearr = res.data.data.stageList; diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 8f712df0..581a2974 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -12,22 +12,78 @@
-
- -
发布
+
+ + + +
+ {{ act }} +
+ +
+ {{ act }} +
+ +
-
+ + +
+ 更多 +
+
+ +
复制
+
存为模板
+
+
+ +
+ 更多 +
+
+
结束
+
复制
+
存为模板
+
+
+ +
+ 更多 +
+
+ +
复制
+
存为模板
+
@@ -406,7 +462,7 @@
- + @@ -1350,6 +1408,178 @@ type="课程二维码" /> + + + +
+
+ + 项目发布 +
+
+ +
+
+
+
{{ releaseProjectName }}
+
+ 项目时间：{{ startTime }}~{{ endTime }} +
+
+
+
项目信息
+
当前项目共0个阶段，0个任务
+
+
+
学员信息
+
项目共{{ projectStudentsNum }}名学员
+
+
+ +
+ 取消 + 发布 +
+
+ + + + +
+
+
+
+
+ 提示 +
+
+
+ 是否撤回项目 +
（项目撤回后学员进度保留，发布后可继续学习）
+
+
+
+
取消
+
+
+
确定
+
+
+
+
+ + + + +
+
+
+
+
+ 提示 +
+
+
+ 是否结束项目 +
+ （项目结束后学员将无法继续学习，此操作不可逆） +
+
+
+
+
取消
+
+
+
确定
+
+
+
+
+ + + + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要存为模版吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+
+ + \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index 83ff56c7..278c0e97 100644 --- a/vue.config.js +++ b/vue.config.js @@ -5,6 +5,7 @@ module.exports = defineConfig({ port:8080, proxy: { "/api": { + // target: "http://192.168.100.208:30019/", target: "http://111.231.196.214:30001/", //这里后台的地址模拟的;应该填写你们真实的后台接口 changeOrigin: true, //表示是否改变原域名 // secure: false,