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/images/leveladd/picture.png b/src/assets/images/leveladd/picture.png new file mode 100644 index 00000000..792d5334 Binary files /dev/null and b/src/assets/images/leveladd/picture.png differ diff --git a/src/assets/images/leveladd/right.png b/src/assets/images/leveladd/right.png new file mode 100644 index 00000000..92b3c8d2 Binary files /dev/null and b/src/assets/images/leveladd/right.png differ 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/AddCase.vue b/src/components/drawers/AddCase.vue index bb2481a0..86eec845 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -79,11 +79,11 @@ const columns1 = [ { title: "案例标题", - width: "35%", + width: "40%", dataIndex: "title", key: "num", align: "center", - ellipsis: true, + ellipsis: true, }, { title: "作者", @@ -94,7 +94,7 @@ }, { title: "导入时间", - width: "40%", + width: "35%", dataIndex: "time", key: "time", align: "center", diff --git a/src/components/drawers/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue index fdf9464d..4327fe2e 100644 --- a/src/components/drawers/AddLevelImportStu.vue +++ b/src/components/drawers/AddLevelImportStu.vue @@ -3,7 +3,7 @@ :visible="AddImpStuvisible" class="drawerStyle AddLevelImpStu" placement="right" - width="40%" + width="800px" @after-visible-change="afterVisibleChange" >
@@ -132,9 +132,8 @@ export default { \ No newline at end of file + diff --git a/src/components/drawers/ImportStu.vue b/src/components/drawers/ImportStu.vue index b1d7c751..a0a89d66 100644 --- a/src/components/drawers/ImportStu.vue +++ b/src/components/drawers/ImportStu.vue @@ -145,6 +145,7 @@ export default { align-items: center; // background-color: red; margin-bottom: 20px; + flex-shrink: 0; .headerTitle { font-size: 18px; font-weight: 600; diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue index 06eb35c1..a546f63d 100644 --- a/src/components/drawers/MemberList.vue +++ b/src/components/drawers/MemberList.vue @@ -71,7 +71,7 @@ :data-source="tabledata" :loading="tableDataTotal === -1 ? true : false" expandRowByClick="true" - :scroll="{ x: 900, y: 560 }" + :scroll="{ x: 900 }" @expand="expandTable" :pagination="false" :row-selection="{ @@ -324,7 +324,7 @@ export default { height: 100%; // background-color: #bfa; - // overflow-y: auto; + overflow-y: auto; .endtime { font-size: 16px; font-weight: 500; diff --git a/src/components/drawers/PowerList.vue b/src/components/drawers/PowerList.vue index 2768f8d5..ea5feb08 100644 --- a/src/components/drawers/PowerList.vue +++ b/src/components/drawers/PowerList.vue @@ -48,7 +48,7 @@ :loading="tableDataTotal === -1 ? true : false" expandRowByClick="true" @expand="expandTable" - :scroll="{ x: 900, y: 400 }" + :scroll="{ x: 900}" :pagination="false" :row-selection="{ columnWidth: 30, @@ -481,13 +481,13 @@ export default { width: 100%; // height: 100%; // background-color: #bfa; - // overflow-y: auto; + overflow-y: auto; .search { width: 100%; display: flex; flex-wrap: wrap; margin-top: 10px; - justify-content: space-between; + //justify-content: space-between; .leftchoose { display: flex; margin-right: 20px; @@ -538,15 +538,15 @@ export default { } .btn1 { - background: #388be1; + background: #409EFF; color: #ffffff; } .btn2 { background: #ffffff; - color: #388be1; - border: 1px solid #388be1; + color: #409EFF; + border: 1px solid #409EFF; } } } @@ -599,6 +599,12 @@ export default { // position: absolute; // bottom: 20px; // margin-bottom: 20px; + .ant-pagination-prev, .ant-pagination-next,.ant-pagination-options { + margin-bottom: 10px; + } + .ant-pagination-item { + margin-bottom: 10px; + } } // .tab { // .ant-table-thead > tr > th { diff --git a/src/components/drawers/ProjectScore.vue b/src/components/drawers/ProjectScore.vue index f553a5dc..6ba17b26 100644 --- a/src/components/drawers/ProjectScore.vue +++ b/src/components/drawers/ProjectScore.vue @@ -494,14 +494,11 @@ export default { .ant-table-tbody{ .pa { - // left: 0; margin-top: 15px; - width: 100%; // height: 20px; // background-color: red; display: flex; justify-content: center; - // position: absolute; // bottom: 20px; } } diff --git a/src/components/drawers/QueryRight.vue b/src/components/drawers/QueryRight.vue index b4484ffb..b7e26a90 100644 --- a/src/components/drawers/QueryRight.vue +++ b/src/components/drawers/QueryRight.vue @@ -69,7 +69,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="{ @@ -148,7 +148,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="{ @@ -229,7 +229,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="{ diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue index b0c37c85..024bca6b 100644 --- a/src/components/drawers/SeeStu.vue +++ b/src/components/drawers/SeeStu.vue @@ -17,109 +17,219 @@
-
-
-
王明
-
产研部门 - 产品经理
+
+ +
+
+
王明
+
产研部门 - 产品经理
+
+
+
进度排名
+
+ 2 + /10
-
-
进度排名
-
- 2 - /10 -
+
+ +
+
完成必修
+
+ 3 + /10
- -
-
完成必修
-
- 3 - /10 -
-
- -
-
已修证书
-
- 1 -
+
+ +
+
已修证书
+
+ 1
+
-
产品经理管理 - 腾飞班1
-
-
说明
-
-
+
产品经理管理 - 腾飞班1
+
+
说明
+
+
-
-
-
阶段1 腾飞班阶段1
+
+
+ +
+
阶段1 腾飞班阶段1
+
+
+
+
+
+
在线
+
如何成为一个产品经理
+
+
+
+ +
+
已完成
+
-
-
-
在线
-
如何成为一个产品经理
-
-
-
-
已完成
+
+
+
直播
+
管理者播课
+
+
+
+
+
已完成
+
-
-
-
直播
-
管理者播课
-
-
-
-
已完成
+
+
+
面授
+
管理面授课
+
+
+
+
+
未完成
+
-
-
-
面授
-
管理面授课
-
-
-
-
未完成
+
+
+
活动
+
管理者活动
+
+
+
+
+
未完成
+
-
-
-
活动
-
管理者活动
-
-
-
-
未完成
-
-
-
-
-
-
作业
-
管理者作业
-
-
-
-
未完成
+
+
+
作业
+
管理者作业
+
+
+
+
+
未完成
+
+
-
-
-
-
阶段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/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 3bf927d1..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); @@ -877,18 +932,28 @@ export default { > 发布
-
{ +
{ state.out1 = true; - }}>编辑
+ }} + > + 编辑 +
) : (
)} {value.state === "已发布" ? (
-
{ +
{ state.out1 = true; - }}>编辑
+ }} + > + 编辑 +
) : (
@@ -1571,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; @@ -1588,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; @@ -1603,7 +1718,7 @@ export default { .btnText { font-size: 14px; font-weight: 400; - color: #FFFFFF; + color: #ffffff; line-height: 36px; margin-left: 5px; } @@ -1611,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; @@ -1626,7 +1741,7 @@ export default { .btnText { font-size: 14px; font-weight: 400; - color: #409EFF; + color: #409eff; line-height: 36px; margin-left: 5px; } @@ -1655,7 +1770,7 @@ export default { } } .btn1:active { - background: #0982FF; + background: #0982ff; } .btn2:hover { background: rgba(64, 158, 255, 0.1); @@ -1670,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; @@ -1685,7 +1800,7 @@ export default { .btnText { font-size: 14px; font-weight: 400; - color: #FFFFFF; + color: #ffffff; line-height: 36px; margin-left: 5px; } @@ -1708,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 242bf097..abf0a309 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -540,8 +540,8 @@
-
+
+
@@ -592,10 +592,10 @@ 学员可预览第 1 - + 关-第4 - + 关内容
@@ -1021,6 +1021,8 @@ export default { activeKey: ref("1"), value: ref(" "), nubvalue: ref("1"), + nubvalue2: ref("1"), + nubvalue3: ref("4"), nubvalue1: ref("4"), checked2: false, currentPage: 1, diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index eb612369..c43cc039 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -8,18 +8,26 @@
添加关卡
-
+
-
-
说明
+
+
+ 说明 +
-
+
-
{{ item.name }}
+
{{ item.name }}
+ + +
+
+ +
+ 已选择 +
+ 3 +
+ + 列表选项总数: + 5 + +
+
+
+ +
+ +
+ +
+
+
+
+
+ 无学员 +
+
+ 请添加学员或导入学员 +
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
上一步
+
+
+
保存
+
+
+
+
+ + + + + + +
+
+
+
+
+ 提示 +
+
+
+ 请确认是否批量删除学员 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+
- - \ No newline at end of file + .tmpl_body { + .tmpl_tabbox { + .operation { + display: flex; + justify-content: center; + align-items: center; + color: #4ea6ff; + .nselect { + justify-content: center; + align-items: center; + display: flex; + .jc { + margin-left: 20px; + white-space: nowrap; + cursor: pointer; + } + } + } + } + } + } +} + diff --git a/vue.config.js b/vue.config.js index f60869bd..6dbe03ab 100644 --- a/vue.config.js +++ b/vue.config.js @@ -7,7 +7,7 @@ module.exports = defineConfig({ target: "http://111.231.196.214:30001/", changeOrigin: true, secure: false, - ws: true, + ws: false, pathRewrite: { "^/api": "", },