diff --git a/README.md b/README.md index 8e7d558b..b27ce9df 100644 --- a/README.md +++ b/README.md @@ -36,17 +36,19 @@ See [Configuration Reference](https://cli.vuejs.org/config/). LearningPath.vue:学习路径页面 LevelAdd.vue:关卡页面 LevelAddDetail.vue:创建关卡页面 - +LevelCheck.vue查看页面 ``` ### 二、projectcenter:项目文件夹 ``` ProjectManage.vue:项目页面 -ProjectAdd.vue:创建项目页面 +ProjectAdd.vue:创建单层项目页面 +SonProject.vue:创建单层子项目页面 TaskPage.vue:任务页面 TaskAdd.vue:创建任务页面 TemplateLibrary.vue:模板页面 +LibraryAdd.vue:模板库查看页面 ``` diff --git a/src/assets/images/taskpage/left1.png b/src/assets/images/taskpage/left1.png new file mode 100644 index 00000000..9ea0fefe Binary files /dev/null and b/src/assets/images/taskpage/left1.png differ diff --git a/src/assets/images/taskpage/left2.png b/src/assets/images/taskpage/left2.png new file mode 100644 index 00000000..1b9bdfd8 Binary files /dev/null and b/src/assets/images/taskpage/left2.png differ diff --git a/src/assets/images/taskpage/left3.png b/src/assets/images/taskpage/left3.png new file mode 100644 index 00000000..d4891f7b Binary files /dev/null and b/src/assets/images/taskpage/left3.png differ diff --git a/src/assets/images/taskpage/picture1.png b/src/assets/images/taskpage/picture1.png new file mode 100644 index 00000000..e380714d Binary files /dev/null and b/src/assets/images/taskpage/picture1.png differ diff --git a/src/assets/images/taskpage/picture2.png b/src/assets/images/taskpage/picture2.png new file mode 100644 index 00000000..45207143 Binary files /dev/null and b/src/assets/images/taskpage/picture2.png differ diff --git a/src/assets/images/taskpage/picture3.png b/src/assets/images/taskpage/picture3.png new file mode 100644 index 00000000..01a11b6c Binary files /dev/null and b/src/assets/images/taskpage/picture3.png differ diff --git a/src/assets/images/taskpage/picture4.png b/src/assets/images/taskpage/picture4.png new file mode 100644 index 00000000..67397f7f Binary files /dev/null and b/src/assets/images/taskpage/picture4.png differ diff --git a/src/assets/images/taskpage/picture5.png b/src/assets/images/taskpage/picture5.png new file mode 100644 index 00000000..7ed7c080 Binary files /dev/null and b/src/assets/images/taskpage/picture5.png differ diff --git a/src/assets/images/taskpage/picture6.png b/src/assets/images/taskpage/picture6.png new file mode 100644 index 00000000..bbd24062 Binary files /dev/null and b/src/assets/images/taskpage/picture6.png differ diff --git a/src/assets/images/taskpage/picture7.png b/src/assets/images/taskpage/picture7.png new file mode 100644 index 00000000..0c754873 Binary files /dev/null and b/src/assets/images/taskpage/picture7.png differ diff --git a/src/assets/images/taskpage/pub.png b/src/assets/images/taskpage/pub.png new file mode 100644 index 00000000..d475472b Binary files /dev/null and b/src/assets/images/taskpage/pub.png differ diff --git a/src/assets/images/taskpage/right1.png b/src/assets/images/taskpage/right1.png new file mode 100644 index 00000000..f023727b Binary files /dev/null and b/src/assets/images/taskpage/right1.png differ diff --git a/src/assets/images/taskpage/right2.png b/src/assets/images/taskpage/right2.png new file mode 100644 index 00000000..7a4dd00c Binary files /dev/null and b/src/assets/images/taskpage/right2.png differ diff --git a/src/assets/images/taskpage/right3.png b/src/assets/images/taskpage/right3.png new file mode 100644 index 00000000..59c4377e Binary files /dev/null and b/src/assets/images/taskpage/right3.png differ diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue index 1832f22a..2947746f 100644 --- a/src/components/BreadCrumb.vue +++ b/src/components/BreadCrumb.vue @@ -68,6 +68,21 @@ export default { }, ]; } + if (n === "/levelcheck" || n === "/LevelCheck") { + state.list = [ + { + name: "学习路径", + href: "/learningpath", + }, + { + name: "关卡", + href: "/leveladd", + }, + { + name: "查看", + }, + ]; + } if (n === "/projectmanage" || n === "/ProjectManage") { state.list = [ { @@ -117,7 +132,7 @@ export default { }, { name: "添加任务", - } + }, ]; } if (n === "/templatelibrary" || n === "/TemplateLibrary") { @@ -130,6 +145,20 @@ export default { }, ]; } + if (n === "/libraryadd" || n === "/LibraryAdd") { + state.list = [ + { + name: "项目中心", + }, + { + name: "模板库", + }, + { + name: "查看", + href:"/libraryadd", + }, + ]; + } if (n === "/coursemanage" || n === "/CourseManage") { state.list = [ { diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 1b3dac35..bc060992 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -258,6 +258,12 @@ export default { selectedKeys: "sub1", pagename: "关卡", }, + { + href: "/levelcheck", + openKeys: "sub1", + selectedKeys: "sub1", + pagename: "查看", + }, { href: "/leveladddetail", openKeys: "sub1", @@ -282,6 +288,12 @@ export default { selectedKeys: "sub2-2", pagename: "模板库", }, + { + href: "/libraryadd", + openKeys: "sub2", + selectedKeys: "sub2-2", + pagename: "查看", + }, { href: "/coursemanage", openKeys: "sub3", diff --git a/src/store/index.js b/src/store/index.js index 86cc9536..fd665d1d 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -7,6 +7,7 @@ export default createStore({ href: "/learningpath", active: true, },] + }, getters: { diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 28de889f..b9e03ee7 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -7,21 +7,21 @@
@@ -49,7 +49,7 @@
@@ -76,8 +76,8 @@
- - + +
+
{{ value5.length }}/20
@@ -183,7 +184,7 @@
- +
@@ -203,7 +204,7 @@ height: 40px; background: #388be1; border-radius: 8px; - font-size: 14px; + font-size: 14px;faceteach font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; color: #ffffff; @@ -253,10 +254,12 @@
+ > +
@@ -334,7 +337,8 @@
@@ -348,7 +352,8 @@
@@ -416,7 +421,7 @@
@@ -431,7 +436,8 @@
@@ -513,6 +519,27 @@
+ +
+
+
取消
+
+
+
确定
+
+
@@ -540,7 +567,7 @@ />
- +
@@ -630,8 +657,8 @@
- - + +
@@ -726,8 +753,8 @@
- - + +
- +
@@ -1009,7 +1037,7 @@
@@ -1023,7 +1051,7 @@
@@ -1036,7 +1064,7 @@
@@ -1112,7 +1140,7 @@
-
取消
+
取消
确定
@@ -1122,7 +1150,7 @@
- +
-
取消
+
取消
确定
@@ -1312,7 +1340,7 @@
-
取消
+
取消
确定
@@ -1367,7 +1395,7 @@
-
取消
+
取消
确定
@@ -1388,16 +1416,17 @@
提示 -
+
- 请确定是否同意此学员学习此课程 +
请确定是否同意此学员学习此课程
+
-
取消
+
取消
确定
@@ -1407,6 +1436,37 @@
+ + +
+
+
+
+
+ 提示 +
+
+
+
+
请确定是否拒绝此学员学习此课程
+ +
+
+
+
+
取消
+
+
+
确定
+
+
+
+
+
+
- \ No newline at end of file diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index d5d1e5e7..650997b4 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -92,9 +92,9 @@
@@ -572,170 +572,183 @@ export default { }; \ No newline at end of file diff --git a/src/views/projectcenter/ClassAdd.vue b/src/views/projectcenter/ClassAdd.vue new file mode 100644 index 00000000..af9fbaf7 --- /dev/null +++ b/src/views/projectcenter/ClassAdd.vue @@ -0,0 +1,536 @@ + + + + diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue new file mode 100644 index 00000000..2278df41 --- /dev/null +++ b/src/views/projectcenter/LibraryAdd.vue @@ -0,0 +1,576 @@ + + + + \ No newline at end of file diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index eaddee91..c83ddd74 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -393,8 +393,8 @@ export default { .in { margin-left: 14px; flex: 1; - .ant-radio-wrapper { - } + // .ant-radio-wrapper { + // } .ant-input { border-radius: 5px; // height: 120%; diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 7189ab4b..0c9929d2 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -55,12 +55,10 @@
重置
- -
- -
创建项目
-
-
+
+ +
创建项目
+
@@ -109,6 +107,434 @@
+ +
+ +
+
+ 请选择项目类别 +
+
+ +
+
+
+ +
+ +
+
+ +
+
+ +
+
+ 单层子项目 +
+
+
+
+ +
+
+ +
+
+ +
+
+ 多层子项目 +
+
+
+
+
+ + +
+
+ +
+
+ 请选择项目类别 +
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ 单层项目 +
+
+ 不包含子项目,直接填写项目基础信息后创建任务 +
+
+
+
+
+ +
+
+ +
+
+ +
+
+ 多层项目 +
+
+ 包含子项目,分为多层子项目和单层子项目,多层子项目可创建班级,通过班级填写基础信息并创建任务 +
+
+
+
+
+
+ + +
+ +
+
+ 创建多层项目 +
+
+ +
+
+
+
+
+ +
+
项目名称:
+
+ +
+
+
+
+ +
+
分类:
+
+ +
+
+
+
+ +
+
项目经理:
+
+ +
+
+
+
+ +
+
资源归属:
+
+ +
+
+
+ 取消 + 确定 +
+
+
+
+ + +
+ +
+
+ 创建多层子项目 +
+
+ +
+
+
+
+ 项目归属: + 管理者进阶 +
+
+
+ +
+
子项目名称:
+
+ +
+
+
+
+ +
+
分类:
+
+ +
+
+
+
+ +
+
子项目经理:
+
+ +
+
+
+
+ +
+
资源归属:
+
+ +
+
+
+ 取消 + 确定 +
+
+
+
+
+ diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 3cc8c737..0bbd1138 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -291,23 +291,23 @@
阶段名称:
- +
阶段说明:
-
+
@@ -791,7 +791,7 @@ export default { border-radius: 8px; // height: 120%; width: 384px; - height: 40px; + height: 88px; } .addstage { .ant-modal { @@ -806,7 +806,7 @@ export default { .ant-input-textarea-show-count::after { position: absolute; right: 10px; - bottom: 10px; + bottom: 5px; } } } diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 610325e7..dec6a136 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -1,51 +1,42 @@ - \ No newline at end of file diff --git a/src/views/research/ManagePage.vue b/src/views/research/ManagePage.vue index cfe10e1f..30ede176 100644 --- a/src/views/research/ManagePage.vue +++ b/src/views/research/ManagePage.vue @@ -209,7 +209,7 @@ export default { font-weight: 500; } .messagebox { - width: 100%; + //width: 100%; //display: flex; margin-top: 20px; margin-left: 38px; diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue index 0709ca37..844b5995 100644 --- a/src/views/research/ResearchAdd.vue +++ b/src/views/research/ResearchAdd.vue @@ -64,7 +64,7 @@
图片名称1.jpg
@@ -91,15 +91,16 @@
非常满意
1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 +
非常不满意
@@ -181,6 +182,7 @@ border: 1px solid #D7E5FD; border-radius: 5px; margin: 0 10px; + padding: 5px; .btn { border: 1px solid #56A3F9; border-radius: 5px; @@ -214,7 +216,8 @@ display:flex; } .delete { - margin-top: 27px; + cursor: pointer; + margin-top: 32px; margin-left: 20px; float: right; color: #4EA6FF; @@ -225,7 +228,7 @@ // background-color: lightcoral; display: flex; margin-top: 20px; - align-items: center; + //align-items: center; //height: 40px; // border: 1px solid black; .namebox { @@ -248,6 +251,7 @@ margin-left: 14px; flex: 1; .addimg { + cursor:pointer; color: rgba(78, 166, 255, 1); font-size: 14px; }