diff --git a/.env.development b/.env.development
index 13c7001..a08e7e1 100644
--- a/.env.development
+++ b/.env.development
@@ -7,9 +7,9 @@ ENV = 'development'
# 开发环境
# VUE_APP_BASE_API = '/dev-api'
# 后台
-# VUE_APP_BASE_API = 'http://192.168.1.222:8080'
+VUE_APP_BASE_API = 'http://192.168.1.222:8080'
# 梅州云端
-VUE_APP_BASE_API = 'http://106.55.173.225:8091'
+# VUE_APP_BASE_API = 'http://106.55.173.225:8091'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/assets/images/fenggui.png b/src/assets/images/fenggui.png
index fec62e7..f8e5340 100644
Binary files a/src/assets/images/fenggui.png and b/src/assets/images/fenggui.png differ
diff --git a/src/views/aircAndWindc/awSysMonitor/asSysMonitorDetails.vue b/src/views/aircAndWindc/awSysMonitor/asSysMonitorDetails.vue
index d54b265..9defa9d 100644
--- a/src/views/aircAndWindc/awSysMonitor/asSysMonitorDetails.vue
+++ b/src/views/aircAndWindc/awSysMonitor/asSysMonitorDetails.vue
@@ -101,29 +101,6 @@
src="../../../assets/images/fengshan.png"
alt=""
/>
-
-
+ {{ airSupplyObj.collectValue }}%
+
+
+
+
2#风阀反馈:
+
{{ airSupplyObj.collectValue }}%
+
+
+
3#风阀反馈:
+
{{ airSupplyObj.collectValue }}%
-
+
水阀调节
@@ -1450,9 +1436,9 @@ export default {
}
.wind-img {
width: 13.1rem;
- height: 5.5rem;
+ height: 5.7rem;
position: absolute;
- top: 0;
+ top: 0.2rem;
left: 0;
z-index: 1;
}
@@ -1460,8 +1446,8 @@ export default {
z-index: 10;
width: 1.3rem;
position: absolute;
- top: 0.3rem;
- left: 7.3rem;
+ top: 0.4rem;
+ left: 4.7rem;
display: flex;
flex-direction: column;
align-items: center;
@@ -1475,15 +1461,48 @@ export default {
z-index: 10;
width: 1.3rem;
position: absolute;
- top: 1.7rem;
+ top: 2.2rem;
right: 0.3rem;
display: flex;
- flex-direction: column;
+ flex-direction: row;
align-items: center;
+ font-size: 0.18rem;
.wind-text {
color: #00d2ff;
font-size: 0.18rem;
- margin-bottom: 0.15rem;
+ white-space: nowrap;
+ }
+ }
+ .wind-tem3 {
+ z-index: 10;
+ width: 1.3rem;
+ position: absolute;
+ top:4.1rem;
+ right: 0.3rem;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ font-size: 0.18rem;
+ .wind-text {
+ color: #00d2ff;
+ font-size: 0.18rem;
+ white-space: nowrap;
+ }
+ }
+ .wind-tem4 {
+ z-index: 10;
+ width: 1.3rem;
+ position: absolute;
+ top: 5.9rem;
+ right: 0.3rem;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ font-size: 0.18rem;
+ .wind-text {
+ color: #00d2ff;
+ font-size: 0.18rem;
+ white-space: nowrap;
}
}
.fan-frequency {
@@ -1503,8 +1522,8 @@ export default {
}
.fan-satatus1 {
position: absolute;
- top: 4.5rem;
- left: 8.5rem;
+ top: 4.3rem;
+ left: 5.5rem;
display: flex;
flex-direction: column;
align-items: flex-start;
@@ -1525,8 +1544,8 @@ export default {
}
.fan-satatus2 {
position: absolute;
- top: 5.5rem;
- left: 6rem;
+ top: 5.3rem;
+ left: 3.5rem;
display: flex;
flex-direction: column;
align-items: flex-start;
@@ -1547,8 +1566,8 @@ export default {
}
.fan-satatus3 {
position: absolute;
- top: 1.7rem;
- left: 8.5rem;
+ top: 1.6rem;
+ left: 6.3rem;
display: flex;
flex-direction: column;
align-items: flex-start;
@@ -1635,8 +1654,8 @@ export default {
.wind-valve {
z-index: 10;
position: absolute;
- top: 4.6rem;
- left: 3rem;
+ top: 4.4rem;
+ left: 1.8rem;
width: 2rem;
display: flex;
flex-direction: row;
@@ -1651,8 +1670,8 @@ export default {
.wind-valve2 {
z-index: 10;
position: absolute;
- top: 5rem;
- left: 3rem;
+ top: 4.8rem;
+ left: 1.8rem;
width: 2rem;
display: flex;
flex-direction: row;
@@ -1668,8 +1687,8 @@ export default {
width: 0.72rem;
height: 0.73rem;
position: absolute;
- top: 3.23rem;
- right: 3.81rem;
+ top: 3.11rem;
+ right: 6.24rem;
z-index: 10;
}
.tunCircle {
@@ -1684,15 +1703,6 @@ export default {
transform: rotate(360deg);
}
}
- .arrow-flex {
- display: flex;
- flex-direction: row;
- align-items: center;
- z-index: 10;
- position: absolute;
- top: 3.2rem;
- left: -0.1rem;
- }
.arrow-flex2 {
display: flex;
flex-direction: row;
@@ -1700,7 +1710,7 @@ export default {
z-index: 10;
position: absolute;
top: 3.2rem;
- right: 0.6rem;
+ right: 2.9rem;
}
.arrow-flex3 {
display: flex;
@@ -1709,7 +1719,7 @@ export default {
z-index: 10;
position: absolute;
top: 0.6rem;
- right: 6rem;
+ right: 8.7rem;
transform: rotateY(180deg);
}
.wind-arrow {