From 195af21a9d1ab37f3b9a6e07f09f5bc5e62b2bb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Mon, 10 Oct 2022 11:11:43 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=E5=88=9B=E5=BB=BA=E8=B0=83=E7=A0=94?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/research/ResearchAdd.vue | 224 ++++++++++++++++++++++++++++- 1 file changed, 217 insertions(+), 7 deletions(-) diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue index bbe46ff7..a36dde4c 100644 --- a/src/views/research/ResearchAdd.vue +++ b/src/views/research/ResearchAdd.vue @@ -1,16 +1,113 @@ - \ No newline at end of file From 27b783c10ec4ad6abcb1470118545b1cacf3e0e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Mon, 10 Oct 2022 14:06:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=E8=B0=83=E7=A0=94=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/research/ResearchManage.vue | 722 ++++++++++++++++++++------ 1 file changed, 557 insertions(+), 165 deletions(-) diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue index c40e72e1..e19da759 100644 --- a/src/views/research/ResearchManage.vue +++ b/src/views/research/ResearchManage.vue @@ -1,174 +1,566 @@ - + - \ No newline at end of file + .btns { + display: flex; + // flex-wrap: wrap; + .btn { + padding: 0px 26px 0px 26px; + height: 38px; + background: rgba(64, 158, 255, 0); + border-radius: 8px; + border: 1px solid rgba(64, 158, 255, 1); + display: flex; + align-items: center; + justify-content: center; + margin-right: 14px; + flex-shrink: 0; + cursor: pointer; + .search { + background-size: 100%; + } + .btnText { + font-size: 14px; + font-weight: 400; + color: rgba(64, 158, 255, 1); + line-height: 36px; + margin-left: 5px; + } + } + .btn1 { + .search { + width: 15px; + height: 17px; + background-image: url("../../assets/images/courseManage/search1.png"); + } + } + .btn2 { + .search { + width: 16px; + height: 18px; + background-image: url("../../assets/images/courseManage/reset1.png"); + } + } + .btn3 { + margin-right: 0px; + .search { + width: 17px; + height: 18px; + background-image: url("../../assets/images/courseManage/add1.png"); + } + } + .btn1:hover { + background: rgba(64, 158, 255, 1); + .search { + background-image: url("../../assets/images/courseManage/search0.png"); + } + .btnText { + color: #ffffff; + } + } + .btn2:hover { + background: rgba(64, 158, 255, 1); + .search { + background-image: url("../../assets/images/courseManage/reset0.png"); + } + .btnText { + color: #ffffff; + } + } + .btn3:hover { + background: rgba(64, 158, 255, 1); + .search { + background-image: url("../../assets/images/courseManage/add0.png"); + } + .btnText { + color: #ffffff; + } + } + } + } + .tableBox { + margin: 20px 38px 30px ; + th.h { + background-color: #eff4fc !important; + } + + .ant-table-tbody + > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) + > td { + background: #f6f9fd; + } + } + .out { + display: block; + position: absolute; + top: 120px; + width: 600px; + // height: 525px; + background-color: #fff; + + box-shadow: 0 0 10px rgba(118, 136, 166, 0.21); + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + .top { + width: 100%; + height: 68px; + + background: linear-gradient( + rgba(78, 166, 255, 0.2) 0%, + rgba(78, 166, 255, 0) 100% + ); + display: flex; + align-items: center; + .topimg { + width: 18px; + height: 18px; + margin-left: 27px; + } + .topc { + color: #000000; + font-size: 16px; + margin-left: 8px; + } + } + .mid { + width: 100%; + height: 100%; + background-color: #fff; + display: flex; + flex-direction: column; + align-items: center; + .d { + // margin-top: 8px; + // color: #ff4e4e; + margin-left: -5px; + } + .name { + width: 78%; + // background-color: lightcoral; + display: flex; + margin-top: 20px; + align-items: center; + height: 40px; + // border: 1px solid black; + + .inname { + color: #6f6f6f; + font-size: 14px; + margin-left: 7px; + } + .in { + margin-left: 14px; + width: 81%; + .ant-input { + border-radius: 5px; + // height: 120%; + width: 100%; + height: 40px; + } + } + } + .btn { + width: 33%; + margin-top: 30px; + display: flex; + justify-content: space-between; + margin-bottom: 30px; + .samtn { + width: 100px; + height: 40px; + font-size: 14px; + border: 1px solid #4ea6ff; + border-radius: 8px; + cursor: pointer; + } + .btn1 { + background-color: #fff; + color: #4ea6ff; + } + .btn2 { + margin-left: 10px; + background-color: #4ea6ff; + color: #fff; + } + } + } + } + .unout { + display: none; + } + + .opa { + display: flex; + justify-content: right; + .opacation { + font-size: 14px; + font-weight: 400; + color: #4ea6ff; + // line-height: 36px; + .activecls { + display: inline-block; + } + .errorCls { + display: none; + } + .more { + position: relative; + .moreArrow { + width: 13px; + height: 7px; + display: inline-block; + background-image: url("../../assets/images/navtop/down.png"); + background-size: 100%; + margin: 2px; + margin-left: 7px; + } + .moreItems { + width: 80px; + height: 70px; + display: none; + background: #ffffff; + box-shadow: 2px 3px 9px 3px rgba(0, 0, 0, 0.05); + border-radius: 3px; + border: 0px solid #dcdcdc; + position: absolute; + left: 0px; + top: 18px; + z-index: 100; + } + } + } + } +} + From 5f90efd974de03a867c80fa0ab5ec007e8a2d6ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=99=93=E9=B8=BD?= Date: Mon, 10 Oct 2022 18:11:31 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=A1=A8=E6=A0=BC=E4=B8=8B=E6=8B=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/common.scss | 47 +- src/components/NavTop.vue | 3 +- src/views/courselibrary/CoursewareManage.vue | 1450 ++++++++++-------- src/views/learningpath/LevelAdd.vue | 4 +- src/views/projectcenter/ProjectManage.vue | 1001 +++++++++++- 5 files changed, 1795 insertions(+), 710 deletions(-) diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss index a6068f6b..3e8dce2d 100644 --- a/src/assets/scss/common.scss +++ b/src/assets/scss/common.scss @@ -78,7 +78,6 @@ border: 1px solid #C7CBD2 !important; // 表格--------------------------------- .tableBox{ - .ant-table-row .ant-table-cell{ height: 48px ; font-size: 14px; @@ -148,4 +147,48 @@ border: 1px solid #C7CBD2 !important; display: none; } } -} \ No newline at end of file +} +// 表格--------------------------------- +//表格下拉框------------------------------------------- +.tableSelect { + margin-left: 21px; + display: inline-block; + .ant-select:not(.ant-select-customize-input) + .ant-select-selector + .ant-select-selection-search-input { + background-color: rgba(255, 255, 255, 0); + border: none; + } + .ant-select:not(.ant-select-customize-input) .ant-select-selector { + background-color: rgba(255, 255, 255, 0); + border: none; + } + .ant-select-single:not(.ant-select-customize-input) .ant-select-selector { + padding: 0; + } + .ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) + .ant-select-selector { + box-shadow: none; + } + .ant-select-arrow { + right: 0px; + color: rgba(0, 0, 0, 0.8); + font-size: 14px; + line-height: 36px; + // top: 17px; + top:14px; + } + .ant-select-selection-item { + font-size: 14px; + font-weight: 400; + color: #4ea6ff; + line-height: 36px; + } + .ant-select-single.ant-select-open .ant-select-selection-item{ + color: #4ea6ff; + } +} +.tabledropdown { + width: 100px !important; +} +//表格下拉框------------------------------------------- \ No newline at end of file diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue index 7cd518d1..b8e05d2a 100644 --- a/src/components/NavTop.vue +++ b/src/components/NavTop.vue @@ -112,7 +112,7 @@ export default { } .roleItems { width: 109px; - height: 80px; + height: 90px; padding-top: 10px; background: #ffffff; box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); @@ -121,6 +121,7 @@ export default { right: 0px; text-align: center; display: none; + z-index: 100; } .roleItem { font-size: 14px; diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 03da7922..0f230fd6 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -6,13 +6,25 @@
- +
- +
- +
- +
- +
-
- -
搜索
-
-
- -
重置
-
-
- -
导出
-
-
- -
新建课程
-
+
+ +
搜索
+
+
+ +
重置
+
+
+ +
导出
+
+
+ +
新建课程
+
- +
-
+
- - 课程名称 + + 课程名称
- +
课程命名规则
-
-
- 收起 +
+
+ 收起
-
- 展开 +
+ 展开
-
- - 1、课程名称统一不加书名号。
- 2、项目名称、属地等信息如需体现在课程名称中,请放在课程名称信息 - 之后,如“时间管理(GROW180项目)”或“时间管理(B*)”确保首先 - 看到的是课程内容主题。
- 3、同一课程如先后有多个版本,原则上仅开放最新版本,旧版本应停用 - 版本如必须以年份标明,请以“沟通技巧(2022年)”的方式呈现。 +
+ + 1、课程名称统一不加书名号。
+ 2、项目名称、属地等信息如需体现在课程名称中,请放在课程名称信息 + 之后,如“时间管理(GROW180项目)”或“时间管理(B*)”确保首先 + 看到的是课程内容主题。
+ 3、同一课程如先后有多个版本,原则上仅开放最新版本,旧版本应停用 + 版本如必须以年份标明,请以“沟通技巧(2022年)”的方式呈现。
- - 授课形式 + + 授课形式
- 线上 + 线上
-
+
- 面授 + 面授
-
+
- - 是否设置目录 + + 是否设置目录
- +
- +