新版学院统计调整

public/react/src/AppConfig.js

@@ -19,25 +19,25 @@ function locationurl(list){
 let hashTimeout
 
 // TODO 开发期多个身份切换
-let debugType =""
+// let debugType =""
-if (isDev) {
+// if (isDev) {
-  const _search = window.location.search;
+//   const _search = window.location.search;
-  let parsed = {};
+//   let parsed = {};
-  if (_search) {
+//   if (_search) {
-    parsed = queryString.parse(_search);
+//     parsed = queryString.parse(_search);
-  }
+//   }
-  debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
+//   debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
-    window.location.search.indexOf('debug=s') != -1 ? 'student' :
+//     window.location.search.indexOf('debug=s') != -1 ? 'student' :
-      window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin'
+//       window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin'
-}
+// }
-// 超管
+// // 超管
-// debugType="admin";
+// // debugType="admin";
-// 老师
+// // 老师
-//ebugType="teacher";
+// //ebugType="teacher";
-// 学生
+// // 学生
-// debugType="student";
+// // debugType="student";
-
+//
-window._debugType = debugType;
+// window._debugType = debugType;
 export function initAxiosInterceptors(props) {
     initOnlineOfflineListener()
 

public/react/src/college/College.js

@@ -1037,7 +1037,7 @@ class College extends Component {
 
 				<div className={"educontent   edu-back-white yinyin mt-4 sortinxdirection"} style={{width: "1200px"}}>
 					<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%"
 					}}>
@@ -1145,7 +1145,7 @@ class College extends Component {
 
 				<div className={"educontent   edu-back-white yinyin mt-4 sortinxdirection mb80"} style={{width: "1200px"}}>
 					<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:'440px',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%',
+			right: '10%',
-			bottom: '10%',
+			bottom: '15%',
 			containLabel: true
 		},
 
@@ -133,7 +133,7 @@ class Colleagechartzu extends Component {
 			<div>
 
 				<div
-					style={{ width:'410px',height:'600px'}}
+					style={{ width:'440px',height:'600px'}}
 					id="shixun_skill_charts">
 				</div>