diff --git a/package-lock.json b/package-lock.json index 15eeab2c..9a92ba29 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "ant-design-vue": "^3.2.12", "core-js": "^3.8.3", "element-plus": "^2.2.17", + "jquery": "^3.6.1", "vue": "^3.2.13", "vue-router": "^4.0.3", "vuex": "^4.0.0" @@ -6824,6 +6825,11 @@ "@sideway/pinpoint": "^2.0.0" } }, + "node_modules/jquery": { + "version": "3.6.1", + "resolved": "https://registry.npmmirror.com/jquery/-/jquery-3.6.1.tgz", + "integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==" + }, "node_modules/js-message": { "version": "1.0.7", "resolved": "https://registry.npmmirror.com/js-message/-/js-message-1.0.7.tgz", @@ -16576,6 +16582,11 @@ "@sideway/pinpoint": "^2.0.0" } }, + "jquery": { + "version": "3.6.1", + "resolved": "https://registry.npmmirror.com/jquery/-/jquery-3.6.1.tgz", + "integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==" + }, "js-message": { "version": "1.0.7", "resolved": "https://registry.npmmirror.com/js-message/-/js-message-1.0.7.tgz", diff --git a/package.json b/package.json index 23f7691a..f7f60daa 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "ant-design-vue": "^3.2.12", "core-js": "^3.8.3", "element-plus": "^2.2.17", + "jquery": "^3.6.1", "vue": "^3.2.13", "vue-router": "^4.0.3", "vuex": "^4.0.0" diff --git a/src/assets/images/basicinfo/asterisk.png b/src/assets/images/basicinfo/asterisk.png new file mode 100644 index 00000000..49c7ac99 Binary files /dev/null and b/src/assets/images/basicinfo/asterisk.png differ diff --git a/src/assets/images/basicinfo/close.png b/src/assets/images/basicinfo/close.png new file mode 100644 index 00000000..26992042 Binary files /dev/null and b/src/assets/images/basicinfo/close.png differ diff --git a/src/assets/images/leveladd/back.png b/src/assets/images/leveladd/back.png new file mode 100644 index 00000000..4e9e5f8b Binary files /dev/null and b/src/assets/images/leveladd/back.png differ diff --git a/src/assets/images/leveladd/ma.png b/src/assets/images/leveladd/ma.png new file mode 100644 index 00000000..9a4996b1 Binary files /dev/null and b/src/assets/images/leveladd/ma.png differ diff --git a/src/assets/images/leveladd/more.png b/src/assets/images/leveladd/more.png new file mode 100644 index 00000000..d1c08d0e Binary files /dev/null and b/src/assets/images/leveladd/more.png differ diff --git a/src/assets/images/leveladd/pub.png b/src/assets/images/leveladd/pub.png new file mode 100644 index 00000000..7813185d Binary files /dev/null and b/src/assets/images/leveladd/pub.png differ diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue index f1d2e889..c72e0058 100644 --- a/src/components/BreadCrumb.vue +++ b/src/components/BreadCrumb.vue @@ -42,6 +42,17 @@ export default { }, ]; } + if (n === "/leveladd" || n === "/LevelAdd") { + state.list = [ + { + name: "学习路径", + href: "/learningpath", + }, + { + name: "创建关卡", + }, + ]; + } if (n === "/projectmanage" || n === "/ProjectManage") { state.list = [ { @@ -66,6 +77,7 @@ export default { }, ]; } + if (n === "/templatelibrary" || n === "/TemplateLibrary") { state.list = [ { @@ -99,12 +111,19 @@ export default { }, ]; } +<<<<<<< HEAD if (n === "/researchmanage" || n === "/ResearchManage") { state.list = [ { name: "调研管理", href: "", // href: "#/researchmanage", +======= + if (n === "/systemmanage" || n === "/SystemManage") { + state.list = [ + { + name: "系统管理", +>>>>>>> e4c5bddd27044684b5bca09f3451b40713469f3a }, ]; } diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 5ded85e1..e28ef8ff 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -153,7 +153,7 @@ src="../assets/images/navleft/system.png" /> - 系统管理 + 系统管理 @@ -251,6 +251,12 @@ export default { selectedKeys: "sub1", pagename: "学习路径", }, + { + href: "/leveladd", + openKeys: "sub1", + selectedKeys: "sub1", + pagename: "创建关卡", + }, { href: "/projectmanage", openKeys: "sub2", @@ -281,6 +287,12 @@ export default { selectedKeys: "sub3-2", pagename: "课程管理", }, + { + href: "/systemmanage", + openKeys: "sub9", + selectedKeys: "sub9", + pagename: "系统管理", + }, { href: "/researchmanage", openKeys: "sub5", diff --git a/src/components/OpenPages.vue b/src/components/OpenPages.vue index c8a1bad1..becbeca6 100644 --- a/src/components/OpenPages.vue +++ b/src/components/OpenPages.vue @@ -79,6 +79,7 @@ export default { overflow-x: auto; .openItems { width: 272px; + // min-width: 250px; height: 50px; border: 1px solid #edf2fa; border-left: 0px; diff --git a/src/views/TestPage.vue b/src/views/TestPage.vue new file mode 100644 index 00000000..7cdfd951 --- /dev/null +++ b/src/views/TestPage.vue @@ -0,0 +1,245 @@ + + + div横向拖拽排序 + + + + 导航一 + 导航二导航 + 导航导航导航三 + 导航导航四 + 导五 + + + + + + diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index e8f0f522..6571d681 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -71,6 +71,7 @@ :data-source="tableData" :loading="tableDataTotal === -1 ? true : false" expandRowByClick="true" + :scroll="{ x: 1600, y: 800 }" @expand="expandTable" :pagination=" tableDataTotal > 10 @@ -319,7 +320,10 @@ export default { 发布 编辑 - 关卡 + + 关卡 + + 授权 diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue new file mode 100644 index 00000000..357e244a --- /dev/null +++ b/src/views/learningpath/LevelAdd.vue @@ -0,0 +1,555 @@ + + + + + + + + 产品经理进阶路径 + 创建时间:2022-07-21 00:00 + + + + + + 发布 + + + + 更多 + + + 撤回 + 复制 + + + + + + 返回 + + + + + + + + + + + + + + + 搜索 + + + + 重置 + + + + + 创建关卡 + + + + + + + {{ item.lev }} + + {{ item.name }} + + 当前关卡 + {{ item.count }} + 个人 + + + + + + {{ item.online }} + + 在线 + + + + + {{ item.homework }} + + 作业 + + + + + {{ item.juan }} + + 问卷 + + + + + {{ item.ballot }} + + 投票 + + + + + {{ item.test }} + + 考试 + + + + 编辑 + + 更多 + + + + + + + + + + + + ccc + + eee + + + + + + + + \ No newline at end of file diff --git a/src/views/system/SystemManage.vue b/src/views/system/SystemManage.vue index e69de29b..973a625a 100644 --- a/src/views/system/SystemManage.vue +++ b/src/views/system/SystemManage.vue @@ -0,0 +1,125 @@ + + + + 添加投票 + + + + + + 添加投票 + + + + + * + 投票名称: + + + + + + + + + + + +