diff --git a/src/assets/box-table.png b/src/assets/box-table.png
new file mode 100644
index 0000000..ba83b61
Binary files /dev/null and b/src/assets/box-table.png differ
diff --git a/src/assets/docs.png b/src/assets/docs.png
new file mode 100644
index 0000000..623b8be
Binary files /dev/null and b/src/assets/docs.png differ
diff --git a/src/components/boxes/FanRuntime.vue b/src/components/boxes/FanRuntime.vue
new file mode 100644
index 0000000..34a944c
--- /dev/null
+++ b/src/components/boxes/FanRuntime.vue
@@ -0,0 +1,26 @@
+
+
+
+
+ 风机运行情况
+
+
+
+
+
+
+
diff --git a/src/components/layout/Container.vue b/src/components/layout/Container.vue
index 97dedb3..6a7dbd5 100644
--- a/src/components/layout/Container.vue
+++ b/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);
- height: h(556px);
- background: url(../../assets/box-number.png);
+ width: w(800px);
+ height: h(528px);
+ 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 */
diff --git a/src/components/layout/Header.vue b/src/components/layout/Header.vue
index cc5973b..af52e8d 100644
--- a/src/components/layout/Header.vue
+++ b/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;
- height: h(300px);
+ background: url(../../assets/header.png) center/contain no-repeat;
+ 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;
- height: 64px;
+ width: 56px;
+ 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;
}
diff --git a/src/components/layout/Main.vue b/src/components/layout/Main.vue
index cbb89f3..6678905 100644
--- a/src/components/layout/Main.vue
+++ b/src/components/layout/Main.vue
@@ -13,7 +13,7 @@
-
+
@@ -22,12 +22,13 @@