Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

src/views/enm_coal/report.vue

@@ -182,7 +182,7 @@ let tooltip = {
 	triggerOn: "mousemove",
 };
 let grid = {
-	right: "8%",
+	right: "10%",
 	left: "4%",
 	top: "15%",
 };
@@ -219,7 +219,7 @@ let yAxis = [
 		name: "运转率 (%)",
 		position: "right",
 		alignTicks: true,
-		offset: 80,
+		offset: 60,
 		axisLine: {
 			show: true,
 			lineStyle: {

src/views/enm_kiln/report.vue

@@ -306,8 +306,8 @@ let tooltip = {
 	triggerOn: "mousemove",
 };
 let grid = {
-	right: "9%",
+	right: "12%",
-	left: "7%",
+	left: "10%",
 	top: "15%",
 };
 let toolbox = {
@@ -357,7 +357,7 @@ let yAxis = [
 			},
 		},
 		axisLabel: {
-			formatter: "{value}%",
+			formatter: "{value}",
 		},
 	},
 	{
@@ -396,7 +396,7 @@ let yAxis = [
 		name: "成本(元)",
 		position: "left",
 		alignTicks: true,
-		offset: 70,
+		offset: 60,
 		axisLine: {
 			show: true,
 			lineStyle: {

src/views/enm_mill/report.vue

@@ -295,8 +295,8 @@ let tooltip = {
 	triggerOn: "mousemove",
 };
 let grid = {
-	right: "8%",
+	right: "10%",
-	left: "7%",
+	left: "10%",
 	top: "15%",
 };
 let toolbox = {
@@ -328,7 +328,7 @@ let yAxis = [
 	},
 	{
 		type: "value",
-		name: "运转率 (%)",
+		name: "运转率",
 		position: "right",
 		alignTicks: true,
 		offset: 80,

src/views/enm_rm/report.vue

@@ -295,8 +295,8 @@ let tooltip = {
 	// alwaysShowContent:true,
 };
 let grid = {
-	right: "7%",
+	right: "10%",
-	left: "7%",
+	left: "10%",
 	top: "15%",
 };
 let toolbox = {

src/views/enm_slag/report.vue

@@ -115,7 +115,7 @@
 						<div class="chartTitle">本月生产参数统计图</div>
 						<scEcharts
 							height="400px"
-							width="1600px"
+							width="1035px"
 							:option="optionDay"
 						></scEcharts>
 					</div>
@@ -123,7 +123,7 @@
 						<div class="chartTitle">本年生产参数统计图</div>
 						<scEcharts
 							height="400px"
-							width="1600px"
+							width="1035px"
 							:option="optionMonth"
 						></scEcharts>
 					</div>
@@ -264,9 +264,9 @@ let tooltip = {
 	triggerOn: "mousemove",
 };
 let grid = {
-	right: "7%",
+	right: "11%",
-	left: "4%",
+	left: "11%",
-	top: "15%",
+	top: "20%",
 };
 let toolbox = {
 	right: "5%",
@@ -302,7 +302,7 @@ let yAxis = [
 		name: "分布电耗(KW.h)",
 		position: "left",
 		alignTicks: true,
-		offset: 80,
+		offset: 100,
 		axisLine: {
 			show: true,
 			lineStyle: {