From 022bdb258108cd3c6cc7f194d75c1b3361988679 Mon Sep 17 00:00:00 2001 From: dongwug Date: Tue, 11 Oct 2022 15:36:41 +0800 Subject: [PATCH 1/8] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E5=BC=80=E8=AF=BE?= =?UTF-8?q?=E5=AD=A6=E5=91=98=E7=AE=A1=E7=90=86=E5=BC=B9=E7=AA=97=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=B8=80=E4=BA=9B=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../images/coursewareManage/asterisk.png | Bin 0 -> 360 bytes src/assets/images/coursewareManage/close.png | Bin 0 -> 695 bytes src/assets/images/coursewareManage/down.png | Bin 0 -> 199 bytes .../images/coursewareManage/enclosure.png | Bin 0 -> 628 bytes src/assets/images/coursewareManage/export.png | Bin 0 -> 1166 bytes .../images/coursewareManage/export1.png | Bin 0 -> 372 bytes .../images/coursewareManage/givepower.png | Bin 0 -> 489 bytes src/assets/images/coursewareManage/scht.png | Bin 0 -> 501 bytes src/assets/images/coursewareManage/stum.png | Bin 0 -> 469 bytes src/assets/images/coursewareManage/up.png | Bin 0 -> 203 bytes src/views/courselibrary/CoursewareManage.vue | 829 ++++++++++++++---- 11 files changed, 646 insertions(+), 183 deletions(-) create mode 100644 src/assets/images/coursewareManage/asterisk.png create mode 100644 src/assets/images/coursewareManage/close.png create mode 100644 src/assets/images/coursewareManage/down.png create mode 100644 src/assets/images/coursewareManage/enclosure.png create mode 100644 src/assets/images/coursewareManage/export.png create mode 100644 src/assets/images/coursewareManage/export1.png create mode 100644 src/assets/images/coursewareManage/givepower.png create mode 100644 src/assets/images/coursewareManage/scht.png create mode 100644 src/assets/images/coursewareManage/stum.png create mode 100644 src/assets/images/coursewareManage/up.png diff --git a/src/assets/images/coursewareManage/asterisk.png b/src/assets/images/coursewareManage/asterisk.png new file mode 100644 index 0000000000000000000000000000000000000000..49c7ac9940b2867a162b34fc066026b765f6ae67 GIT binary patch literal 360 zcmV-u0hj)XP)Px$B1uF+R47wjk3lO$VHAd+Gv6IoCS}Dm7fr?$DP?PCGuE@2>?d1E{s22EC97FU zc1od0@h4_OnTyhlQX)j|%yo~x(P(mZ@AE#L&Jq4i6>rlbpZaoVC7t0ETp#b=LZv?J zL)h*`K`tRV2@MNx@B)xTj@pRLRYu)Wf~Ev`WuOqFJ28zd2X`05HH5_`$t6Kb3G`TQ z8Qh4_MFU+i`liUcqQ)TI0)5{QI>>hG#yis4CNihUtRO`|VmJUjF?^l-JlFo7sW6aA z;T$SVTTvk}eCBh!yxL`LQ35h$K^7ud5$H+48nB!yO!kth z07DU480X=rC0>!vx|qF)XmyOoi(l41Px%aY;l$R7gwhl{;uuK@^6+nd^eY#0MxLm0D;(L%8?OT_5;p5^c3e6BT?kidqOZ zDeMFxU?o-t8^uCIP*IF8#7c=f!zOMcEGmMCg~fI*o4rRyHV}fldp9U)a^O~T=Kt>b z&*6+>2|_IalV#|Cb$!`hZ?DSd^SjeDeQ&L;W%1h>ldIS3`C_s77LaCln%ZlOIRe}P zo>eN9L*;V0+6rup=~7BP6p>*OIp&=6cmEnqp&^@9FOD zegfipF4*73rUg;h{$VTJ#f!jI||h2i-lphHVA@AU?=cZM24Jmu?ipXu}+zBA{qQ)5iGtYqt_*Adghl<7Gmv;Sc3-tnV9Pd&}dGQ`#!diPe zpU?NEY5Ee_4t$)QogJE9{uiuP-*p8{RL%|`#W0;OuTI$SE1eq`0k z3~luIfFCMgWdq=XAUHTRHT5$qu%k+Sau|kNf*^PU^fe&k*4nX7fE_`jDB7mA_C4%V zN)<(909XNxS!>5T0cWx|48t%80zXI_fEU2w#&-+Qzy)jVwXEQ_&?HHAq-i>-lv)Qo zu2d=`bK5CNl2d7#PAH|6h@5fG-N*uN2{p#-1^lL2Eh6`oQlksEk}>8ia9u=1Ykjg% zDER7IMpNkE;Na$5F82Xg<#({P_V~hWG^cEgxd>eK=OS{{Id^wa8!3vSjaqB}T0F4U zo}b%7&BTl`mw?N_FYipNm#J+}+gUaLJdWdYTI)51LgC7yD(wW;Y3@I*G%I`=n$@XA dT5zX7ID+aB@F0+Rp$002ovPDHLkV1iViKUn|( literal 0 HcmV?d00001 diff --git a/src/assets/images/coursewareManage/down.png b/src/assets/images/coursewareManage/down.png new file mode 100644 index 0000000000000000000000000000000000000000..2d4fe598d7718265971abcc37abbbe90a04fd55e GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp@K+Mj;1|%;R9G3!8jKx9jP7LeL$-D$|8a-VcLo|Yu zb28??IdbAl{n7fi|E0W7e;P{^G_;-TlqXO~$;{b@mI_W!EbyHnB^hRHWYm&WY}Tb_ w(yOrZ|BXML3pp1F$^_~Dm;84IK*un6y85}Sb4q9e0FUlU&j0`b literal 0 HcmV?d00001 diff --git a/src/assets/images/coursewareManage/enclosure.png b/src/assets/images/coursewareManage/enclosure.png new file mode 100644 index 0000000000000000000000000000000000000000..4bdc509739cf26257f3e8a98f215d4eef3bf78ac GIT binary patch literal 628 zcmV-)0*n2LP)Px%E=fc|R5(v{lg&$1aTJE1_jm7A(S!mCqFN-?M(6{Hwzg;yIu=9{Bnleopr()u zQ!8BrE|MaMQrcKKXo!Wblq6S`^dCeJ5$HlHv~n8n+gx7ToiQS=#A1$dHD*TVo^sGiJ|0=*=*-oUaL@;TvwCPi)&%9Cos{s=8%Mk&wCq(wj#iNR9pMC23-6YBz4FQC+e$5S$9`?R)_-ch z61U=zP#6qx05l11MI6`xiNlak(GZ|15^!ch6G%uzI~62AplK6_@!T~X2ZAO0z4z1a z`+onv=L@BUClf=XLli|N)H$V0)?xA{2M5Uackbc~WI2v!s(8^|!VTR=lx(^+1XNpJ zMrEX%8*AU9Ns2l&W>u=Vs?7_AYcqP}!-Td+&=fT}6?(d{f-tC|Wy=xi->!T~1IrZY zXR;d9ydtVwbDKU|++3&_n=3}aq^F($lc7KeY=m_X+N(|=gd)AiE0BF;W@)hJf>%WP zZciWT;2{rLm}NOW&E*7`5x5Dk|Ij3wZ!QUCWp+On zIf--~V^3h&Mx((rPBE^(%yNZ7frUKF^J(Id4mKRDhiNA`*=0~rVEC4YE!P1Nqh52@ zu}G6l@0MVD2eeMG-zL&9Hq;`q$13bs@Af@Ss>}kbsIUji#6|Ir+Z=}HP{}BtRUZd z5t*~TYlFS21*>;1`JR0HShII7g`QZJB*R9t{nxC!CL*9{d!Sr$IM6<=!| zx5%xyqbhPG{Gs;OnVZ|Op=-_R8?ndp&Gt{n+TS(9?0mCdz1oURz*y&#(oGpW-{02Z zmUMnZN}M&p(Trs6$n(;4vy}ny_G_)3;d7VPtG_%n2EHiHU;Fu#(i%PgTz_Y=JrW#p=>l;Px$E=fc|R5(wilf6nqK@f$%^8{(M5eq9z6|t}p74#7lOIxw=0R&UW$|BlWh+q?I z>u4)Tu(1$C5yWQ@iz9Q{4Te5JH{-uL;)5x{QR_4!6F5LrDP&6Lx?uAY$VnP2gA3Q3A{Y*T6-e z#lzaMy#?F=tCHUTyJmYks+9CHw34L7x}?29wx`*8kW?Q9IR$u{kOkm5mQT`m$=D~SIzUs>WnREXU>f)+g#a~4%hjCptoS}KR|*MNa_%1kg|4+W SGJbdf0000Px$qe(7!tPxoC_*ePEFyA; zAXum+3ZRpg%zXpB!2ZnU95zIuHQ&}?nk;> zhU>8(S?o(fou33RBaQ>7l1SgigKDuiWu7MuEl+|M5G%mTB+`W#>&%OTZ9V$7~=@0<*wZOou5tq#Q#$m=aO0b}k4k z+T5Qp_g*#irKqy7;@!i)9Qi%X*36K(d^FKYLbX-2YI9}KP-ncgZ1=@(MH9oIKNnEKI00000NkvXXu0mjf;{My7 literal 0 HcmV?d00001 diff --git a/src/assets/images/coursewareManage/scht.png b/src/assets/images/coursewareManage/scht.png new file mode 100644 index 0000000000000000000000000000000000000000..e3a32e9265447c3a39ebeba961c7fda2fd907aa2 GIT binary patch literal 501 zcmVPx$uSrBfR5(w4(miXFQ5eSY|8W+}tZp zP7ZznL7ObaY7&efRf{j6po>%K;2WaSiip+5rs;FZQz<-3(=(oP{m!}X!>xSTS0(lX zro%EsfR}8Q5HEmt^5)RS zhMdGOaEB%rVz>%SOT4wobgWinG5tU<=4A|JOQ-)sh-G7#aA0TkqFd&HHpdko88zyQ+y-vbKB1UWDdNx${ z?sVWN5k3Eu7+7vcJZO~kJ_(;2PS%V1+G*sH`zIRCX1+5Qe@<0qK7u(x*H+lj3b4Px$k4Z#9R5(v{QZY+hK^UBQr`QKX(grL9tF*yRVkEp3HD2bRo~eH&$7hXdnGUm4-2OZX7b<#SY_&|{ze~8( z!MRNX)u~-32ds zCg44VF%Sz7mQX_lCG68!9Vx>6?icv literal 0 HcmV?d00001 diff --git a/src/assets/images/coursewareManage/up.png b/src/assets/images/coursewareManage/up.png new file mode 100644 index 0000000000000000000000000000000000000000..1521cb9c7b8b483a220c01edc2e5e314e42b6058 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp@K+Mj;1|%;R9G3!8jKx9jP7LeL$-D$|T0LDHLo|X* zCm3=y2MD;NubUQ>qg%u*= -
-
+
请选择课程类型 -
x
+
-
-
- ⃰ +
+
+
课程名称
新建面授课 -
x
+
课程信息
@@ -212,7 +209,7 @@
收起
@@ -379,7 +376,7 @@
- --> +
@@ -400,7 +406,7 @@
在线课程管理 -
x
+
课程：BMOT2021年职级晋升-安全管理（高级）
@@ -452,7 +458,7 @@
-
+
面授课程管理 -
x
+
课程：BMOT2021年职级晋升-安全管理（高级）
@@ -522,7 +528,7 @@
-
+
查看详情 -
x
+
-
+
授权 -
x
+
-
+
开课 -
x
+
新建开课 -
x
+
面授名称：管理者的专属面授课
@@ -816,6 +822,87 @@
+ + +
+
+
+
+
+
+ 学员管理 +
+
+
+
XXX课程-第1期-20220726已开课 4.5
+
时间：2022-07-26 14：30-15：00
+
地点：核心能力大楼培训教室
+
授课教师：王雪han
+
+
+ +
+
+
搜索
+
+
+
+
重置
+
+
+
+
+ 添加学员 +
+
+
+ 批量操作 +
+
+
+
+
+
+
批量录入成绩
+
批量结业
+
批量通过
+
批量拒绝
+
+
+
+
+
导出
+
+ +
+
+
+ +
+
+
+
+
\ No newline at end of file From 99a2c1b97f723612941b140bf0ce31da0a469155 Mon Sep 17 00:00:00 2001 From: dongwug Date: Tue, 11 Oct 2022 16:28:59 +0800 Subject: [PATCH 3/8] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 146 +------------------ 1 file changed, 2 insertions(+), 144 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 614a2aa5..06af3842 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -399,12 +399,6 @@
-
-
-
- 在线课程管理 -
x
-
@@ -470,35 +464,13 @@ />
-
-
-
-
搜索
-
-
-
-
- -
-
-
-
-
- 面授课程管理 -
x
-
@@ -567,41 +539,13 @@
-
-
-
-
搜索
-
-
-
-
- - - -
-
-
-
-
- 查看详情 -
x
-
@@ -621,22 +565,12 @@
取消
-
-
取消
-
-
-
-
-
- 授权 -
x
-
@@ -694,60 +628,13 @@
-
- - - -
-
+
-
-
-
- 开课 -
x
-
@@ -816,36 +703,6 @@ />
-
- -
-
@@ -1058,6 +915,7 @@
+
From 731204574a4430ba4d0e2d60cff6db334ae8c332 Mon Sep 17 00:00:00 2001 From: dongwug Date: Tue, 11 Oct 2022 17:28:57 +0800 Subject: [PATCH 4/8] =?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 5/8] =?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 6/8] =?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; } } } From 866d114b2a076478d298641ae1c568f3ca9cf411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=99=93=E9=B8=BD?= Date: Tue, 11 Oct 2022 18:44:03 +0800 Subject: [PATCH 7/8] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E5=85=B3=E5=8D=A1=E5=A4=9A=E9=80=89=E6=A1=86=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=85=B3=E5=8D=A1tab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/common.scss | 6 +- src/views/learningpath/LearningPath.vue | 18 +++++- src/views/learningpath/LevelAdd.vue | 10 ++- src/views/learningpath/LevelAddDetail.vue | 77 +++++++++++++++++------ 4 files changed, 88 insertions(+), 23 deletions(-) diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss index 5386258b..ef0cdae0 100644 --- a/src/assets/scss/common.scss +++ b/src/assets/scss/common.scss @@ -210,7 +210,11 @@ display: none; overflow-x: scroll; display: flex; flex-direction: column; - + height: 100%; + .contentMain { + flex: 1; + overflow-y: scroll; + } }} //抽屉-------------------------------------------------------- diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index b1476f3e..3e404ded 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -137,8 +137,22 @@ @click="chooseImg(item.id)" v-for="item in imgData" :key="item.key" + style=" + border-radius: 8px; + width: 136px; + height: 106px; + background-size: 100%; + background-repeat: no-repeat; + " + :style="{ + border: + learnPathBg === item.id + ? '2px solid rgba(78, 166, 255, 1)' + : '2px solid rgba(78, 166, 255, 0)', + 'background-image': 'url(' + item.source + ')', + }" > - +
@@ -245,6 +259,7 @@ export default { source: require("../../assets/images/leveladd/3.png"), }, ], + learnPathBg: null, //选择的路径图背景 currentPage: 1, tableDataTotal: 100, pageSize: 10, @@ -371,6 +386,7 @@ export default { }; const chooseImg = (id) => { console.log(id); + state.learnPathBg = id; }; const getTableDate = () => { let data = state.tableData; diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 8800568b..0ee1ef9e 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -48,7 +48,7 @@
@@ -268,6 +268,7 @@ export default { methods: {}, setup() { const state = reactive({ + gatename: null, //关卡名称 projectNameList: [ { id: 1, @@ -354,7 +355,7 @@ export default { }, }; - \ No newline at end of file + From 0813131d98711cd9e70b3d4a96e7664d538c0659 Mon Sep 17 00:00:00 2001 From: dongwug Date: Wed, 12 Oct 2022 08:55:11 +0800 Subject: [PATCH 8/8] =?UTF-8?q?feat=EF=BC=9A=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 663 ++++++++++++------- 1 file changed, 438 insertions(+), 225 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 8cdd00d3..58fd3297 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -139,14 +139,16 @@ >⃰ 授课形式 -
-
- 线上 -
-
-
- 面授 -
+ +
+
+
线上
+
+
+
面授
+
+
+
@@ -154,14 +156,12 @@ >⃰ 是否设置目录 -
-
-
- 是 -
-
-
- 否 + +
+
是
+
否
+
+
@@ -624,7 +624,7 @@ > @@ -901,13 +901,31 @@
@@ -1177,6 +1195,82 @@ const columns5 = [ align: "center", }, ]; +const columns6 = [ + { + title: '序号', + width: 200, + dataIndex: 'num', + key: 'num', + align: "center", + }, { + title: '姓名', + width: 200, + dataIndex: 'name', + key: 'name', + }, { + title: '工号', + width: 200, + dataIndex: 'number', + key: '1', + align: "center", + }, { + title: '部门', + width: 200, + dataIndex: 'department', + key: '2', + align: "center", + }, { + title: ' 岗位', + width: 300, + dataIndex: 'postion', + key: '3', + align: "center", + }, { + title: 'Band', + width: 200, + dataIndex: 'band', + key: '4', + align: "center", + }, { + title: '报名状态', + width: 200, + dataIndex: 'status', + key: '5', + align: "center", + }, { + title: '加入方式', + width: 200, + dataIndex: 'join', + key: '6', + align: "center", + }, { + title: '签到状态', + width: 200, + dataIndex: 'signstatus', + key: '7', + align: "center", + }, { + title: '评估状态', + width: 200, + dataIndex: 'evastatus', + key: '8', + align: "center", + }, { + title: '结业状态', + width: 280, + dataIndex: 'overstatus', + key: '9', + align: "center", + },{ + title: '操作', + width: 400, + className: "h", + dataIndex: "operation", + key: 'operation', + fixed: 'right', + align: "center", + }, +]; export default defineComponent({ components: { LoadingOutlined, @@ -1363,9 +1457,6 @@ export default defineComponent({ authority: "管理权", }, ], - currentPage: 1, - tableDataTotal: 50, - pageSize: 5, tableData6: [ { key: 1, @@ -1408,6 +1499,86 @@ export default defineComponent({ createtime: "2022-07-14 14:00:00", }, ], + tableData7: [ + { + key: "1", + num: 1, + name: "李梦", + number: "1000", + department: "显示事业", + postion: "产品经理", + band: "Band9", + status: "待审核", + join: "手动加入", + signstatus: "-", + evastatus: "-", + overstatus: "-", + operation: "2022-07-20 9:30", + }, + { + key: "2", + num: 2, + name: "李梦", + number: "1001", + department: "智慧医工", + postion: "产品经理", + band: "Band10", + status: "已通过", + join: "手动加入", + signstatus: "已签到", + evastatus: "已评估", + overstatus: "-", + operation: "2022-07-20 9:30", + }, + { + key: "3", + num: 3, + name: "李梦", + number: "1002", + department: "业务支援", + postion: "产品经理", + band: "Band10", + status: "已拒绝", + join: "手动加入", + signstatus: "-", + evastatus: "-", + overstatus: "-", + operation: "2022-07-20 9:30", + }, + { + key: "4", + num: 4, + name: "李梦", + number: "1003", + department: "业务支援", + postion: "产品经理", + band: "Band9", + status: "已通过", + join: "报名加入", + signstatus: "已签到", + evastatus: "-", + overstatus: "90/已结业", + operation: "2022-07-20 9:30", + }, + { + key: "5", + num: 5, + name: "李梦", + number: "1004", + department: "业务支援", + postion: "产品经理", + band: "Band9", + status: "已通过", + join: "报名加入", + signstatus: "请假", + evastatus: "-", + overstatus: "", + operation: "2022-07-20 9:30", + }, + ], + currentPage: 1, + tableDataTotal: 100, + pageSize: 10, }); // const tableDataFunc = () => { // const columns = [ @@ -1585,163 +1756,193 @@ export default defineComponent({
{value.status === "已审核" ? (
- + +
开课
- +
- +
管理
- +
-
复制
+
+
复制
+
- - -
权限名单
- - -
{ - console.log("点击了"); - }} +
+
+ - 归属权 -
- - -
查看权
- - -
管理权
- - - - - -
复制
- - -
{ - console.log("点击了"); - }} + +
权限名单
+ + +
{ + console.log("点击了"); + }} + > + 归属权 +
+ + +
查看权
+ + +
管理权
+ + +
+
+
+
+ - 取消 -
- - - + +
复制
+ + +
{ + console.log("点击了"); + }} + > + 取消 +
+ + +
+
) : (
)} {value.status === "待审核" ? (
- + +
开课
- +
-
撤回
+
+
撤回
+
- - -
权限名单
- - -
{ - console.log("点击了"); - }} +
+
+ - 归属权 -
- - -
查看权
- - -
管理权
- - - + +
权限名单
+ + +
{ + console.log("点击了"); + }} + > + 归属权 +
+ + +
查看权
+ + +
管理权
+ + +
+
) : (
)} {value.status === "未提交" ? (
- + +
开课
- +
-
编辑
+
+
编辑
+
-
复制
+
+
复制
+
) : (
)} {value.status === "审核未通过" ? (
- +
开课
- +
-
编辑
+
+
编辑
+
-
复制
+
+
复制
+
- - -
权限名单
- - -
{ - console.log("点击了"); - }} + +
+
+ - 归属权 -
- - -
查看权
- - -
管理权
- - - -
删除
+ +
权限名单
+ + +
{ + console.log("点击了"); + }} + > + 归属权 +
+ + +
查看权
+ + +
管理权
+ + +
+
+
+
删除
+
) : (
@@ -1755,7 +1956,60 @@ export default defineComponent({ }; getTableDate(); + const getTableDate2 = () => { + let data2 = state.tableData7; + data2.map((value) => { + { + //单层项目 + value.operation = ( +
+
+ {value.status === "待审核" ? ( +
+
+
通过
+
+
+
拒绝
+
+
+
删除
+
+
+ ) : ( +
+ )} + {value.status === "已通过" ? ( +
+
+
删除
+
+
+ ) : ( +
+ )} + {value.status === "已拒绝" ? ( +
+
+
删除
+
+
+ ) : ( +
+ )} +
+
+ ); + } + }); + state.tableData2 = data2; + }; + getTableDate2(); + + const onftvalue = ref(); + return { + onftvalue, current, ...toRefs(state), fileList, @@ -1766,10 +2020,12 @@ export default defineComponent({ columns3, columns4, columns5, + columns6, // tableDataFunc, handleChange, beforeUpload, getTableDate, + getTableDate2, }; }, @@ -1821,13 +2077,13 @@ export default defineComponent({ hideshow: true, bs_hs: true, ft_hs:false, - om_1: true, - ftm_1:true, + om_1: false, + ftm_1:false, om_ckxq: false, - gpm_hs:true, - stm_hs: true, + gpm_hs:false, + stm_hs: false, cstm_hs:false, - sm_hs:true, + sm_hs:false, }); const of_hShow = () => { @@ -1846,14 +2102,13 @@ export default defineComponent({ } }; const bs_hShow = () => { - if (state.bs_hs == true) { - state.bs_hs = false; - } else { state.bs_hs = true; - } + }; + const bs_unhShow = () => { + state.bs_hs = false; }; const createft = () => { - if (state.bs_hs == false) { + if (state.bs_hs == true) { state.of_hs = false; state.ft_hs = true; } @@ -1899,6 +2154,7 @@ export default defineComponent({ of_exit, hideShow, bs_hShow, + bs_unhShow, createft, ft_exit, om_exit, @@ -2100,21 +2356,11 @@ export default defineComponent({ background-size: 100% 100%; } } - .checkbtn { - width: 7.8px; - height: 7.8px; - border: 1px solid #4ea6ff; - background-color: #4ea6ff; - border-radius: 50%; - } .ol_checkbox { - width: 14px; - height: 14px; - border: 1px solid #000000; - border-radius: 50%; display: flex; align-items: center; justify-content: center; + margin-left:6px; } .b_header { display: flex; @@ -2138,10 +2384,13 @@ export default defineComponent({ display: flex; align-items: center; margin: 21px auto 14px 80px; - .bc_boxl, - .bc_boxr { + .bc_box{ display: flex; - align-items: center; + .bc_boxl, + .bc_boxr { + display: flex; + align-items: center; + } } } .b_sup { @@ -2149,6 +2398,9 @@ export default defineComponent({ .bs_box { display: flex; align-items: center; + .bc_box{ + display: flex; + } } } .b_footer { @@ -2236,8 +2488,8 @@ export default defineComponent({ } .m_body { display: flex; - height: 500px; - overflow: auto; + height: 500px; + overflow: auto; .mb_left { .mbl_items1 { display: flex; @@ -2331,7 +2583,7 @@ export default defineComponent({ .accessory_icon { width: 15px; height: 15px; - background-color: #4ea6ff; + background-image: url(@/assets/images/coursewareManage/enclosure.png); margin-right: 6px; } } @@ -2343,76 +2595,28 @@ export default defineComponent({ .tableBox { margin: 20px 38px 30px; - .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; - // } - // } - // .more:hover .moreArrow { - // background-image: url("@/assets/images/navtop/up.png"); - // } - // .more:hover .moreItems { - // display: block; - // } - // } - } .operation { display: flex; justify-content: right; .nSelect { + display: flex; .nselect { display: flex; - .jc { - color: #4ea6ff; - font-size: 14px; + color: #4ea6ff; + font-size: 14px; + .ops1,.ops2,.ops3,.ops4,.ops5{ margin-left: 20px; } + // .jc { + // margin-left: 20px; + // } } } .tableSelect { - margin-right: 20px; + margin-left: -30px; display: flex; align-items: center; justify-content: right; - .g1 { - color: #4ea6ff; - font-size: 14px; - } } } } @@ -3232,6 +3436,15 @@ export default defineComponent({ } .stmm_i6{ margin-top:20px; + .operation,.nselect{ + display: flex; + justify-content: center; + color: #4EA6FF; + font-size: 14px; + .ops1,.ops2{ + margin-right: 10px; + } + } } } }