-
-
-
阶段2 腾飞班阶段2
+
+
+
+
+
阶段2 腾飞班阶段2
+
+
+
+
+
+
+

+
+
已完成
+
+
+
+
+
+
+

+
+
已完成
+
+
+
+
+
+
+

+
+
未完成
+
+
+
+
+
+
+

+
+
未完成
+
+
+
+
+
+
+

+
+
未完成
+
+
+
-
@@ -144,6 +254,8 @@ export default {
setup(props, ctx) {
const state = reactive({
Provisible: false,
+ showDown: true,
+ showDown1: false,
});
const closeDrawer = () => {
ctx.emit("update:Seevisible", false);
@@ -155,12 +267,19 @@ export default {
const afterVisibleChange = (bool) => {
console.log("state", bool);
};
-
+ const changeDown = () => {
+ state.showDown = !state.showDown;
+ };
+ const changeDown1 = () => {
+ state.showDown1 = !state.showDown1;
+ };
return {
...toRefs(state),
afterVisibleChange,
closeDrawer,
showProMess,
+ changeDown,
+ changeDown1,
// change,
};
},
@@ -192,6 +311,7 @@ export default {
align-items: center;
// background-color: red;
margin-bottom: 20px;
+ flex-shrink: 0;
.headerTitle {
font-size: 18px;
font-weight: 600;
@@ -201,144 +321,147 @@ export default {
}
}
.main {
- display: flex;
- flex-direction: column;
- .stuinfor {
- display: flex;
- align-items: center;
- height: 133px;
- margin-top: 20px;
- margin-right: 37px;
- background-image: url("../../assets/images/studentimg/bgimg.png");
- background-repeat: no-repeat;
- background-position: right;
- .stumation {
- margin-left: 24px;
- .stuname {
- color: #333333;
- font-size: 18px;
- }
- .stugangw {
- color: #999999;
- font-size: 16px;
- margin-top: 7px;
- }
+ display: flex;
+ flex-direction: column;
+ overflow-y: auto;
+ padding-bottom: 80px;
+ .stuinfor {
+ display: flex;
+ align-items: center;
+ height: 133px;
+ margin-top: 20px;
+ margin-right: 37px;
+ background-image: url("../../assets/images/studentimg/bgimg.png");
+ background-repeat: no-repeat;
+ background-position: right;
+ .stumation {
+ margin-left: 24px;
+ .stuname {
+ color: #333333;
+ font-size: 18px;
}
- .sortbox {
- display: flex;
- flex-direction: column;
- justify-content: center;
- margin-left: 114px;
- .sortname {
- color: #666660;
- font-size: 14px;
- }
- .sortnub {
- display: flex;
- justify-content: center;
- margin-top: 7px;
- .nub1 {
- color: #0060FF;
- font-size: 22px;
- }
- .total {
- color: #999999;
- font-size: 22px;
- }
- }
- }
- }
- .secondrow {
- margin-top: 32px;
- display: flex;
- .rowleft {
- color: rgba(51, 51, 51, 1);
+ .stugangw {
+ color: #999999;
font-size: 16px;
- }
- .rowbox {
- width: 64px;
- height: 24px;
+ margin-top: 7px;
+ }
+ }
+ .sortbox {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ margin-left: 114px;
+ .sortname {
+ color: #666660;
+ font-size: 14px;
+ }
+ .sortnub {
display: flex;
justify-content: center;
- align-items: center;
- margin-left: 24px;
- border: 1px solid rgba(64, 158, 255, 1);
- background: rgba(64, 158, 255, 0.1);
- cursor: pointer;
- .shuom {
- color: rgba(64, 158, 255, 1);
- font-size: 14px;
- line-height: 20px;
- margin-right: 5px;
+ margin-top: 7px;
+ .nub1 {
+ color: #0060ff;
+ font-size: 22px;
}
- }
- }
- .mainbox {
- height: 463px;
+ .total {
+ color: #999999;
+ font-size: 22px;
+ }
+ }
+ }
+ }
+ .secondrow {
+ margin-top: 32px;
+ display: flex;
+ .rowleft {
+ color: rgba(51, 51, 51, 1);
+ font-size: 16px;
+ }
+ .rowbox {
+ width: 64px;
+ height: 24px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin-left: 24px;
+ border: 1px solid rgba(64, 158, 255, 1);
+ background: rgba(64, 158, 255, 0.1);
+ cursor: pointer;
+ .shuom {
+ color: rgba(64, 158, 255, 1);
+ font-size: 14px;
+ line-height: 20px;
+ margin-right: 5px;
+ }
+ }
+ }
+ .mainbox {
+ // height: 463px;
margin-right: 37px;
margin-top: 32px;
border: 1px solid rgba(221, 238, 255, 1);
border-radius: 6px;
.rowtitle {
- height: 56px;
- background: rgba(240, 246, 252, 1);
- display: flex;
- align-items: center;
- .titleimg {
- width: 20px;
- height: 20px;
- margin-left: 23px;
- }
- .titletext {
- color: rgba(51, 51, 51, 1);
- font-size: 16px;
- font-weight: 500;
- margin-left: 16px;
- }
+ height: 56px;
+ background: rgba(240, 246, 252, 1);
+ display: flex;
+ align-items: center;
+ .titleimg {
+ width: 20px;
+ height: 20px;
+ margin-left: 23px;
+ }
+ .titletext {
+ color: rgba(51, 51, 51, 1);
+ font-size: 16px;
+ font-weight: 500;
+ margin-left: 16px;
+ }
}
.rowclass {
- height: 81px;
- border-bottom: 1px solid rgba(221, 238, 255, 1);
+ height: 81px;
+ border-bottom: 1px solid rgba(221, 238, 255, 1);
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ .leftclass {
display: flex;
- justify-content: space-between;
+ margin-left: 25px;
align-items: center;
- .leftclass {
- display: flex;
- margin-left: 25px;
- align-items: center;
- .text1 {
- color: #000000;
- font-size: 14px;
- font-weight: 500;
- margin-left: 25px;
- }
- .text2 {
- color: rgba(51, 51, 51, 0.8);
- font-size: 14px;
- margin-left: 65px;
- }
+ .text1 {
+ color: #000000;
+ font-size: 14px;
+ font-weight: 500;
+ margin-left: 25px;
}
- .alreadyclass {
- display: flex;
- margin-right: 57px;
- .alimg {
- height: 16px;
- width: 16px;
- }
- .altext {
- color: rgba(56, 125, 247, 1);
- font-size: 14px;
- margin-left: 16px;
- }
+ .text2 {
+ color: rgba(51, 51, 51, 0.8);
+ font-size: 14px;
+ margin-left: 65px;
}
+ }
+ .alreadyclass {
+ display: flex;
+ margin-right: 57px;
+ .alimg {
+ height: 16px;
+ width: 16px;
+ }
+ .altext {
+ color: rgba(56, 125, 247, 1);
+ font-size: 14px;
+ margin-left: 16px;
+ }
+ }
}
- }
+ }
}
.btnn {
height: 72px;
width: 100%;
position: absolute;
bottom: 0;
+ background-color: #fff;
left: 0;
display: flex;
align-items: center;
diff --git a/src/components/drawers/StuAdd.vue b/src/components/drawers/StuAdd.vue
index 01ae2c16..41c5d31b 100644
--- a/src/components/drawers/StuAdd.vue
+++ b/src/components/drawers/StuAdd.vue
@@ -72,7 +72,7 @@
:data-source="tabledata"
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
- :scroll="{ x: 500, y: 560 }"
+ :scroll="{ x: 500 }"
@expand="expandTable"
:pagination="false"
:row-selection="{
@@ -156,7 +156,7 @@
:data-source="tabledata1"
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
- :scroll="{ x: 500, y: 560 }"
+ :scroll="{ x: 500}"
@expand="expandTable"
:pagination="false"
:row-selection="{
@@ -246,7 +246,7 @@
:data-source="tabledata2"
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
- :scroll="{ x: 500, y: 560 }"
+ :scroll="{ x: 500 }"
@expand="expandTable"
:pagination="false"
:row-selection="{
@@ -1073,7 +1073,7 @@ export default {
}
.main {
display: flex;
- // height: 80%;
+ //height: 80%;
margin-bottom: 72px;
overflow-y: auto;
.left {
@@ -1274,7 +1274,8 @@ export default {
// bottom: 20px;
.ant-pagination-item,
.ant-pagination-prev,
- .ant-pagination-next {
+ .ant-pagination-next,
+ .ant-pagination-options {
margin-bottom: 10px;
}
}
diff --git a/src/components/drawers/StuScoreDetail.vue b/src/components/drawers/StuScoreDetail.vue
index a2ca9d54..fef6efa1 100644
--- a/src/components/drawers/StuScoreDetail.vue
+++ b/src/components/drawers/StuScoreDetail.vue
@@ -23,8 +23,6 @@
:columns="tablecolumns"
:data-source="tabledata"
:loading="tableDataTotal === -1 ? true : false"
-
- :scroll="{ x: 900, y: 560 }"
@expand="expandTable"
:pagination="false"
@@ -218,16 +216,14 @@
overflow-x: scroll;
display: flex;
flex-direction: column;
-
.header {
height: 73px;
border-bottom: 1px solid #e8e8e8;
display: flex;
justify-content: space-between;
align-items: center;
- // background-color: red;
margin-bottom: 20px;
-
+ flex-shrink: 0;
.headerTitle {
font-size: 18px;
font-weight: 600;
@@ -252,6 +248,7 @@
.tableBox {
+ padding-bottom: 100px;
.ant-table-selection-column {
padding: 0px !important;
// padding-left: 45px !important;
@@ -290,15 +287,11 @@
}
}
.pa {
- // left: 0;
- margin-top: 15px;
+ margin-top: 20px;
width: 100%;
- // height: 20px;
- // background-color: red;
+ flex:1;
display: flex;
justify-content: center;
- // position: absolute;
- // bottom: 20px;
}
}
}
@@ -313,7 +306,7 @@
align-items: center;
justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
-
+ background-color: #ffffff;
.btn1 {
width: 100px;
height: 40px;
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 f02d9e9c..fa1ce109 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -40,17 +40,19 @@
:placeholder="[' 开始时间', ' 结束时间']"
/>
-
-
-
+
+
+
-
{
+ 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);
@@ -874,18 +932,28 @@ export default {
>
发布
-
{
+
{
state.out1 = true;
- }}>编辑
+ }}
+ >
+ 编辑
+
)}
{value.state === "已发布" ? (
@@ -1475,7 +1543,7 @@ export default {
.del_header {
position: absolute;
width: calc(100%);
- height: 40px;
+ height: 68px;
background: linear-gradient(
rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%
@@ -1494,7 +1562,7 @@ export default {
width: 16px;
height: 16px;
margin-right: 10px;
- background-image: url(@/assets/images/coursewareManage/QR.png);
+ background-image: url(@/assets/images/taskpage/gan.png);
background-size: 100% 100%;
}
.close_exit {
@@ -1568,6 +1636,56 @@ export default {
flex-direction: column;
position: relative;
// position: relative;
+ .datanull {
+ display: flex;
+ flex: 1;
+ width: 100%;
+ //background: red;
+ justify-content: center;
+ align-items: center;
+ .nodata_box {
+ width: 412px;
+ height: 212px;
+ position: relative;
+ background: linear-gradient(
+ 180deg,
+ #FEF3DD,
+ #FFFAF0
+ );
+ border-radius: 10px;
+ .left {
+ position: absolute;
+ top: 18px;
+ left: 0;
+ }
+ .center {
+ position: absolute;
+ top: 32px;
+ left: 170px;
+ }
+ .text1 {
+ position: absolute;
+ top: 128px;
+ left: 178px;
+ font-size: 20px;
+ color: #FFB64E;
+ font-weight: 500;
+ }
+ .text2 {
+ position: absolute;
+ bottom: 32px;
+ left: 174px;
+ font-size: 14px;
+ color: #878B92;
+ font-weight: 500;
+ }
+ .right {
+ position: absolute;
+ bottom: 18px;
+ right: 0;
+ }
+ }
+ }
.filter {
margin-left: 38px;
margin-right: 38px;
@@ -1585,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;
@@ -1600,7 +1718,7 @@ export default {
.btnText {
font-size: 14px;
font-weight: 400;
- color: #FFFFFF;
+ color: #ffffff;
line-height: 36px;
margin-left: 5px;
}
@@ -1608,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;
@@ -1623,7 +1741,7 @@ export default {
.btnText {
font-size: 14px;
font-weight: 400;
- color: #409EFF;
+ color: #409eff;
line-height: 36px;
margin-left: 5px;
}
@@ -1652,7 +1770,7 @@ export default {
}
}
.btn1:active {
- background: #0982FF;
+ background: #0982ff;
}
.btn2:hover {
background: rgba(64, 158, 255, 0.1);
@@ -1667,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;
@@ -1682,7 +1800,7 @@ export default {
.btnText {
font-size: 14px;
font-weight: 400;
- color: #FFFFFF;
+ color: #ffffff;
line-height: 36px;
margin-left: 5px;
}
@@ -1705,7 +1823,7 @@ export default {
}
}
.btn3:active {
- background: #0982FF;
+ background: #0982ff;
}
}
}
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index a4dbdd28..4f1f4742 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -541,8 +541,8 @@