From 9db40ecd646aab2bec1282bc10faa6de69ed7655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Mon, 8 Sep 2025 10:37:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/main.css | 42 +++++++++++++++++++++++---- src/assets/css/main.scss | 37 +++++++++++++++++++---- src/views/manage/deviceInfoManage.vue | 19 ++++++++++-- src/views/manage/deviceSet.vue | 14 +++++++-- src/views/manage/deviceStatusSet.vue | 15 ++++++++-- src/views/manage/weatherData.vue | 20 ++++++++++--- 6 files changed, 126 insertions(+), 21 deletions(-) diff --git a/src/assets/css/main.css b/src/assets/css/main.css index 0a94bd91..118ec505 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -31,6 +31,42 @@ /*滚动条边角*/ } +.flex-title { + padding-top: 0; + justify-content: space-between; + border-bottom: 1px solid transparent; +} + +.flex-title > div { + display: flex; + align-items: center; + font-size: 28px; + font-family: Microsoft YaHei; + font-weight: bold; + color: #FFFFFF; +} + +.flex-title > div > img { + width: 60px; + height: 60px; + margin-right: 15px; +} + +.flex-title .table-title-btn { + font-size: 16px; +} + +.flex-title .table-title-btn > img { + width: 14px; + height: 14px; + margin-right: 9px; +} + +.flex-title .table-right { + font-size: 20px; + font-weight: boldflex-title; +} + .amap-marker .p_title { height: 44px; background: rgba(1, 12, 28, 0.7); @@ -4524,12 +4560,6 @@ textarea { margin-top: 0; } -.videoManage .flex-title { - padding-top: 0; - justify-content: space-between; - border-bottom: 1px solid transparent; -} - .el-table .el-table__body-wrapper::-webkit-scrollbar { /*滚动条整体*/ width: 17px; diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss index 68a1bb03..a541f5e7 100644 --- a/src/assets/css/main.scss +++ b/src/assets/css/main.scss @@ -32,6 +32,38 @@ /*滚动条边角*/ } +} +.flex-title { + padding-top: 0; + justify-content: space-between; + border-bottom: 1px solid transparent; + >div{ + display: flex; + align-items: center; + font-size: 28px; + font-family: Microsoft YaHei; + font-weight: bold; + color: #FFFFFF; + >img{ + width: 60px; + height: 60px; + margin-right: 15px; + } + } + + .table-title-btn{ + font-size: 16px; + >img{ + width: 14px; + height: 14px; + margin-right: 9px; + } + } + + .table-right{ + font-size: 20px; + font-weight: boldflex-title; + } } .amap-marker{ .p_title { @@ -4798,11 +4830,6 @@ textarea { margin-top: 0; } - .flex-title { - padding-top: 0; - justify-content: space-between; - border-bottom: 1px solid transparent; - } // >.flex-view { // justify-content: space-between; diff --git a/src/views/manage/deviceInfoManage.vue b/src/views/manage/deviceInfoManage.vue index 52398771..9c174524 100644 --- a/src/views/manage/deviceInfoManage.vue +++ b/src/views/manage/deviceInfoManage.vue @@ -1,7 +1,22 @@