From a43002dfc727a26ce1b450a5f1b902e4ee801248 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Wed, 21 Feb 2024 14:20:22 +0800 Subject: [PATCH] 1 --- src/assets/css/main.css | 45 +++++++++++++++++++++++++++++++++++++ src/assets/css/main.scss | 45 +++++++++++++++++++++++++++++++++++++ src/views/page/realTime.vue | 27 +++++++++++++++++++--- 3 files changed, 114 insertions(+), 3 deletions(-) diff --git a/src/assets/css/main.css b/src/assets/css/main.css index c4309ce..e844ded 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -1696,6 +1696,51 @@ cursor: pointer; } +.dataModel .view-new { + width: 100%; + display: flex; + align-items: center; + flex-wrap: wrap; + padding: 50px 30px 0; +} + +.dataModel .view-new .list-view { + flex-shrink: 0; + display: flex; + align-items: center; + margin-right: 20px; + margin-bottom: 20px; +} + +.dataModel .view-new .list-view img { + width: 60px; + height: 60px; +} + +.dataModel .view-new .list-view .text { + text-align: center; + margin: 5px 0; + font-size: 14px; +} + +.dataModel .view-new .list-view .number { + width: 80px; + height: 30px; + background: url(../image/real-time-text.png) no-repeat center; + background-size: 100% 100%; + font-size: 16px; + font-family: Arial; + font-weight: bold; + color: #FFFFFF; + display: flex; + align-items: center; + justify-content: center; +} + +.dataModel .view-new .list-view .number.red { + color: #fc7d6a; +} + .realTime { width: 100%; height: 100%; diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss index 894879e..6ab835f 100644 --- a/src/assets/css/main.scss +++ b/src/assets/css/main.scss @@ -1781,6 +1781,51 @@ } } +.dataModel{ + .view-new{ + width: 100%; + display: flex; + align-items: center; + flex-wrap: wrap; + padding: 50px 30px 0; + .list-view{ + flex-shrink: 0; + display: flex; + // flex-direction: column; + align-items: center; + margin-right: 20px; + margin-bottom: 20px; + img { + width: 60px; + height: 60px; + + } + + .text { + text-align: center; + margin: 5px 0; + font-size: 14px; + } + + .number { + width: 80px; + height: 30px; + background: url(../image/real-time-text.png) no-repeat center; + background-size: 100% 100%; + font-size: 16px; + font-family: Arial; + font-weight: bold; + color: #FFFFFF; + display: flex; + align-items: center; + justify-content: center; + &.red{ + color: rgba(252, 125, 106, 1); + } + } + } + } +} .realTime { width: 100%; height: 100%; diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue index 497f4f6..1c3bdd0 100644 --- a/src/views/page/realTime.vue +++ b/src/views/page/realTime.vue @@ -57,9 +57,9 @@
- +
+ 查看全部实时数据 +
短信报警
@@ -286,6 +286,23 @@
+ + + 返 回 +
实时数据
+
+
+
+ +
+
{{ item.name }}
+
{{ getControlData(item) }}
+
+
+
+
+ +
请选择要显示的设备
@@ -442,6 +459,7 @@ export default { sunrise: "00:00", sunset: "00:00", statusList: [], + dataModel:false,//全部实时数据弹窗 time: null,//右上角时间 list: [], @@ -540,6 +558,9 @@ export default { this.$bus.$off('refreshTime') }, methods: { + openDataModel(){ + this.dataModel=true + }, tableRowClassName({ row, rowIndex }) { if (rowIndex % 2 == 1) { return 'warning-row';