From bb614e285ac6a801d7a4b85bd4361fa84b6b5b01 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 14 Jun 2022 17:58:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                   |  1 +
 front/src/api/file.js                        | 12 ++++++------
 front/src/views/home/DetailsPageconetent.vue |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..20d50575
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+back/dist-西海岸-后台管理.zip
diff --git a/front/src/api/file.js b/front/src/api/file.js
index 02ac673a..544323a5 100644
--- a/front/src/api/file.js
+++ b/front/src/api/file.js
@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-20 17:16:35
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-14 17:40:14
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-06-14 17:46:02
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
@@ -48,15 +48,15 @@ export function paddleocr(params) {
 }
 export function getVideoList(params) {
   return axios.get(
-    'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraListByName',
-    params,
+    'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraListByName?name=' +
+    params.name + '&pageNo=' + params.pageNo + '&pageSize=' + params.pageSize,
     config2
   )
 }
 export function getHls(params) {
   return axios.get(
-    'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraLiveStream',
-    params,
+    'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraLiveStream?cameraId=' +
+    params.cameraId + '&protocol=' + params.protocol,
     config2
   )
 }
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index d8060317..370144a2 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -1018,7 +1018,7 @@
           //   resourceList.data
           // )
             const params = {
-              name: searchValue.value,
+              name: searchValue.value || '',
               pageNo: paramsGetResources.pageNum,
               pageSize: paramsGetResources.pageSize
             }