update

src/components/boxes/FanRuntime.vue

@@ -0,0 +1,26 @@
+<template>
+	<!-- 风机运行情况 -->
+	<Container usage="Table">
+		<SubContainer title="风机运行情况" icon="docs" padding="17px">
+			风机运行情况
+		</SubContainer>
+	</Container>
+</template>
+
+<script>
+import Container from "../layout/Container.vue";
+import SubContainer from "../layout/SubContainer.vue";
+
+export default {
+	name: "KilnPressure",
+	props: {},
+	components: { Container, SubContainer },
+	data() {
+		return {};
+	},
+};
+</script>
+
+<style scoped lang="scss">
+@import "../../assets/styles/functions";
+</style>

src/components/layout/Container.vue

@@ -45,7 +45,7 @@ export default {
 
 .number-or-date {
   display: inline-block;
-  width: w(753px);
+  width: w(800px);
   height: h(375px);
   background: url(../../assets/box-number.png);
   background-position: 0 0; /** top left */
@@ -54,9 +54,9 @@ export default {
 
 .tables {
   display: inline-block;
-  width: w(753px);
+  width: w(800px);
-  height: h(556px);
+  height: h(528px);
-  background: url(../../assets/box-number.png);
+  background: url(../../assets/box-table.png);
   background-position: 0 0; /** top left */
   background-size: 100% 100%;
 }
@@ -72,7 +72,7 @@ export default {
 
 .number-and-chart {
   display: inline-block;
-  width: w(753px);
+  width: w(800px);
   height: h(931px);
   background: url(../../assets/box-right.png);
   background-position: 0 0; /** top left */

src/components/layout/Header.vue

@@ -22,8 +22,9 @@ export default {
 @import "../../assets/styles/variables";
 
 header {
-	background: url(../../assets/header.png) center/cover no-repeat;
+	background: url(../../assets/header.png) center/contain no-repeat;
-	height: h(300px);
+	background-size: 105%;
+	height: h(280px);
 	width: $actual_width;
 	display: grid;
 	place-items: center;
@@ -34,22 +35,22 @@ header {
 		margin-bottom: 20px;
 
 		.header--logo {
-			width: 64px;
+			width: 56px;
-			height: 64px;
+			height: 56px;
 			background: url(../../assets/logo.png) center/contain no-repeat;
 		}
 
 		h1 {
 			margin-left: 20px;
-			font-size: 40px;
+			font-size: 35px;
 			// line-height: 100px;
 			// background: #eee;
 			user-select: none;
 			letter-spacing: 8px;
-			font-weight: 500;
+			font-weight: 600;
 			// color: #6bf2ff;
 			color: $main-color;
-			font-family: "微软雅黑", "MS YaHei", "Helvicate", sans-serif;
+			font-family: "微软雅黑", sans-serif;
 		}
 	}
 }
@@ -61,13 +62,13 @@ header {
 }
 
 .company {
-	margin-left: w(1180px);
+	margin-left: w(1420px);
 	width: w(1460px);
 	background: url("../../assets/company.png") center/cover no-repeat;
 }
 
 .datetime {
-	margin-left: w(6300px);
+	margin-left: w(6050px);
 	width: w(1407px);
 	background: url("../../assets/date.png") center/cover no-repeat;
 }

src/components/layout/Main.vue

@@ -13,7 +13,7 @@
 			<KilnPressure />
 		</div>
 		<div class="absolute left fan-runtime">
-			<KilnRuntime />
+			<FanRuntime />
 		</div>
 		<div class="right absolute"></div>
 	</main>
@@ -22,12 +22,13 @@
 <script>
 import KilnRuntime from "../boxes/KilnRuntime.vue";
 import KilnPressure from "../boxes/KilnPressure.vue";
+import FanRuntime from "../boxes/FanRuntime.vue";
 import AreaOne from "../isolate-area-1/Area.vue";
 // import Container from './Container.vue'
 
 export default {
 	name: "Main",
-	components: { AreaOne, KilnRuntime, KilnPressure },
+	components: { AreaOne, KilnRuntime, KilnPressure, FanRuntime},
 	props: {},
 	data() {
 		return {};