diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue index ae5c7f5..8f72e92 100644 --- a/src/views/components/carouselChart.vue +++ b/src/views/components/carouselChart.vue @@ -6,8 +6,12 @@ :options="swiperOptionTop" ref="swiperTop" > - - + +
- -

{{ 7 + index }}:00:12

+ +

{{ item.photoTime }}

export default { + props: { + terminalPhoto: { + type: Array, + default: () => [], + }, + }, mounted() { // 实现swiper双向控制 this.$nextTick(() => { @@ -59,32 +69,32 @@ export default { data() { return { //轮播大图配置 - bigImg: [ - { - url: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/210509/XYIGQ10C221000080_21050918190300_1_255.jpg", - id: 0, - }, - { - url: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/202303/XYIGQ10C221000080_20230323100012_1_255_res.jpg", - id: 1, - }, - { - url: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/202303/XYIGQ10C221000080_20230323090012_1_255_res.jpg", - id: 2, - }, - { - url: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/202303/XYIGQ10C221000080_20230323080011_1_255_res.jpg", - id: 3, - }, - { - url: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/202303/XYIGQ10C221000080_20230323070012_1_255_res.jpg", - id: 4, - }, - { - url: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/202303/XYIGQ10C221000080_20230323060012_1_255_res.jpg", - id: 5, - }, - ], + // bigImg: [ + // { + // url: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/210509/XYIGQ10C221000080_21050918190300_1_255.jpg", + // id: 0, + // }, + // { + // url: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/202303/XYIGQ10C221000080_20230323100012_1_255_res.jpg", + // id: 1, + // }, + // { + // url: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/202303/XYIGQ10C221000080_20230323090012_1_255_res.jpg", + // id: 2, + // }, + // { + // url: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/202303/XYIGQ10C221000080_20230323080011_1_255_res.jpg", + // id: 3, + // }, + // { + // url: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/202303/XYIGQ10C221000080_20230323070012_1_255_res.jpg", + // id: 4, + // }, + // { + // url: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/202303/XYIGQ10C221000080_20230323060012_1_255_res.jpg", + // id: 5, + // }, + // ], swiperOptionTop: { zoom: true, loop: true, @@ -120,7 +130,7 @@ export default { methods: {}, }; - diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue index ee35217..ea541b4 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/index.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue @@ -87,6 +87,7 @@ :data="terminalTableData" tooltip-effect="dark" style="width: 100%" + height="calc(100% - 40px)" border @selection-change="handleSelectionChange" @row-click="handleRowClick" @@ -292,6 +293,7 @@ export default { } .photoGraphicTable { padding: 16px 8px 0 8px; + height: calc(100% - 80px); } } diff --git a/src/views/management/userEquipment/lineInformation/index.vue b/src/views/management/userEquipment/lineInformation/index.vue index 9715732..59190c1 100644 --- a/src/views/management/userEquipment/lineInformation/index.vue +++ b/src/views/management/userEquipment/lineInformation/index.vue @@ -42,6 +42,7 @@ :data="lineTableData" tooltip-effect="dark" style="width: 100%" + height="calc(100% - 40px)" border @selection-change="handleSelectionChange" @row-click="handleRowClick" @@ -212,6 +213,8 @@ export default { } .lineTable { padding: 16px 8px 0 8px; + height: calc(100% - 80px); + //background: #fcc; } } diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue index bb00381..961f17d 100644 --- a/src/views/realTimeMonitor/index.vue +++ b/src/views/realTimeMonitor/index.vue @@ -24,12 +24,12 @@
- {{ terminalPhoto }} + - +