update header

src/App.vue

@@ -1,9 +1,5 @@
 <template>
 	<div id="app">
-		<!-- <nav>
-			<router-link to="/">Home</router-link> |
-			<router-link to="/about">About</router-link>
-		</nav> -->
 		<router-view />
 	</div>
 </template>

src/assets/styles/variables.scss

@@ -1,14 +1,17 @@
 // variables 
 
-// $design_width: 4480px;
+// $design_width: 4480px
-$design_width: 8960px;
+$design_width: 21120px;
-$design_height: 2160px;
+$design_height: 4320px;
 $actual_width: 3840px;
 $actual_height: 1080px;
 
+// 纵/4  横/5.5
+// 字体按照纵向调整
+
 $height: 1080px;
 $default_ratio: 0.875;
 
 
 // colors
-$main-color: #6bf2ff;
+$main-color: #3565FF;

src/components/boxes/BottomTemp.vue

@@ -1,7 +1,7 @@
 <template>
 	<!-- 窑底温度 -->
 	<Container usage="Charts">
-		<SubContainer title="窑底温度" icon="kbtm" padding="34px">
+		<SubContainer title="窑底温度" icon="kbtm" padding="24px 32px">
 			<div class="tables flex" style="height: 100%">
 				<LineChart
 					key="1"
