From 4ed3dbdfb74e497e2776609125bff3ded3dc3321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Tue, 1 Nov 2022 18:03:45 +0800 Subject: [PATCH 01/13] =?UTF-8?q?feat:=E6=B4=BB=E5=8A=A8=E7=9A=84=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAddDetail.vue | 8 ++++++++ src/views/projectcenter/TaskAdd.vue | 21 +++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index bee8fb92..149db76c 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -60,6 +60,12 @@
+
+ +
关卡名称：
{{ value1.length }}/20
+
+
关卡说明：
{ console.log("value", value, index); @@ -1046,6 +1048,24 @@ export default { console.log("删除失败", err); }); }; + //删除活动 + const deleteActivity = () => { + let obj = { + activityId: state.deleteActivityID, + }; + apiactivity + .deleteActivity(obj) + .then((res) => { + console.log("删除成功", res); + message.success("删除成功"); + state.deleteModal = false; + //重新获取列表 + getTask(); + }) + .catch((err) => { + console.log("删除失败", err); + }); + }; //删除评估测试 const deleteEvalText = () => { let obj = { @@ -1193,6 +1213,7 @@ export default { deleteLiveBroadcast, deleteDiscuss, deleteEvalText, + deleteActivity, }; }, }; From b75bc00a4d6b5f7e8d23c4414e5589e003758ff5 Mon Sep 17 00:00:00 2001 From: dongwug Date: Tue, 1 Nov 2022 18:13:15 +0800 Subject: [PATCH 02/13] =?UTF-8?q?feat:=E6=B5=8B=E8=AF=84=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskAdd.vue | 39 +++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index f8ae648c..cbb0528f 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -1068,6 +1068,44 @@ export default { }); }; + //编辑测评信息 + const editEvalPath = () => { + // if (!state.inputV1) return message.info("请输入测评名称"); + // if (!state.organizationSelectName) return message.warning("请选择归属组织"); + // state.createLoading = true; + let obj = { + createTime: "", + createUser: 0, + evaluationEndTime: "", + evaluationFlag: "", + evaluationId: "", + evaluationName: "", + evaluationPictureAddress: "", + evaluationStartTime: "", + evaluationTag: "", + evaluationTypeId: 0, + evaluationTypeName: "", + updateTime: "", + updateUser: 0 + }; + apieval + .updateEvaluation(obj) + .then((res) => { + setTimeout(() => { + console.log("修改成功", res); + message.success("修改成功"); + // state.createLoading = false; + // state.currentPage = 1; + // router.push("/leveladd"); + // getLearnPath(); + }, 1000); + }) + .catch((err) => { + console.log("修改失败", err); + // state.createLoading = false; + }); + }; + //删除评估测试 const deleteInvistText = () => { let obj = { @@ -1215,6 +1253,7 @@ export default { deleteLiveBroadcast, deleteDiscuss, deleteEvalText, + editEvalPath, deleteInvistText, }; }, From 6a643fe6ee9102c261da3a84be5f892ed8619064 Mon Sep 17 00:00:00 2001 From: songwc Date: Tue, 1 Nov 2022 18:22:05 +0800 Subject: [PATCH 03/13] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E5=A4=96=E9=93=BE?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskAdd.vue | 33 +++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 96753fa5..a5bb6012 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -539,6 +539,7 @@ import AddVote from "../../components/drawers/AddVote.vue"; import { message } from "ant-design-vue"; import * as api from "../../api/indexTaskadd"; import * as apilive from "../../api/indexLiveBroadcast"; +import * as apiExternal from "../../api/indexExternalChain"; import * as apieval from "../../api/indexEval"; const drawercolumns = [ { @@ -671,6 +672,7 @@ export default { haspub: false, checked1: false, checkedd: false, + id: "ssss", }, { key: 2, @@ -855,6 +857,7 @@ export default { isactive: -1, isActive: false, deleteLiveID: null, //删除直播id + deleteExternalID: null, //删除外链id }); const selectProjectName = (value, index) => { console.log("value", value, index); @@ -963,7 +966,7 @@ export default { // width: 100, align: "center", scopedSlots: { customRender: "action" }, - customRender: () => { + customRender: (text) => { return (
@@ -979,7 +982,13 @@ export default { style="color:#4EA6FF;cursor:pointer" onClick={() => { showDelete(); - {/* deleteEvalText(); */} + { + /* state.deleteLiveID = text.record.id; */ + } + { + /* deleteEvalText(); */ + } + console.log(text.record.id); }} > 删除 @@ -1026,11 +1035,26 @@ export default { console.log(err); }); }; - + + //删除外链 + const deleteExternalChain = () => { + let obj = { + linkId: state.deleteExternalID, + }; + apiExternal + .deleteLink(obj) + .then((res) => { + console.log(res); + }) + .catch((err) => { + console.log(err); + }); + }; + //删除评估测试 const deleteEvalText = () => { let obj = { - evaluationId:state.deleteLiveID, + evaluationId: state.deleteLiveID, }; apieval .deleteEvaluationById(obj) @@ -1173,6 +1197,7 @@ export default { getTask, deleteLiveBroadcast, deleteEvalText, + deleteExternalChain, }; }, }; From cbad8c7124c5e0bef2edb72bc2578b49d84630eb Mon Sep 17 00:00:00 2001 From: wuyx Date: Tue, 1 Nov 2022 18:37:33 +0800 Subject: [PATCH 04/13] =?UTF-8?q?style:=E5=A2=9E=E5=8A=A0=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=88=97=E8=A1=A8Pagation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/ProjectManage.vue | 7213 ++++++++++----------- 1 file changed, 3512 insertions(+), 3701 deletions(-) diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index f0c34427..cca9c989 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -1,91 +1,48 @@ From 07bd75849cd9625f8499135f17529df549b29e2c Mon Sep 17 00:00:00 2001 From: wuyx Date: Wed, 2 Nov 2022 10:50:06 +0800 Subject: [PATCH 05/13] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=8D=95=E5=B1=82?= =?UTF-8?q?=E5=AD=90=E9=A1=B9=E7=9B=AE=E5=88=9B=E5=BB=BA=E6=97=B6=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=8F=E7=90=86=E4=B8=BA=E5=A4=9A=E4=B8=AA=E9=80=89?= =?UTF-8?q?=E6=8B=A9=EF=BC=8C=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 5 +- src/views/projectcenter/ProjectAdd.vue | 121 ++++++++++++++++++---- src/views/projectcenter/ProjectManage.vue | 44 ++++++-- 3 files changed, 141 insertions(+), 29 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index 49ade8be..f1afd2ed 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -37,11 +37,8 @@ import http from "./config"; // 接口-请求 -// 创建编辑单层项目 +// 创建编辑单层项目（type=3）/ 多层项目（type=1）/ 多层子项目（type=2） export const createProject = (obj) => http.post('/admin/project/edit', obj) -// 创建多层项目 -export const createStoreyProject = (obj) => http.post('/admin/project/edit', obj) - // 获取项目列表 export const getProjectList = (obj) => http.post('/admin/project/list', obj) \ No newline at end of file diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index 42af2981..f8c46024 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -81,12 +81,12 @@
项目经理
-
+
@@ -97,8 +97,13 @@
资源归属
-
- +
+
@@ -126,8 +131,13 @@
项目级别
-
- +
+
@@ -135,8 +145,13 @@
培训体系
-
- +
+
@@ -177,9 +192,14 @@
-
模板
+
模版
- +
@@ -340,13 +360,66 @@ export default { let manager = ""; let managerId = ""; const classificationChange1 = (key) => { - console.log(`selected ${key}`); - console.log(classifyList1.value[key - 1].label) - manager = String(classifyList1.value[key - 1].label) - managerId = String(key) + console.log(`selected ${key}`, classifyList1); + let mstr = ''; + let midstr = ''; + for (let i = 0; i < key.length; i++) { + if (key.length - 1 !== i) { + midstr += key[i] + ','; + mstr += classifyList1.value[i].label + ','; + } else { + midstr += key[i]; + mstr += classifyList1.value[i].label; + } + } + console.log(mstr, midstr) + manager = mstr; + managerId = midstr; }; // 资源归属 sourceBelongId 后续给接口 + const classifyList2 = ref([ + { value: 1, label: '项目一' }, + { value: 2, label: '项目二' }, + { value: 3, label: '项目三' }, + ]); + + const classificationChange2 = (key) => { + console.log(`selected ${key}`, classifyList2); + } + + // 项目级别 + const classifyList3 = ref([ + { value: 1, label: '集团级' }, + { value: 2, label: '组织级' }, + { value: 3, label: '现地级' }, + { value: 4, label: '部门级' }, + ]); + const classificationChange3 = (key) => { + console.log(`selected ${key}`, classifyList3); + } + + // 培训体系 + const classifyList4 = ref([ + { value: 1, label: '集团级' }, + { value: 2, label: '组织级' }, + { value: 3, label: '现地级' }, + { value: 4, label: '部门级' }, + ]); + const classificationChange4 = (key) => { + console.log(`selected ${key}`, classifyList4); + } + + // 模版 + const classifyList5 = ref([ + { value: 1, label: '模版一' }, + { value: 2, label: '模版二' }, + { value: 3, label: '模版三' }, + { value: 4, label: '模版四' }, + ]); + const classificationChange5 = (key) => { + console.log(`selected ${key}`, classifyList5); + } // 项目说明 const remark = ref(''); @@ -438,10 +511,14 @@ export default { api.createProject(obj).then(res => { console.log(res) if (res.status == 200 && res.data.code == 200) { - router.push({ - path: '/taskpage', - query: { id: res.data.data.projectId } - }); + message.destroy(); + message.success("创建成功") + setTimeout(() => { + router.push({ + path: '/taskpage', + query: { id: res.data.data.projectId } + }); + }, 1000); } else { message.destroy(); message.error("创建失败，请检查当前网络状态。") @@ -459,6 +536,10 @@ export default { classifyList, classificationChange, classificationChange1, + classificationChange2, + classificationChange3, + classificationChange4, + classificationChange5, fileList, fileList1, loading, @@ -469,6 +550,10 @@ export default { beforeUpload1, onRangeChange, classifyList1, + classifyList2, + classifyList3, + classifyList4, + classifyList5, remark, changeChecked, changeChecked1, diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index cca9c989..7e334aed 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -477,6 +477,7 @@ + From 1a7d8a71f06164dae2fa66d911bdc3b5fecbe227 Mon Sep 17 00:00:00 2001 From: wuyx Date: Wed, 2 Nov 2022 17:27:31 +0800 Subject: [PATCH 07/13] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A4=9A=E5=B1=82=E9=A1=B9=E7=9B=AE=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/ProjectManage.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 891e6fc0..495d7576 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -1628,7 +1628,9 @@ export default { // let data = state.tableData; console.log("1266", data); data.map((value) => { - console.log("map-value", value); + value.children = value.subList; + value.key = value.projectId; + console.log("map-value", value.subList, value.children,); // if (value.subList.length !== 0) { // //多层项目 // value.operation = From d986680eae4743401eff9ba221dcd129767669f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Wed, 2 Nov 2022 18:00:31 +0800 Subject: [PATCH 08/13] =?UTF-8?q?feat:=E8=AE=A8=E8=AE=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?,=E6=B7=BB=E5=8A=A0=E5=85=B3=E5=8D=A1=E7=9A=84=E7=BC=96?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/indexDiscuss.js | 2 +- src/api/indexLevel.js | 8 +- src/components/drawers/AddActive.vue | 9 +- src/components/drawers/ProMess.vue | 4 +- src/components/drawers/SeeStu.vue | 322 ++++++++++------------ src/views/learningpath/LevelAddDetail.vue | 27 +- src/views/projectcenter/TaskAdd.vue | 59 ++++ 7 files changed, 247 insertions(+), 184 deletions(-) diff --git a/src/api/indexDiscuss.js b/src/api/indexDiscuss.js index cc9863a9..5167f69c 100644 --- a/src/api/indexDiscuss.js +++ b/src/api/indexDiscuss.js @@ -10,4 +10,4 @@ export const getDiscussDetail = (obj) => http.post('/discuss/getDiscussDetail', export const deleteDiscuss = (obj) => http.post('/discuss/deleteDiscuss', { params: obj }); //修改讨论接口 -export const updateDiscuss = (obj) => http.post('/discuss/updateDiscuss', { params: obj }); \ No newline at end of file +export const updateDiscuss = (obj) => http.post('/discuss/updateDiscuss', obj ); \ No newline at end of file diff --git a/src/api/indexLevel.js b/src/api/indexLevel.js index 39e22fcd..b7b1b400 100644 --- a/src/api/indexLevel.js +++ b/src/api/indexLevel.js @@ -1,8 +1,14 @@ import http from "./config"; -//新建或编辑关卡 +//新建关卡 export const editChapter = (obj) => http.post('/admin/router/editChapter', obj, { headers: { 'token': '123' } +}); +//编辑关卡 +export const updateChapter = (obj) => http.post('/admin/router/editChapter', obj, { + headers: { + 'token': '123' + } }); \ No newline at end of file diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index 5388f71c..baceb73c 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -71,6 +71,12 @@
+
+ +
活动时间：
@@ -284,8 +290,9 @@ export default { //创建活动 const createActivity = () => { if(!state.inputV1) return message.warning("请输入活动名称"); - if(!state.inputV2) return message.warning("请输入活动时长"); if(!state.textV1) return message.warning("请输入活动公告"); + if(!state.time) return message.warning("请输入活动时间"); + if(!state.inputV2) return message.warning("请输入活动时长"); if(!state.inputV3) return message.warning("请输入活动地址"); let startTime = toDate(new Date(state.time[0].$d).getTime() / 1000, "Y-M-D"); let endTime = toDate(new Date(state.time[1].$d).getTime() / 1000, "Y-M-D"); diff --git a/src/components/drawers/ProMess.vue b/src/components/drawers/ProMess.vue index 5c365471..49e1cc79 100644 --- a/src/components/drawers/ProMess.vue +++ b/src/components/drawers/ProMess.vue @@ -3,7 +3,7 @@ :visible="Provisible" class="drawerStyle promess" placement="right" - width="50%" + width="70%" @after-visible-change="afterVisibleChange" >
@@ -75,7 +75,7 @@ export default { } } .drawerMain { - min-width: 434px; + min-width: 600px; margin: 0px 32px 0px 32px; overflow-x: scroll; display: flex; diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue index 36657360..42932f58 100644 --- a/src/components/drawers/SeeStu.vue +++ b/src/components/drawers/SeeStu.vue @@ -69,178 +69,74 @@
-
-
- -
-
阶段1 腾飞班阶段1
-
-
-
-
-
-
在线
-
如何成为一个产品经理
-
-
-
- + + + +
+
+
+
{{item.course}}
+
{{item.name}}
-
已完成
-
-
-
-
-
-
直播
-
管理者播课
-
-
-
- +
+
+ +
+
{{item.complete}}
-
已完成
-
-
-
-
-
-
面授
-
管理面授课
-
-
-
- -
-
未完成
-
-
-
-
-
-
活动
-
管理者活动
-
-
-
- -
-
未完成
-
-
-
-
-
-
作业
-
管理者作业
-
-
-
- -
-
未完成
-
-
-
-
-
-
-
- -
-
阶段2 腾飞班阶段2
-
-
-
-
-
-
在线
-
如何成为一个产品经理
-
-
-
- -
-
已完成
-
-
-
-
-
-
直播
-
管理者播课
-
-
-
- -
-
已完成
-
-
-
-
-
-
面授
-
管理面授课
-
-
-
- -
-
未完成
-
-
-
-
-
-
活动
-
管理者活动
-
-
-
- -
-
未完成
-
-
-
-
-
-
作业
-
管理者作业
-
-
-
- -
-
未完成
-
-
-
+
+ +
- + - + diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 495d7576..d827e774 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -1228,9 +1228,17 @@ export default {
- +
{ + router.push({ + path: '/classadd', + query: { projectId: value.record.projectId, name: value.record.name } + }); + }} + style={{ cursor: "pointer" }} + to="/classadd" class="operation3"> 创建班级 - +