From 7ed5222366db9ede2c13fa80ac3c126aeb1e5cc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=99=93=E9=B8=BD?= Date: Mon, 24 Oct 2022 16:13:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ChangeGroup.vue | 91 ++-- src/router/index.js | 2 +- src/views/learningpath/LearningPath.vue | 26 +- src/views/projectcenter/ProjectManage.vue | 515 +++++++++++++++------- 4 files changed, 422 insertions(+), 212 deletions(-) diff --git a/src/components/drawers/ChangeGroup.vue b/src/components/drawers/ChangeGroup.vue index 6099646c..7c1c1839 100644 --- a/src/components/drawers/ChangeGroup.vue +++ b/src/components/drawers/ChangeGroup.vue @@ -16,15 +16,15 @@ />
-
将此学员移动到
-
- -
+
将此学员移动到
+
+ +
@@ -32,7 +32,6 @@
- - \ No newline at end of file + diff --git a/src/router/index.js b/src/router/index.js index f91aa145..74803f23 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -6,7 +6,7 @@ const routes = [ { path: '/', name: '首页', - redirect: routesConfig[0].path + redirect: '/learningpath' }, ...routesConfig ] diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index 36cc7d77..73051406 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -408,7 +408,7 @@ import { reactive, toRefs, onMounted } from "vue"; import OwnerShip from "../../components/drawers/Ownership"; import PowerList from "../../components/drawers/PowerList"; - +import axios from "axios"; export default { name: "learningPath", components: { OwnerShip, PowerList }, @@ -656,8 +656,32 @@ export default { ]; return columns; }; + //获取学习路径列表 + const getLearnPath = () => { + let obj = { + beginTime: 0, + endTime: 0, + name: "", + pageNo: 0, + pageSize: 0, + status: 0, + }; + axios + .post("https://111.231.196.214:30001/admin/router/list", obj, { + headers: { + "Content-Type": "application/json;charset=UTF-8", + }, + }) + .then((res) => { + console.log("获取成功", res); + }) + .catch((err) => { + console.log("获取失败", err); + }); + }; onMounted(() => { // console.log("执行"); + getLearnPath(); }); const selectProjectName = (value, index) => { console.log("value", value, index); diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 947cf3c7..bffcaf1a 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -80,13 +80,6 @@ total: tableDataTotal, onChange: (page, pageSize) => { currentPage = page; - // console.log('page', page) - // 加翻页查找代码 - // this.setState({ - // currentPage: page, - // }, () => { - // this.getMilitaryDeployment() - // }) }, }" > @@ -110,24 +103,24 @@
@@ -589,7 +582,9 @@
是否结束项目 -
（项目结束后学员将无法继续学习，此操作不可逆）
+
+ （项目结束后学员将无法继续学习，此操作不可逆） +
@@ -1070,7 +1065,6 @@ export default { data.map((value) => { if (value.children) { //多层项目 - console.log("11"); value.operation = value.state === "草稿" ? (
@@ -1129,9 +1123,13 @@ export default { 基础信息 -
{ - showStartModal(); - }}>存为模板
+
{ + showStartModal(); + }} + > + 存为模板 +
@@ -1173,9 +1171,14 @@ export default {
- { - showCopyModal(); - }}>复制 + { + showCopyModal(); + }} + > + 复制 +
) : value.state === "已结束" ? ( @@ -1215,12 +1218,22 @@ export default { - { - showCopyModal(); - }}>复制 - { - showDeleteModal(); - }}>删除 + { + showCopyModal(); + }} + > + 复制 + + { + showDeleteModal(); + }} + > + 删除 + ) : (
@@ -1278,14 +1291,22 @@ export default { dropdownClassName="tabledropdown" > -
{ - showCopyModal(); - }}>复制
+
{ + showCopyModal(); + }} + > + 复制 +
-
{ - showDeleteModal(); - }}>删除
+
{ + showDeleteModal(); + }} + > + 删除 +
@@ -1331,9 +1352,14 @@ export default { 创建班级 - { + { showCopyModal(); - }}>复制 + }} + > + 复制 + ) : item.state === "已结束" ? (
@@ -1372,12 +1398,22 @@ export default {
- { + { showCopyModal(); - }}>复制 - { - showDeleteModal(); - }}>删除 + }} + > + 复制 + + { + showDeleteModal(); + }} + > + 删除 + ) : (
@@ -1432,19 +1468,31 @@ export default { dropdownClassName="tabledropdown" > -
{ - showCopyModal(); - }}>复制
+
{ + showCopyModal(); + }} + > + 复制 +
-
{ - showDeleteModal(); - }}>删除
+
{ + showDeleteModal(); + }} + > + 删除 +
-
{ - showStartModal(); - }}>存为模板
+
{ + showStartModal(); + }} + > + 存为模板 +
基础信息 @@ -1489,9 +1537,14 @@ export default { - { - showCopyModal(); - }}>复制 + { + showCopyModal(); + }} + > + 复制 +
-
{ - showBackModal(); - }}>撤回
+
{ + showBackModal(); + }} + > + 撤回 +
-
{ - showStopModal(); - }}>结束
+
{ + showStopModal(); + }} + > + 结束 +
-
{ - showStartModal(); - }}>存为模板
+
{ + showStartModal(); + }} + > + 存为模板 +
基础信息 @@ -1557,12 +1622,22 @@ export default {
- { - showCopyModal(); - }}>复制 - { - showCopyModal(); - }}>复制 + { + showCopyModal(); + }} + > + 复制 + + { + showCopyModal(); + }} + > + 复制 +
-
{ - showDeleteModal(); - }}>删除
+
{ + showDeleteModal(); + }} + > + 删除 +
-
{ - showStartModal(); - }}>存为模板
+
{ + showStartModal(); + }} + > + 存为模板 +
基础信息 @@ -1623,9 +1706,14 @@ export default {
- { - showCopyModal(); - }}>复制 + { + showCopyModal(); + }} + > + 复制 +
-
{ - showStopModal(); - }}>结束
+
{ + showStopModal(); + }} + > + 结束 +
-
{ - showBackModal(); - }}>撤回
+
{ + showBackModal(); + }} + > + 撤回 +
-
{ - showStartModal(); - }}>存为模板
+
{ + showStartModal(); + }} + > + 存为模板 +
基础信息 @@ -1707,19 +1807,31 @@ export default { dropdownClassName="tabledropdown" > -
{ - showCopyModal(); - }}>复制
+
{ + showCopyModal(); + }} + > + 复制 +
-
{ - showDeleteModal(); - }}>删除
+
{ + showDeleteModal(); + }} + > + 删除 +
-
{ - showStartModal(); - }}>存为模板
+
{ + showStartModal(); + }} + > + 存为模板 +
基础信息 @@ -1764,9 +1876,14 @@ export default {
- { + { showCopyModal(); - }}>复制 + }} + > + 复制 +
-
{ - showBackModal(); - }}>撤回
+
{ + showBackModal(); + }} + > + 撤回 +
-
{ - showStopModal(); - }}>结束
+
{ + showStopModal(); + }} + > + 结束 +
-
{ - showStartModal(); - }}>存为模板
+
{ + showStartModal(); + }} + > + 存为模板 +
基础信息 @@ -1832,9 +1961,14 @@ export default {
- { + { showCopyModal(); - }}>复制 + }} + > + 复制 +
-
{ - showDeleteModal(); - }}>删除
+
{ + showDeleteModal(); + }} + > + 删除 +
-
{ - showStopModal(); - }}>结束
+
{ + showStopModal(); + }} + > + 结束 +
-
{ - showStartModal(); - }}>存为模板
+
{ + showStartModal(); + }} + > + 存为模板 +
基础信息 @@ -1900,9 +2046,14 @@ export default {
- { + { showCopyModal(); - }}>复制 + }} + > + 复制 +
-
{ - showBackModal(); - }}>撤回
+
{ + showBackModal(); + }} + > + 撤回 +
-
{ - showStopModal(); - }}>结束
+
{ + showStopModal(); + }} + > + 结束 +
-
{ - showStartModal(); - }}>存为模板
+
{ + showStartModal(); + }} + > + 存为模板 +
基础信息 @@ -1983,9 +2146,14 @@ export default { {value.state === "草稿" ? ( 发布 ) : ( - { - showCopyModal(); - }}>复制 + { + showCopyModal(); + }} + > + 复制 + )}
{value.state === "草稿" ? ( @@ -1996,23 +2164,31 @@ export default { dropdownClassName="tabledropdown" > -
{ - showCopyModal(); - }}>复制
+
{ + showCopyModal(); + }} + > + 复制 +
{ - showDeleteModal(); - }} + showDeleteModal(); + }} > 删除
-
{ - showStartModal(); - }}>存为模板
+
{ + showStartModal(); + }} + > + 存为模板 +
基础信息 @@ -2026,23 +2202,31 @@ export default { dropdownClassName="tabledropdown" > -
{ - showStartModal(); - }}>存为模板
+
{ + showStartModal(); + }} + > + 存为模板 +
{ - showStopModal(); - }} + showStopModal(); + }} > 结束
-
{ - showBackModal(); - }}>撤回
+
{ + showBackModal(); + }} + > + 撤回 +
基础信息 @@ -2056,15 +2240,19 @@ export default { dropdownClassName="tabledropdown" > -
{ - showStartModal(); - }}>存为模板
+
{ + showStartModal(); + }} + > + 存为模板 +
{ - showDeleteModal(); - }} + showDeleteModal(); + }} > 删除
@@ -2082,6 +2270,7 @@ export default { } }); state.tableData = data; + console.log("tableData", state.tableData); }; getTableDate();