diff --git a/src/assets/homeIndex/card.png b/src/assets/homeIndex/card.png index 9f445f7..21dc726 100644 Binary files a/src/assets/homeIndex/card.png and b/src/assets/homeIndex/card.png differ diff --git a/src/assets/homeIndex/card1.png b/src/assets/homeIndex/card1.png new file mode 100644 index 0000000..42d4aad Binary files /dev/null and b/src/assets/homeIndex/card1.png differ diff --git a/src/assets/homeIndex/card2.png b/src/assets/homeIndex/card2.png new file mode 100644 index 0000000..12337c0 Binary files /dev/null and b/src/assets/homeIndex/card2.png differ diff --git a/src/assets/homeIndex/card3.png b/src/assets/homeIndex/card3.png new file mode 100644 index 0000000..aec5dd8 Binary files /dev/null and b/src/assets/homeIndex/card3.png differ diff --git a/src/assets/homeIndex/card4.png b/src/assets/homeIndex/card4.png new file mode 100644 index 0000000..4207e4e Binary files /dev/null and b/src/assets/homeIndex/card4.png differ diff --git a/src/assets/homeIndex/card5.png b/src/assets/homeIndex/card5.png new file mode 100644 index 0000000..6f480dc Binary files /dev/null and b/src/assets/homeIndex/card5.png differ diff --git a/src/assets/homeIndex/card6.png b/src/assets/homeIndex/card6.png new file mode 100644 index 0000000..34277d6 Binary files /dev/null and b/src/assets/homeIndex/card6.png differ diff --git a/src/assets/homeIndex/card7.png b/src/assets/homeIndex/card7.png new file mode 100644 index 0000000..24dd4ef Binary files /dev/null and b/src/assets/homeIndex/card7.png differ diff --git a/src/views/controlCenter/controlPanel/index.vue b/src/views/controlCenter/controlPanel/index.vue index 5d2091e..3033723 100644 --- a/src/views/controlCenter/controlPanel/index.vue +++ b/src/views/controlCenter/controlPanel/index.vue @@ -49,6 +49,7 @@ + @@ -109,6 +110,7 @@ @@ -118,7 +120,7 @@ 'battery-yellow': Number(scope.row.battery) >= 20 && Number(scope.row.battery) < 80, 'battery-green': Number(scope.row.battery) >= 80 && Number(scope.row.battery) <= 100 }"> - {{ scope.row.battery || '0'}}% + {{ scope.row.battery || '0' }}% @@ -485,15 +487,17 @@ const forceAlarm = async () => { \ No newline at end of file diff --git a/src/views/homeIndex/components/DeviceCategory.vue b/src/views/homeIndex/components/DeviceCategory.vue index ae52341..1031bc3 100644 --- a/src/views/homeIndex/components/DeviceCategory.vue +++ b/src/views/homeIndex/components/DeviceCategory.vue @@ -71,7 +71,7 @@ onMounted(() => { 0, 0, 0, 1, [ { offset: 0, color: 'rgba(0,166,255,1)' }, - { offset: 1, color: 'rgba(0,125,221, 0.6)' } + { offset: 1, color: 'rgba(0,125,221, 0.3)' } ] ), borderRadius: 4 @@ -87,7 +87,7 @@ onMounted(() => { 0, 0, 0, 1, [ { offset: 0, color: 'rgba(232,69,37,1)' }, - { offset: 1, color: 'rgba(240,12,12, 0.6)' } + { offset: 1, color: 'rgba(240,12,12, 0.3)' } ] ), borderRadius: 4 @@ -110,11 +110,11 @@ onMounted(() => { \ No newline at end of file diff --git a/src/views/homeIndex/components/DeviceUsage.vue b/src/views/homeIndex/components/DeviceUsage.vue index bbb964a..b81387d 100644 --- a/src/views/homeIndex/components/DeviceUsage.vue +++ b/src/views/homeIndex/components/DeviceUsage.vue @@ -121,7 +121,7 @@ onMounted(() => { \ No newline at end of file diff --git a/src/views/homeIndex/index.vue b/src/views/homeIndex/index.vue index e5b8f25..20dbb4d 100644 --- a/src/views/homeIndex/index.vue +++ b/src/views/homeIndex/index.vue @@ -21,21 +21,21 @@
-
设备总览
+
-
设备类别
+
-
设备使用频次
+
@@ -48,21 +48,21 @@
-
报警数据
+
-
报警事件
+
-
报警次数
+
@@ -74,7 +74,7 @@
-
实时报警信息
+
@@ -132,12 +132,12 @@ onMounted(() => { width: 100vw; height: 100vh; position: relative; - overflow: hidden; + overflow: hidden; } .top-fixed { width: 100%; - height: 13vh; + height:7vh; background: url(@/assets/homeIndex/top.png) no-repeat; background-size: 100% 100%; z-index: 11; @@ -215,7 +215,7 @@ onMounted(() => { display: flex; flex-direction: column; width: 27.2vw; - height: calc(100vh - 9vh); + height: calc(100vh - 8vh); pointer-events: auto; } @@ -228,7 +228,7 @@ onMounted(() => { display: flex; flex-direction: column; width: 27.2vw; - height: calc(100vh - 9vh); + height: calc(100vh - 8vh); pointer-events: auto; } @@ -247,7 +247,7 @@ onMounted(() => { /* 模块卡片样式 */ .module-card { - background: url(@/assets/homeIndex/card.png) no-repeat; + /* background: url(@/assets/homeIndex/card.png) no-repeat; */ position: relative; background-size: 100% 100%; width: 100%; @@ -257,24 +257,59 @@ onMounted(() => { display: flex; flex-direction: column; border-radius: 10px; + margin-bottom: 1vh; +} +.left-modules .module-card:nth-of-type(1) { + background: url(@/assets/homeIndex/card1.png) no-repeat; + background-size: 100% 100%; +} +.left-modules .module-card:nth-of-type(2) { + background: url(@/assets/homeIndex/card2.png) no-repeat; + background-size: 100% 100%; +} +.left-modules .module-card:nth-of-type(3) { + background: url(@/assets/homeIndex/card3.png) no-repeat; + background-size: 100% 100%; +} +.right-modules .module-card:nth-of-type(1) { + background: url(@/assets/homeIndex/card4.png) no-repeat; + background-size: 100% 100%; +} +.right-modules .module-card:nth-of-type(2) { + background: url(@/assets/homeIndex/card5.png) no-repeat; + background-size: 100% 100%; +} +.right-modules .module-card:nth-of-type(3) { + background: url(@/assets/homeIndex/card6.png) no-repeat; + background-size: 100% 100%; +} +.bottom-middle-module .module-card:nth-of-type(1) { + background: url(@/assets/homeIndex/card7.png) no-repeat; + background-size: 100% 100%; } /* 模块标题 */ .module-header { position: absolute; font-size: 1.6vh; - color: #fff; + display: flex; align-items: center; flex-shrink: 0; - left: 5vh; - top: 3.2vh; + left:4.8vh; + top:1.5vh; + font-family: SourceHanSansCN, SourceHanSansCN; +font-weight: 500; +/* font-size: 18px; */ +color: #F2F8FF; + +text-shadow: 3px 0px 6px rgba(3,33,42,0.5); } .realtime-header { - left: 8vh; - top: 3.4vh; + left: 7.5vh; + top:1.5vh; } /* 模块内容 */