@@ -59,8 +59,8 @@ export default {
 	width: adjust(3px);
 	background: radial-gradient(
 		ellipse at center,
-		#6fe2ff,
+		#3565ff,
-		#52cbef80,
+		#3565ff51,
 		transparent,
 		transparent
 	);

src/components/boxes/FanRuntime.vue

@@ -1,40 +1,38 @@
 <template>
 	<!-- 风机运行情况 -->
 	<Container usage="Table">
-    <SubContainer title="风机运行情况" icon="fan" padding="34px">
+		<SubContainer title="风机运行情况" icon="fan" padding="24px 32px">
-      <div class="tables flex" style="height: 100%">
+			<div class="tables flex relative" style="height: 100%">
 				<div class="table-wrapper flex-1 align-start">
 					<div
 						v-if="tableData1 && tableData1.length === 0"
 						style="
 							position: absolute;
-              top: 0;
-              left: 0;
 							width: 100%;
 							height: 100%;
 							background: #eee1;
+							font-size: 18px;
+							letter-spacing: 2px;
+							color: #3c4e8b;
 							display: grid;
 							place-items: center;
-              font-size: 24px;
+							user-select: none;
-              color: #eee9;
 						"
-          >无数据</div>
+					>
+						无数据
+					</div>
 					<table class="table-1">
 						<thead>
-              <!-- <tr style="font-size: 8px; background: #044a84; opacity: 19%"> -->
 							<tr class="t-row">
-                <th>序号</th>
+								<th style="width: 90px">序号</th>
-                <th>设备名称</th>
+								<!-- <th style="width: 180px">设备名称</th>
-                <th>运行频率</th>
+								<th style="width: 180px">运行频率</th>
-                <th>设备状态</th>
+								<th style="width: 180px">设备状态</th> -->
+								<th style="width: 220px">设备名称</th>
+								<th style="width: 160px">运行频率</th>
+								<th style="width: 160px">设备状态</th>
 							</tr>
 						</thead>
-            <!-- <tbody> -->
-            <!-- <tr
-							v-for="(row, index) in tableData1"
-							:key="index"
-							style="font-size: 7px; background: #0b5499; opacity: 35%"
-						> -->
 						<transition-group name="fan-list" tag="tbody" mode="out-in">
 							<tr
 								class="t-row"
@@ -49,7 +47,9 @@
 										<StatusComp :value="d" />
 									</template>
 									<template v-else>
-                    {{ d }}
+										<!-- <el-tooltip effect="light" :content="d" placement="top"> -->
+											<span>{{ d }}</span>
+										<!-- </el-tooltip> -->
 									</template>
 								</td>
 							</tr>
@@ -104,43 +104,43 @@ export default {
 		return {
 			tableHead: ["序号", "设备名称", "运行频率", "设备状态"],
 			tableCache: [
-        // [11, "风机11", "未运行", "正常" /**or 0,1*/],
+				[11, "风机11", "未运行", "正常" /**or 0,1*/],
-        // [12, "风机12", "未运行", "正常" /**or 0,1*/],
+				[12, "风机12", "未运行", "正常" /**or 0,1*/],
-        // [13, "风机13", "73Hz", "正常" /**or 0,1*/],
+				[13, "风机13", "73Hz", "正常" /**or 0,1*/],
 			],
 			tableData1: [
-        // [1, "风机1", "2332Hz", "正常" /**or 0,1*/],
+				[1, "风机1", "2332Hz", "正常" /**or 0,1*/],
-        // [2, "风机2", "未运行", "故障" /**or 0,1*/],
+				[2, "2#风机水电费款经典款", "未运行", "故障" /**or 0,1*/],
-        // [3, "风机3", "333Hz", "正常" /**or 0,1*/],
+				[3, "风机3", "333Hz", "正常" /**or 0,1*/],
-        // [4, "风机4", "100Hz", "正常" /**or 0,1*/],
+				[4, "风机4", "100Hz", "正常" /**or 0,1*/],
-        // [5, "风机5", "未运行", "正常" /**or 0,1*/],
+				[5, "风机5", "未运行", "正常" /**or 0,1*/],
-        // [6, "风机6", "未运行", "故障" /**or 0,1*/],
+				[6, "风机6", "未运行", "故障" /**or 0,1*/],
-        // [7, "风机7", "3000Hz", "正常" /**or 0,1*/],
+				[7, "风机7", "3000Hz", "正常" /**or 0,1*/],
-        // [8, "风机8", "未运行", "正常" /**or 0,1*/],
+				[8, "风机8", "未运行", "正常" /**or 0,1*/],
-        // [9, "风机9", "未运行", "正常" /**or 0,1*/],
+				[9, "风机9", "未运行", "正常" /**or 0,1*/],
-        // [10, "风机10", "86423Hz", "正常" /**or 0,1*/],
+				[10, "风机10", "86423Hz", "正常" /**or 0,1*/],
 			],
 		};
 	},
 	computed: {
-    ...mapState(["fan"]),
+		// ...mapState(["fan"]),
 	},
 	watch: {
-    fan: {
+		// fan: {
-      handler: function (data) {
+		// 	handler: function (data) {
-        if (!data) return;
+		// 		if (!data) return;
-        let idx = 0;
+		// 		let idx = 0;
-        this.tableData1 = data.slice(0, 10).map((item, index) => {
+		// 		this.tableData1 = data.slice(0, 10).map((item, index) => {
-          idx += 1;
+		// 			idx += 1;
-          return [idx, ...item];
+		// 			return [idx, ...item];
-        });
+		// 		});
-        this.tableCache = data
+		// 		this.tableCache = data
-          .slice(10)
+		// 			.slice(10)
-          .map((item, index) => [index + 1 + idx, ...item]);
+		// 			.map((item, index) => [index + 1 + idx, ...item]);
-      },
+		// 	},
-      deep: true,
+		// 	deep: true,
-      immediate: true,
+		// 	immediate: true,
-    },
+		// },
 	},
 	mounted() {
 		setInterval(() => {
@@ -188,22 +188,10 @@ export default {
 	flex: 1;
 }
 
-.vertical-line {
-  margin: 0 adjust(3px);
-  width: adjust(3px);
-  background: radial-gradient(
-    ellipse at center,
-    #6fe2ff,
-    #52cbef80,
-    transparent,
-    transparent
-  );
-}
 .table-wrapper {
-  // padding-right: 6px;
 	height: 400px;
-  // overflow-y: auto;
 	overflow: hidden;
+	// background: #f001;
 }
 
 table {
@@ -211,6 +199,10 @@ table {
 	border-spacing: adjust(1px);
 }
 
+// .table-1 {
+//   background: #00f3;
+// }
+
 // tr, td, th {
 // 	max-height: 13.88px !important;
 // }
@@ -219,6 +211,10 @@ table {
 	height: adjust(14px);
 }
 
+.tables {
+	overflow: hidden;
+}
+
 .tables > table {
 	overflow-y: auto;
 }
@@ -232,23 +228,34 @@ thead > tr th:first-child {
 }
 
 thead > tr th {
-  font-size: adjust(10px);
+	font-size: adjust(8px);
-  line-height: 1.5;
+	font-family: -apple-system, BlinkMacSystemFont, Helvetica Neue, PingFang SC,
+		Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei,
+		"微软雅黑", Arial, Helvetica, sans-serif;
+	line-height: 1.25;
+	letter-spacing: 1px;
 	padding: adjust(3px) adjust(8px);
-  font-weight: 400;
+	font-weight: 600;
-  background: #044a8446;
+	background: #4288df23;
+	color: #030609d6;
 	text-align: left;
 }
 
-tbody > tr:nth-child(odd) {
+tbody > tr:nth-child(even) {
-  background: #0b549960;
+  background: #4288df13;
 }
 
 tbody > tr td {
-  font-size: adjust(10px);
+	font-family: -apple-system, BlinkMacSystemFont, Helvetica Neue, PingFang SC,
-  line-height: 1.25;
+		Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei,
+		"微软雅黑", Arial, Helvetica, sans-serif;
+	color: #030609d6;
+	font-size: adjust(8px);
+	height: adjust(8px * 1.2);
+	line-height: 1.2;
 	padding: adjust(2px) adjust(8px);
 	font-weight: 400;
+  overflow: hidden;
 	background: inherit;
 }
 

src/components/boxes/GasFlow.vue

@@ -1,25 +1,13 @@
 <template>
 	<!-- 天然气流量 -->
 	<Container usage="Charts">
-		<SubContainer title="天然气流量" icon="gas" padding="34px">
+		<SubContainer title="天然气流量" icon="gas" padding="24px 32px">
 			<div class="tables flex" style="height: 100%">
-				<LineChart
+				<LineChart key="1" id="line-chart-3" class="flex-1" unit="单位 m³/h" :legend="Object.keys(gasTable1)"
-					key="1"
+					:series="gasTable1" />
-					id="line-chart-3"
-					class="flex-1"
-					unit="单位 m³/h"
-					:legend="Object.keys(gasTable1)"
-					:series="gasTable1"
-				/>
 				<div class="vertical-line"></div>
-				<LineChart
+				<LineChart key="2" id="line-chart-4" class="flex-1" unit="单位 m³/h" :legend="Object.keys(gasTable2)"
-					key="2"
+					:series="gasTable2" />
-					id="line-chart-4"
-					class="flex-1"
-					unit="单位 m³/h"
-					:legend="Object.keys(gasTable2)"
-					:series="gasTable2"
-				/>
 			</div>
 		</SubContainer>
 	</Container>
@@ -57,12 +45,10 @@ export default {
 .vertical-line {
 	margin: 0 adjust(3px);
 	width: adjust(3px);
-	background: radial-gradient(
+	background: radial-gradient(ellipse at center,
-		ellipse at center,
+			#3565ff,
-		#6fe2ff,
+			#3565ff51,
-		#52cbef80,
 			transparent,
-		transparent
+			transparent);
-	);
 }
 </style>

src/components/boxes/HistoryTemp.vue

@@ -7,13 +7,13 @@
       style="
         position: absolute;
         top: 8px;
-        left: -30px;
+        left: -20px;
         width: 110%;
         height: 105%;
         background: #eee1;
         display: grid;
         place-items: center;
-        font-size: 24px;
+        font-size: 12px;
         color: #eee9;
       "
     >
@@ -62,9 +62,9 @@ h3 {
   margin: 0;
   font-family: sans-serif;
   font-weight: 400;
-  font-size: adjust(14px);
+  font-size: adjust(h(20px));
-  letter-spacing: adjust(1px);
+  letter-spacing: 1px;
-  color: #52fff8;
+  color: #0c71ff;
-  margin: adjust(12px) 0;
+  margin: adjust(h(12px)) 0;
 }
 </style>

src/components/boxes/InWater.vue

@@ -1,44 +1,18 @@
 <template>
   <!-- 窑炉进口水温 -->
-  <Container usage="NumberAndChart">
+  <Container class="in-water" usage="NumberAndChart">
-    <SubContainer title="窑炉进口水温" icon="inWater" padding="34px">
+    <SubContainer title="进口实时水温" icon="inWater">
       <div class="pic" style=""></div>
       <div class="content flex flex-col">
         <div class="realtime">
           <div class="time flex flex-center">
-            <template v-for="(item, index) in waterInTemp.split('')">
+            <span class="temp-data">{{ waterInTemp }}</span>
-              <DigitalBox
-                v-if="item !== '.'"
-                class="time--item"
-                :key="index"
-                :value="item"
-                :wider="true"
-              />
-              <span
-                :key="index"
-                v-else
-                style="
-                  background: #fff;
-                  width: 10px;
-                  height: 10px;
-                  align-self: flex-end;
-                  margin-bottom: 9px;
-                  margin-right: 8px;
-                "
-              ></span>
-              <!-- <span :key="index" v-else style="background: red; margin-right: 8px; line-height: 1; font-size: 88px; font-family: 'zcoolqingkehuangyouti-Regular'"></span> -->
-            </template>
             <span class="unit">℃</span>
           </div>
-          <div class="text">进口实时水温</div>
         </div>
         <div class="wave"></div>
         <div class="graph flex-1">
-          <HistoryTrend
+          <HistoryTrend key="water-in" title="窑炉进口水温历史" :series="kilnWaterIn" />
-            key="water-in"
-            title="窑炉进口水温历史"
-            :series="kilnWaterIn"
-          />
         </div>
       </div>
     </SubContainer>
@@ -71,12 +45,18 @@ export default {
 <style scoped lang="scss">
 @import "../../assets/styles/functions";
 
-.pic {
+.in-water {
-  background: url(../../assets/in-water.png) no-repeat;
-  background-size: 100% 100%;
-  background-position: center;
   position: absolute;
-  top: adjust(24px);
+  top: adjust(h(430px));
+  left: adjust(w(5630px));
+  height: adjust(h(620px));
+  width: adjust(w(880px));
+}
+
+.pic {
+  background: url(../../assets/in-water.png) top 0 left 0 / 90% no-repeat;
+  position: absolute;
+  top: adjust(10px);
   right: 0;
   width: adjust(w(440px));
   height: adjust(h(380px));
@@ -87,8 +67,8 @@ export default {
 }
 
 .wave {
-  transform: translateX(adjust(-16px));
+  transform: translateX(adjust(-8px));
-  width: adjust(w(793px));
+  width: adjust(w(852px));
   height: adjust(h(76px));
   background: url(../../assets/inwater.png) no-repeat;
   background-size: 100% 100%;
@@ -103,9 +83,10 @@ export default {
   // background: #eee;
 }
 
+
 .time {
   // background: #eee;
-  margin: adjust(12px) 0;
+  margin: adjust(6px) 0 0;
   padding-left: adjust(14px);
 }
 
@@ -113,44 +94,20 @@ export default {
   margin-right: adjust(5px);
 }
 
+.temp-data {
+  color: #0068ff;
+  font-size: adjust(h(88px));
+  letter-spacing: 1px;
+}
+
 .unit {
-  font-family: Ubuntu, monospace, sans-serif !important;
+  font-family: sans-serif !important;
-  font-size: adjust(20px);
+  font-size: adjust(h(48px));
-  letter-spacing: adjust(1px);
+  font-weight: 400;
+  letter-spacing: 1px;
   align-self: flex-end;
-}
+  margin-bottom: 4px;
-
+  margin-left: 4px;
-.text {
+  color: #0068ff;
-  display: inline-block;
-  margin-left: adjust(24px);
-  margin-bottom: adjust(10px);
-  padding: adjust(12px) 0;
-  text-align: center;
-  font-size: adjust(22px);
-  letter-spacing: adjust(1px);
-  position: relative;
-  z-index: 10;
-  user-select: none;
-}
-
-.text::after {
-  content: "";
-  display: block;
-  position: absolute;
-  z-index: 0;
-  left: 0;
-  bottom: adjust(10px);
-  height: adjust(4px);
-  width: 100%;
-  /* 渐变色 */
-  background: radial-gradient(
-    ellipse at center,
-    #6fe2ff,
-    #6fe2ffc0,
-    #52cbef80,
-    #52cbef30,
-    #52cbef00,
-    transparent
-  );
 }
 </style>

src/components/boxes/OilFlow.vue

@@ -1,7 +1,7 @@
 <template>
 	<!-- 油流量 -->
 	<Container usage="Charts">
-		<SubContainer title="油流量" icon="oil" padding="34px">
+		<SubContainer title="油流量" icon="oil" padding="24px 32px">
 			<div class="tables flex" style="height: 100%">
 				<LineChart
 					key="1"
@@ -30,6 +30,7 @@ import LineChart from "../charts/LineChart.vue";
 import Container from "../layout/Container.vue";
 import SubContainer from "../layout/SubContainer.vue";
 import { mapState } from "vuex";
+import { randomInt } from "@/utils";
 
 export default {
 	name: "OilFlow",
@@ -38,10 +39,62 @@ export default {
 	data() {
 		return {
 			chartConfig: {},
+			oilTable1: {
+				FT111: Array(24)
+					.fill(1)
+					.map((_) => randomInt()),
+				FT112: Array(24)
+					.fill(1)
+					.map((_) => randomInt()),
+				FT113: Array(24)
+					.fill(1)
+					.map((_) => randomInt()),
+				FT114: Array(24)
+					.fill(1)
+					.map((_) => randomInt()),
+				FT115: Array(24)
+					.fill(1)
+					.map((_) => randomInt()),
+			},
+			oilTable2: {
+				OT001: Array(24)
+					.fill(1)
+					.map((_) => randomInt()),
+				OT002: Array(24)
+					.fill(1)
+					.map((_) => randomInt()),
+				OT004: Array(24)
+					.fill(1)
+					.map((_) => randomInt()),
+				OT003: Array(24)
+					.fill(1)
+					.map((_) => randomInt()),
+				OT005: Array(24)
+					.fill(1)
+					.map((_) => randomInt()),
+				OT006: Array(24)
+					.fill(1)
+					.map((_) => randomInt()),
+				OT007: Array(24)
+					.fill(1)
+					.map((_) => randomInt()),
+				OT008: Array(24)
+					.fill(1)
+					.map((_) => randomInt()),
+				OT009: Array(24)
+					.fill(1)
+					.map((_) => randomInt()),
+				OT000: Array(24)
+					.fill(1)
+					.map((_) => randomInt()),
+				OT011: Array(24)
+					.fill(1)
+					.map((_) => randomInt()),
+			},
 		};
 	},
 	computed: {
-		...mapState(["oilTable1", "oilTable2"]),
+		// ...mapState(["oilTable1", "oilTable2"]),
 	},
 };
 </script>
@@ -59,8 +112,8 @@ export default {
 	width: adjust(3px);
 	background: radial-gradient(
 		ellipse at center,
-		#6fe2ff,
+		#3565ff,
-		#52cbef80,
+		#3565ff51,
 		transparent,
 		transparent
 	);

src/components/boxes/OutWater.vue

@@ -1,44 +1,18 @@
 <template>
   <!-- 窑炉出口水温 -->
-  <Container usage="NumberAndChart">
+  <Container class="out-water" usage="NumberAndChart">
-    <SubContainer title="窑炉出口水温" icon="inWater" padding="34px">
+    <SubContainer title="出口实时水温" icon="inWater">
       <div class="pic" style=""></div>
       <div class="content flex flex-col">
         <div class="realtime">
           <div class="time flex flex-center">
-            <template v-for="(item, index) in waterOutTemp.split('')">
+            <span class="temp-data">{{ waterOutTemp }}</span>
-              <DigitalBox
-                v-if="item !== '.'"
-                class="time--item"
-                :key="index"
-                :value="item"
-                :wider="true"
-              />
-              <span
-                :key="index"
-                v-else
-                style="
-                  background: #fff;
-                  width: 10px;
-                  height: 10px;
-                  align-self: flex-end;
-                  margin-bottom: 9px;
-                  margin-right: 8px;
-                "
-              ></span>
-              <!-- <span :key="index" v-else style="background: red; margin-right: 8px; line-height: 1; font-size: 88px; font-family: 'zcoolqingkehuangyouti-Regular'"></span> -->
-            </template>
             <span class="unit">℃</span>
           </div>
-          <div class="text">出口实时水温</div>
         </div>
         <div class="wave"></div>
         <div class="graph flex-1">
-          <HistoryTrend
+          <HistoryTrend key="water-out" title="窑炉出口水温历史" :series="kilnWaterOut" />
-            key="water-out"
-            title="窑炉出口水温历史"
-            :series="kilnWaterOut"
-          />
         </div>
       </div>
     </SubContainer>
@@ -67,16 +41,21 @@ export default {
   },
 };
 </script>
-
 <style scoped lang="scss">
 @import "../../assets/styles/functions";
 
-.pic {
+.out-water {
-  background: url(../../assets/out-water.png) no-repeat;
-  background-size: 100% 100%;
-  background-position: center;
   position: absolute;
-  top: adjust(24px);
+  top: adjust(h(1065px));
+  left: adjust(w(5630px));
+  height: adjust(h(620px));
+  width: adjust(w(880px));
+}
+
+.pic {
+  background: url(../../assets/out-water.png) top 0 left 0 / 90% no-repeat;
+  position: absolute;
+  top: adjust(10px);
   right: 0;
   width: adjust(w(440px));
   height: adjust(h(380px));
@@ -87,10 +66,10 @@ export default {
 }
 
 .wave {
-  transform: translateX(adjust(-16px)) rotateY(0.5turn);
+  transform: translateX(adjust(-8px));
-  width: adjust(w(793px));
+  width: adjust(w(852px));
   height: adjust(h(76px));
-  background: url(../../assets/inwater.png) no-repeat;
+  background: url(../../assets/outwater.png) no-repeat;
   background-size: 100% 100%;
 }
 
@@ -103,9 +82,10 @@ export default {
   // background: #eee;
 }
 
+
 .time {
   // background: #eee;
-  margin: adjust(12px) 0;
+  margin: adjust(4px) 0 0;
   padding-left: adjust(14px);
 }
 
@@ -113,44 +93,20 @@ export default {
   margin-right: adjust(5px);
 }
 
+.temp-data {
+  color: #0068ff;
+  font-size: adjust(h(88px));
+  letter-spacing: 1px;
+}
+
 .unit {
-  font-family: Ubuntu, monospace, sans-serif !important;
+  font-family: sans-serif !important;
-  font-size: adjust(20px);
+  font-size: adjust(h(48px));
-  letter-spacing: adjust(1px);
+  font-weight: 400;
+  letter-spacing: 1px;
   align-self: flex-end;
-}
+  margin-bottom: 4px;
-
+  margin-left: 4px;
-.text {
+  color: #0068ff;
-  display: inline-block;
-  margin-left: adjust(24px);
-  margin-bottom: adjust(10px);
-  padding: adjust(12px) 0;
-  text-align: center;
-  font-size: adjust(22px);
-  letter-spacing: adjust(1px);
-  position: relative;
-  z-index: 10;
-  user-select: none;
-}
-
-.text::after {
-  content: "";
-  display: block;
-  position: absolute;
-  z-index: 0;
-  left: 0;
-  bottom: adjust(10px);
-  height: adjust(4px);
-  width: 100%;
-  /* 渐变色 */
-  background: radial-gradient(
-    ellipse at center,
-    #6fe2ff,
-    #6fe2ffc0,
-    #52cbef80,
-    #52cbef30,
-    #52cbef00,
-    transparent
-  );
 }
 </style>

src/components/boxes/TopTemp.vue

@@ -1,25 +1,13 @@
 <template>
 	<!-- 窑顶温度 -->
 	<Container usage="Charts">
-		<SubContainer title="窑顶温度" icon="ktop" padding="34px">
+		<SubContainer title="窑顶温度" icon="ktop" padding="24px 32px">
 			<div class="tables flex" style="height: 100%">
-				<LineChart
+				<LineChart key="1" id="line-chart-5" class="flex-1" unit="单位/℃" :legend="Object.keys(kilnTop1)"
-					key="1"
+					:series="kilnTop1" />
-					id="line-chart-5"
-					class="flex-1"
-					unit="单位/℃"
-					:legend="Object.keys(kilnTop1)"
-					:series="kilnTop1"
-				/>
 				<div class="vertical-line"></div>
-				<LineChart
+				<LineChart key="2" id="line-chart-6" class="flex-1" unit="单位/℃" :legend="Object.keys(kilnTop2)"
-					key="2"
+					:series="kilnTop2" />
-					id="line-chart-6"
-					class="flex-1"
-					unit="单位/℃"
-					:legend="Object.keys(kilnTop2)"
-					:series="kilnTop2"
-				/>
 			</div>
 		</SubContainer>
 	</Container>
@@ -65,12 +53,10 @@ export default {
 .vertical-line {
 	margin: 0 adjust(3px);
 	width: adjust(3px);
-	background: radial-gradient(
+	background: radial-gradient(ellipse at center,
-		ellipse at center,
+			#3565ff,
-		#6fe2ff,
+			#3565ff51,
-		#52cbef80,
 			transparent,
-		transparent
+			transparent);
-	);
 }
 </style>

src/components/charts/BarChart.vue

@@ -75,27 +75,27 @@ export default {
         this.chart = echarts.init(document.getElementById(this.id));
       this.chart.setOption({
         grid: {
-          top: adjust(20),
+          top: adjust(0),
-          left: adjust(28),
+          left: adjust(10),
-          bottom: adjust(18),
+          bottom: adjust(10),
-          right: adjust(12),
+          right: adjust(0),
         },
         xAxis: {
           type: "category",
           data: this.updateXAxis(),
           axisLine: {
             lineStyle: {
-              color: "#5982b2a0",
+              color: '#0068ff33'
             },
           },
           axisTick: {
             show: false,
           },
           axisLabel: {
-            color: "#fff9",
+            color: "#3C4E8B",
-            fontSize: adjust(8),
+            fontSize: adjust(4),
-            lineHeight: adjust(1),
+            lineHeight: adjust(0),
-            margin: adjust(6),
+            margin: adjust(4),
             rotate: 30,
           },
         },
@@ -110,7 +110,7 @@ export default {
           axisLine: {
             show: true,
             lineStyle: {
-              color: "#5982b2a0",
+              color: '#0068ff33'
             },
           },
           axisTick: {
@@ -118,13 +118,13 @@ export default {
           },
           axisLabel: {
             formatter: "{value} ℃",
-            color: "#fff9",
+            color: "#3C4E8B",
-            fontSize: adjust(8),
+            fontSize: adjust(4),
-            lineHeight: adjust(1),
+            lineHeight: adjust(0),
           },
           splitLine: {
             lineStyle: {
-              color: "#5982b2a0",
+            color: '#0068ff33'
             },
           },
           // data: [100, 200, 300, 400, 500],

src/components/charts/LineChart.vue

@@ -3,7 +3,7 @@
   <div class="line-chart__wrapper">
     <div class="line-chart__custom-legend flex" v-if="legend.length">
       <!-- <span>产线1 - 产线5</span> -->
-      <ul style="" class="flex">
+      <ul style="" class="">
         <li v-for="(v, i) in legend" :key="i">{{ v }}</li>
       </ul>
     </div>
@@ -19,8 +19,9 @@
         height: 100%;
         display: grid;
         place-items: center;
-        font-size: 24px;
+        font-size: 18px;
-        color: #eee8;
+        letter-spacing: 2px;
+        color: #3C4E8B;
         user-select: none;
       "
     >
@@ -95,9 +96,11 @@ export default {
         "#7138FF",
         "#F318D8",
         "#C0F318",
-        "#f77",
+        "#ff7777",
-        "#19f",
+        "#1199ff",
-        "#98f",
+        "#9988ff",
+        "#3388ff",
+        "#337788",
       ],
       data: [],
       legendtext: [
@@ -142,11 +145,12 @@ export default {
         this.chart = echarts.init(document.getElementById(this.id));
       this.chart.setOption({
         grid: {
-          top: adjust(32),
+          top: adjust(22),
-          left: adjust(32),
+          left: adjust(22),
-          bottom: adjust(24),
+          bottom: adjust(20),
-          right: adjust(12),
+          right: adjust(8),
         },
+        tooltip: {},
         xAxis: {
           data: this.updateXAxis(),
           axisLine: {
@@ -158,20 +162,21 @@ export default {
             show: false,
           },
           axisLabel: {
-            color: "#fff9",
+            color: "#3C4E8Baa",
-            fontSize: adjust(8),
+            fontSize: adjust(6),
-            lineHeight: adjust(1),
+            lineHeight: adjust(0),
-            margin: adjust(8),
+            margin: adjust(4),
-            rotate: 30,
+            rotate: 45,
           },
         },
         yAxis: {
           type: "value",
           name: this.unit,
           nameTextStyle: {
-            color: "#fff9",
+            color: "#3C4E8Baa",
-            fontSize: adjust(9),
+            fontSize: adjust(8),
-            align: "",
+            lineHeight: adjust(12),
+            align: "center",
           },
           axisLine: {
             show: true,
@@ -184,9 +189,9 @@ export default {
             show: false,
           },
           axisLabel: {
-            color: "#fff9",
+            color: "#3C4E8Baa",
-            fontSize: adjust(8),
+            fontSize: adjust(7),
-            lineHeight: adjust(1),
+            lineHeight: adjust(0),
           },
           splitLine: {
             lineStyle: {
@@ -229,7 +234,7 @@ export default {
               name: lgd,
               type: "line",
               symbol: "circle",
-              symbolSize: adjust(3),
+              symbolSize: adjust(2),
               lineStyle: {
                 width: adjust(1),
               },
@@ -276,50 +281,47 @@ li {
 }
 
 ul {
-  // padding: 0 adjust(8px);
+  // background: #0005;
-  display: flex;
+  width: 100%;
-  flex-wrap: wrap;
+  height: adjust(14px);
-  justify-content: flex-end;
-  align-items: center;
-  height: adjust(28px);
-  // background: #eeec;
-  // overflow-x: hidden;
   white-space: pre-wrap;
-  padding-bottom: adjust(2px);
+  padding-bottom: 0;
+  padding-left: adjust(6px);
+  display: grid;
+  grid-template-columns: repeat(5, 1fr);
+  column-gap: 6px;
+  // column-span: none;
+  justify-items: end;
+  align-items: end;
 }
 
 li {
-  text-align: right;
+  padding-left: adjust(1px);
   position: relative;
-  min-width: 40px;
+  // background: #f003;
-  margin-right: adjust(9px);
+  user-select: none;
-  padding: 0 adjust(2px);
-}
-
-li:not(:last-child) {
-  // margin-right: adjust(16px);
 }
 
 .line-chart__custom-legend {
   position: absolute;
-  top: adjust(-32px);
+  top: adjust(-20px);
   right: 0;
-  font-size: adjust(9px);
+  font-size: adjust(5px);
   font-family: Ubuntu, sans-serif;
   padding: 0;
   // max-width: 100%;
-  width: 65%;
+  width: 75%;
-  align-items: flex-start;
+  align-items: flex-end;
   justify-content: flex-end;
 }
 
 li::before {
   content: "";
   position: absolute;
-  top: adjust(2px);
+  top: adjust(.5px);
-  left: adjust(-8px);
+  left: adjust(-5px);
-  width: adjust(8px);
+  width: adjust(5px);
-  height: adjust(8px);
+  height: adjust(5px);
   border-radius: adjust(1px);
   background: #eee6;
 }
@@ -357,11 +359,14 @@ li:nth-child(10)::before {
 li:nth-child(11)::before {
   background: #98f;
 }
+li:nth-child(12)::before {
+  background: #38f;
+}
 
 .line-chart__wrapper {
   position: relative;
-  background: #7771;
+  background: #3564ff0f;
-  border-radius: adjust(3px);
+  border-radius: adjust(4px);
   backdrop-filter: blur(adjust(2px));
   box-shadow: inset 0 0 adjust(10px) adjust(2px) rgba($color: #fff, $alpha: 0.1);
   height: 100%;

src/components/common/SmallBox2.vue

@@ -56,39 +56,41 @@ export default {
 @import "../../assets/styles/functions";
 
 .small-box-2 {
-	padding: adjust(14px);
+	flex-shrink: 0;
-	// border: 1px solid gray;
+	padding: 0;
-	// box-shadow: inset 0 0 15px rgba($color: #fff, $alpha: 0.285);
-	box-shadow: inset 0 0 30px rgba($color: #fff, $alpha: 0.285);
-	border-radius: adjust(6px);
 	user-select: none;
-	// width: adjust(w(465px));
+	width: adjust(w(820px));
-	// height: adjust(h(200px));
+	height: adjust(h(350px));
-	width: adjust(w(528px));
-	height: adjust(h(240px));
 	display: flex;
+	background: url(../../assets/top-middle.png) no-repeat;
+	background-size: 100% 100%;
+	background-position: bottom;
 
 	.icon {
-		width: adjust(h(128px));
+		margin-top: adjust(h(56px));
-		height: adjust(h(128px));
+		margin-left: adjust(w(24px));
+		width: adjust(h(172px));
+		height: adjust(h(172px));
 	}
 	
 	.info {
+		margin-top: adjust(h(56px));
+		flex: 1 auto;
 		font-family: "微软雅黑", sans-serif;
+		padding-left: adjust(5px);
 
 		h2 {
-			font-size: adjust(16px);
+			font-size: adjust(12px);
 			opacity: 0.7;
-			// line-height: adjust(12px);
 			letter-spacing: adjust(1px);
 			font-weight: 400;
-			color: hsla(0, 0%, 100%, 0.9);
+			color: hsla(0, 0%, 0%, 0.9);
 		}
 
 		.value {
-			color: #fff;
+			color: #030609;
-			font-size: adjust(30px);
+			font-size: adjust(18px);
-			line-height: adjust(29px);
+			line-height: adjust(22px);
 		}
 	}
 }

src/components/groups/data.vue

@@ -0,0 +1,71 @@
+<template>
+  <section class="data-group absolute">
+    <OilFlow />
+    <GasFlow />
+    <TopTemp />
+    <BottomTemp />
+    <OilFlow />
+    <FanRuntime />
+  </section>
+</template>
+
+<script>
+import OilFlow from "../boxes/OilFlow.vue";
+import GasFlow from "../boxes/GasFlow.vue";
+import TopTemp from "../boxes/TopTemp.vue";
+import BottomTemp from "../boxes/BottomTemp.vue";
+import FanRuntime from "../boxes/FanRuntime.vue";
+// import { mapState } from "vuex";
+
+export default {
+  name: "DataGroup",
+  props: {},
+  components: {
+    FanRuntime,
+    OilFlow,
+    GasFlow,
+    TopTemp,
+    BottomTemp,
+  },
+  data() {
+    return {};
+  },
+  computed: {
+    // ...mapState(["kilnWaterIn", "waterInTemp"]),
+  },
+};
+</script>
+
+<style scoped lang="scss">
+@import "../../assets/styles/functions";
+
+section {
+  background: url('../../assets/middle-under.png') left 110px top 4px / 380px 22px no-repeat;
+  width: adjust(w(13700px));
+  height: adjust(h(830px));
+  // width: adjust(w(13500px));
+  // height: adjust(h(960px));
+  position: absolute;
+  top: adjust(h(3390px));
+  // top: adjust(h(3265px));
+  left: adjust(w(3700px));
+}
+
+section::before {
+  content: '数据组';
+  font-family: -apple-system, BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, "微软雅黑", Arial, Helvetica, sans-serif;
+  font-size: adjust(h(64px));
+  font-weight: 400;
+  letter-spacing: 1px;
+  position: absolute;
+  color: $main-color;
+  top: 0;
+  left: 0;
+}
+
+.data-group {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-end;
+}
+</style>

src/components/groups/environ.vue

@@ -0,0 +1,47 @@
+<template>
+  <section class="environ-analysis">
+
+  </section>
+</template>
+
+<script>
+// import { mapState } from "vuex";
+
+export default {
+  name: "EnviroAnalysis",
+  props: {},
+  components: {},
+  data() {
+    return {};
+  },
+  computed: {
+    // ...mapState(["kilnWaterIn", "waterInTemp"]),
+  },
+};
+</script>
+
+<style scoped lang="scss">
+@import "../../assets/styles/functions";
+
+section {
+  background: url('../../assets/fault-analysis.png') left 144px top 4px / 79% 54% no-repeat, #ccc7;
+  width: adjust(w(1900px));
+  height: adjust(h(1260px));
+  position: absolute;
+  top: adjust(h(430px));
+  // left: adjust(w(15300px));
+  left: adjust(w(15500px));
+}
+
+section::before {
+  content: '环境浓度';
+  font-family: -apple-system, BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, "微软雅黑", Arial, Helvetica, sans-serif;
+  font-size: adjust(h(64px));
+  font-weight: 400;
+  letter-spacing: 1px;
+  position: absolute;
+  color: $main-color;
+  top: 0;
+  left: 0;
+}
+</style>

src/components/groups/fault.vue

@@ -0,0 +1,46 @@
+<template>
+  <section class="fault-analysis">
+
+  </section>
+</template>
+
+<script>
+// import { mapState } from "vuex";
+
+export default {
+  name: "FaultAnalysis",
+  props: {},
+  components: {},
+  data() {
+    return {};
+  },
+  computed: {
+    // ...mapState(["kilnWaterIn", "waterInTemp"]),
+  },
+};
+</script>
+
+<style scoped lang="scss">
+@import "../../assets/styles/functions";
+
+section {
+  background: url('../../assets/fault-analysis.png') left 144px top 4px / 79% 54% no-repeat, #ccc7;
+  width: adjust(w(1900px));
+  height: adjust(h(1260px));
+  position: absolute;
+  top: adjust(h(430px));
+  left: adjust(w(3700px));
+}
+
+section::before {
+  content: '缺陷分析';
+  font-family: -apple-system, BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, "微软雅黑", Arial, Helvetica, sans-serif;
+  font-size: adjust(h(64px));
+  font-weight: 400;
+  letter-spacing: 1px;
+  position: absolute;
+  color: $main-color;
+  top: 0;
+  left: 0;
+}
+</style>

src/components/groups/monitor.vue

@@ -0,0 +1,46 @@
+<template>
+  <section class="monitor-group">
+
+  </section>
+</template>
+
+<script>
+// import { mapState } from "vuex";
+
+export default {
+  name: "MonitorGroup",
+  props: {},
+  components: {},
+  data() {
+    return {};
+  },
+  computed: {
+    // ...mapState(["kilnWaterIn", "waterInTemp"]),
+  },
+};
+</script>
+
+<style scoped lang="scss">
+@import "../../assets/styles/functions";
+
+section {
+  background: url('../../assets/monitor-group.png') left 144px top 4px / 1152px 80% no-repeat, #ccc7;
+  width: adjust(w(3570px));
+  height: adjust(h(3790px));
+  position: absolute;
+  top: adjust(h(430px));
+  left: adjust(w(80px));
+}
+
+section::before {
+  content: '监控组 1';
+  font-family: -apple-system, BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, "微软雅黑", Arial, Helvetica, sans-serif;
+  font-size: adjust(h(64px));
+  font-weight: 400;
+  letter-spacing: 1px;
+  position: absolute;
+  color: $main-color;
+  top: 0;
+  left: 0;
+}
+</style>

src/components/groups/monitor2.vue

@@ -0,0 +1,48 @@
+<template>
+  <section class="monitor-group-2">
+
+  </section>
+</template>
+
+<script>
+// import { mapState } from "vuex";
+
+export default {
+  name: "MonitorGroup-2",
+  props: {},
+  components: {},
+  data() {
+    return {};
+  },
+  computed: {
+    // ...mapState(["kilnWaterIn", "waterInTemp"]),
+  },
+};
+</script>
+
+<style scoped lang="scss">
+@import "../../assets/styles/functions";
+
+section {
+  background: url('../../assets/middle1.png') left 144px top 4px / 97% 420px no-repeat, #ccc7;
+  width: adjust(w(13700px));
+  height: adjust(h(1600px));
+  // width: adjust(w(13500px));
+  // height: adjust(h(1470px));
+  position: absolute;
+  top: adjust(h(1740px));
+  left: adjust(w(3700px));
+}
+
+section::before {
+  content: '监控组 2';
+  font-family: -apple-system, BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, "微软雅黑", Arial, Helvetica, sans-serif;
+  font-size: adjust(h(64px));
+  font-weight: 400;
+  letter-spacing: 1px;
+  position: absolute;
+  color: $main-color;
+  top: 0;
+  left: 0;
+}
+</style>

src/components/groups/monitor3.vue

@@ -0,0 +1,47 @@
+<template>
+  <section class="monitor-group">
+
+  </section>
+</template>
+
+<script>
+// import { mapState } from "vuex";
+
+export default {
+  name: "MonitorGroup-3",
+  props: {},
+  components: {},
+  data() {
+    return {};
+  },
+  computed: {
+    // ...mapState(["kilnWaterIn", "waterInTemp"]),
+  },
+};
+</script>
+
+<style scoped lang="scss">
+@import "../../assets/styles/functions";
+
+section {
+  background: url('../../assets/monitor-group.png') left 144px top 4px / 1152px 80% no-repeat, #ccc7;
+  width: adjust(w(3570px));
+  height: adjust(h(3790px));
+  position: absolute;
+  top: adjust(h(430px));
+  // left: adjust(w(17264px));
+  left: adjust(w(17464px));
+}
+
+section::before {
+  content: '监控组 3';
+  font-family: -apple-system, BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, "微软雅黑", Arial, Helvetica, sans-serif;
+  font-size: adjust(h(64px));
+  font-weight: 400;
+  letter-spacing: 1px;
+  position: absolute;
+  color: $main-color;
+  top: 0;
+  left: 0;
+}
+</style>

src/components/icons/fireSvg.vue

@@ -1,8 +1,8 @@
 <template>
 	<svg
-		:width="adjust('64px')"
+		:width="adjust('46px')"
-		:height="adjust('64px')"
+		:height="adjust('46px')"
-		viewBox="0 0 94 96"
+		viewBox="0 0 96 96"
 		version="1.1"
 		xmlns="http://www.w3.org/2000/svg"
 		xmlns:xlink="http://www.w3.org/1999/xlink"

src/components/icons/sandSvg.vue

@@ -1,7 +1,7 @@
 <template>
 	<svg
-		:width="adjust('64px')"
+		:width="adjust('46px')"
-		:height="adjust('64px')"
+		:height="adjust('46px')"
 		viewBox="0 0 95 96"
 		version="1.1"
 		xmlns="http://www.w3.org/2000/svg"

src/components/icons/switchSvg.vue

@@ -1,7 +1,7 @@
 <template>
 	<svg
-		:width="adjust('64px')"
+		:width="adjust('46px')"
-		:height="adjust('64px')"
+		:height="adjust('46px')"
 		viewBox="0 0 122 122"
 		version="1.1"
 		xmlns="http://www.w3.org/2000/svg"

src/components/icons/tempSvg.vue

@@ -1,7 +1,7 @@
 <template>
 	<svg
-		:width="adjust('64px')"
+		:width="adjust('46px')"
-		:height="adjust('64px')"
+		:height="adjust('46px')"
 		viewBox="0 0 94 96"
 		version="1.1"
 		xmlns="http://www.w3.org/2000/svg"

src/components/isolate-area-1/Area.vue

@@ -1,12 +1,20 @@
 <template>
   <DragabbleContainer class="isolate-area-1">
-    <SmallBox2
+    <div class="data pressure">
-      v-for="rd in rdata"
+      <span>压</span>
-      :key="rd.icon"
+      <span>力</span>
-      :icon="rd.icon"
+      <span v-for="press, index in pressure" :key="index"
-      :title="rd.title"
+        :class="{ 'digit': true, 'dot': press == '.' ? true : false }">{{ press
-      :value="rd.value"
+        }}</span>
-    ></SmallBox2>
+      <span>Pa</span>
+    </div>
+    <SmallBox2 class="data-center" v-for="rd in rdata" :key="rd.icon" :icon="rd.icon" :title="rd.title" :value="rd.value"></SmallBox2>
+    <div class="data runtime">
+      <span>运</span>
+      <span>行</span>
+      <span v-for="val, index in runtime" :key="index" :class="{ 'digit': true, 'dot': press == '.' ? true : false }">{{ val }}</span>
+      <span>天</span>
+    </div>
   </DragabbleContainer>
 </template>
 
@@ -22,11 +30,13 @@ export default {
   components: { DragabbleContainer, SmallBox2 },
   data() {
     return {
+      pressure: '10.1'.split(''),
+      runtime: '0012'.split(''),
       rdata: [
         // { icon: "temp", title: "车间温度", value: "27℃" },
         { icon: "fire", title: "当前火向", value: "" },
         { icon: "clock", title: "换火时间", value: "20分" },
-        { icon: "sand", title: "剩余时间", value: "0" },
+        { icon: "sand", title: "剩余时间", value: "19分20秒" },
       ],
     };
   },
@@ -56,25 +66,6 @@ export default {
   },
   computed: {
     ...mapState(["fireDirection", "lastFireChangeTime", "fireChangeTime"]),
-    // rdata() {
-    //   let [_, min, sec] = /(\d+)分(\d+)秒/.exec(this.lastFireChangeTime)
-    //   min = +min 
-    //   sec = +sec 
-    //   let interTime = `${min}分${sec}秒`
-    //   let timer = setInterval(() => {
-    //     if (sec) sec -= 1
-    //     else {
-    //       sec = 59
-    //       min -= 1
-    //     }
-    //   }, 1000);
-    //   return [
-    //     // { icon: "temp", title: "车间温度", value: "27℃" },
-    //     { icon: "fire", title: "当前火向", value: this.fireDirection },
-    //     { icon: "clock", title: "换火时间", value: this.fireChangeTime },
-    //     { icon: "sand", title: "剩余时间", value: interTime },
-    //   ];
-    // },
   },
 };
 </script>
@@ -84,11 +75,42 @@ export default {
 
 .isolate-area-1 {
   display: flex;
+  color: $main-color; 
+  min-width: 300px;
+  align-items: center;
 
-  > .small-box-2:not(:last-child) {
+  > *:not(:last-child) {
     margin: {
-      right: adjust(15px);
+      right: adjust(10px);
     }
   }
+
+  > .data {
+    flex-shrink: 0;
+    font-family: zcoolqingkehuangyouti-Regular, sans-serif;
+    display: flex;
+    align-items: flex-end;
+  }
+
+  > .data > span:not(.dot) {
+    /** 边框 */
+    background: url('../../assets/digitbox1.png') no-repeat;
+    background-size: 100% 100%; 
+    display: inline-block;
+    width: adjust(w(220px));
+    height: adjust(h(260px));
+    color: #0068ffaa;
+    font-size: h(200px);
+    line-height: h(600px);
+    text-align: center;
+    vertical-align: bottom;
+  }
+  
+  > .data > span.digit {
+    /** 数字字体大小 */
+    color: #0071ff;
+    font-size: h(360px);
+    line-height: h(540px);
+  }
 }
 </style>

src/components/layout/Container.vue

@@ -45,28 +45,27 @@ export default {
 
 .number-or-date {
 	display: inline-block;
-  width: adjust(w(800px));
+	// background: url(../../assets/box-number.png) 0 0 / 100% 100% no-repeat;
-  height: adjust(h(375px));
-  background: url(../../assets/box-number.png);
-  background-position: 0 0; /** top left */
-  background-size: 100% 100%;
 }
 
 .tables {
 	display: inline-block;
-  width: adjust(w(800px));
+	// width: adjust(w(1115px));
-  height: adjust(h(528px));
+	width: adjust(w(1400px));
+	height: adjust(h(700px));
 	background: url(../../assets/box-table.png);
-  background-position: 0 0; /** top left */
+	background-position: 0 0;
+	/** top left */
 	background-size: 100% 100%;
 }
 
 .charts {
 	display: inline-block;
-  width: adjust(w(1580px));
+	width: adjust(w(2440px));
-  height: adjust(h(520px));
+	height: adjust(h(700px));
 	background: url(../../assets/box-chart.png);
-  background-position: 0 0; /** top left */
+	background-position: 0 0;
+	/** top left */
 	background-size: 100% 100%;
 }
 
@@ -74,9 +73,6 @@ export default {
 	display: inline-block;
 	width: adjust(w(800px));
 	height: adjust(h(931px));
-  background: url(../../assets/box-right.png);
+	background: url(../../assets/box-right.png) 0 0 / 100% 100% no-repeat;
-  background-position: 0 0; /** top left */
-  background-size: 100% 100%;
 }
-
 </style>

src/components/layout/Header.vue

@@ -6,9 +6,13 @@
       </span>
       <h1>凯盛晶华玻璃有限公司800t/d特种玻璃生产线大数据指挥中心</h1>
     </div>
-    <span class="header--wing absolute company"></span>
+    <span class="header--wing absolute company">
+      设计单位: 中建材智能自动化研究院
+    </span>
     <span class="header--wing absolute datetime">
-      {{ moment(today).format('YYYY.M.D dddd HH:mm:ss') }}
+      {{ moment(today).format('YYYY.M.D dddd') }}
+      &nbsp;&nbsp;
+      {{ moment(today).format('HH:mm:ss') }}
     </span>
   </header>
 </template>
@@ -66,60 +70,69 @@ export default {
 @import "../../assets/styles/variables";
 
 header {
-  background: url(../../assets/header.png) center/contain no-repeat;
+  background: url(../../assets/header.png) center / 65% 100% no-repeat;
-  background-size: 100%;
+  // background-size: 100% 100%;
-  height: adjust(h(280px));
+  // background-size: 13515px 634px;
-  width: adjust($actual_width);
+  // background-position: bottom;
+  height: adjust(h(580px));
+  width: adjust(w(21120px));
   display: grid;
   place-items: center;
+  // padding-bottom: adjust(2px);
 
   >div {
     display: flex;
     align-items: center;
     margin-bottom: adjust(10px);
+    margin-left: adjust(64px);
 
     .header--logo {
-      width: adjust(102px);
+      width: adjust(128px);
-      height: adjust(56px);
+      height: adjust(h(337px));
       background: url(../../assets/logo.png) center/contain no-repeat;
     }
 
     h1 {
       margin-left: adjust(20px);
-      font-size: adjust(35px);
+      font-size: adjust(42px);
-      // line-height: adjust(100px);
-      // background: #eee;
       user-select: none;
-      letter-spacing: adjust(8px);
+      letter-spacing: adjust(6px);
       font-weight: 600;
-      // color: #6bf2ff;
       color: $main-color;
-      font-family: "微软雅黑", sans-serif;
+      font-family: -apple-system, BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, "微软雅黑", Arial, Helvetica, sans-serif;
     }
   }
 }
 
 .header--wing {
+  top: adjust(h(128px));
   left: 0;
   bottom: adjust(10px);
-  height: adjust(h(78px));
+  height: adjust(h(130px));
+  font-family: -apple-system, BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, "微软雅黑", Arial, Helvetica, sans-serif;
 }
 
 .company {
-  margin-left: adjust(w(1460px));
+  margin-left: adjust(w(4035px));
-  width: adjust(w(1320px));
+  height: adjust(h(130px));
-  height: adjust(h(48px));
+  // font-weight: 600;
-  background: url("../../assets/company.png") center/cover no-repeat;
+  text-align: center;
+  color: lighten($main-color, 8);
+  font-size: adjust(h(90px));
+  letter-spacing: unset;
+  // background: red;
+  // width: adjust(w(1320px));
+  // background: url("../../assets/company.png") center/cover no-repeat;
 }
 
 .datetime {
   color: $main-color;
-  font-size: adjust(26px);
+  font-size: adjust(h(90px));
   text-align: center;
-  // display: inline-block;
+  margin-left: adjust(w(15420px));
-  margin-left: adjust(w(6150px));
+  color: lighten($main-color, 8);
-  width: adjust(w(1320px));
+  height: adjust(h(130px));
-  height: adjust(h(48px));
+  // width: adjust(w(1764px));
-  background: url("../../assets/date.png") center/cover no-repeat;
+  // background: url("../../assets/date.png") center/cover no-repeat;
 }
 </style>

src/components/layout/Main.vue

@@ -1,24 +1,30 @@
 <template>
 	<main class="">
+		<!-- 监控组 -->
+		<MonitorGroup />
+
+		<!-- 缺陷分析 -->
+		<FaultAnalysis />
+
+		<!-- 环境浓度 -->
+		<Environ />
+
+		<!-- 监控组 2 -->
+		<MonitorGroup2 />
+
+		<!-- 监控组 3 -->
+		<MonitorGroup3 />
+
+		<!-- 数据组 -->
+		<DataGroup />
+
 		<div class="video-crash" v-if="false"></div>
 
 		<div class="eq-main absolute">
-			<div
+			<div class="arrow ar-top-left" :class="topLeftArrowRolling === '运行' ? 'ar-running' : ''"></div>
-				class="arrow ar-top-left"
+			<div class="arrow ar-top-right" :class="topRightArrowRolling === '运行' ? 'ar-running' : ''"></div>
-				:class="topLeftArrowRolling === '运行' ? 'ar-running' : ''"
+			<div class="arrow ar-bottom-left" :class="bottomLeftArrowRolling === '运行' ? 'ar-running' : ''"></div>
-			></div>
+			<div class="arrow ar-bottom-right" :class="bottomRightArrowRolling === '运行' ? 'ar-running' : ''"></div>
-			<div
-				class="arrow ar-top-right"
-				:class="topRightArrowRolling === '运行' ? 'ar-running' : ''"
-			></div>
-			<div
-				class="arrow ar-bottom-left"
-				:class="bottomLeftArrowRolling === '运行' ? 'ar-running' : ''"
-			></div>
-			<div
-				class="arrow ar-bottom-right"
-				:class="bottomRightArrowRolling === '运行' ? 'ar-running' : ''"
-			></div>
 
 			<div class="swd onekb">
 				<div class="swd-box">
@@ -45,37 +51,20 @@
 				</div>
 			</div>
 
-			<div class="video-bottom" v-show="fireDirection === '北火'" style="">
+			<div class="video-bottom--wrapper" v-show="true || fireDirection === '北火'" style="">
-				<video
+				<video class="video-bottom" id="1" preload="auto" height="130" muted autoplay loop disablepictureinpicture
-					id="1"
+					src="../../assets/videos/fire-to-top.mp4"></video>
-					preload="auto"
-					height="260"
-					muted
-					autoplay
-					loop
-					disablepictureinpicture
-					src="../../assets/videos/fire-to-top.mp4"
-				></video>
 			</div>
 
-			<div class="video-top" v-show="fireDirection === '南火'" style="">
+			<div class="video-top--wrapper" v-show="true || fireDirection === '南火'" style="">
-				<video
+				<video id="2" class="video-top" preload="auto" height="130" muted autoplay loop disablepictureinpicture
-					id="2"
+					src="../../assets/videos/fire-to-bottom.mp4"></video>
-					class="video-top"
-					preload="auto"
-					height="260"
-					muted
-					autoplay
-					loop
-					disablepictureinpicture
-					src="../../assets/videos/fire-to-bottom.mp4"
-				></video>
 			</div>
 		</div>
 
 		<AreaOne class="area-one" />
 
-		<div class="absolute left kiln-runtime">
+		<!-- <div class="absolute left kiln-runtime">
 			<KilnRuntime />
 		</div>
 		<div class="absolute left kiln-pressure">
@@ -98,28 +87,33 @@
 		</div>
 		<div class="absolute left ou-temp">
 			<XicaoTemp />
-		</div>
+		</div> -->
-		<div class="absolute in-water">
+
+
 		<InWater />
-		</div>
-		<div class="absolute out-water">
 		<OutWater />
-		</div>
+
 	</main>
 </template>
 
 <script>
-import KilnRuntime from "../boxes/KilnRuntime.vue";
+// import KilnRuntime from "../boxes/KilnRuntime.vue";
-import KilnPressure from "../boxes/KilnPressure.vue";
+// import KilnPressure from "../boxes/KilnPressure.vue";
-import OilFlow from "../boxes/OilFlow.vue";
+// import OilFlow from "../boxes/OilFlow.vue";
-import GasFlow from "../boxes/GasFlow.vue";
+// import GasFlow from "../boxes/GasFlow.vue";
-import TopTemp from "../boxes/TopTemp.vue";
+// import TopTemp from "../boxes/TopTemp.vue";
-import BottomTemp from "../boxes/BottomTemp.vue";
+// import BottomTemp from "../boxes/BottomTemp.vue";
-import XicaoTemp from "../boxes/XicaoTemp.vue";
+// import XicaoTemp from "../boxes/XicaoTemp.vue";
 import InWater from "../boxes/InWater.vue";
 import OutWater from "../boxes/OutWater.vue";
-import FanRuntime from "../boxes/FanRuntime.vue";
+// import FanRuntime from "../boxes/FanRuntime.vue";
 import AreaOne from "../isolate-area-1/Area.vue";
+import MonitorGroup from '../groups/monitor.vue'
+import MonitorGroup2 from '../groups/monitor2.vue'
+import MonitorGroup3 from '../groups/monitor3.vue'
+import DataGroup from '../groups/data.vue'
+import FaultAnalysis from '../groups/fault.vue'
+import Environ from '../groups/environ.vue'
 // import Container from './Container.vue'
 import { mapMutations, mapState } from "vuex";
 
@@ -128,15 +122,21 @@ import WsClient from "../../utils/wsClass";
 export default {
 	name: "Main",
 	components: {
+		DataGroup,
+		MonitorGroup,
+		MonitorGroup2,
+		MonitorGroup3,
+		Environ,
+		FaultAnalysis,
 		AreaOne,
-		KilnRuntime,
+		// KilnRuntime,
-		KilnPressure,
+		// KilnPressure,
-		FanRuntime,
+		// FanRuntime,
-		OilFlow,
+		// OilFlow,
-		GasFlow,
+		// GasFlow,
-		TopTemp,
+		// TopTemp,
-		BottomTemp,
+		// BottomTemp,
-		XicaoTemp,
+		// XicaoTemp,
 		InWater,
 		OutWater,
 	},
@@ -174,19 +174,19 @@ export default {
 main {
 	height: 1px;
 	flex: 1;
-	// background: #eee2;
+	// background: #f2e2;
 }
 
 .area-one {
 	position: absolute;
-	top: adjust(160px);
+	top: adjust(150px);
-	left: adjust(1588px);
+	left: adjust(1310px);
 }
 
 .video-crash {
 	height: adjust(h(424px));
 	width: adjust(w(800px));
-	background: url(../../assets/tv.png) no-repeat;
+	// background: url(../../assets/tv.png) no-repeat;
 	background-size: 100%;
 	display: inline-block;
 	position: absolute;
@@ -196,9 +196,9 @@ main {
 
 .video-bottom {
 	position: absolute;
-	bottom: adjust(200.5px);
+	bottom: adjust(207px);
-	left: adjust(48px);
+	left: adjust(29px);
-	transform: scale(0.9);
+	transform: scale(0.95);
 }
 
 .video-top {
@@ -209,8 +209,8 @@ main {
 }
 
 .arrow {
-	width: adjust(20px);
+	width: adjust(12px);
-	height: adjust(20px);
+	height: adjust(12px);
 	display: inline-block;
 	position: absolute;
 	background: #ff5757;
@@ -221,116 +221,95 @@ main {
 	background: #1bff3a;
 }
 
-// .ar-top-left.arrow,
-// .ar-top-right.arrow {
-// 	animation: none;
-// 	background: url(../../assets/arrow-disabled.png) 100% 100% / contain no-repeat;
-// }
-// .ar-bottom-left.arrow,
-// .ar-bottom-right.arrow {
-// 	animation: none;
-// 	background: url(../../assets/arrow-r-disabled.png) 100% 100% / contain
-// 		no-repeat;
-// }
-// .ar-top-left.arrow.ar-running,
-// .ar-top-right.arrow.ar-running {
-// 	background: url(../../assets/arrow.png) 100% 100% / contain no-repeat;
-// 	animation: clock-direction 1.15s linear infinite forwards;
-// }
-// .ar-bottom-left.arrow.ar-running,
-// .ar-bottom-right.arrow.ar-running {
-// 	background: url(../../assets/arrow-r.png) 100% 100% / contain no-repeat;
-// 	animation: reverse-clock-direction 1.15s linear infinite forwards;
-// }
-
 .ar-top-right {
-	top: 145px;
+	top: 66px;
-	left: 65px;
+	left: 38px;
-}
-.ar-top-left {
-	top: 175px;
-	left: 985px;
-}
-.ar-bottom-left {
-	top: 445px;
-	left: 960px;
-}
-.ar-bottom-right {
-	top: 460px;
-	left: 20px;
 }
 
-// @keyframes clock-direction {
+.ar-top-left {
-// 	0% {
+	top: 88px;
-// 		transform: rotate(0deg);
+	left: 515px;
-// 	}
+}
-// 	100% {
+
-// 		transform: rotate(360deg);
+.ar-bottom-left {
-// 	}
+	top: 232px;
-// }
+	left: 500px;
-// @keyframes reverse-clock-direction {
+}
-// 	0% {
+
-// 		transform: rotate(0deg);
+.ar-bottom-right {
-// 	}
+	top: 258px;
-// 	100% {
+	left: 14px;
-// 		transform: rotate(-360deg);
+}
-// 	}
-// }
 
 .swd {
-	background-size: 100%;
+	// background-size: 100% 10px;
-	width: adjust(w(276px));
+	width: adjust(w(376px));
-	height: adjust(h(156px));
+	height: adjust(h(218px));
 	position: absolute;
 	transform: rotateY(180deg);
+
 	p {
 		margin: 0;
-		margin-top: adjust(12px);
+		color: #0008;
+		margin-top: adjust(8px);
 	}
+
 	.swd-box {
-		margin-left: adjust(21px);
+		margin-left: adjust(8px);
-		font-size: adjust(15px);
+		font-size: adjust(8px);
+		font-family: -apple-system, BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, "微软雅黑", Arial, Helvetica, sans-serif;
+
 		.swd-value {
-			color: #00f4ff;
+			color: #ff2020;
-			margin-top: adjust(6px);
+			margin-top: adjust(3px);
-			font-size: adjust(26px);
+			font-size: adjust(14px);
-			overflow: hidden;  /*超出部分隐藏*/
+			overflow: hidden;
-    		white-space: nowrap;  /*禁止换行*/
+			/*超出部分隐藏*/
-    		text-overflow: ellipsis; /*省略号*/
+			white-space: nowrap;
+			/*禁止换行*/
+			text-overflow: ellipsis;
+			/*省略号*/
 		}
 	}
 }
 
-.onekb, .onesp{
+.onekb,
-	background: url(../../assets/tem-bottom.png) no-repeat;
-}
-.onekb {
-	top: adjust(300px);
-	left: adjust(350px)
-}
 .onesp {
-	top: adjust(270px);
+	background: url(../../assets/tem-bottom.png) top 0 left 0 / 100% no-repeat;
-	left: adjust(520px)
 }
-.twokb, .twosp{
+
-	background: url(../../assets/tem-top.png) no-repeat;
+.onekb {
+	top: adjust(158px);
+	left: adjust(180px)
 }
-.twokb {
+
-	top: adjust(-20px);
+.onesp {
-	left: adjust(370px)
+	top: adjust(135px);
+	left: adjust(275px)
 }
+
+.twokb,
 .twosp {
-	top: adjust(10px);
+	background: url(../../assets/tem-top.png) top 0 left 0 / 100% no-repeat;
-	left: adjust(540px)
+}
+
+.twokb {
+	top: adjust(-10px);
+	left: adjust(188px)
+}
+
+.twosp {
+	top: adjust(6px);
+	left: adjust(275px)
 }
 
 .eq-main {
-	width: adjust(w(7150px));
+	width: adjust(w(8800px));
-	height: adjust(h(960px));
+	height: adjust(h(1400px));
 	background: url(../../assets/eq.png) no-repeat;
 	background-size: 100%;
-	top: adjust(170px);
+	top: adjust(h(220px));
-	left: adjust(380px);
+	left: adjust(w(6600px));
 	position: relative;
 	transform: rotateY(0.5turn);
 }
@@ -338,53 +317,54 @@ main {
 .eq-main::before {
 	content: "";
 	position: absolute;
-	//   right: adjust(1200px);
 	opacity: 0;
-	top: adjust(105px);
+	top: adjust(55px);
-	width: adjust(150px);
+	width: adjust(75px);
-	height: adjust(150px);
+	height: adjust(75px);
 	background: url(../../assets/mirror.png) no-repeat;
 	background-size: 100% 100%;
-	animation: 10s linear 0.3s infinite mirror-to-left-2;
+	// animation: 10s linear 0.3s infinite mirror-to-left-2;
 }
 
 .eq-main::after {
 	content: "";
 	position: absolute;
-	//   right: adjust(1200px);
 	opacity: 0;
-	top: adjust(105px);
+	top: adjust(55px);
-	// top: adjust(125px);
+	width: adjust(75px);
-	width: adjust(150px);
+	height: adjust(75px);
-	height: adjust(150px);
 	background: url(../../assets/mirror.png) no-repeat;
 	background-size: 100% 100%;
-	animation: 10s linear 5s infinite mirror-to-left;
+	// animation: 10s linear 5s infinite mirror-to-left;
 }
 
 @keyframes mirror-to-left {
 	0% {
-		right: adjust(1200px);
+		right: adjust(700px);
 		opacity: 1;
 	}
+
 	90% {
 		opacity: 1;
 	}
+
 	100% {
-		right: adjust(60px);
+		right: adjust(30px);
 	}
 }
 
 @keyframes mirror-to-left-2 {
 	0% {
-		right: adjust(1200px);
+		right: adjust(700px);
 		opacity: 1;
 	}
+
 	90% {
 		opacity: 1;
 	}
+
 	100% {
-		right: adjust(60px);
+		right: adjust(30px);
 	}
 }
 
@@ -436,20 +416,4 @@ main {
 	left: adjust(w(7330px));
 	// left: adjust(w(6460px));
 }
-
-.in-water {
-	top: adjust(h(200px));
-	left: adjust(w(40px));
-	// left: adjust(w(8096px));
-	// //   left: w(5096px);
-	z-index: 100;
-}
-
-.out-water {
-	top: adjust(h(1177px));
-	left: adjust(w(40px));
-	// left: adjust(w(8096px));
-	//   left: w(5096px);
-	z-index: 100;
-}
 </style>

src/components/layout/SubContainer.vue

@@ -3,7 +3,7 @@
 	<div class="sub-container" :style="{ padding }">
 		<div class="title">
 			<span class="icon" :class="iconClass[icon]"></span>
-			<span>{{ title }}</span>
+			<span class="title_text">{{ title }}</span>
 		</div>
 		<div class="content">
 			<slot />
@@ -25,7 +25,7 @@ export default {
 		},
 		padding: {
 			type: String,
-			default: "10px",
+			default: "20px",
 		},
 	},
 	data() {
@@ -57,8 +57,8 @@ export default {
 
 .icon {
 	height: adjust(17px);
-	width: adjust(17px);
+	width: adjust(16px);
-	margin-right: adjust(8px);
+	margin-right: 0;
 }
 
 .icon-clock {
@@ -72,46 +72,59 @@ export default {
 }
 
 .icon-oil {
-	background: url(../../assets/oil.png);
+	background: url(../../assets/oil.png) top 0 left 0 / 90% 75% no-repeat;
-	background-size: 100% 100%;
+	margin-right: 6px;
 }
+
 .icon-gas {
-	background: url(../../assets/gas-icon.png);
+	background: url(../../assets/gas-icon.png) top 0 left 0 / 90% 75% no-repeat;
-	background-size: 100% 100%;
+	margin-right: 6px;
 }
+
 .icon-xc {
 	background: url(../../assets/xicao-icon.png);
 	background-size: 100% 100%;
 }
+
 .icon-fan {
-	background: url(../../assets/fan-icon.png);
+	background: url(../../assets/fan-icon.png) top 0 left 0 / 90% 75% no-repeat;
-	background-size: 100% 100%;
+	margin-right: 6px;
 }
+
 .icon-kiln-top {
-	background: url(../../assets/kiln-top-icon.png);
+	background: url(../../assets/kiln-top-icon.png) top 0 left 0 / 90% 75% no-repeat;
-	background-size: 100% 100%;
+	margin-right: 6px;
 }
+
 .icon-kiln-bottom {
-	background: url(../../assets/kiln-bottom-icon.png);
+	background: url(../../assets/kiln-bottom-icon.png) top 0 left 0 / 90% 75% no-repeat;
-	background-size: 100% 100%;
+	margin-right: 6px;
 }
 
 .icon-water-in {
-	background: url(../../assets/water-temp.png);
+	background: url(../../assets/water-temp.png) top 24% left 0 / 80% 75% no-repeat;
-	background-size: 100% 100%;
 }
 
 .title {
-	/* margin: 12px 0; */
+	font-size: adjust(h(40px));
-	margin-bottom: adjust(12px);
+	letter-spacing: 1px;
-	font-size: adjust(17px);
+	color: #3565ff;
-	color: #72f2ff;
 	font-family: sans-serif;
 	user-select: none;
 	display: flex;
 	align-items: center;
 }
 
+.title_text {
+	line-height: 0;
+	margin-bottom: 10px;
+}
+
+.out-water .title,
+.in-water .title {
+	font-size: adjust(h(40px));
+}
+
 .content {
 	height: 1px;
 	/* background: #eee; */

src/store/index.js

@@ -31,7 +31,7 @@ export default new Vuex.Store({
     kilnPressure: '00',
     fireChangeTime: '00:00:00',
     lastFireChangeTime: '0分0秒',
-    waterInTemp: '000',
+    waterInTemp: '00.0',
     waterOutTemp: '000'
   },
   getters: {

src/utils/index.js

@@ -0,0 +1,11 @@
+export function randomInt(min, max, closeRight = false) {
+  min = min ?? 0
+  max = max ?? 100
+  if (min >= max) { min = max - 100 > 0 ? max - 100 : 0 }
+  const fn = closeRight ? Math.ceil : Math.floor
+  let val = fn(Math.random() * max)
+  while (val < min) {
+    val = fn(Math.random() * max)
+  }
+  return val
+}

src/views/HomeView.vue

@@ -26,12 +26,10 @@ export default {
 @import '../assets/styles/functions';
 
 .home-view {
-	// width: 100vw;
-	// height: 100vh;
 	height: adjust($actual_height);
 	width: adjust($actual_width);
 	overflow: hidden;
-	background: url(../assets/bg.png) center/cover no-repeat ;
+	background: url(../assets/bg.png) center/cover no-repeat, #E0E3F6;
 	color: white;
 	display: flex;
 	flex-direction: column;

vue.config.js

@@ -2,7 +2,8 @@ const { defineConfig } = require("@vue/cli-service");
 module.exports = defineConfig({
   transpileDependencies: true,
   devServer: {
-    host: "127.0.0.1",
+    host: '0.0.0.0',
+    // host: "127.0.0.1",
     port: 8000,
   },
   publicPath: './'