From 223cb2d27451b0fdb020b77492a59ab0104c92d0 Mon Sep 17 00:00:00 2001 From: zhangjun1 Date: Wed, 8 Jul 2020 18:30:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/imgs/btn_front_page.png | Bin 0 -> 1051 bytes src/assets/imgs/btn_front_page_dis.png | Bin 0 -> 1051 bytes src/assets/imgs/btn_last_page.png | Bin 0 -> 1057 bytes src/assets/imgs/btn_last_page_dis.png | Bin 0 -> 1057 bytes src/assets/imgs/btn_next_page.png | Bin 0 -> 1037 bytes src/assets/imgs/btn_next_page_dis.png | Bin 0 -> 1037 bytes src/assets/imgs/btn_previous_page.png | Bin 0 -> 1035 bytes src/assets/imgs/btn_previous_page_dis.png | Bin 0 -> 1035 bytes src/components/apass-dialog.vue | 2 +- src/components/service-header.vue | 3 +- .../fwgl/approval_service_detail.vue | 1 - src/pages/workbench/yygl/app_debugger.vue | 34 +- .../workbench/yygl/app_debugger_detail.vue | 486 ++++++++++++------ src/services/helper.js | 7 + 14 files changed, 358 insertions(+), 175 deletions(-) create mode 100644 src/assets/imgs/btn_front_page.png create mode 100644 src/assets/imgs/btn_front_page_dis.png create mode 100644 src/assets/imgs/btn_last_page.png create mode 100644 src/assets/imgs/btn_last_page_dis.png create mode 100644 src/assets/imgs/btn_next_page.png create mode 100644 src/assets/imgs/btn_next_page_dis.png create mode 100644 src/assets/imgs/btn_previous_page.png create mode 100644 src/assets/imgs/btn_previous_page_dis.png diff --git a/src/assets/imgs/btn_front_page.png b/src/assets/imgs/btn_front_page.png new file mode 100644 index 0000000000000000000000000000000000000000..dc7d3ec44878a30932e8009381aa99a2e8d1db01 GIT binary patch literal 1051 zcmaJ=OK1~87~ZDTrm>YueNZnB8;}Z3_K`=kYhs&ZQyVa)q=5zz>SlM+EbZ>ByHk@E zu@40;6?&)#dl63x9*Sob1@+?1vzMYEcn~zugQx{((L4C`GlO z(Q@yVMV~Wlu@a+eydpU}W`+he7d#uI_mj$JCO{Hd5QO|; zpTY%0U`X(D;XqIj1_94<5r&O0T)@YL#ULy4Jg9#(iDs!qF)NMMW06~oE@5nn3{x(b z{pElkSu+eL2m-_M4A1+BhtFOxuw3yOwzt6`L0hpj6Klu-4x?N^^EgJ6O!rIB%_gm3 z*V{xI##CgJ;ry&qQo}Km`M;~KH@$6~g$Mcmli1EJn2^ar8_in^8C=opgfhjX1!at^ z971!AE>4sXMs^9AAenT!CV+t{%}`O<5>n=MXy67`J-~)qVjVf?CW$OTOS=ZuQ48syR<@|M z&V_HuSI4TYa|yJ>G9($s8SY=hZkULIoMThEGCYB5j)8eN3LkdRmI-Djy2n zcb8sntgL+W_IC0QT}AMq^X;X~ z{=Cyx-Fkn_H=3nfo6A2=Kcn&H(y|+;xRDoqYtx?W&FwGedVjT7!voXD)mYz&oxNK> u=lbqVQ`Va5+R5})G2zSyIY60fj94i-|zSTc)xcoJ=oXi zYw}SP)tKs+GGuNb!&hHN{`o`r1({CaL=F$3JT59Wq~aPHg&<`pV=x01ZTj*X*hx_b z&g$75&dCFUiVQ~aFpO(hgiTSM-L9pm;}C;UIHsF1di&W+8t7V#9uCU^*%Dzv@1L>Z z(9B>~of%hojqdIOovuIx42Tur8WW}?xG{Q9S0HQen5DrU1dqq){iJeo8i>e-Ak0Mk zDi;ca4xZs6?IE6T1Hk|nWdl)`Yxi>zArugTK~VZ=63y1~LPkoKVv${pE?{g4EL$uV znPNMG>@k+(d7cdf*n#3`hWV&C1VO3;J zr_?6WFxFKpmSX~5NoAlc{~u}?6|{ph@K3(~6n3)H7GyKfL6f#hE-v5Vg|YqhT?UjEa1jD?;wF);9sLJ*1U|1xw1Z{l^YDpUzV6SXJ zubzukRjbpzb?CcL>%NTE7m2Oius{Q9B&hAzw=M;l4o%vCB?Ju z$I<6gU*31s)m>TcX>XM94L?m$ A*#H0l literal 0 HcmV?d00001 diff --git a/src/assets/imgs/btn_last_page.png b/src/assets/imgs/btn_last_page.png new file mode 100644 index 0000000000000000000000000000000000000000..f8f9b2f4e9fac682ad304c683d97dbffe5cf4710 GIT binary patch literal 1057 zcmaJ=&r1|h9G^7J%rz6F%tMb6%BYUPFP1l{-TyU3dU34#jvolY3SZCfe^K3^C zsexe;LeL?qL;VBMF$nqrmUQUQDd-XzL8rvJbO`Fr>S~9!fj8gx9-q(W`}1ATX3qOs zkG4`2$3^6FeDcy|G8&99pK-XgQcsR|atpqIT!*ezq zoy+9axw0x~^uRgL?}|jgfLH;pF>N}c8>6ebBH4S_EDfpH}*o2^ZXIVrjAi=1L~31drS*-E9t zRDuk$r&wMP1eOc1fqH!7-Xdx|M=q?Z}$W zc9}@QSXZ%Fp5eTdYQS{*|4_r&K|44HcjNu1u#=y)Ae(~@nz2>VxXE76l_e%@s9qwAU|NXalK1j9qg zkj(RPJW6U6PjaOCiGUmp%Qdcq)ENVsxW?6XxskeDZyXGZc$T28Uxr%JMh2*+E$a1S z3D(uy=4$n03DxDYBpB9f?qAKWU6Bd$wmYLs4m-mSO)~K|8ST#vV@dKXZl$Dn-u+N) zyE%VlX>svWpku9ZlWopF?pj_dEUcEn3RTR2_QYt(xB6>ju-K4)acueh9=_+U-Uj4* zi$B|MZ}?Vw7Vk7(d^Z5TB|3jl>#x4v7+g5?_S$b^pLC?A&vvXmJoUY)*wr_Gpkp7k zc@WFo=wN&M>&~&Z2UchE`j^4`3-Zeg*@=d|N2ryL-NPqZ=)>NlP01PQ(a^-zKP65} Ay8r+H literal 0 HcmV?d00001 diff --git a/src/assets/imgs/btn_last_page_dis.png b/src/assets/imgs/btn_last_page_dis.png new file mode 100644 index 0000000000000000000000000000000000000000..4b98237a831e13f902b6111ececa2f81a0e954b1 GIT binary patch literal 1057 zcmaJ=O-$2J9PdD;5D{YJL*(#MjM3=UbziK73ER41BPGk2vXh}}-&h0fEA4{~E;0`~ zj-EW3XiPj}yqRbq7!DW>@$5~#YB+c`>g(8s2WOMl|9daL-|zqVHq$dx-CaXn6h(E5 zH-rqaon&>La+80d18);^9w&2n78P(wwjdQ#Q62(Omlt3L%IezkJ2*~J?U%G{4(Ft4 zUO~E7b}-(uZW1;{jZc(KSy_Y_CxCsRceGr0TxNDM}YHHhG3Al}g@Hz>BN} zhUGYp@%b6Q-$M`{d(FUd*<;uv4Fv((ilv!YLk4gZk_ zESn7L^*JdufRglosIE8BHqOA~c>gJEXV*-~WT1^!EQK_#Fygo}`Gf^!jI1m|ON}a~ ziwGmTh)j@3I921o<1&TtHCMsS{Q~8)LoD6aPP&^e(vTQOI z4+C$o7Y;$5@@Mc z=c=t^3AW@iBpAkN?qAJrT#*TKw$0Hchvx7@gG{_dMq9HEJIJ$mCequl zxBLG4$>E;8ox$|(ZP1^0oqbV>v{kuE%O3s%EsEs5=Y3GVa5wx`(O>UueJ|XNWcwZ zf{7jd_&T=X!P(^XedPE1{XgFC-5MLc)Z#ho zAqb)+F(Rh$+<=Ft(fzNVU;=nLgQN@^hf^poTY!kFFbl|pE>D9Lkky6j@4z5I9PQT9 z8I(z0<`t;ZvWuY|-NbBy7#wm;S(yQd%z|mn5U6i2Us0r{3e-d>=}Ve1kkdvMEik?~ znpPHP6i%gvE|P-|j|FsqWYW=R4V!las-(-~wR_A^WC?<11nMBEOmd8jK?{%}I_y>0 zV2JGJXf_-Oa$Fzj_pt+vZ-8L~UN+1JeZ1dKmOlzdv(za*CC1CK@J^s|2$?*?9NA=8+UJ&30Vb3Ghw6G2ZKD)8%=e$dc6z}CObXa=&QkEjO?A4VOg?4-89^%z z;cTUgV>yVRor5MBi@9Cn$esz!P+{IaU*aT_e8RAiY$zZh3KUkMHBIF?F3d$mQ5=p3 zC6<+<197Qe3`?O{C>99#eNu%hLS;?|2C8t?L#|Yl>)Js#abyu#+B{I>7Szd7*}PUe zm*JXvWv*H~msm|MgOg$0%l+%JD@WKt?y_oKys4TW7})U^w)WPCrw{P6SW1Y|wDT$3 zeEY`o&0_IOckA1_AN>tIlXZLRk#qIi*9!NVu5PrwpReERi0m}o-95Jb_0gT@kc+Q(L*eWiV{LSjNV zD4aB0B=LZW7f${IYK(~oy?F742MHQaCWgcikG_s=cyKm(eLwQ~e7-;4=dDlVZ*+&x zg(-^a&W+0jGIx*>KJNdYoM5A5I*YRKnKofl)bNOBtJ*BYpbRU9m85^Zd_x06PtsFyg;VSdtQzCX4xC)h z7q#VCP1Na;>tNWEh=2*P3OsYpawRWG*L5Yb_K#T_)FF5_NgpOvQYJtKIS|B|L`36b zad1s!_(U`&idTWa@k1;(#PZPypO9jlBnY7K(IlFq&qxJ%tPzXsl5`bgTVmN-t;W=% z400+gFNz||39KMQ2qNMxSy=TVmfPP{kfEzNhK&tm0bfxqqXnF#Nv4M-n08CnavN8J3P}?&Ug1QKX#ZV%5@MPEOK9g)t0W64RMfERl_+$6{HY z&!)tPOsoTdr>h(Saqt`&@*! zdJV4LK9^`)E=!VO{mcF9vYSW5LH@F3U9xGJA6mrm4zc#@?oZ#yv$&s=Q$=s5{A%&* z$5S0051x*m?|S#8@7YS{+TFl>Z!bDlX7u&^;OCQTHHv3%mCy8UJ-oRS*w2ISmDTVs z0jyklU)l^sgI9j{Y)pst0vF#tAN|p_VF$~Z?cEFDfZBTm)`jieJK!L+$8uAh!TsBh d7xkV%sE@jrKE1iQHL&GB&|EezzerE7{sA3NL_Gii literal 0 HcmV?d00001 diff --git a/src/assets/imgs/btn_previous_page.png b/src/assets/imgs/btn_previous_page.png new file mode 100644 index 0000000000000000000000000000000000000000..236e52be9b9a1afc7fdc72dde53966203018a6c9 GIT binary patch literal 1035 zcmaJ=&rj1(94`ZjEKDIWQA}K(1&JnXZTF+BbrZLB$P!DIv4kD%+Beof`)d1O1riZ1 zqVb?!^y0r@;=y>(#LEsE6K@>!V4_Da$OTMH)Yq{M56&j9??*nL&-cgsyt{?jYXSdR zKSfc2{ESp2b3YmWK)fh zWn7l8iz+h0iiZiihDF#Em7H=dMO}m#RN#Vcrs&;QZ)l)vDSAFGv$BW z2a`gW$#go#8#1QBvpO{};f(;00mNYGJj-NHIDfv2cc&@xWZB-6tZ467q+I;}R5 zhB2;UFKsM`jO#m0?byGui=Teg+%VOSiuwtq(FQsUr64rH16u8J_BA1)YOviE@ zmrG{^K9P&21uhfivl7p?xe`*B4QS#vS3BY+x^g``7#4{vL0eye+O&-f&@5ZjyXO+` zs@LLb-E-l)av72g<6Z7wm)$-h4)T^A>yk~!{Lmzhw~4iT&jiVfq1N+Ky5xSU4Bp@P zaJw(D>0TIm&z>K!d-kee|Jc`qi9$LEKKmN`g+;jz8Iw?|J410k?-M>x1V^fP;|$G7wL*N=fl`s!={ c_QxLIAob<vV00!ei&Hw-a literal 0 HcmV?d00001 diff --git a/src/assets/imgs/btn_previous_page_dis.png b/src/assets/imgs/btn_previous_page_dis.png new file mode 100644 index 0000000000000000000000000000000000000000..06e021e9e414284d8354d306911acc19e989cacb GIT binary patch literal 1035 zcmaJ=O=#0l9M9ON9h+q+et_`ErcPO#kFMPk)@^Olx}q(mtE?BnG`~5%O@7>I1&h+_? z`Y4L(OU=kRGIx>T>+$|~`k4@!j^IQA&!Q5pDmJ8I8Y)7NGL(6kgNjzW^a@T;RQm}% zU%-X*IZ;JMQ1LK9*RTkiq9&$XOHmgf21Pipn^Ah}={gN`ElSUY(`?$3U|FA8w&Cn@ zCa*3psDegMO@awmBmxG+3UG}@(-GY$y{#*fwRgkxLqV!Hug>)83$c7*sj099} zGz`XsAQuUZ3c?8BS#F$R#~CgZ;3DEEEAl+p{b&-+)=FYdPVUAcyC_}8*b*70TCE1F zp&+v78BP!chUFQa4-iDashL=D1Ew?BP>`Xc+PZ~xWCBl7DWVFF(j?QJ5)7*;YdX7a zA`N3)#bUT1>y^|1rqln28b%ZC;2hk`_n*Q}zGgut2OU(gRdR8qK`)dgN;Xt5vhxTn zHoBNCBaECfvVbIcT@%3YoNj8U>YUodG}p$ zZE3T=ec*G)m)p}L&#w)=?5y9rvT^9fr^nNswH3G5|6cle0qmOuAAR*m_Sui=wO;M* z@=(lwm#Y7c4Xhu|wr#kpGV9+;+#2pGCRgiY56>>ek3U)2IQI3!*7Udim5!eL;IGY- h{_eK#r$MQ^ho# false, }, submit: { - type: Function, + type: [Function,String], default: () => null, }, }, diff --git a/src/components/service-header.vue b/src/components/service-header.vue index 3ea81b5..c70ae66 100644 --- a/src/components/service-header.vue +++ b/src/components/service-header.vue @@ -92,8 +92,7 @@ export default { }, mounted() {}, methods: { - subevent(val){ - debugger + subevent(val){ if(val == 0){ // this.$emit('deploy',this.data) this.$router.push(`/yygl/${this.$route.params.level}/${this.$route.params.type}/deployment/${this.$route.params.id}`) diff --git a/src/pages/workbench/fwgl/approval_service_detail.vue b/src/pages/workbench/fwgl/approval_service_detail.vue index de5cc65..b6d8684 100644 --- a/src/pages/workbench/fwgl/approval_service_detail.vue +++ b/src/pages/workbench/fwgl/approval_service_detail.vue @@ -352,7 +352,6 @@ export default { this.$set(this.list_arr[5], "info", data.service_apply_info.business_url); this.$set(this.list_arr[6], "info", data.service_apply_info.apply_file.split('/')[data.service_apply_info.apply_file.split('/').length - 1]); this.$set(this.list_arr[6], "url", data.service_apply_info.apply_file); - debugger this.$set(this.list_arr[8], "info", data.service_apply_info.duration+(data.service_apply_info.duration_unit==1?'月':'年')); this.$set(this.list_arr[9], "info", "访问次数："+data.service_apply_info.request_spcs.pv+"/日 访问量："+data.service_apply_info.request_spcs.count+"/日"); this.id = data.service_apply_info.id diff --git a/src/pages/workbench/yygl/app_debugger.vue b/src/pages/workbench/yygl/app_debugger.vue index 6d68922..9336499 100644 --- a/src/pages/workbench/yygl/app_debugger.vue +++ b/src/pages/workbench/yygl/app_debugger.vue @@ -53,7 +53,8 @@
此操作相当于：kubectl apply -f {{'<'+'spec.yaml'+'>'}}
- + + @@ -93,6 +94,7 @@ export default { now_yaml:0, pod_name:'', code_arr:'', + yaml_arr:'', area_arr:[], app_arr:[], tableData:[], @@ -126,14 +128,12 @@ export default { { prop: "name", label: "名称", - minWidth: "40%", align: "left", type: "button" }, { prop: "tag", label: "标签", - minWidth: "60%", align: "left", type: "tag", }, @@ -206,13 +206,6 @@ export default { methods: { changyaml(n){ this.now_yaml = n - if(n==0){ - this.code_arr = yaml.stringify(this.code_arr) - }else{ - console.log(json.load(this.code_arr)); - console.log(JSON.stringify(json.load(this.code_arr), null, 2)); - this.code_arr = JSON.stringify(json.load(this.code_arr), null, 2); - } }, get_namespace_list(){ this.$http @@ -232,11 +225,20 @@ export default { } }) }, - gotopage(){ - this.$router.push(`/yygl/${this.$route.params.level}/${this.$route.params.type}/appdebuggerdetail/${this.$route.params.deploy_id}?content=0`) + gotopage(val){ + this.$http + .get(`/awecloud/rest/kubernetes/api/v1/_raw/pod/namespace/${val.namespace}/name/${val.name}`) + .then(response => { + this.$router.push(`/yygl/${this.$route.params.level}/${this.$route.params.type}/appdebuggerdetail/${this.$route.params.deploy_id}?content=0&namespace=${val.namespace}&name=${val.name}&container=${response.data.spec.containers[0].name}`) + }) }, - gotopage1(){ - this.$router.push(`/yygl/${this.$route.params.level}/${this.$route.params.type}/appdebuggerdetail/${this.$route.params.deploy_id}?content=1`) + gotopage1(val){ + this.$http + .get(`/awecloud/rest/kubernetes/api/v1/_raw/pod/namespace/${val.namespace}/name/${val.name}`) + .then(response => { + this.$router.push(`/yygl/${this.$route.params.level}/${this.$route.params.type}/appdebuggerdetail/${this.$route.params.deploy_id}?content=1&namespace=${val.namespace}&name=${val.name}&container=${response.data.spec.containers[0].name}`) + }) + }, get_list_pod(){ this.$http @@ -301,8 +303,8 @@ export default { .get(`/awecloud/rest/kubernetes/api/v1/_raw/pod/namespace/${val.namespace}/name/${val.name}`) .then(response => { console.log(response.data); - debugger - this.code_arr = yaml.stringify(response.data) + this.yaml_arr = yaml.stringify(response.data) + this.code_arr = JSON.stringify(json.load(this.yaml_arr), null, 2); this.$refs.actiondialog.show(); }) diff --git a/src/pages/workbench/yygl/app_debugger_detail.vue b/src/pages/workbench/yygl/app_debugger_detail.vue index 7df90ba..718943d 100644 --- a/src/pages/workbench/yygl/app_debugger_detail.vue +++ b/src/pages/workbench/yygl/app_debugger_detail.vue @@ -10,10 +10,10 @@ {{ $route.query.content == 1 ? "命令行" : "容器日志" }} @@ -24,14 +24,14 @@ v-if="$route.query.content == 0" > - 在请问请问1212 + 在 {{now_app}}
@@ -51,16 +51,18 @@

- 日志范围从 4/22/20 3:05 AM 到 4/22/20 3:05 AM UTC + 日志范围从 {{from_log}} 到 {{to_log}}

@@ -71,6 +73,7 @@ title="下载日志文件" sunbmitText="保存" :submitDisable="download_flag" + submit="file" @submit="save_file" >