From 9e53722d45420879e99bddc511bae28a817b66f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=9D=A4=20=E6=A2=81?= <liangkun7173@hotmail.com>
Date: Sun, 19 Jun 2022 09:57:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9E=E4=BA=8B=E5=A4=A7=E5=8E=85=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Content/css/DragSSO/index.css             | 37 +++++++++++++++++--
 .../Content/css/DragSSO/index3.css            |  1 +
 .../Content/js/DragSSO/index3.js              |  9 +++--
 .../Views/SSOSystem/DragModelOne.cshtml       |  4 ++
 4 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/index.css b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/index.css
index 2bab40735..482df29b3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/index.css	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/index.css	
@@ -667,12 +667,20 @@ body.active .headSearchImg {
 .warpper {
     height: calc(100% - 70px);
 }
-
+#teacherDesktop_major
+{
+    width:100% !important;
+    }
 .inSec3RowBox {
     height: calc(100% - 76px);
     margin: 10px -10px;
 }
 
+    #workDesktop_major
+{
+    width:100% !important;
+     height:200px !important;
+    }
 .inSec3Row {
     height: 100%;
     overflow: auto;
@@ -1969,18 +1977,39 @@ body.active .headSearchImg {
     padding: 0 5px;
     margin-top: 10px;
 }
-
+#major
+{
+  width:100%;
+}
 .specialCol4 {
     float: left;
     width: 33.333333%;
     padding: 0 5px;
     margin-top: 10px;
 }
-
+.headNumTxt
+{
+  width:80px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;  
+ height:30px;  
+}
 .echartBox {
     height: 100%;
+    width: 205px;
 }
-
+#age
+{
+    width:280px !important;    
+    position:relative;
+    	left:-65px;
+}
+.ageTxt
+{
+    
+    left: calc(9% - 46px) !important;
+    }
 .layui-input-block {
     position: absolute;
     right: 22px;
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/index3.css b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/index3.css
index 261122bb4..194e43574 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/index3.css	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/index3.css	
@@ -129,6 +129,7 @@
 .in3Sec3Echart1Box {
 	height: 190px;
 	position: relative;
+
 }
 
 .in3Sec3Echart1Con {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/index3.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/index3.js
index a7d46d77d..3158d50b3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/index3.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/index3.js	
@@ -99,10 +99,10 @@ function ageEchart() {
 			// orient: 'vertical',
 			textStyle: { //图例文字的样式
 				color: '#424242',
-				fontSize: 10
+				fontSize: 8
 			},
 			left: 0,
-			bottom: 0,
+            bottom: 0,
 			itemWidth: 8,
 			itemHeight: 8,
 			data: ['20~30岁', '30~40岁', '40~50岁', '50~60岁', '60岁以上']
@@ -118,7 +118,7 @@ function ageEchart() {
 			},
 			roseType: 'radius',
             data: TeacherByAge
-		}]
+		}],
 	};
 
 	// 使用刚指定的配置项和数据显示图表。
@@ -230,6 +230,9 @@ function majorEchart() {
 	window.addEventListener("resize", function() {
 		myChart5.resize();
 	});
+    setTimeout(function(){
+    myChart5.resize();
+    });
 }
 
 // 学生逃课预警
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml
index c955538ce..02d2f9338 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml	
@@ -672,6 +672,10 @@
         window.addEventListener("resize", function () {
             myChart5.resize();
         });
+		 setTimeout(function(){
+		 console.log(123)
+    myChart5.resize();
+},2000)
     }
     //办公业务流量
     function serviceEchart(ind) {