diff --git a/src/assets/images/border4.png b/src/assets/images/border4.png new file mode 100644 index 0000000..f930f7c Binary files /dev/null and b/src/assets/images/border4.png differ diff --git a/src/assets/images/haiwang.png b/src/assets/images/haiwang.png index 09a692a..aceb5b0 100644 Binary files a/src/assets/images/haiwang.png and b/src/assets/images/haiwang.png differ diff --git a/src/assets/images/haiwang2.png b/src/assets/images/haiwang1.png similarity index 54% rename from src/assets/images/haiwang2.png rename to src/assets/images/haiwang1.png index ae5450d..09a692a 100644 Binary files a/src/assets/images/haiwang2.png and b/src/assets/images/haiwang1.png differ diff --git a/src/views/centerairC/enSourceAnalysis/components/machineRoom.vue b/src/views/centerairC/enSourceAnalysis/components/machineRoom.vue index 140cacc..a8e9357 100644 --- a/src/views/centerairC/enSourceAnalysis/components/machineRoom.vue +++ b/src/views/centerairC/enSourceAnalysis/components/machineRoom.vue @@ -434,7 +434,7 @@ export default { this.listLoading = true; energyAnalyze(data).then((res) => { console.log("能源返回", res); - if (res.code == 200 && res.data.length > 0) { + if (res.code == 200 && res.data) { this.allDataArr = res.data.all; this.allDataArr = this.allDataArr.map((item) => { item.value = parseFloat(item.value); diff --git a/src/views/centerairC/sysControl/index.vue b/src/views/centerairC/sysControl/index.vue index 31434cf..0963fed 100644 --- a/src/views/centerairC/sysControl/index.vue +++ b/src/views/centerairC/sysControl/index.vue @@ -25,7 +25,7 @@
-
+ +
{{ item.name }}
@@ -163,32 +164,23 @@ + + diff --git a/src/views/centerairC/sysMonitor/index.vue b/src/views/centerairC/sysMonitor/index.vue index aa4f413..db032f6 100644 --- a/src/views/centerairC/sysMonitor/index.vue +++ b/src/views/centerairC/sysMonitor/index.vue @@ -36,6 +36,7 @@
+
系统性能
实时EER: @@ -68,7 +69,6 @@ kw
-
系统性能
@@ -91,9 +91,9 @@ >
@@ -132,9 +132,9 @@ >
@@ -159,8 +159,8 @@
@@ -176,9 +176,9 @@ @@ -205,61 +205,82 @@
1#
2#
3#
+ + +
+ {{ coolingPumpHz0 }}Hz +
+
+ {{ coolingPumpHz1 }}Hz +
+
+ {{ coolingPumpHz2 }}Hz +
1#
2#
3#
+ +
+ {{ freezingPumpHz0 }}Hz +
+
+ {{ freezingPumpHz1 }}Hz +
+
+ {{ freezingPumpHz2 }}Hz +
3#
2#
@@ -380,13 +401,39 @@ export default { coolingTowerOutlet: [], //冷却塔出水阀 isShowOn: false, //一键启停,false是Off,true显示On oneKeyButtonId: "", + + // 冷却泵频率反馈 + coolingPumpHz0: "", + coolingPumpHz1: "", + coolingPumpHz2: "", + // 冷冻泵频率反馈 + freezingPumpHz0: "", + freezingPumpHz1: "", + freezingPumpHz2: "", + timer: null, // 用于存储定时器 ID }; }, - created() { + created() {}, + mounted() { + // 首次进入页面时执行 this.getWeatherData(); this.getPerformance(); this.getOneKeyButton(); this.getMonitorList(); + + // 设置定时器,每 10 秒执行一次 + this.timer = setInterval(() => { + this.getWeatherData(); + this.getPerformance(); + this.getOneKeyButton(); + this.getMonitorList(); + }, 10000); + }, + beforeDestroy() { + // 组件销毁前清除定时器 + if (this.timer) { + clearInterval(this.timer); + } }, methods: { // 获取天气相关数据 @@ -666,6 +713,32 @@ export default { // 否则代表运行状态中的不运行 return false; }, + // 冷却泵频率 + coolingPumpHz(index) { + // 检查 coolingPump 长度是否足够 + if (this.coolingPump.length <= index) { + return false; + } + // 检查 properties 数组是否存在 coolingPump[index]数组的properties数组 + const properties = this.coolingPump[index].properties; + if (!properties || properties.length === 0) { + return false; + } + // 遍历 properties 数组,如果当前对象paramType === 4则有频率反馈 + for (let i = 0; i < properties.length; i++) { + const item = properties[i]; + if (item.paramType === "4") { + // 动态构造属性名 + const propertyName = `coolingPumpHz${index}`; + // 使用方括号语法动态设置属性值 + this[propertyName] = item.collectValue; + this.coolingPumpHz[index] = item.collectValue; + return true; + } + } + // 否则代表运行状态中的不运行 + return false; + }, // 冷冻泵运行状态 freezingPumpRunClass(index) { // 检查 freezingPump 长度是否足够 @@ -688,6 +761,32 @@ export default { // 否则代表运行状态中的不运行 return false; }, + //冷冻泵频率 + freezingPumpHz(index) { + // 检查 freezingPump 长度是否足够 + if (this.freezingPump.length <= index) { + return false; + } + // 检查 properties 数组是否存在 freezingPump[index]数组的properties数组 + const properties = this.freezingPump[index].properties; + if (!properties || properties.length === 0) { + return false; + } + // 遍历 properties 数组,如果当前对象paramType === 4则有频率反馈 + for (let i = 0; i < properties.length; i++) { + const item = properties[i]; + if (item.paramType === "4") { + // 动态构造属性名 + const propertyName = `freezingPumpHz${index}`; + // 使用方括号语法动态设置属性值 + this[propertyName] = item.collectValue; + this.freezingPumpHz[index] = item.collectValue; + return true; + } + } + // 否则代表运行状态中的不运行 + return false; + }, // 冷却塔风机运行状态,index为多少号风机,0表示1号风机;item表示风机x coolingTowerRunClass(index, item) { // 检查 coolingTower 长度是否足够 @@ -873,64 +972,65 @@ export default { .monitor { width: 100%; .monitor-content { - width: 12.19rem; + width: 16rem; + // height: 9.65rem; position: relative; - margin-left: calc((100% - 12.19rem) / 2); + margin-left: calc((100% - 16rem) / 2); .monitor-img { position: absolute; - top: 0rem; - left: calc((100% - 12.19rem) / 2); - width: 12.19rem; - height: 8.2rem; + top: -0.2rem; + left: calc((100% - 16rem) / 2); + width: 15.5rem; + height: 9.65rem; z-index: 1; } .fan-img1 { z-index: 10; position: absolute; - top: 0.86rem; - left: 3.78rem; - width: 0.3rem; - height: 0.3rem; + top: 0.7rem; + left: 4.96rem; + width: 0.5rem; + height: 0.5rem; transform-style: preserve-3d; transform: translateX(-50%) rotateX(60deg) rotateZ(0deg); } .fan-img2 { z-index: 10; position: absolute; - top: 0.73rem; - left: 4.43rem; - width: 0.3rem; - height: 0.3rem; + top: 0.39rem; + left: 5.92rem; + width: 0.5rem; + height: 0.5rem; transform-style: preserve-3d; transform: translateX(-50%) rotateX(60deg) rotateZ(0deg); } .fan-img3 { z-index: 10; position: absolute; - top: 0.67rem; - left: 4.76rem; - width: 0.3rem; - height: 0.3rem; + top: 0.27rem; + left: 6.41rem; + width: 0.5rem; + height: 0.5rem; transform-style: preserve-3d; transform: translateX(-50%) rotateX(60deg) rotateZ(0deg); } .fan-img4 { z-index: 10; position: absolute; - top: 0.59rem; - left: 5.34rem; - width: 0.3rem; - height: 0.3rem; + top: 0.06rem; + left: 7.25rem; + width: 0.5rem; + height: 0.5rem; transform-style: preserve-3d; transform: translateX(-50%) rotateX(60deg) rotateZ(0deg); } .fan-img5 { z-index: 10; position: absolute; - top: 0.55rem; - left: 5.63rem; - width: 0.3rem; - height: 0.3rem; + top: -0.04rem; + left: 7.7rem; + width: 0.5rem; + height: 0.5rem; transform-style: preserve-3d; transform: translateX(-50%) rotateX(60deg) rotateZ(0deg); } @@ -948,37 +1048,37 @@ export default { .towerValve1 { z-index: 10; position: absolute; - top: 1.08rem; - left: 4.23rem; - width: 0.15rem; - height: 0.15rem; + top: 1.17rem; + left: 5.66rem; + width: 0.18rem; + height: 0.18rem; background-color: #ebebeb; border-radius: 50%; } .towerValve2 { z-index: 10; position: absolute; - top: 0.98rem; - left: 4.99rem; - width: 0.15rem; - height: 0.15rem; + top: 0.9rem; + left: 6.75rem; + width: 0.18rem; + height: 0.18rem; background-color: #ebebeb; border-radius: 50%; } .towerValve3 { z-index: 10; position: absolute; - top: 0.84rem; - left: 5.87rem; - width: 0.15rem; - height: 0.15rem; + top: 0.56rem; + left: 8.05rem; + width: 0.18rem; + height: 0.18rem; background-color: #ebebeb; border-radius: 50%; } .in-arrow { position: absolute; - top: 1.8rem; - right: 3.2rem; + top: 2.5rem; + right: 3.7rem; transform: rotate(180deg); width: 0.4rem; height: 0.6rem; @@ -986,63 +1086,66 @@ export default { } .out-arrow { position: absolute; - top: 2.2rem; - right: 1.2rem; + top: 3.4rem; + right: 1.3rem; width: 0.4rem; height: 0.6rem; z-index: 10; } .host-line1 { position: absolute; - left: -1.92rem; - top: 4.4rem; + left: -0.96rem; + top: 6.57rem; z-index: 10; } .host-line2 { position: absolute; - left: -1.7rem; - top: 5.4rem; + left: -0.48rem; + top: 7.48rem; z-index: 10; } .host-line3 { position: absolute; - left: -1.8rem; - top: 6.6rem; + left: -0.3rem; + top: 8.24rem; z-index: 10; } .hostName1 { - border-bottom: 1px solid rgba(0, 255, 255, 0.5); + border-bottom: 1px solid rgba(0, 255, 255, 1); z-index: 10; font-size: 0.22rem; + font-weight: bold; color: aqua; position: absolute; - top: 4.6rem; - left: 1.5rem; - transform: rotateX(50deg) rotateY(0deg) rotateZ(53deg); /* 分别在 X、Y、Z 轴上旋转 */ + top: 6.8rem; + left: 2.5rem; + transform: rotateX(50deg) rotateY(0deg) rotateZ(45deg); /* 分别在 X、Y、Z 轴上旋转 */ transform-origin: bottom center; /* 设置旋转的基点为底部中心 */ text-shadow: 0.02rem 0.02rem 0.04rem rgba(0, 0, 0, 0.9); /* 添加文字阴影增强立体感 */ } .hostName2 { - border-bottom: 1px solid rgba(0, 255, 255, 0.5); + border-bottom: 1px solid rgba(0, 255, 255, 1); z-index: 10; font-size: 0.22rem; + font-weight: bold; color: aqua; position: absolute; - top: 4.1rem; - left: 3.08rem; - transform: rotateX(50deg) rotateY(0deg) rotateZ(48deg); + top: 6rem; + left: 4.6rem; + transform: rotateX(50deg) rotateY(0deg) rotateZ(42deg); transform-origin: bottom center; text-shadow: 0.02rem 0.02rem 0.04rem rgba(0, 0, 0, 0.9); } .hostName3 { - border-bottom: 1px solid rgba(0, 255, 255, 0.5); + border-bottom: 1px solid rgba(0, 255, 255, 1); z-index: 10; font-size: 0.22rem; + font-weight: bold; color: aqua; position: absolute; - top: 3.6rem; - left: 4.48rem; - transform: rotateX(50deg) rotateY(0deg) rotateZ(40deg); + top: 5.12rem; + left: 6.5rem; + transform: rotateX(50deg) rotateY(0deg) rotateZ(39deg); transform-origin: bottom center; text-shadow: 0.02rem 0.02rem 0.04rem rgba(0, 0, 0, 0.9); } @@ -1050,77 +1153,80 @@ export default { @keyframes host { 0% { /* 修改初始旋转角度 */ - transform: translateX(-50%) rotateX(0deg) rotateZ(0deg); + transform: translateX(-50%) rotateX(15deg) rotateZ(0deg); } 100% { /* 修改结束旋转角度 */ - transform: translateX(-50%) rotateX(0deg) rotateZ(360deg); + transform: translateX(-50%) rotateX(15deg) rotateZ(360deg); } } .host-img1 { z-index: 10; position: absolute; - top: 4.62rem; - left: 2.8rem; - width: 0.3rem; - height: 0.3rem; + top: 6.72rem; + left: 4.02rem; + width: 0.4rem; + height: 0.4rem; transform-style: preserve-3d; - transform: translateX(-50%) rotateX(0deg) rotateZ(0deg); + transform: translateX(-50%) rotateY(0deg) rotateX(0deg) rotateZ(0deg); } .host-img2 { z-index: 10; position: absolute; - top: 4.1rem; - left: 4.36rem; - width: 0.3rem; - height: 0.3rem; + top: 5.85rem; + left: 6.04rem; + width: 0.4rem; + height: 0.4rem; transform-style: preserve-3d; transform: translateX(-50%) rotateX(0deg) rotateZ(0deg); } .host-img3 { z-index: 10; position: absolute; - top: 3.64rem; - left: 5.98rem; - width: 0.3rem; - height: 0.3rem; + top: 5.02rem; + left: 8.2rem; + width: 0.4rem; + height: 0.4rem; transform-style: preserve-3d; - transform: translateX(-50%) rotateX(0deg) rotateZ(0deg); + transform: translateX(-50%) rotateX(15deg) rotateZ(0deg); } .water-flow1 { z-index: 10; position: absolute; - top: 4.9rem; - left: -0.8rem; - font-size: 0.14rem; + top: 7.03rem; + left: 0.1rem; + font-size: 0.16rem; } .water-flow2 { z-index: 10; position: absolute; - top: 5.9rem; - left: -0.6rem; - font-size: 0.14rem; + top: 7.93rem; + left: 0.58rem; + font-size: 0.16rem; } .water-flow3 { z-index: 10; position: absolute; - top: 7.1rem; - left: -0.66rem; - font-size: 0.14rem; + top: 8.71rem; + left: 0.78rem; + font-size: 0.16rem; } .water-flow-li { margin-bottom: 0.04rem; color: #46f1e3; + display: flex; + flex-direction: row; + align-items: center; span { background-color: rgba(0, 255, 255, 0.2); border-radius: 0.1rem; - padding: 0.03rem; + padding: 0.01rem 0.03rem; } .break { margin-left: 0.07rem; display: inline-block; - width: 0.12rem; - height: 0.12rem; + width: 0.18rem; + height: 0.18rem; border-radius: 50%; border: 1px solid #46f1e3; background-color: transparent !important; @@ -1144,161 +1250,218 @@ export default { .hostStatus1 { z-index: 10; position: absolute; - top: 4.3rem; - left: 2.3rem; - width: 0.15rem; - height: 0.15rem; + top: 6.5rem; + left: 3.3rem; + width: 0.18rem; + height: 0.18rem; border-radius: 50%; } .hostStatus2 { z-index: 10; position: absolute; - top: 3.81rem; - left: 3.9rem; - width: 0.15rem; - height: 0.15rem; + top: 5.7rem; + left: 5.4rem; + width: 0.18rem; + height: 0.18rem; border-radius: 50%; } .hostStatus3 { z-index: 10; position: absolute; - top: 3.4rem; - left: 5.6rem; - width: 0.15rem; - height: 0.15rem; + top: 4.8rem; + left: 7.5rem; + width: 0.18rem; + height: 0.18rem; border-radius: 50%; } .coolingPump1 { z-index: 10; - font-size: 0.16rem; + font-size: 0.18rem; + font-weight: bold; color: #46f1e3; position: absolute; - top: 2.8rem; - left: 5.22rem; + top: 3.8rem; + left: 7.22rem; } .coolingPump2 { z-index: 10; - font-size: 0.16rem; + font-size: 0.18rem; + font-weight: bold; color: #46f1e3; position: absolute; - top: 2.65rem; - left: 5.86rem; + top: 3.45rem; + left: 8.12rem; } .coolingPump3 { z-index: 10; - font-size: 0.16rem; + font-size: 0.18rem; + font-weight: bold; color: #46f1e3; position: absolute; - top: 2.48rem; - left: 6.44rem; + top: 3.11rem; + left: 9.05rem; } .cooling-img1 { z-index: 10; position: absolute; - top: 2.57rem; - left: 5.45rem; - width: 0.3rem; - height: 0.3rem; + top: 3.31rem; + left: 7.4rem; + width: 0.4rem; + height: 0.4rem; transform-style: preserve-3d; transform: translateX(-50%) rotateX(60deg) rotateZ(0deg); } .cooling-img2 { z-index: 10; position: absolute; - top: 2.4rem; - left: 6.06rem; - width: 0.3rem; - height: 0.3rem; + top: 2.98rem; + left: 8.34rem; + width: 0.4rem; + height: 0.4rem; transform-style: preserve-3d; transform: translateX(-50%) rotateX(60deg) rotateZ(0deg); } .cooling-img3 { z-index: 10; position: absolute; - top: 2.24rem; - left: 6.7rem; - width: 0.3rem; - height: 0.3rem; + top: 2.66rem; + left: 9.25rem; + width: 0.4rem; + height: 0.4rem; transform-style: preserve-3d; transform: translateX(-50%) rotateX(60deg) rotateZ(0deg); } + .cooling-hz1 { + z-index: 10; + position: absolute; + top: 3.88rem; + left: 7.52rem; + font-size: 0.14rem; + font-weight: bold; + } + .cooling-hz2 { + z-index: 10; + position: absolute; + top: 3.51rem; + left: 8.5rem; + font-size: 0.14rem; + font-weight: bold; + } + .cooling-hz3 { + z-index: 10; + position: absolute; + top: 3.18rem; + left: 9.38rem; + font-size: 0.14rem; + font-weight: bold; + } .freezingPump1 { z-index: 10; - font-size: 0.16rem; + font-size: 0.18rem; + font-weight: bold; color: #46f1e3; position: absolute; - top: 5.23rem; - left: 4.66rem; + top: 7.5rem; + left: 6.6rem; } .freezingPump2 { z-index: 10; - font-size: 0.16rem; + font-size: 0.18rem; + font-weight: bold; color: #46f1e3; position: absolute; - top: 4.82rem; - left: 5.75rem; + top: 6.82rem; + left: 8rem; } .freezingPump3 { z-index: 10; - font-size: 0.16rem; + font-size: 0.18rem; + font-weight: bold; color: #46f1e3; position: absolute; - top: 4.5rem; - left: 6.7rem; + top: 6.28rem; + left: 9.1rem; } .freezing-img1 { z-index: 10; position: absolute; - top: 4.87rem; - left: 4.94rem; - width: 0.3rem; - height: 0.3rem; + top: 6.91rem; + left: 6.93rem; + width: 0.4rem; + height: 0.4rem; transform-style: preserve-3d; transform: translateX(-50%) rotateX(60deg) rotateZ(0deg); } .freezing-img2 { z-index: 10; position: absolute; - top: 4.48rem; - left: 6rem; - width: 0.3rem; - height: 0.3rem; + top: 6.28rem; + left: 8.26rem; + width: 0.4rem; + height: 0.4rem; transform-style: preserve-3d; transform: translateX(-50%) rotateX(60deg) rotateZ(0deg); } .freezing-img3 { z-index: 10; position: absolute; - top: 4.13rem; - left: 6.86rem; - width: 0.3rem; - height: 0.3rem; + top: 5.72rem; + left: 9.38rem; + width: 0.4rem; + height: 0.4rem; transform-style: preserve-3d; transform: translateX(-50%) rotateX(60deg) rotateZ(0deg); } + .freezing-hz1 { + z-index: 10; + position: absolute; + top: 7.6rem; + left: 7rem; + font-size: 0.14rem; + font-weight: bold; + } + .freezing-hz2 { + z-index: 10; + position: absolute; + top: 6.9rem; + left: 8.42rem; + font-size: 0.14rem; + font-weight: bold; + } + .freezing-hz3 { + z-index: 10; + position: absolute; + top: 6.32rem; + left: 9.5rem; + font-size: 0.14rem; + font-weight: bold; + } .coolingTower1 { z-index: 10; - font-size: 0.16rem; + font-size: 0.18rem; color: #46f1e3; position: absolute; - top: 1.46rem; - left: 3.84rem; + top: 1.78rem; + left: 5.1rem; + font-weight: bold; } .coolingTower2 { z-index: 10; - font-size: 0.16rem; + font-size: 0.18rem; color: #46f1e3; position: absolute; - top: 1.33rem; - left: 4.75rem; + top: 1.42rem; + left: 6.3rem; + font-weight: bold; } .coolingTower3 { z-index: 10; - font-size: 0.16rem; + font-size: 0.18rem; color: #46f1e3; position: absolute; - top: 1.16rem; - left: 5.6rem; + top: 1.07rem; + left: 7.52rem; + font-weight: bold; } /* 定义灯闪烁的动画 */ @keyframes blink { @@ -1315,60 +1478,60 @@ export default { .frozenValve1 { z-index: 10; position: absolute; - top: 4.58rem; - left: 3.2rem; - width: 0.15rem; - height: 0.15rem; + top: 6.67rem; + left: 4.62rem; + width: 0.18rem; + height: 0.18rem; background-color: #ebebeb; border-radius: 50%; } .frozenValve2 { z-index: 10; position: absolute; - top: 4.04rem; - left: 4.76rem; - width: 0.15rem; - height: 0.15rem; + top: 5.8rem; + left: 6.62rem; + width: 0.18rem; + height: 0.18rem; background-color: #ebebeb; border-radius: 50%; } .frozenValve3 { z-index: 10; position: absolute; - top: 3.46rem; - left: 6.16rem; - width: 0.15rem; - height: 0.15rem; + top: 4.8rem; + left: 8.46rem; + width: 0.18rem; + height: 0.18rem; background-color: #ebebeb; border-radius: 50%; } .coolingValue1 { z-index: 10; position: absolute; - top: 3.91rem; - left: 1.99rem; - width: 0.15rem; - height: 0.15rem; + top: 5.8rem; + left: 2.7rem; + width: 0.18rem; + height: 0.18rem; background-color: #ebebeb; border-radius: 50%; } .coolingValue2 { z-index: 10; position: absolute; - top: 3.48rem; - left: 3.48rem; - width: 0.15rem; - height: 0.15rem; + top: 5rem; + left: 4.73rem; + width: 0.18rem; + height: 0.18rem; background-color: #ebebeb; border-radius: 50%; } .coolingValue3 { z-index: 10; position: absolute; - top: 3.06rem; - left: 5.02rem; - width: 0.15rem; - height: 0.15rem; + top: 4.24rem; + left: 6.86rem; + width: 0.18rem; + height: 0.18rem; background-color: #ebebeb; border-radius: 50%; } @@ -1377,13 +1540,13 @@ export default { min-width: 2.5rem; z-index: 10; position: absolute; - top: 0rem; - left: -0.8rem; + top: 0.4rem; + left: -0rem; display: flex; flex-direction: column; align-items: flex-start; justify-content: flex-start; - font-size: 0.16rem; + font-size: 0.2rem; color: rgb(18, 155, 209); background-image: url(../../../assets/images/border1.png); background-size: 100% 100%; @@ -1403,14 +1566,14 @@ export default { color: #20ebfa; font-weight: bold; font-family: DIN; - font-size: 0.2rem; + font-size: 0.24rem; } } .performance { position: absolute; - top: 4.7rem !important; - right: -1rem !important; + top: 6.1rem !important; + right: 0.1rem !important; display: flex; flex-direction: column; align-items: flex-start; @@ -1425,19 +1588,20 @@ export default { flex-direction: column; align-items: flex-start; justify-content: flex-start; - font-size: 0.16rem; + font-size: 0.2rem; color: rgb(18, 155, 209); - background-image: url(../../../assets/images/border1.png); + background-image: url(../../../assets/images/border4.png); background-size: 100% 100%; background-repeat: no-repeat; padding: 0.15rem 0 0.25rem 0rem; } .title { + z-index: 10; width: 100%; background-image: url(../../../assets/images/text_img_title.png); background-repeat: no-repeat; background-repeat: no-repeat; - background-size: 3rem 0.45rem; + background-size: 2rem 0.45rem; background-position: bottom left; font-family: SourceHanSansCN-Medium; font-size: 0.16rem; @@ -1445,17 +1609,18 @@ export default { line-height: 0.6rem; color: rgba(209, 214, 223, 1); padding-left: 0.6rem; - margin-top: -0.15rem; + margin-bottom: 0.01rem; + margin-left: 0.4rem; } .offClass { position: absolute; - width: 1.4rem; - height: 1.4rem; + width: 1.6rem; + height: 1.6rem; background-image: url(../../../assets/images/border2.png); background-repeat: no-repeat; background-size: 100% 100%; top: 0; - right: 0rem; + right: 2rem; z-index: 10; display: flex; flex-direction: column; @@ -1465,16 +1630,16 @@ export default { .off-bg { position: absolute; left: 0.38rem; - top: 0.3rem; - width: 0.8rem; - height: 0.8rem; + top: 0.32rem; + width: 1rem; + height: 1rem; background-image: url(../../../assets/images/border3.png); background-repeat: no-repeat; background-size: 100% 100%; text-align: center; - line-height: 0.8rem; + line-height: 1rem; font-family: DIN; - font-size: 0.24rem; + font-size: 0.3rem; color: #20ebfa; font-weight: bold; } @@ -1501,4 +1666,11 @@ export default { animation: none; } } +// @media (min-width: 1240px) and (max-width: 1440px) { +// } +@media (max-width: 1440px) { + .monitor-content { + transform: scale(0.9); + } +} diff --git a/src/views/centerairC/sysMonitor/index2.vue b/src/views/centerairC/sysMonitor/index1.vue similarity index 99% rename from src/views/centerairC/sysMonitor/index2.vue rename to src/views/centerairC/sysMonitor/index1.vue index e51eb32..aa4f413 100644 --- a/src/views/centerairC/sysMonitor/index2.vue +++ b/src/views/centerairC/sysMonitor/index1.vue @@ -873,15 +873,15 @@ export default { .monitor { width: 100%; .monitor-content { - width: 14rem; + width: 12.19rem; position: relative; - margin-left: calc((100% - 14rem) / 2); + margin-left: calc((100% - 12.19rem) / 2); .monitor-img { position: absolute; - top: 0.2rem; - left: calc((100% - 14rem) / 2); - width: 14rem; - height: 7.9rem; + top: 0rem; + left: calc((100% - 12.19rem) / 2); + width: 12.19rem; + height: 8.2rem; z-index: 1; } .fan-img1 { @@ -1409,7 +1409,7 @@ export default { .performance { position: absolute; - top: 5.4rem !important; + top: 4.7rem !important; right: -1rem !important; display: flex; flex-direction: column; diff --git a/src/views/centerairC/sysMonitor/lineChildren.vue b/src/views/centerairC/sysMonitor/lineChildren.vue index 20036dc..0f3f6ff 100644 --- a/src/views/centerairC/sysMonitor/lineChildren.vue +++ b/src/views/centerairC/sysMonitor/lineChildren.vue @@ -96,7 +96,7 @@ export default { .line { position: absolute; height: 1px; - background-color: rgba(0, 255, 255, 0.3); + background-color: rgba(0, 255, 255, 0.5); transform-origin: left center; }