From 731204574a4430ba4d0e2d60cff6db334ae8c332 Mon Sep 17 00:00:00 2001 From: dongwug Date: Tue, 11 Oct 2022 17:28:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat=EF=BC=9A=E8=A7=A3=E5=86=B3=E5=86=B2?= =?UTF-8?q?=E7=AA=81=EF=BC=8C=E8=A1=A5=E5=9B=9E=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/coursewareManage/gan.png | Bin 0 -> 352 bytes src/assets/images/coursewareManage/reset0.png | Bin 0 -> 486 bytes src/assets/images/coursewareManage/reset1.png | Bin 0 -> 598 bytes src/views/courselibrary/CoursewareManage.vue | 181 ++++++++++++------ 4 files changed, 121 insertions(+), 60 deletions(-) create mode 100644 src/assets/images/coursewareManage/gan.png create mode 100644 src/assets/images/coursewareManage/reset0.png create mode 100644 src/assets/images/coursewareManage/reset1.png diff --git a/src/assets/images/coursewareManage/gan.png b/src/assets/images/coursewareManage/gan.png new file mode 100644 index 0000000000000000000000000000000000000000..f8442bb09df0d97e33658dd3c7c5da4626ede14e GIT binary patch literal 352 zcmV-m0iXVfP)Px$8c9S!R5(wal07d(K@^6cbFI)&+l0`d-akMh(fQ~VVwEb9sKiHzN^DfhT~X*X zloE+wpph+XBOxJ5n#FaG%+9)*%h`xM-OPKQIUn;1ZH8pHH64g@ECbUBLk&&21J09} z19s*9J3j?GHngb1A<*5TiMl9DpW9M#dIM}iK??E6$wwS${;y{ElJ)*2jJ7 y&J|Ryjqh+*mI2INI>)32XlAr!x%BmanEVUg18)Kt7O6`B0000@P)Px$ph-kQR5(wS)JupDP!z}U&#&3pSg;^U*;=rWBuW-G>}<#*NyI`P$*YJghCCN6 zJkmtUPIgj~Px%5J^NqR5(wSlubyKQ51%s*U6wDTGXO22;8=)MMOk0cP!l0E`p>?=Nn0C5&a;g zL4UNcD655m*7to3giqPl4qIW5qzLGokG;I9y|NkGAW0~Xh5TVbiYp#Zs zV(G}51%qa6QYN-;Gft*b)ZK5@mudisCLP*y#JF5!9$4%HZK(G0Oxa1v>l47ZV7L(I zzkiieNLO_18|W&2EHd5Tr}7(vCL=nqZ&v< zzpYHw@)4s;F18gIZxKB{t25OA(vjr_+ZHXPetM8Hu^lnvl8L5bR`)6)>Cid_DW6l1 zi|hn&4%p=b4b6^nCbB_;W}tJ)FRtC~(6
搜索
-
+
重置
-
i
+
已选择 1 项
列表选项总计：5条
@@ -628,7 +629,7 @@ - + @@ -665,12 +666,12 @@
搜索
-
+
重置
-
-
-
新建开课
+
+
+
新建开课
@@ -707,10 +708,7 @@ -
+
@@ -864,7 +862,7 @@
搜索
-
+
重置
@@ -915,7 +913,6 @@
- @@ -2499,32 +2496,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 +2652,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 +2950,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 +2973,7 @@ export default defineComponent({ } .btn2:hover { background: rgba(64, 158, 255, 1); - .search { + .reset { background-image: url("../../assets/images/courseManage/reset0.png"); } .btnText { From da2e87a940a279a8dfb725c8f971f709d765a814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Tue, 11 Oct 2022 17:55:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=E5=88=9B=E5=BB=BA=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + src/assets/images/projectadd/delete.png | Bin 0 -> 306 bytes src/assets/images/projectadd/delete1.png | Bin 0 -> 269 bytes src/assets/images/projectadd/keep.png | Bin 0 -> 1201 bytes src/assets/images/projectadd/right.png | Bin 0 -> 246 bytes src/views/projectcenter/TaskAdd.vue | 1208 ++++++++++++++++++++++ src/views/projectcenter/TaskPage.vue | 21 +- src/views/research/ResearchAdd.vue | 1 + 8 files changed, 1221 insertions(+), 10 deletions(-) create mode 100644 src/assets/images/projectadd/delete.png create mode 100644 src/assets/images/projectadd/delete1.png create mode 100644 src/assets/images/projectadd/keep.png create mode 100644 src/assets/images/projectadd/right.png create mode 100644 src/views/projectcenter/TaskAdd.vue 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/projectadd/delete.png b/src/assets/images/projectadd/delete.png new file mode 100644 index 0000000000000000000000000000000000000000..f1578bba12adc973969f604f2e92e5d619d70b4b GIT binary patch literal 306 zcmV-20nPr2P)Px#>`6pHR5(xVQZa7AKoFdP7vu#L6!eHDO5rm-kKmkwDnj`{#0M;tDg{0sL5tuh zA~!sN6zL=J0@&y*WF7Vemuc8$wL7EH?(7nQh>TPx#$4Nv%R5(xVl06PVK@^3*vji(pDDPx(Ye_^wR9HvVnOkUFRTPH*b;dHc*koohl{1+{NrtGzOKJi|A`&kkNGsYtc)_Zu zsI8zcRUdqB5q(Gni{Mi?Eug#=_3u`2%t^rzOJ8$h$VFeGgqLgGH?b= z`(yslXGCPl_>uxmt!8h5r5ytJJ{hO7HUu2c=e51@j?lD|#t}4?GhPB?0)XGinPU58 zFy7Mr;fZGH&=8cFJt@<8pNRG<0=SgXC%P~60uf!d6WW3b$aK#57@((IMr+mln+0EZ z=Md3ats`5|l$kvQ(4JPKs_FSt-51$in+A2DNz-_dfREIIv`0mZH}pW{y-IIYpvBou zrvL=n6H?jB8Z2up7L1-Od#D0Uo5l|eJkZR2(llV^SCt479Wi+wVOsZwM~Nt3wcyX? z=C@nSUpMpg!MP)tT}oA%ygINQvrB1w|F;;3`tP9|Mv&;xA+&vgD8{3AU~AWaBrxrc z`NLCHph?p>LBO^~9x|(!u>beNb=TCTJ)somD*1QRQS00`Z!+cf7l5W7Wl!qzx!wrbj6qe;q_*!c7uvo;wL5Yb~5IV zJXZuYv$Fs-O`JxcPxg)%a_@`eG28##)iZ|afBv-1VM)-e?h9|BlsVrA@Lx`2&ZEH2C_o1&nKRxc#y+Qj|1BscDPM#41J#b8OO4}t(&+4RULY#g}xTJaw{#jNrM8D z%9CkhK?{>fZF$;A(8BVhy5MglXko!GZlT6G0R3+E`p0|k#n9#(*Cz*+PPW{jtRQx< zlM8>~=*25HW62yXZlR?^$w3faa|0@7aopdHq0N1g%hMuGEzDM}5|W@5hmz&YC^YRC zH=t5<4n{JdRmVKxPxav33h=(cUFh*gnz^VxI15YFtB5M7NFC9m%|Dx~h!9-u%Uv0& zb5jseZ>IxegUelEQvHvv%VhCAda!$a-dvjni1Jum6D1u1D~e=ux%nvuo=}}Ein?zX zeBsBWi)3ZkjV(L!l@2c!r*&C%o?m+-P#a?ofwN}Wjf?dttS}Ki?J4JQV&cF%I zYkS&K8ZQTCW=fkz@v(t1;s&VJw)EI=Am$GpZtG)1Z6NV{qY*y?kl0${lF(@azGG;U zSN-|M4(LKIGw89j;o^fBbRr4@qyg44fzlS!SRCYEgyyUH5(p{5l<60!Tcq;pZ3WnWR#1=j1N>ZF5-w}VO zY})ZRZ`K{U!soyr-Wg_g@up_`O37oK8}+lbtXL|Sc$+emMXqVQ?Ap3ud2>Bu+sd!A zmFmwgnbvHuku|BN`J&mikA^qR8>Tv5Y{-z!{>;cB6z%16y2v<#dzb#(tYc^R89v|d t4=Clnr&zUq5)Y literal 0 HcmV?d00001 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; } From e53798cb5f06a3239508fef2ce685e1225821996 Mon Sep 17 00:00:00 2001 From: dongwug Date: Tue, 11 Oct 2022 18:31:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat=EF=BC=9A=E6=93=8D=E4=BD=9C=EF=BC=88?= =?UTF-8?q?=E6=B2=A1=E5=BC=84=E5=AE=8C=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 310 ++++++++++++++----- 1 file changed, 238 insertions(+), 72 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index d0a9aea0..8cdd00d3 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1577,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(); @@ -2204,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; } } }