From 3c77507db065799f95584e4b38aab1164c7933c5 Mon Sep 17 00:00:00 2001 From: LuPan2015 <874325293@qq.com> Date: Tue, 22 Nov 2016 17:37:35 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=85=8D=E9=A2=9D?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E6=8D=A2=E7=AE=97=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/functions/HDFS/Capacity/Manager.jsx | 19 ++++++++++++++---- .../src/functions/HDFS/Capacity/index.jsx | 20 ++++++++++++++++--- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/package/Aries/src/functions/HDFS/Capacity/Manager.jsx b/package/Aries/src/functions/HDFS/Capacity/Manager.jsx index a98d01e..febe3e7 100644 --- a/package/Aries/src/functions/HDFS/Capacity/Manager.jsx +++ b/package/Aries/src/functions/HDFS/Capacity/Manager.jsx @@ -6,8 +6,19 @@ import xhr from 'bfd-ui/lib/xhr' import message from 'bfd-ui/lib/message' const TabManager = React.createClass({ - handleSlid(value,spaceName){ - console.log(`slid:${value}, spaceName:${spaceName}`); + handleSlid(value,spaceName,unit){ + console.log(`slid:${value}, unit:${unit} spaceName:${spaceName}`); + //根据单位换算成G保存到后端 + switch (unit.toLocaleUpperCase()) { + case "TB": + value = value * 1024; + break; + case "PB": + value = value * 1024 * 1024; + break; + default: + break; + } let upsetUrl = this.props.getUrlData({ type : "UPSET", spaceName : spaceName }); @@ -23,8 +34,8 @@ const TabManager = React.createClass({ let sliderData = this.props.sliderData.map((slider,i)=>{ return
- {slider.name}{this.handleSlid(value,slider.name)}} /> + {slider.name}{this.handleSlid(value,slider.name,slider.unit)}} />
}); diff --git a/package/Aries/src/functions/HDFS/Capacity/index.jsx b/package/Aries/src/functions/HDFS/Capacity/index.jsx index bd8d00e..afbb7ce 100644 --- a/package/Aries/src/functions/HDFS/Capacity/index.jsx +++ b/package/Aries/src/functions/HDFS/Capacity/index.jsx @@ -10,16 +10,30 @@ import NavigationInPage from 'public/NavigationInPage' import auth from 'public/auth' export default React.createClass({ + unit:["GB","TB","PB"], + converUnit(value,unitIndex){ + //默认是GB. 如果满足TB则直接换算成TB.(plan, total) + if(value/1024.0 > 1){ + //可以进行转换 + return converUnit(value/1024.0,unitIndex+1); + } + return {value:value,index:unitIndex} + }, sliderDataSccuess(data){ let percentData = data; let slider_data=data.map((d,index)=>{ + let finalUnit = this.converUnit(d.plan_capacity,0); + let unit = this.unit[finalUnit.index]; + let total_capacity = d.plan_capacity/1024.0*(finalUnit.index+1); + let end = finalUnit.value; return { "name":d.name, - "value":d.total_capacity, + "value":total_capacity.toFixed(2), // 已经分配的空间 "start":0, - "end":d.plan_capacity, + "end":end.toFixed(0), // 计划使用的空间 + "unit":unit, } - }); + },this); this.setState({sliderData:slider_data,percentData:percentData}); }, getInitialState: function() { From c99f6a17e8749e541bcbcefbac1bd1131bb5f382 Mon Sep 17 00:00:00 2001 From: LuPan2015 <874325293@qq.com> Date: Wed, 30 Nov 2016 15:23:20 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=BE=AE=E8=B0=83,=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=96=B0=E7=9A=84bfd-ui=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package/Aries/package.json | 88 +++++++++---------- package/Aries/src/App.jsx | 8 +- .../src/functions/HDFS/Capacity/Manager.jsx | 4 +- .../src/functions/HDFS/Capacity/Monitor.jsx | 6 +- .../src/functions/HDFS/Capacity/index.jsx | 10 +-- 5 files changed, 55 insertions(+), 61 deletions(-) diff --git a/package/Aries/package.json b/package/Aries/package.json index fee91a7..b7759f7 100644 --- a/package/Aries/package.json +++ b/package/Aries/package.json @@ -1,46 +1,46 @@ { - "scripts": { - "lint": "eslint --ext .jsx,.js src || true", - "build": "cross-env NODE_ENV=production webpack -p --progress --colors --bail", - "start": "node-dev server.js", - "theme": "node bin/theme.js -#ff7043:#42a5f5 -#ff5722:#55a8fd -#f4511e:#1e88e5" - }, - "dependencies": { - "antd": "^1.8.0", - "bfd-bootstrap": "0.0.22", - "bfd-ui": "^0.10.0", - "echarts": "^3.2.3", - "js-cookie": "^2.1.2", - "less": "^2.7.1", - "less-loader": "^2.2.3", - "react-copy-to-clipboard": "^4.2.2", - "react-markdown": "^2.4.2", - "uuid": "^2.0.2", - "vis": "^4.16.1" - }, - "devDependencies": { - "autoprefixer": "^6.3.6", - "babel-cli": "^6.3.17", - "babel-loader": "^6.2.0", - "babel-plugin-antd": "^0.4.1", - "babel-plugin-transform-runtime": "~6.4.3", - "babel-preset-es2015": "^6.3.13", - "babel-preset-react": "^6.3.13", - "babel-preset-stage-0": "^6.3.13", - "cross-env": "^1.0.8", - "ejs": "^2.4.1", - "eslint": "^1.10.3", - "eslint-loader": "^1.3.0", - "eslint-plugin-react": "^4.2.3", - "express": "^4.13.3", - "install": "^0.8.1", - "node-dev": "^3.1.0", - "npm": "^3.9.5", - "postcss-loader": "^0.8.2", - "rimraf": "^2.5.2", - "underscore": "^1.8.3", - "webpack": "^1.12.9", - "webpack-dev-middleware": "^1.4.0", - "webpack-livereload-plugin": "^0.8.1" - } + "scripts": { + "lint": "eslint --ext .jsx,.js src || true", + "build": "cross-env NODE_ENV=production webpack -p --progress --colors --bail", + "start": "node-dev server.js", + "theme": "node bin/theme.js -#ff7043:#42a5f5 -#ff5722:#55a8fd -#f4511e:#1e88e5" + }, + "dependencies": { + "antd": "^1.8.0", + "bfd-bootstrap": "0.0.22", + "bfd-ui": "^1.3.4", + "echarts": "^3.2.3", + "js-cookie": "^2.1.2", + "less": "^2.7.1", + "less-loader": "^2.2.3", + "react-copy-to-clipboard": "^4.2.2", + "react-markdown": "^2.4.2", + "uuid": "^2.0.2", + "vis": "^4.16.1" + }, + "devDependencies": { + "autoprefixer": "^6.3.6", + "babel-cli": "^6.3.17", + "babel-loader": "^6.2.0", + "babel-plugin-antd": "^0.4.1", + "babel-plugin-transform-runtime": "~6.4.3", + "babel-preset-es2015": "^6.3.13", + "babel-preset-react": "^6.3.13", + "babel-preset-stage-0": "^6.3.13", + "cross-env": "^1.0.8", + "ejs": "^2.4.1", + "eslint": "^1.10.3", + "eslint-loader": "^1.3.0", + "eslint-plugin-react": "^4.2.3", + "express": "^4.13.3", + "install": "^0.8.1", + "node-dev": "^3.1.0", + "npm": "^3.9.5", + "postcss-loader": "^0.8.2", + "rimraf": "^2.5.2", + "underscore": "^1.8.3", + "webpack": "^1.12.9", + "webpack-dev-middleware": "^1.4.0", + "webpack-livereload-plugin": "^0.8.1" + } } diff --git a/package/Aries/src/App.jsx b/package/Aries/src/App.jsx index 94de6f2..b253db0 100644 --- a/package/Aries/src/App.jsx +++ b/package/Aries/src/App.jsx @@ -134,7 +134,7 @@ const App = React.createClass({
{auth.user.cur_space != "" ? [ -
+