From 44e2d6a9b9d711eefc211f59f09d5d0e3c1571b5 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Mon, 25 Jul 2022 19:21:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
front/src/api/file.js | 53 ++--
front/src/views/home/DetailsPageconetent.vue | 112 +++++++-
.../home/detailsPageInfrastructureTree.vue | 89 +++++--
front/src/views/home/infrastructurePage.vue | 65 ++++-
.../views/home/videoSurveillance/index.vue | 242 +++++++++++-------
5 files changed, 394 insertions(+), 167 deletions(-)
diff --git a/front/src/api/file.js b/front/src/api/file.js
index 5848b83a..70115607 100644
--- a/front/src/api/file.js
+++ b/front/src/api/file.js
@@ -61,11 +61,11 @@ export function count() {
export function getVideoList(params) {
return axios.get(
'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraListByName?name=' +
- params.name +
- '&pageNo=' +
- params.pageNo +
- '&pageSize=' +
- params.pageSize,
+ params.name +
+ '&pageNo=' +
+ params.pageNo +
+ '&pageSize=' +
+ params.pageSize,
config2
)
}
@@ -73,17 +73,17 @@ export function getVideoList(params) {
export function getRecord(params) {
return axios.get(
'http://10.134.135.24:30090/api/share-portal/platform/catalogue/query?serviceName=' +
- params.serviceName +
- '&orderField=' +
- params.orderField +
- '&orderType=' +
- params.orderType +
- '&pageNum=' +
- params.pageNum +
- '&pageSize=' +
- params.pageSize +
- '&serviceType=' +
- params.serviceType,
+ params.serviceName +
+ '&orderField=' +
+ params.orderField +
+ '&orderType=' +
+ params.orderType +
+ '&pageNum=' +
+ params.pageNum +
+ '&pageSize=' +
+ params.pageSize +
+ '&serviceType=' +
+ params.serviceType,
config2
)
}
@@ -91,9 +91,24 @@ export function getRecord(params) {
export function getHls(params) {
return axios.get(
'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraLiveStreamByCode?cameraCode=' +
- params.cameraId +
- '&protocol=' +
- params.protocol,
+ params.cameraId +
+ '&protocol=' +
+ params.protocol,
+ config2
+ )
+}
+//能力集市基础设施-左侧列表
+export function getCameraInfoByAreaId(params) {
+ return axios.get(
+ 'http://10.134.135.92:9537/data_service/getCamera/getCameraInfoByAreaId?areaId=' +
+ params.areaId,
+ config2
+ )
+}
+//能力集市基础设施-摄像头
+export function getCameraByCondition(params) {
+ return axios.get(
+ 'http://10.134.135.92:9537/data_service/getCamera/getCameraByCondition?' + params,
config2
)
}
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 799cd94e..ea3343c6 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -232,10 +232,13 @@
v-else-if="whoShow1 && whoShow1.itShowXiHaiAn"
>