From a7998206f2b504ab709ac9747079f8c526b15177 Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Thu, 24 Nov 2022 16:11:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/src/views/modules/assetReport/index.vue | 156 ++++++------- front/public/static/config/basicConfig.js | 6 +- front/public/static/config/mapConfig.js | 6 +- front/src/api/file.js | 217 +++++++++--------- .../views/home/videoSurveillance/index.vue | 6 +- 5 files changed, 192 insertions(+), 199 deletions(-) diff --git a/back/src/views/modules/assetReport/index.vue b/back/src/views/modules/assetReport/index.vue index 13db4b3b..c06d8f55 100644 --- a/back/src/views/modules/assetReport/index.vue +++ b/back/src/views/modules/assetReport/index.vue @@ -1,7 +1,7 @@ - + - \ No newline at end of file diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js index ec7ed27c..264aa89b 100644 --- a/front/public/static/config/basicConfig.js +++ b/front/public/static/config/basicConfig.js @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-11-22 14:37:59 + * @LastEditTime: 2022-11-24 15:54:56 * @Description: 系统静态参数配置 */ var _global = {} @@ -68,8 +68,8 @@ var CONFIGITEM = { cameraUrl: '192.168.124.236:9537', // 远雄（不挂vpn可直接连） }, backUrl: 'http://10.134.135.9:9797', - // apiURL: 'http://10.134.135.92:8888/renren-admin', - apiURL: 'http://192.168.124.233:8888/ucs-admin', + apiURL: 'http://10.134.135.92:8888/renren-admin', + // apiURL: 'http://192.168.124.233:8888/ucs-admin', previewUrl: 'http://10.134.135.9:9796/', // websocketURL: '10.134.135.9:8888/ucs-admin', // 正式环境 // websocketURL: '10.134.135.92:8888/ucs-admin', // 测试环境 diff --git a/front/public/static/config/mapConfig.js b/front/public/static/config/mapConfig.js index d8ffa3be..8fd27865 100644 --- a/front/public/static/config/mapConfig.js +++ b/front/public/static/config/mapConfig.js @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-11-21 20:41:44 + * @LastEditTime: 2022-11-24 16:01:04 * @Description: 地图静态参数配置 */ var _mapConfig = {} @@ -19,10 +19,10 @@ var _mapConfig = {} base: 'xihaian', CURRENT_MAP_OPTIONS: { // crs: CRS_4490, - center: [36.17, 120.13], + center: [36.017043, 119.922772], maxZoom: 17, minZoom: 0, - zoom: 5, + zoom: 10, }, }, qingdao: { diff --git a/front/src/api/file.js b/front/src/api/file.js index deec0224..c0e0dd66 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: Light - * @LastEditTime: 2022-11-21 10:51:25 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-11-24 14:32:50 * @Description: 告诉大家这是什么 */ import request from '@/utils/request' @@ -10,161 +10,162 @@ import axios from 'axios' import store from '@/store' const config = { - headers: { - token: store.getters['user/accessToken'], - 'Content-Type': 'multipart/form-data', - }, + headers: { + token: store.getters['user/accessToken'], + 'Content-Type': 'multipart/form-data', + }, } const config2 = { - headers: { - 'Content-Type': 'application/json; charset-utf-8', - }, + headers: { + 'Content-Type': 'application/json; charset-utf-8', + }, } export function getDevelopmentFile(params) { - return request({ - url: '/developmentGuide/getDevelopmentFile', - method: 'get', - params, - }) + return request({ + url: '/developmentGuide/getDevelopmentFile', + method: 'get', + params, + }) } export function updateDevelopmentFile(params) { - return axios.post( - window.SITE_CONFIG.apiURL + '/developmentGuide/uploadDevelopmentFile', - params, - config - ) + return axios.post( + window.SITE_CONFIG.apiURL + '/developmentGuide/uploadDevelopmentFile', + params, + config + ) } export function test() { - return axios.post( - 'http://15.72.158.81/zyjk/ZywMessage.asmx/ZywMessagePort', - config2 - ) + return axios.post( + 'http://15.72.158.81/zyjk/ZywMessage.asmx/ZywMessagePort', + config2 + ) } export function correct(params) { - return axios.post('http://15.72.183.90:7008/correct', params, config2) + return axios.post('http://15.72.183.90:7008/correct', params, config2) } export function paddleocr(params) { - return axios.post('http://15.72.183.90:7008/paddleocr', params, config2) + return axios.post('http://15.72.183.90:7008/paddleocr', params, config2) } // 算法总接口 export function algo(params) { - return axios.post('http://15.72.184.10:8888/api/algo', params, config2) + return axios.post('http://15.72.184.10:8888/api/algo', params, config2) } // 能力云图-数据资源 export function count() { - return axios.post( - 'http://10.134.135.24:30058/share-portal/platform/index/abilityMarket/count', - config2 - ) + return axios.post( + 'http://10.134.135.24:30058/share-portal/platform/index/abilityMarket/count', + config2 + ) } 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, - config2 - ) + return axios.get( + 'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraListByName?name=' + + params.name + + '&pageNo=' + + params.pageNo + + '&pageSize=' + + params.pageSize, + config2 + ) } // 能力云图-数据资源-总数据数 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, - config2 - ) + 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, + config2 + ) } export function getHls(params) { - return axios.get( - 'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraLiveStreamByCode?cameraCode=' + - params.cameraId + - '&protocol=' + - params.protocol, - config2 - ) + return axios.get( + 'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraLiveStreamByCode?cameraCode=' + + params.cameraId + + '&protocol=' + + params.protocol, + config2 + ) } // 西海岸 POI搜索 export function getListForPOI(params) { - return axios.get( - 'http://10.134.135.3:21009/service/lbs/coder/geocoding2?appKey=675d95594136456bb7b1434dda31953f&city=青岛&keywords=' + - params.keywords, - config2 - ) + return axios.get( + 'http://10.134.135.3:21009/service/lbs/coder/geocoding2?appKey=675d95594136456bb7b1434dda31953f&city=青岛&keywords=' + + params.keywords, + config2 + ) } //西海岸 获取左侧标签树 export function getPlaceType() { - return axios.get( - `http://${_cameraUrl}/data_service/placeTypes/getPlaceType`, - config2 - ) + return axios.get( + `http://${_cameraUrl}/data_service/placeTypes/getPlaceType`, + config2 + ) } //西海岸 根据标签树查询视频列表 export function CameraConditionPlaceType(params) { - return axios.post( - `http://${_cameraUrl}/data_service/getCamera/CameraConditionPlaceType'`, - params, - config2 - ) + return axios.post( + `http://${_cameraUrl}/data_service/getCamera/CameraConditionPlaceType'`, + params, + config2 + ) } // 西海岸视频wss流获取 export function getCameraLiveStream(params) { - return axios.get( - `http://${_cameraUrl}/data_service/getCamera/getCameraLiveStream?cameraIndexCode=` + - params.channelId + - '&protocol=' + - 'wss' + '&transmode=1&streamType=1', - config2 - ) + return axios.get( + `http://${_cameraUrl}/data_service/getCamera/getCameraLiveStream?cameraIndexCode=` + + params.channelId + + '&protocol=' + + 'wss' + + '&transmode=1&streamType=1', + config2 + ) } // 西海岸--获取摄像头列表的后台地址 (测试环境地址：10.134.135.92:9537) let _cameraUrl = - (_global && - _global.config && - _global.config.camreaInfo && - _global.config.camreaInfo.cameraUrl) || - '10.134.135.92:9537' - //能力集市基础设施-左侧列表 + (_global && + _global.config && + _global.config.camreaInfo && + _global.config.camreaInfo.cameraUrl) || + '10.134.135.92:9537' +//能力集市基础设施-左侧列表 export function getCameraInfoByAreaId(params) { - return axios.get( - `http://${_cameraUrl}/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`, - config2 - ) + return axios.get( + `http://${_cameraUrl}/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`, + config2 + ) } //能力集市基础设施-摄像头 export function getCameraByCondition(params) { - return axios.post( - `http://${_cameraUrl}/data_service/getCamera/getCameraByCondition`, - params, - config2 - ) + return axios.post( + `http://${_cameraUrl}/data_service/getCamera/getCameraByCondition`, + params, + config2 + ) } export function initiateMeet(data) { - // return request({ - // url: '/enke/initiateMeet', - // method: 'post', - // data: data, - // }) - return axios.post( - 'http://10.134.135.92:8888/renren-admin/enke/initiateMeet', - data, - config2 - ) -} \ No newline at end of file + // return request({ + // url: '/enke/initiateMeet', + // method: 'post', + // data: data, + // }) + return axios.post( + 'http://10.134.135.92:8888/renren-admin/enke/initiateMeet', + data, + config2 + ) +} diff --git a/front/src/views/home/videoSurveillance/index.vue b/front/src/views/home/videoSurveillance/index.vue index 57c7c636..f333ac17 100644 --- a/front/src/views/home/videoSurveillance/index.vue +++ b/front/src/views/home/videoSurveillance/index.vue @@ -32,8 +32,8 @@ --> - - + +