From fe6d03dfd9fc3404c88ee56aa84d126584460bba Mon Sep 17 00:00:00 2001 From: zhangjun1 Date: Fri, 24 Jul 2020 17:32:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E4=BD=9C=E5=8F=B0?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/imgs/home_btn_enter_hov.png | Bin 0 -> 1650 bytes src/components/e-charts/dashboard.vue | 6 +- src/components/menu.vue | 18 +- src/pages/authority/user/organizationuser.vue | 4 +- src/pages/workbench/workPlace.vue | 285 ++++++++++++------ 5 files changed, 218 insertions(+), 95 deletions(-) create mode 100644 src/assets/imgs/home_btn_enter_hov.png diff --git a/src/assets/imgs/home_btn_enter_hov.png b/src/assets/imgs/home_btn_enter_hov.png new file mode 100644 index 0000000000000000000000000000000000000000..5bbea78bd33daa5f7de8fccbdf533a4b9bb80d97 GIT binary patch literal 1650 zcmaJ?c~BE~6kbcAf<_&ssdu-bL)1bp2+2l*9<2qD>JvmpWT0L23k zm5Q`DiqvBq(JHlt0u~Ta3N11ssNl#U6hTp|&=$20-5_B9DBYRe-!bp|-uK@7W_C|V z@M@adLN@>aXlj*QORb9??{pXHOVBzGQp*BT5lMz(deR0HC?G+wXcSbN;22bk!bnm= zJ?aktPM(IaNHS6rB+_9f7VL;&*-bcw1_1w6b{y6jQ4)+sV+>|7<7q_|12iCFMg(8O z(cm&P)}Trz(9q=IFkP}y2O*4A0ieHKL=l)!5(e$2c(X-h7c<6qMbzGL&1QgOA*4~v zcq1xO69URG0tNXjKW`n^M+gca7MBkRdA?pCkHht2b09X?*PFu?aUcCCIU5@{|_~pCZjE+7JaMt zKZz}2NjS>Zq87|b=%~TzJshcUk&HlL5+lMeEPkSkA+Z>VSz<99l*t@j6M)Mi3}ytg zS(cAsG#ZiGY$0K@4pqy=42p$iFd!lhha*)e1qzvz=fmYHBtpJ`FM%XNnL^?t<4b)e zuyRaiHKAs50*k!GDyPIc>|nyF%yN`4B%+9tz)av+*&@T#T4Yo5jbo9iwaBN$vMDia z$8i5O?1?MNL5}UDb*aOo`B5|Fc!IKaI8+q^0Poya%Ozp<_U{j^SA7Y)*Ntuxl)gAn zu=}@lk=n8o?x8oT2W6^sxALMQuwq$yzClvbqM*km>m*1^xXrp2$vouTafeBlxz#k? z%HmnKTrX>duoYJrM;=4?pO*%^p{l?9pC(-&is*fU?L2?4Vsq>~nxfaa*I3X0y(y}9 zeJ}laU;oct!JX>d*(!}}yQRfCc)4eG^P^cSD`yJ3k3M^;n4wkYkK}gm91c4IKRtS4 z-tcW2;gQNr+HiTn^_rz6RRc}NICEX?iAAXw_IH8qAJ$6~%PVtjS;uZR4@ULONNeT) z;5_r%wc>~8OH${yU9Dio2!*}}g6@ty85wxh5LiRkC!b3!V5X#dru%rs6>o8OIsD7P zhthg4m%geL`qc zt>G{3?4REw!21L;Z*Qx_`r0R`Oh1QyM!6mhm^<&Ayxf7D)FpoJ1?8Q^E5y5}-@czw z2DrXdB?Oj440mht3L5S)bB@var2Rb}wbR=A=Uj>ETp>GtJnaTv2(&a%SMBYa5{jQe zmpTe|?{!r)w)qzaCKXD#qd`%{)sNd;PjmXDIqoBV!t9KE=KXDVdAF*`IOf4MuAN(h zx_Zm#!piK7Y5G&=lzi*r@*$2dZ%^~kzKu5F)i6W*A$!?R-1s|Cy7s2W@aCm-+bqq= zmB(67cP+LQo^4KhQdx-F@(o)aT^-!~VB6n~4MkofE#iKGswlVh*ZHG~1D`2A{$qIb z)!t8xUyMFV&d8+o6y}9qL{1It=-f51oOh+6`fz&EBC(f~d_kS3^8>hT*%Dz&opN1I zvU)8&C4Y5wmX3(m?~l9K7@o;B7Im!Kkh48d-%#9;VF@fQ1G0w7hcW3_=NSPlOZRP+ zMk?NKDqXESlU;h_)30AI-|>O!HL@`KyDpek6W!iad#!%ckAeD=m5sLNd4LmeGQmYT Tt>Y5S@fT1lg5}>zH>UjqpTLnn literal 0 HcmV?d00001 diff --git a/src/components/e-charts/dashboard.vue b/src/components/e-charts/dashboard.vue index 53690c7..0ffa337 100644 --- a/src/components/e-charts/dashboard.vue +++ b/src/components/e-charts/dashboard.vue @@ -35,11 +35,11 @@ export default { text: self.data.data + "{a|%}", show: !self.is_word, x: "center", - y: "center", + y: "30%", textStyle: { fontSize: 36, fontWeight: "lighter", - color: ["#67828c"], + color: self.dangerousValue == "workplace"?["#0d1847"]:["#67828c"], rich: { a: { fontSize: 14, @@ -205,7 +205,7 @@ export default { barMaxWidth: 10, name: "C", roundCap: true, - color: "#ddd", + color: "#f4f4f5", barGap: "-100%" }, { diff --git a/src/components/menu.vue b/src/components/menu.vue index 65804bf..c1eb006 100644 --- a/src/components/menu.vue +++ b/src/components/menu.vue @@ -22,11 +22,13 @@
{{ item.menu_name }}
退出登录
-
+
{{ v.menu_name }}
-
+
@@ -110,6 +114,7 @@ export default { ], shopping_list: [], menuCartNum: 0, + now_hover:-1, show_shop_menu: false }; }, @@ -131,6 +136,9 @@ export default { } }, methods: { + change_now_hover(n){ + this.now_hover = n + }, gotopage(n) { if (n == "logout") { window.location.href = "/iam/api/logout"; @@ -306,7 +314,7 @@ export default { box-shadow: 0px 3px 6px 0px rgba(15, 19, 65, 0.05); border-radius: 8px; position: absolute; - top: 80px; + top: 70px; left: -20px; overflow: hidden; font-size: 14px; @@ -356,9 +364,9 @@ export default { .sj { width: 16px; height: 16px; - background-color: #e56600; + background-color: #fff; position: absolute; - top: 72px; + top: 62px; transform: rotate(45deg); display: none; } diff --git a/src/pages/authority/user/organizationuser.vue b/src/pages/authority/user/organizationuser.vue index 0286bfc..b60f838 100644 --- a/src/pages/authority/user/organizationuser.vue +++ b/src/pages/authority/user/organizationuser.vue @@ -206,12 +206,12 @@ export default { }, 1000); }; var user_name_pass = (rule, value, callback) => { - var reg = /^[a-z0-9|\-|_|\.]+$/; + var reg = /^[a-z0-9]+$/; setTimeout(() => { if (reg.test(value)) { callback(); } else { - callback(new Error("只支持小写字母、数字、-、_、.")); + callback(new Error("只支持小写字母、数字")); } }, 100); }; diff --git a/src/pages/workbench/workPlace.vue b/src/pages/workbench/workPlace.vue index 5c5dce3..630f599 100644 --- a/src/pages/workbench/workPlace.vue +++ b/src/pages/workbench/workPlace.vue @@ -43,7 +43,7 @@

- {{ helper.numberFormat(item.num, 2) }} + {{ helper.numberFormat(item.num, 2) }}

@@ -55,11 +55,11 @@

数据分析中心 - +

@@ -81,22 +81,22 @@
-

物理总量{{cpu_data.all}}核

+

物理总量{{cpu_data.all}}核

剩余量{{cpu_data.remaining.toFixed(2)}}核

-

物理总量{{memory_data.all}}GB

+

物理总量{{memory_data.all}}GB

剩余量{{memory_data.remaining.toFixed(2)}}GB

-

物理总量{{pan_data.all}}GB

+

物理总量{{pan_data.all}}GB

剩余量{{pan_data.remaining}}GB未知

-

物理总量{{pod_data.all}}

+

物理总量{{pod_data.all}}

剩余量{{pod_data.remaining}}

@@ -119,7 +119,7 @@

在线组件工具

{{ it.text }} @@ -154,11 +156,11 @@

数据分析中心 - +

@@ -197,11 +199,11 @@

数据分析中心 - +

@@ -231,11 +233,11 @@

{{ now_user == 0||now_user == 4 ? "我的服务" : "服务管理" }} - +

@@ -277,11 +279,11 @@

{{ now_user == 0||now_user == 4 ? "我的应用" : "平台应用" }} - +

@@ -313,12 +315,14 @@ -- 2.26.0