diff --git a/src/assets/img/loading.jpg b/src/assets/img/loading.jpg index b3d6667..2573434 100644 Binary files a/src/assets/img/loading.jpg and b/src/assets/img/loading.jpg differ diff --git a/src/assets/img/nopic.jpg b/src/assets/img/nopic.jpg index 129a7fa..e328166 100644 Binary files a/src/assets/img/nopic.jpg and b/src/assets/img/nopic.jpg differ diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue index 86444b9..8bf67e6 100644 --- a/src/views/components/carouselChart.vue +++ b/src/views/components/carouselChart.vue @@ -72,7 +72,7 @@ {{ $moment(item.photoTime).format("HH:mm:ss") }}({{ $moment(item.recvTime).format("HH:mm:ss") }}) - (通道{{ item.channelId }}) + --通道{{ item.channelId }}

@@ -203,8 +203,8 @@ export default { justify-content: center; img { - width: 260px; - height: 160px; + //width: 100%; + height: 100%; object-fit: fill; } } @@ -215,7 +215,7 @@ export default { width: 100%; background: #f0f0f0; padding: 8px 0px; - font-size: 14px; + font-size: 12px; text-align: center; color: #333; } diff --git a/src/views/devicePhotoSchedule/index.vue b/src/views/devicePhotoSchedule/index.vue index e162521..35ffd4d 100644 --- a/src/views/devicePhotoSchedule/index.vue +++ b/src/views/devicePhotoSchedule/index.vue @@ -29,7 +29,19 @@ - + + + { this.deviceTableData = res.data.list; this.total = res.data.total; + console.log(this.deviceTableData); this.loading = false; }) .catch((err) => {}); @@ -209,6 +222,15 @@ export default { margin-top: 16px; height: calc(100% - 48px); //background: #fcc; + .rulesBox { + display: flex; + flex-direction: row; + li { + list-style: none; + margin-right: 24px; + line-height: 24px; + } + } } } diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue index f3e994a..85837c5 100644 --- a/src/views/realTimeMonitor/index.vue +++ b/src/views/realTimeMonitor/index.vue @@ -477,10 +477,9 @@ export default { .totalPic { width: 100%; height: 24px; - margin-bottom: 8px; text-align: center; - font-size: 14px; + font-size: 12px; color: #2d8cf0; font-weight: bold; line-height: 24px;