diff --git a/src/components/StandardTable/index.js b/src/components/StandardTable/index.js index 3a4ec8a8a0875f7d34a64e0a743efe15a20bbf9a..66dba867e0b9b630b72ffca7384e9ca4c8f8debc 100644 --- a/src/components/StandardTable/index.js +++ b/src/components/StandardTable/index.js @@ -59,11 +59,8 @@ class StandardTable extends PureComponent { title: '服务调用次数', dataIndex: 'callNo', sorter: true, - render: val => ( -
- {val} 万 -
- ), + align: 'right', + render: val => `${val} 万`, }, { title: '状态', diff --git a/src/routes/Dashboard/Analysis.js b/src/routes/Dashboard/Analysis.js index 1ef131ca5005fab83860419c99eaef257dbe562a..3f0b3765b23d2728eebd2f545810260e12a0a207 100644 --- a/src/routes/Dashboard/Analysis.js +++ b/src/routes/Dashboard/Analysis.js @@ -177,7 +177,7 @@ export default class Analysis extends Component { {text}% ), - className: styles.alignRight, + align: 'right', }, ]; diff --git a/src/routes/Dashboard/Analysis.less b/src/routes/Dashboard/Analysis.less index cdd326e6627bcf4f541be099ab93a68188fbde79..9b773a173b7519d53b7c8a8c5783377d451c1a73 100644 --- a/src/routes/Dashboard/Analysis.less +++ b/src/routes/Dashboard/Analysis.less @@ -131,11 +131,6 @@ } } -td.alignRight, -th.alignRight { - text-align: right!important; -} - .trendText { margin-left: 8px; color: @heading-color; diff --git a/src/routes/Profile/BasicProfile.js b/src/routes/Profile/BasicProfile.js index 2efa34cda7c71159bdbc3701a7b67250becb3355..da59fc2c691e4b0010f5e75fa7b41aebb75a7dd1 100644 --- a/src/routes/Profile/BasicProfile.js +++ b/src/routes/Profile/BasicProfile.js @@ -99,13 +99,13 @@ export default class BasicProfile extends Component { title: '单价', dataIndex: 'price', key: 'price', - className: 'col-money', + align: 'right', render: renderContent, }, { title: '数量(件)', dataIndex: 'num', key: 'num', - className: 'col-money', + align: 'right', render: (text, row, index) => { if (index < basicGoods.length) { return text; @@ -116,7 +116,7 @@ export default class BasicProfile extends Component { title: '金额', dataIndex: 'amount', key: 'amount', - className: 'col-money', + align: 'right', render: (text, row, index) => { if (index < basicGoods.length) { return text; diff --git a/src/routes/Profile/BasicProfile.less b/src/routes/Profile/BasicProfile.less index 2b543976b3bc4cdf3b3b7608ff8abc6b44e1425d..cb3e6a379e0c2b2b669b5632c0e347963bbb4c9b 100644 --- a/src/routes/Profile/BasicProfile.less +++ b/src/routes/Profile/BasicProfile.less @@ -6,9 +6,3 @@ font-weight: 500; margin-bottom: 16px; } - -:global { - .col-money { - text-align: right!important; - } -}