diff --git a/.env.development b/.env.development
index 8253cfb..8e968ab 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:8090'
+VUE_APP_BASE_API = 'http://106.55.173.225:8090'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/views/centerairC/sysMonitor/components/performanceChart.vue b/src/views/centerairC/sysMonitor/components/performanceChart.vue
new file mode 100644
index 0000000..7aa38da
--- /dev/null
+++ b/src/views/centerairC/sysMonitor/components/performanceChart.vue
@@ -0,0 +1,416 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/centerairC/sysMonitor/hostDetails.vue b/src/views/centerairC/sysMonitor/hostDetails.vue
index e22a076..eb79da9 100644
--- a/src/views/centerairC/sysMonitor/hostDetails.vue
+++ b/src/views/centerairC/sysMonitor/hostDetails.vue
@@ -139,7 +139,7 @@
运行累计时间:
- {{ timeObj.showValue }}
+ {{ timeObj.showValue }}小时
@@ -850,7 +850,7 @@ export default {
// width: 100%;
margin-right: 0.1rem;
position: relative;
- color: #2980b9;
+ color: #89acc4;
font-family: Arial, sans-serif;
letter-spacing: 0.02rem;
font-size: 0.18rem;
@@ -1011,7 +1011,9 @@ export default {
.dotData {
font-weight: bold;
margin: 0 0.06rem;
- color: #3d8df5;
+ color: #3b80ff;
+ display: flex;
+ align-items: center;
}
.goodData {
font-weight: bold;
diff --git a/src/views/centerairC/sysMonitor/monitorCenter.vue b/src/views/centerairC/sysMonitor/monitorCenter.vue
index 3065812..76ac4ed 100644
--- a/src/views/centerairC/sysMonitor/monitorCenter.vue
+++ b/src/views/centerairC/sysMonitor/monitorCenter.vue
@@ -124,10 +124,10 @@
{{ startOrStopStatus }}
-
+
-
-
-
+
+
+

+
1号螺旋机
+
+
+
+
+
+
+ 实时EER:
+ 10.365
+ kw/kw
+
+
+
+
+
+
+
+ 实时冷量:
+ 1306
+ kw
+
+
+
+
+
+
+ 全年EER:
+ 0.000
+ kw/kw
+
+
+
+
+
+
+ 全年用电:
+ 64098
+ kw/H
+
+
+
+
+
+
+ 全年供电:
+ 101365
+ kw
+
+
+
+
+
+
+
+

+
2号螺旋机
+
+
+
+
+
+
+ 实时EER:
+ 10.365
+ kw/kw
+
+
+
+
+
+
+
+ 实时冷量:
+ 1306
+ kw
+
+
+
+
+
+
+ 全年EER:
+ 0.000
+ kw/kw
+
+
+
+
+
+
+ 全年用电:
+ 64098
+ kw/H
+
+
+
+
+
+
+ 全年供电:
+ 101365
+ kw
+
+
+
+
+
+
+
+

+
3号磁悬浮机
+
+
+
+
+
+
+ 实时EER:
+ 10.365
+ kw/kw
+
+
+
+
+
+
+
+ 实时冷量:
+ 1306
+ kw
+
+
+
+
+
+
+ 全年EER:
+ 0.000
+ kw/kw
+
+
+
+
+
+
+ 全年用电:
+ 64098
+ kw/H
+
+
+
+
+
+
+ 全年供电:
+ 101365
+ kw
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 今日EER:
+ 6.531
+ kw/kw
+
+
+
+
+
+
+ 今日用电:
+ 367
+ kw/H
+
+
+
+
+
+
+ 今日供冷:
+ 2397
+ kw
+
+
+
+
+
+
+ 当月EER:
+ 6.131
+ kw/kw
+
+
+
+
+
+
+ 今月用电:
+ 27840
+ kw/H
+
+
+
+
+
+
+ 当月供冷:
+ 172069
+ kw
+
+
+
+
+
+
+ 当年EER:
+ 6.531
+ kw/kw
+
+
+
+
+
+
+ 当年用电:
+ 105771
+ kw/H
+
+
+
+
+
+
+ 当年供冷:
+ 744519
+ kw
+
+
+
+
+
+
+ 累计EER:
+ 5.531
+ kw/kw
+
+
+
+
+
+
+ 累计用电:
+ 1096628
+ kw/H
+
+
+
+
+
+
+ 累计供冷:
+ 6107983
+ kw
+
+
+
+
+
+
+
+
-
@@ -62,15 +395,12 @@ import {
runTime,
} from "@/api/centerairC/sysMonitor";
import { alarmRecordList } from "@/api/alarm/alarmRecord";
-import { cpmList } from "@/api/device/gather";
-import LoadData from "./components/loadData.vue";
-import hostChart from "./components/hostChart.vue";
import titleImg from "./components/titleImg.vue";
-import lineSquare from "./components/lineSquare.vue";
import { format } from "@/utils/datetime";
+import PerformanceChart from './components/performanceChart.vue';
export default {
name: "sysControl",
- components: { LoadData, hostChart, titleImg, lineSquare },
+ components: { titleImg, PerformanceChart },
data() {
return {
loading: false,
@@ -78,7 +408,7 @@ export default {
currentDate: new Date(),
nowTimer: null,
deviceName: "", //主机名称
- hostData: [], //主机参数
+ hostData: [], //冷机性能
rightHostData: [], //右
automaticObj: {}, //手自动状态
localObj: {}, //本地远程状态
@@ -321,23 +651,230 @@ export default {
align-items: center;
justify-content: space-between;
.detail-top-left {
- width: 7rem;
- height: 4.4rem;
+ width: 14rem;
// background-color: aquamarine;
position: relative;
+ display: flex;
+ flex-direction: row;
+ align-items: flex-start;
+ .host-li {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ margin-left: 0.3rem;
+ position: relative;
+ .host-img {
+ width: 3.5rem;
+ height: 2.6rem;
+ margin-bottom: 0.1rem;
+ }
+ .host-name{
+ position: absolute;
+ top: 0.8rem;
+ left: 1.6rem;
+ color: #3520f8;
+ font-size: 0.18rem;
+ font-weight: bold;
+ }
+ }
}
.detail-top-right {
- width: calc(100% - 7.25rem);
- height: 4.4rem;
+ width: calc(100% - 14rem);
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ }
+ .detail-data {
+ display: flex;
+ flex-direction: column;
+ width: 4.5rem;
+ position: relative;
+ .detail-data-top {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ justify-content: center;
+ color: #c0dffc;
+ font-weight: bold;
+ font-size: 0.18rem;
+ width: 100%;
+ text-align: center;
+ z-index: 10;
+ .details-title {
+ margin: 0 0.15rem;
+ }
+ }
+ .detail-data-bottom {
+ width: 100%;
+ padding: 0rem 0.3rem;
+ z-index: 0;
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+ align-items: flex-start;
+ justify-content: center;
+ .detail-data-li {
+ width: 80%;
+ margin-right: 0.1rem;
+ position: relative;
+ color: #89acc4;
+ font-family: Arial, sans-serif;
+ letter-spacing: 0.02rem;
+ font-size: 0.18rem;
+ position: relative;
+ margin-bottom: 0.08rem;
+ border-left: 0.01rem solid #217df5;
+ border-right: 0.01rem solid #217df5;
+ background-image: radial-gradient(
+ circle at left top,
+ #217df5 0.01rem,
+ transparent 0.01rem
+ ),
+ radial-gradient(
+ circle at right top,
+ #217df5 0.01rem,
+ transparent 0.01rem
+ ),
+ radial-gradient(
+ circle at left bottom,
+ #217df5 0.01rem,
+ transparent 0.01rem
+ ),
+ radial-gradient(
+ circle at right bottom,
+ #217df5 0.01rem,
+ transparent 0.01rem
+ );
+ background-repeat: no-repeat;
+ background-position: left top, right top, left bottom, right bottom;
+ }
+ .detail-data-li::before,
+ .detail-data-li::after {
+ content: "";
+ position: absolute;
+ left: 0;
+ right: 0;
+ height: 0.01rem;
+ background-image: linear-gradient(
+ to right,
+ #217df5 0%,
+ rgba(41, 128, 185, 0) 50%,
+ #217df5 100%
+ ) !important;
+ }
+ .year-data {
+ margin-top: 0.1rem;
+ }
+ .rightDot {
+ position: relative;
+ width: 100%;
+ height: 100%;
+ z-index: 999;
+ }
+ .leftDot {
+ position: relative;
+ width: 100%;
+ height: 100%;
+ padding: 0.04rem 0.1rem;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ .dotData {
+ font-weight: bold;
+ margin: 0 0.06rem;
+ color: #3b80ff;
+ display: flex;
+ align-items: center;
+ }
+ .dotUnit{
+ width: 0.55rem;
+ text-align: left;
+ display: flex;
+ align-items: center;
+ }
+ }
+
+ .rightDot::before {
+ content: "";
+ position: absolute;
+ top: -0.03rem;
+ right: -0.03rem;
+ width: 0.06rem;
+ height: 0.06rem;
+ background-color: #217df5;
+ box-shadow: 0 0 0.1rem 0.02rem rgba(33, 125, 245, 0.9);
+ background-image: radial-gradient(
+ circle at 30% 30%,
+ rgba(255, 255, 255, 0.8) 0%,
+ rgba(255, 255, 255, 0) 70%
+ );
+ border-radius: 50%;
+ }
+
+ .rightDot::after {
+ content: "";
+ position: absolute;
+ bottom: -0.03rem;
+ right: -0.03rem;
+ width: 0.06rem;
+ height: 0.06rem;
+ background-color: #217df5;
+ box-shadow: 0 0 0.1rem 0.02rem rgba(33, 125, 245, 0.9);
+ background-image: radial-gradient(
+ circle at 30% 30%,
+ rgba(255, 255, 255, 0.8) 0%,
+ rgba(255, 255, 255, 0) 70%
+ );
+ border-radius: 50%;
+ }
+ .leftDot::before {
+ content: "";
+ position: absolute;
+ top: -0.03rem;
+ left: -0.03rem;
+ width: 0.06rem;
+ height: 0.06rem;
+ background-color: #217df5;
+ border-radius: 50%;
+ box-shadow: 0 0 0.1rem 0.02rem rgba(33, 125, 245, 0.9);
+ background-image: radial-gradient(
+ circle at 30% 30%,
+ rgba(255, 255, 255, 0.8) 0%,
+ rgba(255, 255, 255, 0) 70%
+ );
+ }
+
+ .leftDot::after {
+ content: "";
+ position: absolute;
+ bottom: -0.03rem;
+ left: -0.03rem;
+ width: 0.06rem;
+ height: 0.06rem;
+ background-color: #217df5;
+ box-shadow: 0 0 0.1rem 0.02rem rgba(33, 125, 245, 0.9);
+ background-image: radial-gradient(
+ circle at 30% 30%,
+ rgba(255, 255, 255, 0.8) 0%,
+ rgba(255, 255, 255, 0) 70%
+ );
+ border-radius: 50%;
+ }
+ }
+ .line1 {
+ position: absolute;
+ top: 0.53rem;
+ }
}
}
.detail-bottom {
- height: 2.6rem;
- margin-top: 0.3rem;
- margin-left: 0.25rem;
+ // margin: 0.3rem 0.5rem 0 0.5rem;
display: flex;
flex-direction: row;
justify-content: space-between;
+ height:3rem;
+ // background-color: #217df5;
}
}
}