From 44e0ecf40abb960193bb4add3c7c2da6f54dd899 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Sat, 3 Dec 2022 17:57:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE/?= =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84=E5=9B=BE=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=A4=A7=E7=BA=B2=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/leveladd/pinggu.png | Bin 0 -> 1398 bytes src/assets/images/leveladd/xiangmu.png | Bin 0 -> 785 bytes src/components/drawers/SelFacet.vue | 2 +- src/views/learningpath/LevelAdd.vue | 40 ++++++++++++++----------- src/views/projectcenter/TaskPage.vue | 30 ++++++++++--------- 5 files changed, 39 insertions(+), 33 deletions(-) create mode 100644 src/assets/images/leveladd/pinggu.png create mode 100644 src/assets/images/leveladd/xiangmu.png diff --git a/src/assets/images/leveladd/pinggu.png b/src/assets/images/leveladd/pinggu.png new file mode 100644 index 0000000000000000000000000000000000000000..ef4afd061ead75d538dd19ffec0ae2816ed176fc GIT binary patch literal 1398 zcmV-+1&R8JP)P000^Y1^@s6LVfqm00001b5ch_0Itp) z=>Px)FiAu~R7gvWmThblRTPHbbMNeQw?a#8S$5k}sgQ~VT&jSu@|_Sg5K#z*m>7*3 zk|rjo(LYACeu0vp2_}j}G!SgHl@HM$Qeq+CN(4a(L_nk4cDsd8OKqV@KW45ucV?F9 zhEV3mZn|^tdCqyyd(SOln5VM-w3!>uTW=^lDFo#kz%Poh=J4FHM~B<%y{F+8-rv;v zCK1*`00AO^072+6q3+&4yR3b<{rp}-D)uEG$sw@`J}lU4HvHH>?D71GH!+ZCAe5YhrfwM=W&L*l1YupMnPgxHoy=BcP|2x@Lpvh z?#K;b?YT}QuMTkRApjlR0ca2eDtAvQKBFPA#+HO2#Qha8fK%0AH(OsnG62Z|wWL`U z39izvYM5O5n*;fwC1Dc9IT)|a25=zaO+FyYqowfy^g3p_Kmi|QdQ&O^QgIF<1ZkZo z=9!pP5Ogwjb=K*js2Idg2nd$++U@v>y=DDm`X^c;vRq_d^s(G;-D7m zmY#LVOE__*PnX63PC(jLRjnu2%!5uPp5|Q1vgioRFA6#S_GPUr$o%H$+dW`m^MxMt zSxWz{9mlVvRaINz_GI>K(sd7Sx`9Q#U>1@3T@an;0whrx2o>BOC9)vw zF4mKq$5|{a3}IeT2!eOInRg6W*p}|Wpwpv^g4A1<)xTp;Rr$YuO;?@mC^l$twJ?m@ z?c+!Pp_Q0>IHfJ@0hqI+DuS@7{WRox<*!bh?d?ASh=+E^A{WOUNCrp4m@lBlO9|T~ z`RC|@u0suzC-?g|(%eKU5pXTc09Gts7(#qhFykOcdmD8Zdrnb*Ximd-1()x6pykCJ zDPAQ)z99()K_6NobQ+Rg`+j=y$C(qq@JL%i0{WbI{qUawU7^q_URFX@?Ku-}juo_i zWlCDX>#_ilJj?hf2yESZZ^^S-u0==M5^&|xW5Jt0Je#fqAfev)I#yCMb$?4uK+@~O z05qHgs&`H)-b{;rZc9j_cqX`OLG38v4m>~&kc_5MwrvClT8R+6Nd*qTF;a(`6p7M< zN7GIvZWVfF5kWYk+nr%_qJB#Bz8MEn&j9Mvn*p9E$%Ca7c6IjZ@vj1Q87(>HKzw65 zbD+G#MFMs8mBo+GXlmJD7~*BG$w5h|F3-mo?U&JO+jy!Z4~q+P@lL7>$!i1p+!+B8 zqb0}F2>}P4L?>xWYfxeCGAP) z*GSMxDO5<$9Q~h)(;QDi?KFW+TgOE{TlrHeWRH{^rJ&VPKxP51LEzo)((v02M3#5S z-O|N$qeZJurN;_WERzP^DTxLRq0U)3YVYUKXor9O|MAglF@Vtw)&Kwi07*qoM6N<$ Eg8S=)GXMYp literal 0 HcmV?d00001 diff --git a/src/assets/images/leveladd/xiangmu.png b/src/assets/images/leveladd/xiangmu.png new file mode 100644 index 0000000000000000000000000000000000000000..fe1310fea335cf2d9f9d7bb73ceb7721a5e6d181 GIT binary patch literal 785 zcmV+s1Md8ZP)Px%%Sl8*R7gv$mdk1sK@^71sWFb5yoKUQ5CvTbYVVvZ5<#*M@(eB_qPw(@puU5m zF&T$ph%t!BKyaZ1T!^60AX$mS*yl)H`*e5p#nB98`chM0{r|aCAppQ^`eq#w?*qU^ zeGeS|nOl2rFOXqOm_6uUUHRglF7l1P4qu;E)ce*3%;B2PM<=h}xUdM&{|0B%gA@U_ zgsg(X5->Qxzz_S$AYBxWv*~_{fLj&C!rlNEAwY(o%ybt?eYNo4@imCY1oWdnSo^F8 z;_Ur?im1VkdCVCA{R+$D{GuA4v!3hIiQcJe7Hq8c`SZVkQiuV%Ffp)FmvV4H zp&f-$_4N~4GdjFyNO1OU&sm-Ss5`Kzq>v}ldUuVWKLEt+z|Lw5j7-)^iBwxutqd-o zm%u4j?8<5JgbDGJs>?th2FftO`P)efp`6;{W27Gg^CJTwpONmueW|>#HUVHckGq|p zh#c4`7Ok>D`O;w3R#eBoY_w}V7IPACg7X8dxX$XT14}Dwe+PcGVWPH4d66xeqz z4{Egh7|2>JEY*YTtih8}3aG(d6!Q1p z>a8;!6WR>Rwx8?W>#PigBAr~5p{-*FjuyS>XbR{G-dsQI0_T^{E)(GgJvOvqeTp&3 zH69wp1z@3dw#BWv#m4$R>P;fkV81PP*;$$zji}d3-#Xe63j+Bu2=iPZPrHWJ;bmX=vyc1UTwhtusc|FFx1R#T?E*X!YgrPNhSLG)hCJzQY~1++3zByPA8ts& P00000NkvXXu0mjf;Aw8; literal 0 HcmV?d00001 diff --git a/src/components/drawers/SelFacet.vue b/src/components/drawers/SelFacet.vue index a6a845cb..109d261b 100644 --- a/src/components/drawers/SelFacet.vue +++ b/src/components/drawers/SelFacet.vue @@ -136,7 +136,7 @@ //import { ApiFilled } from "@ant-design/icons-vue"; import {reactive, toRefs, ref, computed} from "vue"; // import { planList } from "../../api/indexTaskadd"; -import {detail} from "../../api/indexCourse"; +// import {detail} from "../../api/indexCourse"; import {list} from "../../api/indexTaskadd"; import {toDate} from "../../api/method"; diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 6a278849..460fcf55 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -415,31 +415,33 @@ > @@ -462,7 +464,7 @@
- {{ item.complete }}/{{ item.total }}人 + {{ item.complete?item.complete:0 }}/{{ item.total?item.total:0 }}人
{{ item.percent }}%{{ item.percent?item.percent:0 }}%
@@ -992,7 +994,7 @@
活动管理 -
+
@@ -1882,6 +1884,7 @@ export default { const getOverview = () => { getRouterOverview(state.routerId) .then((res) => { + console.log(res) Object.keys(res.data.data.routerInfoOverview).forEach((item) => { levelList.routerInfoOverview[item] = res.data.data.routerInfoOverview[item] || 0; @@ -1894,7 +1897,7 @@ export default { // console.log(r) // }) state.addLoading = false; - console.log("项目概览--" + res); + console.log("项目概览--", res); }) .catch((err) => { state.addLoading = false; @@ -1906,6 +1909,7 @@ export default { const myGetRouterDetail = () => { GetRouterDetail(state.routerId) .then((res) => { + console.log('router-list',res) if (res.data.data.routerInfo.status == 1) { state.nodata = false; } diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index e0d43355..15a65b5e 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -383,31 +383,33 @@ >
From 603c0b4c07e101a90abd9f9efbdd7fb1dc8e0958 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Sat, 3 Dec 2022 18:25:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=9D=A2=E6=8E=88?= =?UTF-8?q?=E8=AF=BE=E5=88=97=E8=A1=A8=E4=BF=A1=E6=81=AF=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/SelFacet.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/drawers/SelFacet.vue b/src/components/drawers/SelFacet.vue index 109d261b..1773df3e 100644 --- a/src/components/drawers/SelFacet.vue +++ b/src/components/drawers/SelFacet.vue @@ -113,9 +113,9 @@ :loading="tableDataTotal === -1 ? true : false" :pagination="false" /> -
+
{ - console.log(res.data.data.rows); + console.log('面授课列表', res.data.data); let result = res.data.data; state.tableDataTotal = result.total; getClassData(result.rows);