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 }