diff --git a/src/api/index1.js b/src/api/index1.js
new file mode 100644
index 00000000..a57c3bfc
--- /dev/null
+++ b/src/api/index1.js
@@ -0,0 +1,55 @@
+import http from "./config";
+// import qs from 'qs';
+
+
+/**
+ * 接口传参数方式(get)
+ * axios.get('/user', {
+ * params: {
+ * id: 12345,
+ * name: user
+ * }
+ * }).then(res => console.log(res))
+ *
+ * 接口传参三种方式(post/put/patch)
+ *
+ * 1.'Content-Type'= 'multipart/form-data',传参格式为 formData。
+ * (全局请求头:'Content-Type'= 'application/x-www-form-urlencoded')
+ * (request的Header:'Content-Type'= 'multipart/form-data')
+ * var formData=new FormData();
+ * formData.append('user',123456);formData.append('pass',12345678);
+ * axios.post("/notice",formData).then()
+ *
+ * 2.'Content-Type'= 'application/x-www-form-urlencoded',传参格式为 query 形式,使用$qs.stringify。
+ * (全局请求头:'Content-Type'= 'application/x-www-form-urlencoded')
+ * (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')
+ * (request的Header:'Content-Type'= 'application/json;charset=UTF-8')
+ * let data = {"code":"1234","name":"yyyy"}
+ * axios.post(`${this.$url}/test/testRequest`,data).then()
+ *
+ */
+
+
+// 接口-请求
+
+// 获取学习路径图列表
+export const getLearnPath = (obj) => http.post('/admin/router/list', obj);
+
+//获取关卡
+export const getChapter = (obj) => http.post('/admin/router/detail', { params: obj });
+
+//新建或编辑关卡
+export const editChapter = (obj) => http.post('/admin/router/editChapter', obj);
+
+// 测试方法
+// import * as api from '../../api/index'
+// api.getLearnPath({}).then(res => {
+// console.log(res)
+// }).catch(err => {
+// console.log(err)
+// })
diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss
index 52d28c4a..bbe805e6 100644
--- a/src/assets/scss/common.scss
+++ b/src/assets/scss/common.scss
@@ -45,31 +45,94 @@ body {
/*对水平流动条有效*/
}
+::-moz-scrollbar {
+ width: 6px;
+ /*对垂直流动条有效*/
+ height: 6px;
+ /*对水平流动条有效*/
+}
+::-o-scrollbar {
+ width: 6px;
+ /*对垂直流动条有效*/
+ height: 6px;
+ /*对水平流动条有效*/
+}
+.scrollbar {
+ width: 6px;
+ /*对垂直流动条有效*/
+ height: 6px;
+ /*对水平流动条有效*/
+}
/*定义滚动条的轨道颜色、内阴影及圆角*/
::-webkit-scrollbar-track {
background-color: rgba(239, 244, 252, 1);
border-radius: 6px;
}
-
+::-moz-scrollbar-track {
+ background-color: rgba(239, 244, 252, 1);
+ border-radius: 6px;
+}
+::-o-scrollbar-track {
+ background-color: rgba(239, 244, 252, 1);
+ border-radius: 6px;
+}
+.scrollbar-track {
+ background-color: rgba(239, 244, 252, 1);
+ border-radius: 6px;
+}
/*定义滑块颜色、内阴影及圆角*/
::-webkit-scrollbar-thumb {
border-radius: 3px;
background-color: rgba(78, 166, 255, 1);
}
+::-moz-scrollbar-thumb {
+ border-radius: 3px;
+ background-color: rgba(78, 166, 255, 1);
+}
+::-o-scrollbar-thumb {
+ border-radius: 3px;
+ background-color: rgba(78, 166, 255, 1);
+}
+.scrollbar-thumb {
+ border-radius: 3px;
+ background-color: rgba(78, 166, 255, 1);
+}
/*定义两端按钮的样式*/
::-webkit-scrollbar-button {
background-color: cyan;
display: none;
}
-
+::-moz-scrollbar-button {
+ background-color: cyan;
+ display: none;
+}
+::-o-scrollbar-button {
+ background-color: cyan;
+ display: none;
+}
+.scrollbar-button {
+ background-color: cyan;
+ display: none;
+}
/*定义右下角汇合处的样式*/
::-webkit-scrollbar-corner {
background: rgba(239, 244, 252, 1);
;
}
-
+::-moz-scrollbar-corner {
+ background: rgba(239, 244, 252, 1);
+ ;
+}
+::-o-scrollbar-corner {
+ background: rgba(239, 244, 252, 1);
+ ;
+}
+.scrollbar-corner {
+ background: rgba(239, 244, 252, 1);
+ ;
+}
//隐藏滚动条----------------------------------------------------------------
//禁止选中----------------------------------------------------------
diff --git a/src/components/drawers/ChangeGroup.vue b/src/components/drawers/ChangeGroup.vue
index 440985da..ed8eff09 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/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue
index 78cbd2d2..e1c7c75d 100644
--- a/src/components/drawers/TimeManage.vue
+++ b/src/components/drawers/TimeManage.vue
@@ -70,7 +70,7 @@
:data-source="tabledata"
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
- :scroll="{ x: 900, y: 350 }"
+ :scroll="{ x: 900 }"
@expand="expandTable"
:pagination="false"
/>
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 4f353d1e..fa1ce109 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -53,7 +53,6 @@
-
{
+ let obj = {
+ beginTime: 0,
+ endTime: 0,
+ name: "",
+ pageNo: 0,
+ pageSize: 0,
+ status: 0,
+ };
+ api
+ .getLearnPath(obj)
+ .then((res) => {
+ console.log("获取路径列表数据", res);
+ })
+ .catch((err) => {
+ console.log("获取学习路径失败", err);
+ });
+ let getChapterObj = {
+ routerId: 0,
+ };
+ api
+ .getChapter(getChapterObj)
+ .then((res) => {
+ console.log("获取关卡数据", res);
+ })
+ .catch((err) => {
+ console.log("获取关卡数据失败", err);
+ });
+
+ // let editChapterObj = {
+ // name: "测试关卡",
+ // remark: "这是测试关卡说明",
+ // routerId: 0,
+ // };
+ // api
+ // .editChapter(editChapterObj)
+ // .then((res) => {
+ // console.log("添加测试关卡数据", res);
+ // })
+ // .catch((err) => {
+ // console.log("添加测试关卡数据失败", err);
+ // });
+ };
onMounted(() => {
// console.log("执行");
+ getLearnPath();
});
const selectProjectName = (value, index) => {
console.log("value", value, index);
@@ -888,18 +932,28 @@ export default {
>
发布
- {
+
{
state.out1 = true;
- }}>编辑
+ }}
+ >
+ 编辑
+
) : (
)}
{value.state === "已发布" ? (
-
{
+
{
state.out1 = true;
- }}>编辑
+ }}
+ >
+ 编辑
+
) : (
@@ -1649,7 +1703,7 @@ export default {
.btn {
padding: 0px 26px 0px 26px;
height: 38px;
- background: #409EFF;
+ background: #409eff;
border-radius: 8px;
//border: 1px solid rgba(64, 158, 255, 1);
display: flex;
@@ -1664,7 +1718,7 @@ export default {
.btnText {
font-size: 14px;
font-weight: 400;
- color: #FFFFFF;
+ color: #ffffff;
line-height: 36px;
margin-left: 5px;
}
@@ -1672,7 +1726,7 @@ export default {
.btnn {
padding: 0px 26px 0px 26px;
height: 38px;
- background: #FFFFFF;
+ background: #ffffff;
border-radius: 8px;
border: 1px solid rgba(64, 158, 255, 1);
display: flex;
@@ -1687,7 +1741,7 @@ export default {
.btnText {
font-size: 14px;
font-weight: 400;
- color: #409EFF;
+ color: #409eff;
line-height: 36px;
margin-left: 5px;
}
@@ -1716,7 +1770,7 @@ export default {
}
}
.btn1:active {
- background: #0982FF;
+ background: #0982ff;
}
.btn2:hover {
background: rgba(64, 158, 255, 0.1);
@@ -1731,7 +1785,7 @@ export default {
.btn {
padding: 0px 26px 0px 26px;
height: 38px;
- background: #409EFF;
+ background: #409eff;
border-radius: 8px;
//border: 1px solid rgba(64, 158, 255, 1);
display: flex;
@@ -1746,7 +1800,7 @@ export default {
.btnText {
font-size: 14px;
font-weight: 400;
- color: #FFFFFF;
+ color: #ffffff;
line-height: 36px;
margin-left: 5px;
}
@@ -1769,7 +1823,7 @@ export default {
}
}
.btn3:active {
- background: #0982FF;
+ background: #0982ff;
}
}
}
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 @@
-
-

-
-
-

-
-
-

-
-
- 创建项目
-
-
点击创建项目任务
-
+ class="taskbox"
+ @click="showModal1"
+ style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
+ >
+
+

+
+
+

+
+
+

+
+
+ 创建项目
+
+
点击创建项目任务
+
@@ -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();
diff --git a/src/views/projectcenter/TemplateLibrary.vue b/src/views/projectcenter/TemplateLibrary.vue
index a6ef6eb7..8c6c4732 100644
--- a/src/views/projectcenter/TemplateLibrary.vue
+++ b/src/views/projectcenter/TemplateLibrary.vue
@@ -1,68 +1,65 @@