From 1215a40cddfdcbec7c8c746fd6b032265cff5ae6 Mon Sep 17 00:00:00 2001 From: songwc Date: Sun, 9 Oct 2022 16:46:25 +0800 Subject: [PATCH 1/7] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E5=85=B3=E5=8D=A1=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/leveladd/back.png | Bin 0 -> 1409 bytes src/assets/images/leveladd/ma.png | Bin 0 -> 595 bytes src/assets/images/leveladd/more.png | Bin 0 -> 1197 bytes src/assets/images/leveladd/pub.png | Bin 0 -> 1230 bytes src/components/BreadCrumb.vue | 12 + src/components/NavLeft.vue | 6 + src/views/learningpath/LearningPath.vue | 6 +- src/views/learningpath/LevelAdd.vue | 555 ++++++++++++++++++++++++ 8 files changed, 578 insertions(+), 1 deletion(-) create mode 100644 src/assets/images/leveladd/back.png create mode 100644 src/assets/images/leveladd/ma.png create mode 100644 src/assets/images/leveladd/more.png create mode 100644 src/assets/images/leveladd/pub.png create mode 100644 src/views/learningpath/LevelAdd.vue diff --git a/src/assets/images/leveladd/back.png b/src/assets/images/leveladd/back.png new file mode 100644 index 0000000000000000000000000000000000000000..4e9e5f8b91e0a70c9b252973fa55ebff7e04763c GIT binary patch literal 1409 zcmV-{1%CR8P)Px)J4r-AR9HvVnOkg>RS?I2XFp0y+3vQ*7IrJ;B80|rQBWX2kf=cLg8HC|mtZgw zFZcjTFk*rU0Tg2*4~WqOC72lTLBRwsK@yCjSe1*2K&uuEZf~?*c1xwD+c9Uq7M6Cu zTepbL(`L_q=KRl`IdkUBr^rA=#20C0lImc*g0V_bjKVKM8;WxXrv)mr3@VBSt4Ib@ zp}Z=KNLF2(`64`mVjfW7(#COMr@+>5K+E70X z^TX%@C=Ecd9}HJVmjsI2LV4<|R05Z&*2Lw0gby7V0>3uE-ji^+&J7wS4TU));rb$1 z_{jML<)aEzv>SbqXk()U+Os$Ygq=+7I1Zov=7dT=zF-X8TjoMn*c=L~rM-yOo|Uzt zc+ttkTR*{p8Yh(f_~Z~gF~!kFq7%wX0_ucDCOxWC(IA6rfqXmlcMih$e>qOT;DIpE zfabrgvC~T6u^Sz2Z4Cv~;)_IU;<6NBlbzbGD)=P1HfI?!$c)E5)et>zjbAtp?zF$_ z+B<~M@Sti+dbB1c`+;dzCXb(ijr&2IIbKApoC(>6sTXfguc#+qHXX{Yu`%40u2fB2 ziV*bKO`AMAI$`q~A>`-403UP;__~&^cjVne)?u(_j+u8YBt9&ULKTV0 zdIc|7p?02tPpi_8Y9e=xg}I|4XMp`;PDbJVBcK=FQy!fJGlpC1cS4z}jmbv>_gTSS z`xdI2(vRwVsPm#5xzGt)55bRV>U@3h9vp9NMZw*wCMJ4gXIa5k@4a*_regF~t)6Xe zvy+@{gDnT(L}PlSK1|D}+Y()(iT(^su!61F4e_?#qcclk(Zoyt$J*f78Th>k8d}Ye z7+Yw@rS_yAvyy@wc;$BMaa{uTnP}=&Sbq+-90VPQ-Lhf^jLL^i74{@G-YwBSZN2u` zJ>x*9uUGe7en8Ugbt7buU6gKR0L&qB9Dn0cz;VT7CPJxm6y*=ucwyT6+8<%1cbR>DcLiH8- z%v9KR7>?9?rDx(@U!fYDNl~I}%Ueg8WcBIyBA$wpB+(4ZJe@Cf4SFhSU3{clfafx= zKMLn8!;GEwggc-1sc_b&BQaU0V3pG}|K?LfV0?E&t>@!TciBQtWUuPut}9mm`_JWW zFM4f2oQ|1q{G;`t3zOChrls60&{t`BvH6z2Hqeg^h-9orBv<*_1K1Q^PQj7ExZ9SF zp5lMeBeQXe6T{xf|9^#i6xbkQ!;jX^^0udfkiuq3csubNy;A0f; zh4R!Px%4M{{nR7gwh)k}zuVHgJBYn&;3Ad@BbT(DGT4`|G)2j-uHgq=f0o&X*0l2TRDFm z)?qG&G{Jm*TjFtBb=xJHe(tt<5SIs#O1*0*oHCKhda23-rx3&Ea1;8 zfNosE)fN?-g1tD1(b$Mh_|jz03UpKeM{pKBEdVB9Ke{lg0IY8jzYLxK0sfs5g}CcQ zNzHhhiS0Om;n-4CmHw!E)}p;4IWJ*7y8c)bJs1nh_ua_89hiidHSt3+8K*0NVOWLP z7}O-Ax44McWqkw|V{A?QH$1_^3Sht-sRGDvvYF8YDH%P(UF3hCp9)}2Dbdp=t)H6C z!WCR7r-$_UMHne@2X5jGmg61nR{)1_8|Pc3mL!%GB_*sAD~p;YVi(TfTCtRHb@)%L z;-|Ni0|U^Gg*b_+1t5MF!;ELWLU(@v8ZR5G&kZVolkq)9QtLQz=EF`LF9Ru@ zW$5(w2cY6$YiZ7u>~R@b0ZRiO`&$4RxqEO5w+aVQQ&;0ei~Mf1P*EmSW^giYR8ihD zj2bxz$-e+>z?`Ch&rQ4~l1%#_E$j1&ijs9~BYu`XiTR}`Vl6$@4Kia>(|A#xeWZKS hgi*=+KDY6Y!0(+RjJeIVkG22+002ovPDHLkV1i?P3;O^7 literal 0 HcmV?d00001 diff --git a/src/assets/images/leveladd/more.png b/src/assets/images/leveladd/more.png new file mode 100644 index 0000000000000000000000000000000000000000..d1c08d0e8d7410e473b2ac9ba7f7f334375e518a GIT binary patch literal 1197 zcmV;e1XBBnP)Px(XGugsR9HvVnO$rYRTO~FxpVioT?VWz{$S}JYS2w&w-5SYfJC?YV)UVe#DqX% z8a2N7pfMT^FFqPcOps{Q5(V*(1QSzSN&-g3gzbW9sTx|eu{5QC{oS&&d*>c=w@z)> zX*)CBR(2kD&(AmKo^$S*dl8oTY}-q`Z+y^KF`nUh?qf2?P?=E18y&pFYVE8_~ZZujp&jv}IA zz~|P{TzQj>e0FVcYVhs5ZaB5$2vjZa@TJQ-aT#!G*oho*o{PZHc-MQ)`K9ES1ihne zD6B(HmtrROO8qb{33+(3cYn>)Vzw7`-q6;s`-HEe)Npq8`~kYr{ci0T0FvGR3xY$(AA7&aUf`Mya~3zZMtgxJ`1Xvd4OrR zcs0BddKn!@txaJT^zOEyTTuxAN;vdtQ}}bD|3K4-(l3C<+fu$MQB&>J;7aP56~^_x zcQzRXP%rK1u^1jh2F*o~a&!uI{PZiG*%pPJp#Z*B{1Q^a*>BVIq|=u(q&fXZd;M4e zwDH-#8lLlWr^-t1@n*biC!d#as54D3x5V*lh7h-t=}6I?PJL<8l)dfs!w9XU-4pq9 zy;DU?Zb49!4tAb{R})+Cu%^LQ8@onFiW=PbtK=hB(QCCY2rA&i&hzwoB8H!647L{o z5kU5MiW=R3PI5kmo1Y)4G_%FJAWv_PQJ zjpAaUxjgPa`Lld85r=~s;v>t=QKhd63cXakQhqoJPx(1M$bcjflZ3=c;z<8+{{4X~ z+QfaetoHUQ+Cuc-J>WecEQmwu^;MjK?^ZMyaX z5eP&o48w#N&gb!m)7|oOH}Hj}FLg1^=4cELNeO)!gH9qtP7)+%q*ny+mE&o$E3yUI z3&m9O_GC5u7#_VoNpGYsLeE@+L>!MKyJ)AIh!)yY$s7JZee}^7ewxYBfggL}v;|eI zQ*cWo`#71VRyUx9hOZRrpSiT&=|RGhJCnfn&hzrMM2vklF-`l_zHjLS7-L%>kVlef z*x?lP-!0VRP_od@BuqGb;vBuy631^chTQjk51z1~s;VFquft=>E=o8Boi~(t8S`3V zc$CddPl8lI18@TPYdixlp817NZI8kpzYm`Px(h)G02R9HvVnM-IMRTO}~Gmn3onC4~Dw2N9$3KrZLBcftSu#lRVK*ZDs2(4m8 zt%YogRk5H8MGzDUYHJh}RGLMVnpUw85kY)x+_(^-5U3Von`qM{f97#yCduFA@Bg@y zKhS%+%RV$zqyWR0s#Wh1g)K=YU{9bX5PxSBJX z^3h}c85*c!D!Yyy&I*2y9L2LQ zO2^P-DgBbp^{f6mG<(gm0MaVWhSPKpPl%v}REvV@=iLot?5ec>Dw2=989Il?3&9oy z{ZAvA|7Ww|wA?#9p8xs^&}2?}QeRPIDphv9fAZ(-63`^OvyIJHEpbeLAWpERroR?f zgQcLS`>tK_5@ZUOFBkZ}be$Soc%1`Hin(9gxLmub^?cb38shSMQQZk|d|^?z40@uc z2~RSq9i~+XS&!0&$__-|#oGtlc$Ya61^0I~C8`_u0cJ&MX9VDlo=AK-A% z#8n~__>-b1@2SOcYmAga?j)iUksY90%IF-&VvvY8fgAE*;xeSM>Ocib;`CMIsIhlmy=8h zFfAwt5qg0cko`D%nm~_&bQO;{!?^4<1vZbR0$se#OQKro#@UzW5q%1H9kC8$M|0;(VZ2EuUP4=emvMO87&L$5 zoPbuE{Q(D1YKWpkc-GQG1mCWK;OQiyj{Iy4TBsFCU@K|v;vUG>^H@w7gOn01*4)iU zb#1iE^K*6eA3!XO#EO)w<&MAUkxmYFEgX{lFOgmDv11N)Ega3_N?wTl3$8H~H`himfdBvi07*qoM6N<$g1vx7;Q#;t literal 0 HcmV?d00001 diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue index 9628b7ba..32139a04 100644 --- a/src/components/BreadCrumb.vue +++ b/src/components/BreadCrumb.vue @@ -42,6 +42,17 @@ export default { }, ]; } + if (n === "/leveladd" || n === "/LevelAdd") { + state.list = [ + { + name: "学习路径", + href: "/learningpath", + }, + { + name: "创建关卡", + }, + ]; + } if (n === "/projectmanage" || n === "/ProjectManage") { state.list = [ { @@ -66,6 +77,7 @@ export default { }, ]; } + if (n === "/templatelibrary" || n === "/TemplateLibrary") { state.list = [ { diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 2ef66aed..a2bff243 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -251,6 +251,12 @@ export default { selectedKeys: "sub1", pagename: "学习路径", }, + { + href: "/leveladd", + openKeys: "sub1", + selectedKeys: "sub1", + pagename: "创建关卡", + }, { href: "/projectmanage", openKeys: "sub2", diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index e8f0f522..6571d681 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -71,6 +71,7 @@ :data-source="tableData" :loading="tableDataTotal === -1 ? true : false" expandRowByClick="true" + :scroll="{ x: 1600, y: 800 }" @expand="expandTable" :pagination=" tableDataTotal > 10 @@ -319,7 +320,10 @@ export default { 发布 编辑 - 关卡 + + 关卡 + + 授权
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue new file mode 100644 index 00000000..357e244a --- /dev/null +++ b/src/views/learningpath/LevelAdd.vue @@ -0,0 +1,555 @@ + + + + + \ No newline at end of file From fdd6d543b0a341d9564fa259ba8eb8b6c67707d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Sun, 9 Oct 2022 16:53:35 +0800 Subject: [PATCH 2/7] =?UTF-8?q?feat:=E8=B0=83=E7=A0=94=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=9A=84=E6=90=9C=E7=B4=A2=E6=A1=86=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BreadCrumb.vue | 9 ++ src/views/research/ResearchManage.vue | 174 ++++++++++++++++++++++++++ 2 files changed, 183 insertions(+) diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue index 9628b7ba..f1d2e889 100644 --- a/src/components/BreadCrumb.vue +++ b/src/components/BreadCrumb.vue @@ -99,6 +99,15 @@ export default { }, ]; } + if (n === "/researchmanage" || n === "/ResearchManage") { + state.list = [ + { + name: "调研管理", + href: "", + // href: "#/researchmanage", + }, + ]; + } } ); diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue index e69de29b..839cd806 100644 --- a/src/views/research/ResearchManage.vue +++ b/src/views/research/ResearchManage.vue @@ -0,0 +1,174 @@ + + + + \ No newline at end of file From 970e9f3cfa1af262589ee4a6180baf4512ccf9b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Sun, 9 Oct 2022 17:20:24 +0800 Subject: [PATCH 3/7] =?UTF-8?q?feat:=E8=B0=83=E7=A0=94=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/NavLeft.vue | 2 +- src/views/research/ResearchManage.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index c9863932..5ded85e1 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -114,7 +114,7 @@ src="../assets/images/navleft/survey.png" /> - 调研管理 + 调研管理 diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue index 839cd806..c40e72e1 100644 --- a/src/views/research/ResearchManage.vue +++ b/src/views/research/ResearchManage.vue @@ -59,7 +59,7 @@
- 123 +
From fb0a1dae012a9b1366280d5849e57bbf4d67c58b Mon Sep 17 00:00:00 2001 From: songwc Date: Sun, 9 Oct 2022 17:42:14 +0800 Subject: [PATCH 4/7] =?UTF-8?q?style=EF=BC=9A=E5=AD=A6=E4=B9=A0=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LearningPath.vue | 81 +++++++++++++++---------- 1 file changed, 49 insertions(+), 32 deletions(-) diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index 6571d681..e92d62c1 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -73,52 +73,56 @@ expandRowByClick="true" :scroll="{ x: 1600, y: 800 }" @expand="expandTable" - :pagination=" - tableDataTotal > 10 - ? false - : { - // disabled: true, - display: false, - showSizeChanger: true, - showQuickJumper: true, - hideOnSinglePage: true, - pageSizeOptions: [], - pageSize: pageSize, - current: currentPage, - total: tableDataTotal, - onChange: (page, pageSize) => { - currentPage = page; - // console.log('page', page) - // 加翻页查找代码 - // this.setState({ - // currentPage: page, - // }, () => { - // this.getMilitaryDeployment() - // }) - }, - } - " + :pagination="false" /> + +
+ +
+
创建路径
- x +
-
*
+
+ +
路径图名称
-
*
+
+ +
路径图背景
- -
-
-
+ +
+
+
请选择课程类型 @@ -128,11 +128,11 @@
- 线上 + 是
- 面授 + 否
@@ -140,13 +140,164 @@
取消
-
确定
+
确定
- + + + +
+
+
+
+
+ 新建面授课 +
x
+
+
课程信息
+
+
+
+ ⃰ + 课程名称 +
+ +
+
+
+
+
课程命名规则
+
+
+ 收起 +
+
+ 展开 +
+
+
+
+
+ + 1、课程名称统一不加书名号。
+ 2、项目名称、属地等信息如需体现在课程名称中，请放在课程名称信息 + 之后，如“时间管理（GROW180项目）”或“时间管理（B*）”确保首先 + 看到的是课程内容主题。
+ 3、同一课程如先后有多个版本，原则上仅开放最新版本，旧版本应停用 + 版本如必须以年份标明，请以“沟通技巧（2022年）”的方式呈现。 + +
+
+
+
+ ⃰ + 封面图 +
+ + avatar +
+ + +
Upload
+
+ +
+
+
+ 高宽比为16:9 (如:800*450) png或jpg图片 +
+
+
+ ⃰ + 目标人群 +
+ +
+
+
+ 课程价值 +
+ +
+
+
+ ⃰ + 内容分类 +
+ +
+
+
+ 场景 +
+ +
+
+
+
+ 内容标签 +
+ +
+
+
+ Tag 2 + Prevent Default +
+
+
+
+
+ ⃰ + 授课教师 +
+ +
+
+
+ 课程简介 +
+ +
+
+
+
+ 附件 +
+ 添加附件 +
+
+
+
+
+
+
@@ -163,6 +314,8 @@