diff --git a/README.md b/README.md index 3dee4fd0..8e7d558b 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,7 @@ LevelAddDetail.vue:创建关卡页面 ProjectManage.vue:项目页面 ProjectAdd.vue:创建项目页面 TaskPage.vue:任务页面 +TaskAdd.vue:创建任务页面 TemplateLibrary.vue:模板页面 ``` diff --git a/src/assets/images/coursewareManage/gan.png b/src/assets/images/coursewareManage/gan.png new file mode 100644 index 00000000..f8442bb0 Binary files /dev/null and b/src/assets/images/coursewareManage/gan.png differ diff --git a/src/assets/images/coursewareManage/reset0.png b/src/assets/images/coursewareManage/reset0.png new file mode 100644 index 00000000..e9f628fa Binary files /dev/null and b/src/assets/images/coursewareManage/reset0.png differ diff --git a/src/assets/images/coursewareManage/reset1.png b/src/assets/images/coursewareManage/reset1.png new file mode 100644 index 00000000..2ad08ea4 Binary files /dev/null and b/src/assets/images/coursewareManage/reset1.png differ diff --git a/src/assets/images/projectadd/delete.png b/src/assets/images/projectadd/delete.png new file mode 100644 index 00000000..f1578bba Binary files /dev/null and b/src/assets/images/projectadd/delete.png differ diff --git a/src/assets/images/projectadd/delete1.png b/src/assets/images/projectadd/delete1.png new file mode 100644 index 00000000..b51497f3 Binary files /dev/null and b/src/assets/images/projectadd/delete1.png differ diff --git a/src/assets/images/projectadd/keep.png b/src/assets/images/projectadd/keep.png new file mode 100644 index 00000000..98bec4c7 Binary files /dev/null and b/src/assets/images/projectadd/keep.png differ diff --git a/src/assets/images/projectadd/right.png b/src/assets/images/projectadd/right.png new file mode 100644 index 00000000..995670c6 Binary files /dev/null and b/src/assets/images/projectadd/right.png differ diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 06af3842..8cdd00d3 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -580,19 +580,20 @@
搜索
- +
重置
-
i
+
已选择 1
列表选项总计:5条
@@ -628,7 +629,7 @@ - + @@ -665,12 +666,12 @@
搜索
- +
重置
-
- -
新建开课
+
+
+
新建开课
@@ -707,10 +708,7 @@ -
+
@@ -864,7 +862,7 @@
搜索
- +
重置
@@ -915,7 +913,6 @@
- @@ -1580,38 +1577,180 @@ export default defineComponent({ const getTableDate = () => { let data = state.tableData; - // data.map((value) => { - // value.operation = ( - // // value.courseform === '面授' ? - //
- //
- // 开课 - // 停用 - // 编辑 - // {}} class={value.status === '已审核' ? "activecls" : "errorCls"} style={{ "margin-left": "25px" }} >管理 - // 复制 - // - // 授权 - //
- //
- // 权限名单 - //
归属权
- //
管理权
- //
查看权
- //
- //
- // - // 更多 - //
- //
- //
- //
- //
- // ); - // }); + data.map((value) => { + { + //单层项目 + value.operation = ( +
+
+ {value.status === "已审核" ? ( +
+ +
开课
+
+ + +
管理
+
+ +
复制
+ + + +
权限名单
+
+ +
{ + console.log("点击了"); + }} + > + 归属权 +
+
+ +
查看权
+
+ +
管理权
+
+
+ + + +
复制
+
+ +
{ + console.log("点击了"); + }} + > + 取消 +
+
+
+ +
+ ) : ( +
+ )} + {value.status === "待审核" ? ( +
+ +
开课
+
+ +
撤回
+ + + +
权限名单
+
+ +
{ + console.log("点击了"); + }} + > + 归属权 +
+
+ +
查看权
+
+ +
管理权
+
+
+ +
+ ) : ( +
+ )} + {value.status === "未提交" ? ( +
+ +
开课
+
+ +
编辑
+ +
复制
+
+ ) : ( +
+ )} + {value.status === "审核未通过" ? ( +
+ +
开课
+
+ +
编辑
+ +
复制
+ + + +
权限名单
+
+ +
{ + console.log("点击了"); + }} + > + 归属权 +
+
+ +
查看权
+
+ +
管理权
+
+
+ +
删除
+ +
+ ) : ( +
+ )} +
+
+ ); + } + }); state.tableData = data; }; getTableDate(); @@ -2207,48 +2346,72 @@ export default defineComponent({ .op_box { 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; - align-items: center; - position: absolute; - left: 0px; - top: 18px; - z-index: 9999 !important; + // .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; + // align-items: center; + // position: absolute; + // left: 0px; + // top: 18px; + // z-index: 9999 !important; + // } + // } + // .more:hover .moreArrow { + // background-image: url("@/assets/images/navtop/up.png"); + // } + // .more:hover .moreItems { + // display: block; + // } + // } + } + .operation { + display: flex; + justify-content: right; + .nSelect { + .nselect { + display: flex; + .jc { + color: #4ea6ff; + font-size: 14px; + margin-left: 20px; } } - .more:hover .moreArrow { - background-image: url("@/assets/images/navtop/up.png"); - } - .more:hover .moreItems { - display: block; + } + .tableSelect { + margin-right: 20px; + display: flex; + align-items: center; + justify-content: right; + .g1 { + color: #4ea6ff; + font-size: 14px; } } } @@ -2499,32 +2662,82 @@ export default defineComponent({ background-size: 100% 100%; } } - .b_sub { + .gpm_inputbtn{ + width: 90%; + margin: 20px auto; display: flex; - margin-bottom: 10px; - .bs_type { - color: #999ba3; + .gpm_btn { + width: 100px; + height: 40px; + margin-right: 14px; + background: #ffffff; + border: 1px solid #4EA6FF; + border-radius: 8px; + display: flex; + align-items: center; + justify-content: center; + flex-shrink: 0; + cursor: pointer; + .btnText { + color: #4EA6FF; + font-size: 14px; + font-weight: 400; + line-height: 40px; + } } - .bs_left { - color: #999ba3; - margin-left: 35px; + .btn1 { + .search { + width: 15px; + height: 17px; + margin-right: 6px; + background-image: url("../../assets/images/courseManage/search1.png"); + } } - .bs_right { - color: #4f5156; + .btn2 { + .reset { + width: 16px; + height: 18px; + margin-right: 6px; + background-image: url("../../assets/images/courseManage/reset1.png"); + } + } + .btn1:hover { + background: #4EA6FF; + .search { + background-image: url("@/assets/images/coursewareManage/search0.png"); + } + .btnText { + color: #ffffff; + } + } + .btn2:hover { + background: #4EA6FF; + .reset { + background-image: url("@/assets/images/coursewareManage/reset0.png"); + } + .btnText { + color: #ffffff; + } } } - .b_menu { - width: calc(100%); - } - .b_menunav { + .gpm_notice{ display: flex; - margin-top: 20px; - margin-bottom: 20px; - .bm_select { - margin-right: 20px; + background: rgba(78,166,255,0.25); + border: 1px solid #4EA6FF; + width: 90%; + height: 62px; + margin:20px auto; + align-items: center; + line-height: 64px; + .th_icon{ + width: 16px; + height: 16px; + background-image: url(@/assets/images/coursewareManage/gan.png); + background-size: 100% 100%; + margin: auto 13px auto 37px; } - .bm_input { - margin-right: 20px; + .textarea{ + margin-right: 33px; } } .gpm_table{ @@ -2605,52 +2818,64 @@ export default defineComponent({ .search { width: 15px; height: 17px; - background-image: url("../../assets/images/courseManage/search1.png"); + margin-right: 6px; + background-image: url("@/assets/images/coursewareManage/search1.png"); } } .btn2 { - .search { + .reset { width: 16px; height: 18px; - background-image: url("../../assets/images/courseManage/reset1.png"); - } - } - .btn3 { - .search { - width: 17px; - height: 18px; - background-image: url("../../assets/images/courseManage/add1.png"); - margin-right: 5px; + margin-right: 6px; + background-image: url("@/assets/images/coursewareManage/reset1.png"); } } .btn1:hover { - background: rgba(64, 158, 255, 1); + background: #4EA6FF; .search { - background-image: url("../../assets/images/courseManage/search0.png"); + background-image: url("@/assets/images/coursewareManage/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"); + background: #4EA6FF; + .reset { + background-image: url("@/assets/images/coursewareManage/reset0.png"); } .btnText { color: #ffffff; } } } + .stm_btn3{ + width: 130px; + height: 40px; + border: 1px solid #4EA6FF; + background-color: #4EA6FF; + border-radius: 8px; + display: flex; + align-items: center; + justify-content: center; + flex-shrink: 0; + cursor: pointer; + .btnText { + font-size: 14px; + font-weight: 400; + line-height: 40px; + } + .btn3 { + .add { + width: 17px; + height: 18px; + background-image: url("@/assets/images/coursewareManage/add0.png"); + background-size: 100% 100%; + margin-right: 6px; + } + } + } + .stm_table{ width: 90%; margin:30px auto; @@ -2891,13 +3116,15 @@ export default defineComponent({ .search { width: 15px; height: 17px; + margin-right: 6px; background-image: url("../../assets/images/courseManage/search1.png"); } } .btn2 { - .search { + .reset { width: 16px; height: 18px; + margin-right: 6px; background-image: url("../../assets/images/courseManage/reset1.png"); } } @@ -2912,7 +3139,7 @@ export default defineComponent({ } .btn2:hover { background: rgba(64, 158, 255, 1); - .search { + .reset { background-image: url("../../assets/images/courseManage/reset0.png"); } .btnText { diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue new file mode 100644 index 00000000..1a642635 --- /dev/null +++ b/src/views/projectcenter/TaskAdd.vue @@ -0,0 +1,1208 @@ + + + + + \ No newline at end of file diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index cdcb8dc4..79f87126 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -20,7 +20,7 @@
-
+
-
+
返回
-
@@ -258,10 +257,11 @@ width: 100%; display: flex; flex-direction: column; - position: relative; + //position: relative; .header { width: 100%; display: flex; + flex-wrap: wrap; .box { border: 12px solid #E7F2FF; margin: 16px 0 16px 19px; @@ -270,12 +270,13 @@ } .imgfor { display: flex; + flex: 1; flex-direction: column; margin-top: 38px; - //margin-left: 15px; + margin-left: 15px; //float: left; - position: absolute; - left: 210px; + //position: absolute; + //left: 210px; .forz { font-size: 16px; color: #363636; @@ -289,9 +290,9 @@ } .right { display: flex; - position: absolute; - right: 10px; - top: 5px; + //position: absolute; + //right: 10px; + //top: 5px; //float: right; .end { border-left: 1px solid #E8EFFA; diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue index 29dc7116..1726270e 100644 --- a/src/views/research/ResearchAdd.vue +++ b/src/views/research/ResearchAdd.vue @@ -278,6 +278,7 @@ margin-bottom: 14px; .btn { display: flex; + margin-bottom: 20px; justify-content: center; cursor: pointer; }