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/assets/homeIndex/select.png b/src/assets/homeIndex/select.png
new file mode 100644
index 0000000..7134dcc
Binary files /dev/null and b/src/assets/homeIndex/select.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/components/MapComponent.vue b/src/views/homeIndex/components/MapComponent.vue
index eaeb2fe..160240f 100644
--- a/src/views/homeIndex/components/MapComponent.vue
+++ b/src/views/homeIndex/components/MapComponent.vue
@@ -520,6 +520,10 @@ onMounted(() => {
width: 100vw;
height: 100vh;
}
+.el-icon{
+ color: #007EFF;
+ font-size: 1vw;
+}
.map {
width: 100%;
@@ -545,19 +549,20 @@ onMounted(() => {
.topTool .form-item {
width: calc(calc(100% - 160px) / 3);
- height: 45px;
+ height: 5vh;
border: none;
}
:deep .el-select__wrapper,
:deep .el-input__wrapper {
border: none;
- height: 45px;
+ height: 7vh;
}
:deep .el-select__wrapper,
:deep .el-input__wrapper,
.topTool .form-item {
- background: linear-gradient(to bottom, #007eff59 0%, /* 顶部红色 */ #00efed59 50%, /* 中间蓝色 */ #1d5df459 100% /* 底部红色 */);
+ background: url(@/assets/homeIndex/select.png) no-repeat;
+
}
.topTool .form {
width: 43%;
@@ -605,7 +610,7 @@ onMounted(() => {
border: none;
box-sizing: border-box;
padding: 0px 10px;
- line-height: 45px;
+ line-height: 4vh;
outline: none;
font-family: MicrosoftYaHei;
font-size: 15px;
@@ -616,13 +621,14 @@ onMounted(() => {
flex-direction: row;
flex-wrap: nowrap;
align-content: center;
- align-items: center;
+
justify-content: space-between;
}
.topTool .form-item input::placeholder {
font-family: MicrosoftYaHei;
font-size: 15px;
color: #deefff;
+ line-height: 4vh;
}
.topTool .form-item input:focus {
outline: none;
@@ -632,7 +638,7 @@ onMounted(() => {
.topTool .form-item .vertiLine {
width: 6px;
height: 100%;
- background: radial-gradient(0% 0% at 0% 0%, #00d6ef 0%, #007eff 100%);
+ // background: radial-gradient(0% 0% at 0% 0%, #00d6ef 0%, #007eff 100%);
}
.topTool .form-item .ul {
diff --git a/src/views/homeIndex/components/RealTimeAlarm.vue b/src/views/homeIndex/components/RealTimeAlarm.vue
index 8e134ae..bff5042 100644
--- a/src/views/homeIndex/components/RealTimeAlarm.vue
+++ b/src/views/homeIndex/components/RealTimeAlarm.vue
@@ -29,7 +29,7 @@