Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

public/react/src/college/College.js

@@ -824,8 +824,8 @@ class College extends Component {
 			<div className="newMain clearfix edu-back-eeee">
 					<div className="yslstatistic-header intermediatecenter" >
 						<div className="intermediatecenter " style={{
-							maxWidth:"1200px",
-							width:"1200px",
+							maxWidth:"1300px",
+							width:"1300px",
 							height: '100%',
 						}}>
 						<div className="yslstatistic-header-title">{school}</div>
@@ -874,7 +874,7 @@ class College extends Component {
 						</div>
 						</div>
  					</div>
-					<div className={"educontent   edu-back-white mt-4"} style={{width: "1200px"}}>
+					<div className={"educontent   edu-back-white mt-4"} style={{width: "1300px"}}>
 						<p className="h4 linjibenshiyong">
 							基本使用情况
 						</p>
@@ -956,7 +956,7 @@ class College extends Component {
 					</div>
 
 
-				<div className={"educontent   edu-back-white mt-4 yinyin"} style={{width: "1200px"}}>
+				<div className={"educontent   edu-back-white mt-4 yinyin"} style={{width: "1300px"}}>
 					<p className="statistic-label linjibenshiyong">
 						课堂
 					</p>
@@ -974,7 +974,7 @@ class College extends Component {
 
 							</NoneData>
 						:
-							<div style={{width: "1200px"}}>
+							<div style={{width: "1300px"}}>
 								<div className={"justify break_full_word new_li edu-back-white"}
 										 style={{minHeight: "480px"}}>
 									<style>{`
@@ -1035,9 +1035,9 @@ class College extends Component {
 				</div>
 
 
-				<div className={"educontent   edu-back-white yinyin mt-4 sortinxdirection"} style={{width: "1200px"}}>
+				<div className={"educontent   edu-back-white yinyin mt-4 sortinxdirection"} style={{width: "1300px"}}>
 					<div className=" verticallayout" style={{
-						width: "65%"
+						width: "63%"
 					}}>
 						<p className="statistic-label ysllinjibenshiyong yinyin">
 							教师排名
@@ -1112,7 +1112,7 @@ class College extends Component {
 					</div>
 
 					<div className="" style={{
-						width: "35%"
+						width: "37%"
 					}}><div className="yslslinjibenshiyong"  style={{
 						height: "100%"
 					}}>
@@ -1143,9 +1143,9 @@ class College extends Component {
 				</div>
 
 
-				<div className={"educontent   edu-back-white yinyin mt-4 sortinxdirection mb80"} style={{width: "1200px"}}>
+				<div className={"educontent   edu-back-white yinyin mt-4 sortinxdirection mb80"} style={{width: "1300px"}}>
 					<div className=" verticallayout" style={{
-						width: "65%"
+						width: "63%"
 					}}>
 						<p className="statistic-label ysllinjibenshiyong yinyin ">
 							学生排名
@@ -1218,7 +1218,7 @@ class College extends Component {
 					</div>
 
 					<div className="" style={{
-						width: "35%"
+						width: "37%"
 					}}>
 
 						<div className="yslslinjibenshiyong" style={{

public/react/src/college/colleagechart/Colleagechart.js

@@ -13,12 +13,12 @@ function startechart(data,datanane){
 
 		tooltip : {
 			trigger: 'item',
-			formatter: "{a} <br/>{b} : {c} ({d}%)"
+			formatter: "{d}% <br/>"
 		},
 		legend: {
 			// orient: 'vertical',
 			// top: 'middle',
-			bottom: 40,
+			bottom: 50,
 			left: 'center',
 			data: datanane
 		},
@@ -68,7 +68,7 @@ class Colleagechart extends Component {
 			<div>
 
 					<div
-							 style={{ width:'410px',height:'600px'}}
+							 style={{ width:'100%',height:'600px'}}
 							 id="shixun_skill_chart">
 					</div>
 

public/react/src/college/colleagechart/Colleagechartzu.js

@@ -15,8 +15,8 @@ function startechart(names, values){
 		backgroundColor: '#fff',
 		grid: {
 			left: '3%',
-			right: '4%',
-			bottom: '10%',
+			right: '8%',
+			bottom: '15%',
 			containLabel: true
 		},
 
@@ -133,7 +133,7 @@ class Colleagechartzu extends Component {
 			<div>
 
 				<div
-					style={{ width:'410px',height:'600px'}}
+					style={{ width:'100%',height:'600px'}}
 					id="shixun_skill_charts">
 				</div>
 

public/react/src/college/colleagecss/colleage.css

@@ -31,7 +31,7 @@
 }
 
 .yslstatistic-base-item-label{
-    width: 200px;
+    width: 217px;
     text-align: center;
     font-size: 16px;
     height: 48px;
@@ -41,7 +41,7 @@
     border-top: 1px solid #EBEBEB;
 }
 .yslstatistic-base-item-labels{
-    width: 200px;
+    width: 217px;
     text-align: center;
     height: 100px;
     line-height: 100px;