Merge branch '236-frontend' into dev-backstage

src/pages/Data/index.js

@@ -76,12 +76,12 @@ class Data extends Component {
                                                        }}/>
                                 </Col>
 
-                                <Col span={12} offset={2} style={{alignItems:"start", flexDirection:"row", justifyContent:"center"}}>
+                                <Col span={14} offset={1} style={{alignItems:"start", flexDirection:"row", justifyContent:"center"}}>
                                     {/*justifyContent:"center", alignItems:"flex-start"*/}
                                     {/*右侧*/}
                                     <Row justify={"center"} style={{flexDirection:"row",alignItems:"flex-start", justifyContent:"center"}}>
                                         <Col span={24} style={{fontSize:window.innerWidth/100, marginLeft:5,marginTop:window.innerWidth/100, padding:0, height:window.innerWidth/100-10, fontWeight:"bold", color:"#4b4b4b"}}>今日访问量</Col>
-                                        <Col span={24} style={{fontSize:window.innerWidth/10/3, margin:0, padding:0, height:window.innerWidth/10/3-30, fontWeight:"bolder", color:"#4b4b4b", maxWidth:window.innerWidth/10}}>{visitsNum}</Col>
+                                        <Col span={24} style={{fontSize:window.innerWidth/10/3, margin:0, padding:0, height:window.innerWidth/10/3-30, fontWeight:"bolder", color:"#4b4b4b", maxWidth:window.innerWidth/5}}>{visitsNum>99999999?(visitsNum/100000000).toFixed(2)+"亿":(visitsNum>9999?(visitsNum/10000).toFixed(2)+"万":visitsNum)}</Col>
                                     </Row>
                                     
                                 </Col>
@@ -93,11 +93,11 @@ class Data extends Component {
                             {/*右一 区域对战人数占比*/}
                             <Row justify={"center"} align={"bottom"}>
                                 <Col span={11} style={{fontSize:window.innerWidth/10/12, color:"#333333"}}>区域PK人数占比</Col>
-                                <Col span={11} style={{fontSize:window.innerWidth/10/6, display:"flex", flexDirection:"row", justifyContent:"flex-end", color:"#51D351",fontWeight:"bolder"}}>{(onlineNum===0?0:Math.round(curAreaNum/onlineNum))*100}%</Col>
+                                <Col span={11} style={{fontSize:window.innerWidth/10/6, display:"flex", flexDirection:"row", justifyContent:"flex-end", color:"#51D351",fontWeight:"bolder"}}>{((onlineNum===0?0:(curAreaNum/onlineNum))*100).toFixed(2)}%</Col>
                             </Row>
                             <Row justify={"center"}>
                                 <Col span={22}>
-                                    <Progress percent={(onlineNum===0?0:Math.round(curAreaNum/onlineNum))*100} strokeColor={"#51D351"} trailColor={"#E4E4E4"} strokeWidth={window.innerWidth/10/17} showInfo={false}/>
+                                    <Progress percent={((onlineNum===0?0:curAreaNum/onlineNum)*100).toFixed(2)} strokeColor={"#51D351"} trailColor={"#E4E4E4"} strokeWidth={window.innerWidth/10/17} showInfo={false}/>
                                 </Col>
                             </Row>
                             <Row justify={"center"} style={{fontSize:window.innerWidth/10/10}}>
@@ -115,11 +115,11 @@ class Data extends Component {
                             {/*在线人数占比*/}
                             <Row justify={"center"} align={"bottom"}>
                                 <Col span={11} style={{fontSize:window.innerWidth/10/12, color:"#333333"}}>在线人数占比</Col>
-                                <Col span={11} style={{fontSize:window.innerWidth/10/6, display:"flex", flexDirection:"row", justifyContent:"flex-end", color:"#F2CA80",fontWeight:"bolder"}}>{(onlineNum===0?0:Math.round(onlineNum/totalNum))*100}%</Col>
+                                <Col span={11} style={{fontSize:window.innerWidth/10/6, display:"flex", flexDirection:"row", justifyContent:"flex-end", color:"#F2CA80",fontWeight:"bolder"}}>{((onlineNum===0?0:(onlineNum/totalNum))*100).toFixed(2)}%</Col>
                             </Row>
                             <Row justify={"center"}>
                                 <Col span={22}>
-                                    <Progress percent={(totalNum===0?0:Math.round(onlineNum/totalNum))*100} strokeColor={"#F2CA80"} trailColor={"#E4E4E4"} strokeWidth={window.innerWidth/10/17}  showInfo={false}/>
+                                    <Progress percent={((totalNum===0?0:onlineNum/totalNum)*100).toFixed(2)} strokeColor={"#F2CA80"} trailColor={"#E4E4E4"} strokeWidth={window.innerWidth/10/17}  showInfo={false}/>
                                 </Col>
                             </Row>
                             <Row justify={"center"} style={{fontSize:window.innerWidth/10/10}}>
@@ -135,11 +135,11 @@ class Data extends Component {
                             {/*双人PK人数占比*/}
                             <Row justify={"center"} align={"bottom"}>
                                 <Col span={11} style={{fontSize:window.innerWidth/10/12, color:"#333333"}}>双人PK人数占比</Col>
-                                <Col span={11} style={{fontSize:window.innerWidth/10/6, display:"flex", flexDirection:"row", justifyContent:"flex-end", color:"#BF7636",fontWeight:"bolder"}}>{(totalNum===0?0:Math.round(curPKNum/totalNum))*100}%</Col>
+                                <Col span={11} style={{fontSize:window.innerWidth/10/6, display:"flex", flexDirection:"row", justifyContent:"flex-end", color:"#BF7636",fontWeight:"bolder"}}>{((totalNum===0?0:(curPKNum/totalNum))*100).toFixed(2)}%</Col>
                             </Row>
                             <Row justify={"center"}>
                                 <Col span={22}>
-                                    <Progress percent={(totalNum===0?0:Math.round(curPKNum/totalNum))*100} strokeColor={"#BF7636"} trailColor={"#E4E4E4"} strokeWidth={window.innerWidth/10/17} showInfo={false}/>
+                                    <Progress percent={((totalNum===0?0:curPKNum/totalNum)*100).toFixed(2)} strokeColor={"#BF7636"} trailColor={"#E4E4E4"} strokeWidth={window.innerWidth/10/17} showInfo={false}/>
                                 </Col>
                             </Row>
                             <Row justify={"center"} style={{fontSize:window.innerWidth/10/10}}>