From 302b21f6be34377c9eb8099f34314f78ddf51d22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=B7=E5=86=89=E5=86=89?= Date: Thu, 15 Jan 2026 18:16:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=87=BA=E7=9C=81=E6=B5=81?= =?UTF-8?q?=E9=87=8F=E3=80=81=E7=A1=AC=E7=9B=98=E8=AE=BE=E5=A4=87=E7=9B=91?= =?UTF-8?q?=E6=8E=A7=E3=80=81=E5=91=8A=E8=AD=A6=E9=98=88=E5=80=BC=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1、磁盘容量布局完成 2、查看出省流量页面搭建完成 3、硬盘设备监控列表搭建完成 4、告警日志的告警阈值配置页面搭建完成 --- src/assets/images/diskSize.png | Bin 0 -> 3345 bytes src/components/table/index.vue | 12 +- src/router/index.js | 30 +++- src/views/resource/alarmLog/alarmLog.vue | 14 +- .../resource/alarmLog/alarmLogDetails.vue | 114 ++++++++++--- src/views/resource/serverRegister/details.vue | 67 +++++--- .../resource/serverRegister/flowForm.vue | 159 ++++++++++++++++++ src/views/resource/serverRegister/table.vue | 33 ++++ 8 files changed, 373 insertions(+), 56 deletions(-) create mode 100644 src/assets/images/diskSize.png create mode 100644 src/views/resource/serverRegister/flowForm.vue diff --git a/src/assets/images/diskSize.png b/src/assets/images/diskSize.png new file mode 100644 index 0000000000000000000000000000000000000000..490b6ec282e1defe2c29eda86e967b1abe0cf045 GIT binary patch literal 3345 zcmV+s4es)ZP)7m6}`7-QNRG(y%-~c3Ny2SpC~axFrZW^A&{ss5=c^35HOMLS&@%lL`{@{NDzeW z-X)5Fri}PWB38gp`9TozLxeI>+3v*;hKhmhSt1G|(>LeM)(kVl&TP-_@+qaO@AUiJ zckg}Yz3zA4?H-N3=EqS0zUC8vj?RFCF#}4MykBZmIRg#5cC2nWvkc2wZdmRr-F99w zZ1;8K|Eb$fongD%nxIX(?Y?N(&ZD|rH`7ou7QXj=CG%j|+9orgwA$%cR_#tSV6^I- zwmb0-Y5W9{_IqX?L(GGT=`1ELM<==yvw?I6q?L@=7rIXZYp8RQR!u4x);E0u2Dau*ua z&ajrMEDC^bi?(&ttDFkmb~dsm_hWP~gF#(ds=U?hn7c63KH*M2YP07T-=Pz0j+9?m2dPWMnBGNr}Eolr|%!9zGd1QTv(VZ6(Iv<8! z5U-5R^eUsTZo9hM=Xv;BT&zG+vXeSuk-?hJLxkjB2y7Bm*k$ULvkdhG&w>EpexF9f zqv?P{)(L5&Ju@;8qdRANEaD!(a*zvlREBHgW^^`e=+8`70E`W}Dw%mGK)}N}w`PAn zF92O__Z-~smHSy6Q$EX$o*5k(H+!vVEIItY^%ap90LH~E{xsZ*donEo2ot+3a>AKq znd!U$B#0+vGGa=7=4*-J4HeOcGRu#obbYLRX-P;MMj~FOU7-Y-nfc6gUI196PZpz} zn9wkx_omFUBQd>wLf9eV>nP*E;9ZcB%}VA401v*bCw_fp@8`2x9>E!`8c%1M$Hd)I z`P^%M0CG9MqWPl$d_@N~aJP=mfS^!yzh`TQpuC5huj}mhIt8^M@C?}1Vb92*LJv2e z-zoI#pf&^s0DJz~a4RnkD)?~m=~f+_o@_s$kS&1$P(t8VER{VwOO=z?AJp0iYVesrX4dE?KMF&W&9cew5e2P`rnNj0H}2*m85bL})Ga6+J_X z1^`NkR3wJ@T0gY+P2G0?3Ind_eE(L14$+}zAolxXp!Z2C;ny)J*Fbe=P|;`00LW0o zL<5-k?vlM*UH4Qwt=-%3?`J{p zxvdh6#>D`z3;YF7COLUP~P4cocOuR!%pzN z9XIxA`x#J*w>_!eHki>Bo*DUtgt#we#kEBKv#9$Y=#ZR3j9Dm8`=m|ixaZig7mJSf zVv(#Za8N@6&j8--kH{4ozdF3rGoz1rX8Dz#8R?^fqZo=vq@(@ZM6vQH;cL zuOj+8+$vYV$Uz?71E`te`+Eoa2&n;}ky(T=I^v8!V(~BZ@m?S#q3`$|LZ@}^5bCAc zf<|~|baLD*uZhQcuSICR;7n7oOw#-X&2>Cg9~b~UklOpctSGZ;@xCtAJlIvul!nUF zK2#w!FBVysMF^uK&iEGMdGD(C0^4If|I;wGXTt|$du9bUgJ@E=`9x1KamOJ1iYG7t zidm7cHdDvarrTQvtNf8brPa<5wPY&WinXU`0F(m8(#GU3H!NqJVLMYwtKUCWl^;qv zzNRj!!ySkI*EHdWF+&U9p80HR5ddjn%;-2@r%7TRMqqzBR^V)*Qhso zf`2pMO%nWlA?-mW8+wK^$q5;%Ta^q9fUjvk$8w~0T*WAC))OSAv{$I6GV=4#$?4qa z3HFDw;x;)#&k$A?v#@e)?3s~rI6Px9E0&|Y;M$D(wm(I7Lg=4Fc$8;GPe;dZ18qfF zQDOPhVUJ-dDUKy}fwkPqqYuN5e1AxG=;a%?gpl6D$HCNSH6*WqZ zvh7qs_6vTelFb_VHB2;;ncKHUe(L}@Q1jUYKw#M7(3ksO0U+BjHCG#!`><{~mJa8} zu-xm6YIkayRNk(;O;3Im>dZrZjc&Wk4E52a?W|XwRZ$~WqfGo$$nJBX+Lo6D20#+~ zeuk&}N5!hb2t|o$2(FhgoEyT!kc6hDN#zk?f_H~qCXYt_CFtZ(QXgFspG-v_%Em@p zgEb5cK$(Qz?A)Pbh_%(fA392_Q0J)vqaZG4{+M}x{ zb{r8IwNwegjU_ttPEfjc632)ySGHi;?FX`zje1T*NJwhaO>z=>0YC(3T_&&QC+2j{ zc=@50Dy+*BJvc$wnf;iAXTzAa)aapQHf_svz0!eOWR{8|c_utS6)nQDnNpG`BD6kL zpL@*<0M>guo0)rrzS#4;UhQI2lwGs4GWriM7QPn-jq+mAzI*q{S;_lQ>EzCqR| zM?q*ucFV>b>UIM-^<~$`NY|3kCgj(M_zxgdHcf4Ae1yq7GjgVf{YbqTS*W5&jji|p zmLXc@HxUu?>6kz6=gLmy1pph0e}Q!|D1G8Vb^?I8M@K}cv}Vis>581hu8Gm@>OKS* zi!m*4Rz}Co=nyX!`L>4`VJ@LgMRw0Xd4Hr8-*7J$9UYIAPp^-aFNH0yHXuxvqb8kI z+h`pxQJRhj$=y5ic#cXyUI0`j47wE~@v=&15~kn)&G#R{GWROLxW3Sbh?(u$GTpVR zu3U%DZ`e-Wh>#F3^~~t}LVC4Am8#B*MKR^MMx~peQvk-~P=ePOw)=dU<=$dcIRg)d zS9rplO~)zOhzw2FZTCfAlb4t{Z$yZhX2#9%v?grMDry!0#qF8lJCgS_Ng+R=uQ0_( z<0l%uLT9~UI}hl#dp&4)sa1P6{PyljULi6pw};}@@g&zR_Xgyb7#QU*k2}s$vV}C0 ziF)Uk0UL!z)>lNT^7HJk2?T&*SNF79V?}rd^4mepoXUyeAHvwlpvCGR9)!>qW=d24 z6H1p6(`$;i@edg^3Hf0}&By%&Z;M1E=?8cSy;Hy=FaS!PT4Up}u}WNpiIJ>;*!jGC49 z17guB%9fTYX)yqq3e$c7mM$-r;Rg`kf@#@uKLAhh1N;E!s5hJT12Sz2nr;&Sa+Rh1 z05iO#Rek`T;`IUifL#5>~-S literal 0 HcmV?d00001 diff --git a/src/components/table/index.vue b/src/components/table/index.vue index e2041e6..0483d3a 100644 --- a/src/components/table/index.vue +++ b/src/components/table/index.vue @@ -33,14 +33,14 @@
{{ column.label }} - +
@@ -246,8 +246,12 @@ buttonConfigs.forEach(config => { // 判断按钮是否显示 if (this.isButtonVisible(config, row)) { - // 12是图标的宽度 8是按钮padding宽度 - const btnWidth = this.calculateButtonWidth(config) + 14 + 8; + let iconWid = 0; + if (config.icon || config.more) { + iconWid = 14; + } + // iconWid:是图标的宽度 8是按钮padding宽度 + const btnWidth = this.calculateButtonWidth(config) + iconWid + 8; currentLineWidth += btnWidth; visibleButtonCount++; } diff --git a/src/router/index.js b/src/router/index.js index 98babba..6757105 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -403,6 +403,20 @@ export const dynamicRoutes = [ } ] }, + { + path: '/resource/serverRegister/flowForm', + component: Layout, + hidden: true, + permissions: ['rocketmq:traffic'], + children: [ + { + path: ':id?', + component: () => import('@/views/resource/serverRegister/flowForm'), + name: 'SerRegisterFlowForm', + meta: { title: '查看出省流量', activeMenu: '/resource/serverRegister' } + } + ] + }, // 交换机管理 { path: '/resource/switchRegister/edit', @@ -739,7 +753,7 @@ export const dynamicRoutes = [ ] }, // 告警日志 - { + { path: '/resource/alarmLog/details', component: Layout, hidden: true, @@ -754,6 +768,20 @@ export const dynamicRoutes = [ } ] }, + { + path: '/resource/alarmLog/add', + component: Layout, + hidden: true, + permissions: ['resource:alarmLog:details'], + children: [ + { + path: ':id?', + component: () => import('@/views/resource/alarmLog/alarmLogDetails'), + name: 'alarmLogAdd', + meta: { title: '告警阈值配置', activeMenu: '/resource/alarmLog' } + } + ] + }, // 文件管理 { path: '/resource/fileManage/view', diff --git a/src/views/resource/alarmLog/alarmLog.vue b/src/views/resource/alarmLog/alarmLog.vue index 7b1002d..34dbf80 100644 --- a/src/views/resource/alarmLog/alarmLog.vue +++ b/src/views/resource/alarmLog/alarmLog.vue @@ -74,6 +74,7 @@ config: { tableButton: { top: [ + {content: '告警阈值配置', fnCode: 'add', type: 'primary', icon: 'el-icon-add', hasPermi: 'resource:alarmLog:add'}, {content: '导出', fnCode: 'export', type: 'warning', icon: 'el-icon-download', hasPermi: 'resource:alarmLog:export'}, ], line: [ @@ -122,6 +123,12 @@ callback(result, rowData, selectChange) { if (result && result.fnCode) { switch (result.fnCode) { + case 'add': + this.$router.push({ + path: '/resource/alarmLog/add', + query: {id: rowData.clientId} + }); + break; case 'details': // this.$router.push({ // path:'/resource/alarmLog/details', @@ -151,13 +158,6 @@ // } break; case 'export': - // let dataList = []; - // Object.keys(this.columns).forEach(item => { - // if (item.visible) { - // dataList.push(item.prop); - // } - // }); - // this.download("/system/alarmManage/export", {properties: dataList,}, `拓扑管理_${new Date().getTime()}.xlsx`); let paramsList = Object.assign({}, this.queryParams,rowData); this.download("rocketmq/alarmLog/export", paramsList, `告警日志 _${new Date().getTime()}.xlsx`, null, 'json'); break; diff --git a/src/views/resource/alarmLog/alarmLogDetails.vue b/src/views/resource/alarmLog/alarmLogDetails.vue index a83a2aa..f9a69a9 100644 --- a/src/views/resource/alarmLog/alarmLogDetails.vue +++ b/src/views/resource/alarmLog/alarmLogDetails.vue @@ -1,23 +1,42 @@ - diff --git a/src/views/resource/serverRegister/details.vue b/src/views/resource/serverRegister/details.vue index 8154ccd..e0d4137 100644 --- a/src/views/resource/serverRegister/details.vue +++ b/src/views/resource/serverRegister/details.vue @@ -1,8 +1,8 @@