diff --git a/src/api/index.ts b/src/api/index.ts index c2dcce3..4d82f62 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -16,6 +16,11 @@ export interface GET_MBPS_BY_TIME_PARAM { warehouseId: number; // 仓库id } +export interface GET_FIRE_OR_FLOOD_PARAM { + parkId: number; // 园区id + warehouseId: number; // 仓库id +} + // 查询仓库列表及仓库下的摄像头 export const getWarehouses = (param: GET_WAREHOUSES_PARAM) => http.post('/warehouse/selAllWarehouse', { param }); @@ -24,3 +29,6 @@ export const getTeamAndHumidity = (param: GET_TEAM_AND_HUMIDITY_PARAM) => http.p // 查看吞吐量折线图 export const getMbpsByTime = (param: GET_MBPS_BY_TIME_PARAM) => http.post('/mbps/selMbpsByTime', { param }); + +// 查询火灾水灾警报 +export const getFireOrFlood = (param: GET_FIRE_OR_FLOOD_PARAM) => http.post('/mbps/selFireOrFlood', { param }); diff --git a/src/assets/img/arc-left.png b/src/assets/img/arc-left.png index 0667d4a..284c7e0 100644 Binary files a/src/assets/img/arc-left.png and b/src/assets/img/arc-left.png differ diff --git a/src/assets/img/arc-right.png b/src/assets/img/arc-right.png index b10d084..d7667ad 100644 Binary files a/src/assets/img/arc-right.png and b/src/assets/img/arc-right.png differ diff --git a/src/assets/img/close.png b/src/assets/img/close.png new file mode 100644 index 0000000..04d76c5 Binary files /dev/null and b/src/assets/img/close.png differ diff --git a/src/assets/img/closeScreen.png b/src/assets/img/closeScreen.png new file mode 100644 index 0000000..2060414 Binary files /dev/null and b/src/assets/img/closeScreen.png differ diff --git a/src/assets/img/footer-bg.png b/src/assets/img/footer-bg.png deleted file mode 100755 index 68d198f..0000000 Binary files a/src/assets/img/footer-bg.png and /dev/null differ diff --git a/src/assets/img/footer.png b/src/assets/img/footer.png new file mode 100644 index 0000000..329f211 Binary files /dev/null and b/src/assets/img/footer.png differ diff --git a/src/assets/img/fullScreen.png b/src/assets/img/fullScreen.png new file mode 100644 index 0000000..cbaa671 Binary files /dev/null and b/src/assets/img/fullScreen.png differ diff --git a/src/assets/img/vedio.png b/src/assets/img/vedio.png new file mode 100644 index 0000000..9fcb515 Binary files /dev/null and b/src/assets/img/vedio.png differ diff --git a/src/components/finance.vue b/src/components/finance.vue index af5c255..a30c6c6 100644 --- a/src/components/finance.vue +++ b/src/components/finance.vue @@ -35,6 +35,13 @@ export default defineComponent({ type: "shadow", }, }, + grid: { + left: "0", + right: "6%", + top: "20%", + bottom: "0", + containLabel: true, + }, xAxis: { type: "category", data: ["2016", "2017", "2018", "2019", "2020"], diff --git a/src/components/footer-bar.vue b/src/components/footer-bar.vue index 5be9966..c1f2eaa 100644 --- a/src/components/footer-bar.vue +++ b/src/components/footer-bar.vue @@ -1,14 +1,76 @@ + + diff --git a/src/components/temperature.vue b/src/components/temperature.vue new file mode 100644 index 0000000..20b3195 --- /dev/null +++ b/src/components/temperature.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/src/components/top-bar.vue b/src/components/top-bar.vue index e8d1e99..270737c 100644 --- a/src/components/top-bar.vue +++ b/src/components/top-bar.vue @@ -3,41 +3,150 @@
-
40%
-
70℃
+
{{ humidity }}%RH
+
{{ temp }}℃
-

现海园区5号仓库

+

{{ title }}电子看板

{{ time }}
-
-
+
+
@@ -54,6 +163,7 @@ export default defineComponent({ z-index: 4; color: #fff; } + .top-wrap:after { content: ""; display: block; @@ -66,6 +176,7 @@ export default defineComponent({ background: url("../assets/img/border-top.png") no-repeat left top; background-size: contain; } + .top-wrap .title { flex: 1; font-family: FZCHSJW, FZCHSJW--GB1-0; @@ -75,6 +186,7 @@ export default defineComponent({ letter-spacing: 4rem; text-align: center; } + .top-wrap .left-wrap { position: absolute; left: 30rem; @@ -84,6 +196,7 @@ export default defineComponent({ align-items: center; font-size: 17rem; } + .top-wrap .left-wrap:before { content: ""; display: block; @@ -93,6 +206,7 @@ export default defineComponent({ background-size: contain; margin-right: 20rem; } + .top-wrap .right-wrap { position: absolute; right: 30rem; @@ -102,10 +216,12 @@ export default defineComponent({ align-items: center; font-size: 17rem; } + .top-wrap .right-wrap .time { font-size: 26rem; font-weight: bold; } + .top-wrap .right-wrap .fire, .top-wrap .right-wrap .water { width: 42rem; @@ -115,6 +231,7 @@ export default defineComponent({ background-size: contain; margin-left: 40rem; } + .top-wrap .right-wrap .fire { background-image: url("../assets/img/fire.png"); } diff --git a/src/components/totalCargo.vue b/src/components/totalCargo.vue new file mode 100644 index 0000000..ac2f238 --- /dev/null +++ b/src/components/totalCargo.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/router/index.ts b/src/router/index.ts index 21ba9c8..fef48a8 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -13,6 +13,7 @@ const router = createRouter({ { path: '/jht', component: () => import('views/jht.vue') }, { path: '/xh', component: () => import('views/xh.vue') }, { path: '/yj', component: () => import('views/repo-yj.vue') }, + { path: '/vs', component: () => import('views/videoScreen.vue') }, ], strict: true }); diff --git a/src/views/jht.vue b/src/views/jht.vue index e69de29..a2e010d 100644 --- a/src/views/jht.vue +++ b/src/views/jht.vue @@ -0,0 +1,181 @@ + + + + + diff --git a/src/views/repo-5.vue b/src/views/repo-5.vue index 495e654..ea6fcb5 100644 --- a/src/views/repo-5.vue +++ b/src/views/repo-5.vue @@ -4,22 +4,22 @@ @@ -82,4 +117,65 @@ export default defineComponent({ height: 100%; z-index: 0; } + +.vedio { + position: absolute; + bottom: 15%; + left: 37%; + z-index: 99; + width: 524rem; + height: 369rem; + background: url(/src/assets/img/vedio.png) center no-repeat; + background-size: 100% 100%; +} + +.head { + text-align: center; + font-size: 20rem; + padding-top: 30rem; + padding-bottom: 10rem; +} + +.camera { + color: #fff; + font-size: 12rem; +} + +.close { + position: absolute; + top: 7%; + right: 8%; + width: 20rem; + height: 20rem; +} + +.monitor { + width: 446rem; + height: 287rem; + margin: 0 auto; +} + +.monitor1 { + width: 100%; + height: 100%; + position: relative; +} + +.screen { + width: 100%; + height: 40rem; + position: absolute; + right: 0; + bottom: -1px; + z-index: 9; + background: rgba(0, 0, 0, 0.5); +} + +.monitor2 { + width: 30rem; + height: 30rem; + position: absolute; + right: 15rem; + bottom: 5rem; +} diff --git a/src/views/repo-yj.vue b/src/views/repo-yj.vue index e69de29..ad384dc 100644 --- a/src/views/repo-yj.vue +++ b/src/views/repo-yj.vue @@ -0,0 +1,176 @@ + + + + + diff --git a/src/views/videoScreen.vue b/src/views/videoScreen.vue new file mode 100644 index 0000000..51486c4 --- /dev/null +++ b/src/views/videoScreen.vue @@ -0,0 +1,54 @@ + + + + + diff --git a/src/views/xh.vue b/src/views/xh.vue index e69de29..a2193ac 100644 --- a/src/views/xh.vue +++ b/src/views/xh.vue @@ -0,0 +1,181 @@ + + + + +