diff --git a/package-lock.json b/package-lock.json index 8edd4d84..60967631 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,8 +14,10 @@ "element-plus": "^2.2.17", "jquery": "^3.6.1", "qs": "^6.11.0", + "sortablejs": "^1.15.0", "vue": "^3.2.13", "vue-router": "^4.0.3", + "vuedraggable": "^4.1.0", "vuex": "^4.0.0" }, "devDependencies": { @@ -9658,6 +9660,11 @@ "websocket-driver": "^0.7.4" } }, + "node_modules/sortablejs": { + "version": "1.15.0", + "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.15.0.tgz", + "integrity": "sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w==" + }, "node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz", @@ -10601,6 +10608,22 @@ "node": ">=0.10.0" } }, + "node_modules/vuedraggable": { + "version": "4.1.0", + "resolved": "https://registry.npmmirror.com/vuedraggable/-/vuedraggable-4.1.0.tgz", + "integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==", + "dependencies": { + "sortablejs": "1.14.0" + }, + "peerDependencies": { + "vue": "^3.0.1" + } + }, + "node_modules/vuedraggable/node_modules/sortablejs": { + "version": "1.14.0", + "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.14.0.tgz", + "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==" + }, "node_modules/vuex": { "version": "4.0.2", "resolved": "https://registry.npmmirror.com/vuex/-/vuex-4.0.2.tgz", @@ -18839,6 +18862,11 @@ "websocket-driver": "^0.7.4" } }, + "sortablejs": { + "version": "1.15.0", + "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.15.0.tgz", + "integrity": "sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w==" + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz", @@ -19589,6 +19617,21 @@ } } }, + "vuedraggable": { + "version": "4.1.0", + "resolved": "https://registry.npmmirror.com/vuedraggable/-/vuedraggable-4.1.0.tgz", + "integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==", + "requires": { + "sortablejs": "1.14.0" + }, + "dependencies": { + "sortablejs": { + "version": "1.14.0", + "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.14.0.tgz", + "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==" + } + } + }, "vuex": { "version": "4.0.2", "resolved": "https://registry.npmmirror.com/vuex/-/vuex-4.0.2.tgz", diff --git a/package.json b/package.json index 41b11993..cb6ab7b1 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,10 @@ "element-plus": "^2.2.17", "jquery": "^3.6.1", "qs": "^6.11.0", + "sortablejs": "^1.15.0", "vue": "^3.2.13", "vue-router": "^4.0.3", + "vuedraggable": "^4.1.0", "vuex": "^4.0.0" }, "devDependencies": { diff --git a/src/App.vue b/src/App.vue index b6b111f7..7ab55e6d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -75,7 +75,7 @@ export default defineComponent({ flex: 1 1 auto; // flex-shrink: 0; display: flex; - overflow-y: scroll; + overflow-y: auto; // display: flex; // flex: 1 1 auto; width: calc(100% - 40px); diff --git a/src/api/index1.js b/src/api/index1.js index 42b3b5bd..9ec700ca 100644 --- a/src/api/index1.js +++ b/src/api/index1.js @@ -59,7 +59,8 @@ export const getRouterDetail = (routerId) => http.get('/admin/router/detail', { routerId: routerId, } }); - +//添加学员 +export const addStudent = (obj) => http.post('/admin/router/addStudent', obj); diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss index bbe805e6..d5affa62 100644 --- a/src/assets/scss/common.scss +++ b/src/assets/scss/common.scss @@ -345,14 +345,14 @@ textarea { .drawerMain { min-width: 700px; margin: 0px 32px 0px 32px; - overflow-x: scroll; + overflow-x: auto; display: flex; flex-direction: column; height: 100%; .contentMain { flex: 1; - overflow-y: scroll; + overflow-y: auto; } } @@ -376,7 +376,7 @@ textarea { .drawerMain { min-width: 700px; margin: 0px 32px 0px 32px; - overflow-x: scroll; + overflow-x: auto; display: flex; flex-direction: column; } @@ -392,7 +392,7 @@ textarea { .ant-modal { height: calc(100% - 200px); background-color: rgba(255, 255, 255, 1); - // overflow-y: scroll; + // overflow-y: auto; min-width: 900px; max-width: 1300px; padding: 0; @@ -428,7 +428,7 @@ textarea { .modalMain { height: 0px; flex: 1 1 auto; - overflow-y: scroll; + overflow-y: auto; margin-top: 7px; margin: 0px 52px; diff --git a/src/components/OpenPages.vue b/src/components/OpenPages.vue index 6b3f37dd..02374b62 100644 --- a/src/components/OpenPages.vue +++ b/src/components/OpenPages.vue @@ -1,37 +1,51 @@ - - \ No newline at end of file diff --git a/src/components/drawers/AddGroup.vue b/src/components/drawers/AddGroup.vue index 9179fc1d..0606e0a7 100644 --- a/src/components/drawers/AddGroup.vue +++ b/src/components/drawers/AddGroup.vue @@ -104,7 +104,7 @@ export default { .drawerMain { min-width: 600px; margin: 0px 32px 0px 32px; - overflow-x: scroll; + overflow-x: auto; display: flex; flex-direction: column; .header { diff --git a/src/components/drawers/AddLevelAddStu.vue b/src/components/drawers/AddLevelAddStu.vue index 4d29f924..87ef5560 100644 --- a/src/components/drawers/AddLevelAddStu.vue +++ b/src/components/drawers/AddLevelAddStu.vue @@ -1051,7 +1051,7 @@ export default { .drawerMain { min-width: 600px; margin: 0px 32px 0px 32px; - // overflow-y: scroll; + // overflow-y: auto; display: flex; flex-direction: column; diff --git a/src/components/drawers/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue index 3385642e..4d2c4872 100644 --- a/src/components/drawers/AddLevelImportStu.vue +++ b/src/components/drawers/AddLevelImportStu.vue @@ -139,7 +139,7 @@ export default { }; - \ No newline at end of file + diff --git a/src/components/drawers/ChangeGroup.vue b/src/components/drawers/ChangeGroup.vue index 52b2ce32..6447ff12 100644 --- a/src/components/drawers/ChangeGroup.vue +++ b/src/components/drawers/ChangeGroup.vue @@ -89,7 +89,7 @@ export default { .drawerMain { min-width: 600px; margin: 0px 32px 0px 32px; - overflow-x: scroll; + overflow-x: auto; display: flex; flex-direction: column; .header { diff --git a/src/components/drawers/CheckStu.vue b/src/components/drawers/CheckStu.vue index 1e35333f..0b32c086 100644 --- a/src/components/drawers/CheckStu.vue +++ b/src/components/drawers/CheckStu.vue @@ -223,7 +223,7 @@ export default { .drawerMain { min-width: 600px; margin: 0px 32px 0px 32px; - overflow-x: scroll; + overflow-x: auto; display: flex; flex-direction: column; .header { diff --git a/src/components/drawers/CheckStuMess.vue b/src/components/drawers/CheckStuMess.vue index 34b824f3..70966a0b 100644 --- a/src/components/drawers/CheckStuMess.vue +++ b/src/components/drawers/CheckStuMess.vue @@ -78,7 +78,7 @@ export default { .drawerMain { min-width: 600px; margin: 0px 32px 0px 32px; - overflow-x: scroll; + overflow-x: auto; display: flex; flex-direction: column; .header { diff --git a/src/components/drawers/EntryScores.vue b/src/components/drawers/EntryScores.vue index fef7f769..34cbbb56 100644 --- a/src/components/drawers/EntryScores.vue +++ b/src/components/drawers/EntryScores.vue @@ -82,7 +82,7 @@ export default { }; - \ No newline at end of file + diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue index a615ab51..48960ef2 100644 --- a/src/components/drawers/FaceManage.vue +++ b/src/components/drawers/FaceManage.vue @@ -385,7 +385,7 @@ export default { }; - \ No newline at end of file + diff --git a/src/components/drawers/FaceStu.vue b/src/components/drawers/FaceStu.vue index a5da82ea..f7c39cbd 100644 --- a/src/components/drawers/FaceStu.vue +++ b/src/components/drawers/FaceStu.vue @@ -722,7 +722,7 @@ export default { .drawerMain { min-width: 600px; margin: 0px 32px 0px 32px; - overflow-x: scroll; + overflow-x: auto; display: flex; flex-direction: column; .header { diff --git a/src/components/drawers/ManageRight.vue b/src/components/drawers/ManageRight.vue index 3ff545b2..65bdbfc9 100644 --- a/src/components/drawers/ManageRight.vue +++ b/src/components/drawers/ManageRight.vue @@ -831,7 +831,7 @@ export default { .drawerMain { min-width: 550px; margin: 0px 32px 0px 32px; - // overflow-y: scroll; + // overflow-y: auto; display: flex; flex-direction: column; diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue index cc142a0a..f10227a1 100644 --- a/src/components/drawers/MemberList.vue +++ b/src/components/drawers/MemberList.vue @@ -25,7 +25,7 @@ placeholder="请输入姓名" /> - +
@@ -67,18 +67,18 @@
+ >
- +
提示
@@ -123,7 +123,6 @@
- - \ No newline at end of file + diff --git a/src/components/drawers/OwnPower.vue b/src/components/drawers/OwnPower.vue index 4e765153..f2de47ca 100644 --- a/src/components/drawers/OwnPower.vue +++ b/src/components/drawers/OwnPower.vue @@ -78,17 +78,17 @@ }" />
-
- -
+
+ +
@@ -160,16 +160,16 @@ />
- -
+ +
@@ -243,16 +243,16 @@ />
- -
+ +
@@ -306,8 +306,8 @@ - - - - \ No newline at end of file + diff --git a/src/components/drawers/Ownership.vue b/src/components/drawers/Ownership.vue index f7cf2d5d..2f8c229e 100644 --- a/src/components/drawers/Ownership.vue +++ b/src/components/drawers/Ownership.vue @@ -786,7 +786,7 @@ export default { .drawerMain { min-width: 550px; margin: 0px 32px 0px 32px; - // overflow-y: scroll; + // overflow-y: auto; display: flex; flex-direction: column; diff --git a/src/components/drawers/PowerList.vue b/src/components/drawers/PowerList.vue index dc14bc8f..db21a8f0 100644 --- a/src/components/drawers/PowerList.vue +++ b/src/components/drawers/PowerList.vue @@ -329,7 +329,7 @@ export default { }; - \ No newline at end of file + diff --git a/src/components/drawers/ProMess.vue b/src/components/drawers/ProMess.vue index 49e1cc79..ddd8406c 100644 --- a/src/components/drawers/ProMess.vue +++ b/src/components/drawers/ProMess.vue @@ -17,12 +17,14 @@
- 班级名称: - 产品经理管理-腾飞班1 + 班级名称: + 产品经理管理-腾飞班1
- 说明: - 班级说明,此班级为产品经理班级,其他岗位不要进入请大家按照规定时间进行任务学习 + 说明: + 班级说明,此班级为产品经理班级,其他岗位不要进入请大家按照规定时间进行任务学习
@@ -30,7 +32,6 @@
- - \ No newline at end of file + diff --git a/src/components/drawers/ProjCheckPower.vue b/src/components/drawers/ProjCheckPower.vue index a802c8ff..78ac83f6 100644 --- a/src/components/drawers/ProjCheckPower.vue +++ b/src/components/drawers/ProjCheckPower.vue @@ -80,18 +80,17 @@ />
- + +
- - @@ -162,18 +161,17 @@ />
- + +
- -
@@ -246,18 +244,17 @@ />
- + +
- - @@ -789,7 +786,7 @@ export default { .drawerMain { min-width: 550px; margin: 0px 32px 0px 32px; - // overflow-y: scroll; + // overflow-y: auto; display: flex; flex-direction: column; diff --git a/src/components/drawers/ProjManagePower.vue b/src/components/drawers/ProjManagePower.vue index 35e1b42c..949ad4e5 100644 --- a/src/components/drawers/ProjManagePower.vue +++ b/src/components/drawers/ProjManagePower.vue @@ -80,18 +80,17 @@ />
- + +
- - @@ -162,18 +161,17 @@ />
- + +
- -
@@ -246,18 +244,17 @@ />
- + +
- - @@ -789,7 +786,7 @@ export default { .drawerMain { min-width: 550px; margin: 0px 32px 0px 32px; - // overflow-y: scroll; + // overflow-y: auto; display: flex; flex-direction: column; diff --git a/src/components/drawers/ProjPowerList.vue b/src/components/drawers/ProjPowerList.vue index 7ecd7d38..1bf31e58 100644 --- a/src/components/drawers/ProjPowerList.vue +++ b/src/components/drawers/ProjPowerList.vue @@ -59,16 +59,16 @@
- -
+ +
- - \ No newline at end of file + diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue index d2dbd1d7..a71722cc 100644 --- a/src/components/drawers/TestManage.vue +++ b/src/components/drawers/TestManage.vue @@ -365,7 +365,7 @@ export default { .drawerMain { min-width: 520px; margin: 0px 32px 0px 32px; - // overflow-x: scroll; + // overflow-x: auto; display: flex; flex-direction: column; position: relative; diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue index f71b9c75..e15764a2 100644 --- a/src/components/drawers/TimeManage.vue +++ b/src/components/drawers/TimeManage.vue @@ -318,11 +318,11 @@ export default { // } // } .TimeManage { - // overflow-x: scroll; + // overflow-x: auto; .drawerMain { min-width: 550px; margin: 0px 32px 0px 32px; - overflow-x: scroll; + overflow-x: auto; display: flex; flex-direction: column; .noticebox { diff --git a/src/components/drawers/ViewAssess.vue b/src/components/drawers/ViewAssess.vue index 3df8b914..f068b7fa 100644 --- a/src/components/drawers/ViewAssess.vue +++ b/src/components/drawers/ViewAssess.vue @@ -17,73 +17,86 @@
-
评估名称:
-
产品经理面授课评估
+
评估名称:
+
产品经理面授课评估
-
评估说明:
-
-
+
评估说明:
+
-
-
-
评估类型:
-
单选
+
+
评估类型:
+
单选
+
+
+
题干:
+
+ 这个课程你觉得对你有用吗?
-
-
题干:
-
这个课程你觉得对你有用吗?
+
+ +
+
选择1:
+ 有用
- -
-
选择1:
- 有用 -
-
-
选择2:
- 没用 -
-
- +
+
选择2:
+ 没用 +
+
-
-
评估类型:
-
问答题
+
+
评估类型:
+
问答题
+
+
+
标题:
+
+ 对这个课程有什么建议吗?
-
-
标题:
-
对这个课程有什么建议吗?
-
-
-
描述:
-
希望以后这样的课程能够躲开,让我们多多了解!
+
+
+
描述:
+
+ 希望以后这样的课程能够躲开,让我们多多了解!
+
-
-
评估类型:
-
评分题
+
+
评估类型:
+
评分题
+
+
+
标题:
+
+ 请给当前课程打分
-
-
标题:
-
请给当前课程打分
-
-
-
非常不满意
-
-
1
-
2
-
3
-
4
-
5
-
6
-
7
-
8
-
9
-
10
-
-
非常满意
+
+
+
非常不满意
+
+
1
+
2
+
3
+
4
+
5
+
6
+
7
+
8
+
9
+
10
+
非常满意
+
@@ -131,7 +144,7 @@ export default { .drawerMain { min-width: 600px; margin: 0px 32px 0px 32px; - overflow-x: scroll; + overflow-x: auto; display: flex; flex-direction: column; .header { @@ -160,13 +173,13 @@ export default { margin-top: 10px; margin-left: 10px; .assname { - font-size: 16px; - color: #333333; - font-weight: 500; + font-size: 16px; + color: #333333; + font-weight: 500; } .asscontent { - color: #999999; - font-size: 16px; + color: #999999; + font-size: 16px; } } .assessbox { @@ -175,66 +188,65 @@ export default { display: flex; flex-direction: column; .box1 { + display: flex; + margin-top: 20px; + margin-left: 36px; + align-items: center; + .asstype { + color: rgba(51, 51, 51, 1); + font-size: 14px; + font-weight: 500; + } + .typename { + width: 80px; + height: 32px; + //margin-left: 10px; + border-radius: 4px; + border: 1px solid rgba(64, 158, 255, 1); display: flex; - margin-top: 20px; - margin-left: 36px; + justify-content: center; align-items: center; - .asstype { - color: rgba(51, 51, 51, 1); - font-size: 14px; - font-weight: 500; - } - .typename { - width: 80px; - height: 32px; - //margin-left: 10px; - border-radius: 4px; - border: 1px solid rgba(64, 158, 255, 1); - display: flex; - justify-content: center; - align-items: center; - color: rgba(64, 158, 255, 1); - font-size: 14px; - background: rgba(64,158,255,0.1); - } + color: rgba(64, 158, 255, 1); + font-size: 14px; + background: rgba(64, 158, 255, 0.1); + } } .lastbox { + display: flex; + align-items: center; + margin-left: 30px; + .sorcetext { + color: rgba(153, 153, 153, 1); + font-size: 14px; + } + .sorcebox { display: flex; - align-items: center; - margin-left: 30px; - .sorcetext { - color: rgba(153, 153, 153, 1); - font-size: 14px; + .numbox { + width: 32px; + height: 32px; + display: flex; + justify-content: center; + align-items: center; + background: rgba(64, 158, 255, 1); + color: #ffffff; + font-size: 14px; + border-radius: 4px; + margin: 20px 5px; + cursor: pointer; } - .sorcebox { - display: flex; - .numbox { - width: 32px; - height: 32px; - display: flex; - justify-content: center; - align-items: center; - background: rgba(64, 158, 255, 1); - color: #FFFFFF; - font-size: 14px; - border-radius: 4px; - margin: 20px 5px; - cursor: pointer; - } - .numbox1 { - width: 32px; - height: 32px; - display: flex; - justify-content: center; - align-items: center; - border: 1px solid rgba(151, 151, 151, 0.29); - color: rgba(0, 0, 0, 0.6500); - margin: 20px 5px; - cursor: pointer; - border-radius: 4px; - } + .numbox1 { + width: 32px; + height: 32px; + display: flex; + justify-content: center; + align-items: center; + border: 1px solid rgba(151, 151, 151, 0.29); + color: rgba(0, 0, 0, 0.65); + margin: 20px 5px; + cursor: pointer; + border-radius: 4px; } - + } } } } diff --git a/src/components/drawers/WorkDetail.vue b/src/components/drawers/WorkDetail.vue index d5256d52..33228d92 100644 --- a/src/components/drawers/WorkDetail.vue +++ b/src/components/drawers/WorkDetail.vue @@ -89,7 +89,7 @@ export default { }; - \ No newline at end of file + diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue index bd655f9b..9348356b 100644 --- a/src/components/drawers/WorkManage.vue +++ b/src/components/drawers/WorkManage.vue @@ -366,7 +366,7 @@ export default { }; - \ No newline at end of file + diff --git a/src/store/index.js b/src/store/index.js index fd665d1d..4754115b 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -6,8 +6,9 @@ export default createStore({ pagename: "学习路径", href: "/learningpath", active: true, - },] + },], + routerId: null, }, getters: { @@ -16,7 +17,11 @@ export default createStore({ chengeOpenpages(state, list) { // console.log('list', list) state.openpages = list - } + }, + chengeRouterId(state, routerId) { + // console.log('list', list) + state.routerId = routerId + }, }, actions: { }, diff --git a/src/views/TestPage.vue b/src/views/TestPage.vue index 7cdfd951..046eadf1 100644 --- a/src/views/TestPage.vue +++ b/src/views/TestPage.vue @@ -20,7 +20,6 @@ export default { name: "TestPage", setup() { const state = reactive({}); - return { ...toRefs(state), }; @@ -30,14 +29,10 @@ export default { $(document).ready(function () { var range = { x: 0, y: 0 }; //鼠标元素偏移量 var lastPos = { x: 0, y: 0, x1: 0, y1: 0 }; //拖拽对象的四个坐标 - var tarPos = { x: 0, y: 0, x1: 0, y1: 0 }; //目标元素对象的坐标初始化 - var theDiv = null, move = false; - var choose = false; //拖拽对象 拖拽状态 选中状态 - // var theDivId = 0; // var theDivHeight = 0; var theDivHalf = 0; @@ -101,7 +96,6 @@ $(document).ready(function () { if (!choose) { return false; } - if (!move) { //恢复对象的初始样式 diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index 51ea5961..cefe7a20 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -1042,36 +1042,36 @@ export default {
{ - state.out1 = true; - state.pathName = text.record.manager; - // state.pathBg = ""; - // state.organizationSelectName = null; - // state.organizationSelectId = null; - state.pathIntro = text.record.remark; - state.editPathId = text.record.id; + // state.out1 = true; + // state.pathName = text.record.manager; + // // state.pathBg = ""; + // // state.organizationSelectName = null; + // // state.organizationSelectId = null; + // state.pathIntro = text.record.remark; + // state.editPathId = text.record.id; }} - > - 编辑 -
-
- ) : ( -
- )} - {text.record.state === "未发布" ? ( -
-
{ - showCopyModal(); - }} - > - 复制 -
+ >
) : (
)} + { + // text.record.state === "未发布" ? ( + //
+ //
{ + // showCopyModal(); + // }} + // > + // 复制 + //
+ //
+ // ) : ( + //
+ // ) + }
{ router.push({ path: "/leveladd", - query: { routerId: text.record.id }, }); + localStorage.setItem("routerId", text.record.id); }} > 管理 @@ -1220,13 +1220,26 @@ export default { ) : (
)} - {text.record.state === "未发布" ? ( + {text.record.state === "已停用" ? (
+ +
{ + showCopyModal(); + }} + > + 复制 +
+
- +
导入学员
@@ -899,7 +898,8 @@ import TimeManage from "../../components/drawers/TimeManage"; import TestManage from "../../components/drawers/TestManage"; import FaceManage from "../../components/drawers/FaceManage"; import WorkManage from "../../components/drawers/WorkManage"; -import { useRoute } from "vue-router"; +// import { useRoute } from "vue-router"; +// import { useStore } from "vuex"; import * as api from "../../api/index1"; export default { name: "LevelAdd", @@ -916,9 +916,10 @@ export default { }, methods: {}, setup() { - const routers = useRoute(); + // const routers = useRoute(); + // const store = useStore(); const state = reactive({ - routerId: routers.query.routerId, //学习路径页面传的学习路径id + routerId: localStorage.getItem("routerId"), //学习路径页面传的学习路径id gatename: null, //关卡名称 gatenamee: null, //学员管理关卡名称 deleteAll: false, //批量删除学员弹窗 @@ -1237,6 +1238,7 @@ export default { }, ], }); + console.log("store", state.routerId); const selectProjectName = (value, index) => { console.log("value", value, index); if (value === "批量删除") { @@ -1472,6 +1474,7 @@ export default { }); }; + //学员管理------------------------------------------------ return { ...toRefs(state), selectProjectName, @@ -2839,6 +2842,10 @@ export default { } } } + .ant-select-selection-item { + padding-left: 15px; + color: #4ea6ff; + } } } .talk { diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 7e2638a9..7af4435b 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -60,7 +60,7 @@
-
+
{{ value1.length }}/20
-
-
+
关卡说明:
{ - if(!state.value1) return message.warning("请输入关卡名称"); + if (!state.value1) return message.warning("请输入关卡名称"); let obj = { name: state.value1, remark: state.value2, @@ -845,25 +852,25 @@ export default { .catch((err) => { console.log("创建失败", err); }); - } + }; //编辑关卡 const updateChapter = () => { let obj = { chapterId: state.updateChapterID, name: "", - remark:"", + remark: "", routerId: 0, }; api .updateChapter(obj) .then((res) => { - console.log("修改成功",res); + console.log("修改成功", res); message.success("修改成功"); }) .catch((err) => { - console.log("修改失败",err); - }) + console.log("修改失败", err); + }); }; const showDrawer = () => { state.visible = true; @@ -993,9 +1000,14 @@ export default { 编辑 - { - updateChapter(); - }}>删除 + { + updateChapter(); + }} + > + 删除 +
); @@ -1352,9 +1364,9 @@ export default { width: 100px; height: 40px; border-radius: 4px; - border: 1px solid #409EFF; + border: 1px solid #409eff; font-size: 14px; - color: #409EFF; + color: #409eff; cursor: pointer; background: #ffffff; margin-right: 20px; @@ -1367,7 +1379,7 @@ export default { color: #fff; cursor: pointer; border: 0; - background: #409EFF; + background: #409eff; } } } @@ -1389,7 +1401,7 @@ export default { .drawerMain { min-width: 600px; margin: 0px 32px 0px 32px; - overflow-x: scroll; + overflow-x: auto; display: flex; flex-direction: column; .header { diff --git a/src/views/projectcenter/ClassAdd.vue b/src/views/projectcenter/ClassAdd.vue index b836d6ea..e2605ff5 100644 --- a/src/views/projectcenter/ClassAdd.vue +++ b/src/views/projectcenter/ClassAdd.vue @@ -1,53 +1,82 @@ - diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index f8c46024..e6e459d8 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -1,44 +1,68 @@ diff --git a/src/views/projectcenter/SonProject.vue b/src/views/projectcenter/SonProject.vue index 6174797b..768b3f5d 100644 --- a/src/views/projectcenter/SonProject.vue +++ b/src/views/projectcenter/SonProject.vue @@ -1,53 +1,82 @@ - diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 12ded11e..4650c5cf 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -1708,7 +1708,7 @@ export default { .drawerMain { min-width: 600px; margin: 0px 32px 0px 32px; - overflow-x: scroll; + overflow-x: auto; display: flex; flex-direction: column; .header { diff --git a/src/views/system/SystemManage.vue b/src/views/system/SystemManage.vue index 12d39867..9c791a40 100644 --- a/src/views/system/SystemManage.vue +++ b/src/views/system/SystemManage.vue @@ -62,6 +62,22 @@ > 跳转
+ + +