diff --git a/back/public/config/basicConfig.js b/back/public/config/basicConfig.js index 86da66bc..d8d4dbe2 100644 --- a/back/public/config/basicConfig.js +++ b/back/public/config/basicConfig.js @@ -7,45 +7,45 @@ */ var _global = {} var CONFIGITEM = { - // version: 'qingdao', // 青岛 - // version: 'xihaian', // 西海岸 - version: 'dev', // 测试 - // version: 'frp', // 内网穿透 - // version: 'xihaian', // 开发 - vNum: 'v0.8.7.2', - configData: { - // 青岛市大数据局 - qingdao: { - previewUrl: 'http://15.72.183.90:7008/', - apiURL: 'http://15.72.183.90:8000/ucs-admin', - websocketURL: 'ws://15.72.183.90:8000/ucs-admin/websocket' - }, - // 西海岸大数据局 - xihaian: { - previewUrl: 'http://10.134.135.9:9796/', - // apiURL: 'http://10.134.135.9:8888/ucs-admin', - // apiURL: 'http://10.16.5.35:8888/ucs-admin', // 李志成-研发 - apiURL: 'http://192.168.124.236:8888/ucs-admin', - // apiURL: 'http://192.168.124.254:8888/ucs-admin', // 李志成-远雄 - websocketURL: 'ws://10.134.135.9:8888/ucs-admin/websocket' - }, - // 测试 - test: { - previewUrl: 'http://192.168.124.243:9796/', - apiURL: 'http://192.168.124.243:8888/ucs-admin', - websocketURL: 'ws://192.168.124.243:8888/ucs-admin/websocket' - }, - // 内网穿透 - frp: { - previewUrl: 'http://124.222.94.39:9796/', - apiURL: 'http://124.222.94.39:8888/ucs-admin', - websocketURL: 'ws://124.222.94.39:8888/ucs-admin/websocket' - }, - dev: { - previewUrl: 'http://localhost:8080/', - apiURL: 'http://192.168.124.243:8888/ucs-admin', - websocketURL: 'ws://192.168.124.243:8888/ucs-admin/websocket' + // version: 'qingdao', // 青岛 + // version: 'xihaian', // 西海岸 + version: 'dev', // 测试 + // version: 'frp', // 内网穿透 + // version: 'xihaian', // 开发 + vNum: 'v0.8.7.2', + configData: { + // 青岛市大数据局 + qingdao: { + previewUrl: 'http://15.72.183.90:7008/', + apiURL: 'http://15.72.183.90:8000/ucs-admin', + websocketURL: 'ws://15.72.183.90:8000/ucs-admin/websocket' + }, + // 西海岸大数据局 + xihaian: { + previewUrl: 'http://10.134.135.9:9796/', + // apiURL: 'http://10.134.135.9:8888/ucs-admin', + // apiURL: 'http://10.16.5.35:8888/ucs-admin', // 李志成-研发 + apiURL: 'http://192.168.124.236:8888/ucs-admin', + // apiURL: 'http://192.168.124.254:8888/ucs-admin', // 李志成-远雄 + websocketURL: 'ws://10.134.135.9:8888/ucs-admin/websocket' + }, + // 测试 + test: { + previewUrl: 'http://192.168.124.243:9796/', + apiURL: 'http://192.168.124.243:8888/ucs-admin', + websocketURL: 'ws://192.168.124.243:8888/ucs-admin/websocket' + }, + // 内网穿透 + frp: { + previewUrl: 'http://124.222.94.39:9796/', + apiURL: 'http://124.222.94.39:8888/ucs-admin', + websocketURL: 'ws://124.222.94.39:8888/ucs-admin/websocket' + }, + dev: { + previewUrl: 'http://localhost:8080/', + apiURL: 'http://192.168.124.233:8888/ucs-admin', + websocketURL: 'ws://192.168.124.233:8888/ucs-admin/websocket' + } } - } } -_global.config = CONFIGITEM.configData[CONFIGITEM.version] +_global.config = CONFIGITEM.configData[CONFIGITEM.version] \ No newline at end of file diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js index 1659fe20..b6641aa4 100644 --- a/front/public/static/config/basicConfig.js +++ b/front/public/static/config/basicConfig.js @@ -7,122 +7,117 @@ */ var _global = {} var CONFIGITEM = { - // version: 'qingdao', //青岛 - // version: 'xihaian', // 西海岸 - version: 'dev', // 开发 - // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加) - // version: 'qingdao', // 测试 - //version: 'frp', // 内网穿透 - vNum: 'v0.8.15.2', - configData: { - // 青岛市大数据局 - qingdao: { - loginInfo: { - // 视频平台登陆信息 - loginIp: '10.132.191.3', - loginPort: '8320', - userName: 'ynszdz', - userPwd: 'Admin@123', - }, - backUrl: 'http://15.72.183.90:8001', - previewUrl: 'http://15.72.183.90:7008/', - //frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/', - apiURL: 'http://15.72.183.90:8000/ucs-admin', - websocketURL: '15.72.183.90:8000/ucs-admin', - // websocketURL: '192.168.124.233:8888/ucs-admin', - POI_URL: - 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', + // version: 'qingdao', //青岛 + version: 'xihaian', // 西海岸 + //version: 'dev', // 开发 + // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加) + // version: 'qingdao', // 测试 + //version: 'frp', // 内网穿透 + vNum: 'v0.8.15.2', + configData: { + // 青岛市大数据局 + qingdao: { + loginInfo: { + // 视频平台登陆信息 + loginIp: '10.132.191.3', + loginPort: '8320', + userName: 'ynszdz', + userPwd: 'Admin@123', + }, + backUrl: 'http://15.72.183.90:8001', + previewUrl: 'http://15.72.183.90:7008/', + //frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/', + apiURL: 'http://15.72.183.90:8000/ucs-admin', + websocketURL: '15.72.183.90:8000/ucs-admin', + // websocketURL: '192.168.124.233:8888/ucs-admin', + POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', + }, + // 研发展厅 + zhanTingDev: { + loginInfo: { + // 视频平台登陆信息 + loginIp: '10.132.191.3', + loginPort: '8320', + userName: 'ynszdz', + userPwd: 'Admin@123', + }, + backUrl: 'http://15.72.183.90:8001', + previewUrl: 'http://15.72.183.90:7008/', + //frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/', + //apiURL: 'http://15.72.183.90:8000/ucs-admin', + // websocketURL: '10.16.5.146:8888/ucs-admin', // 姜永超 + websocketURL: '10.18.1.99:8889/ucs-admin', + // websocketURL: '10.16.5.35:8888/ucs-admin', + POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', + }, + // 西海岸大数据局 + xihaian: { + loginInfo: { + // 视频平台登陆信息 + loginIp: '', + loginPort: '', + userName: '', + userPwd: '', + }, + // 获取摄像头的后端接口地址 + camreaInfo: { + // cameraUrl: '10.134.135.92:9537', // 西海岸-测试环境 + // cameraUrl: '10.134.135.9:9537', // 西海岸-生产环境 + cameraUrl: '192.168.124.236:9537', // 远雄（不挂vpn可直接连） + }, + backUrl: 'http://10.134.135.9:9797', + previewUrl: 'http://10.134.135.9:9796/', + apiURL: 'http://10.134.135.92:8888/renren-admin', + // websocketURL: '10.134.135.9:8888/ucs-admin', // 正式环境 + websocketURL: '10.134.135.92:8888/ucs-admin', // 测试环境 + //websocketURL: '192.168.124.254:8888/ucs-admin', // 李志成-远雄 + // websocketURL: '10.18.1.99:8889/ucs-admin', // 研发 + POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', + }, + // 开发 + dev: { + loginInfo: { + // 视频平台登陆信息 + loginIp: '', + loginPort: '', + userName: '', + userPwd: '', + }, + backUrl: 'http://localhost:8001', + previewUrl: 'http://192.168.124.243:9796/', + apiURL: 'http://192.168.124.243:8888/ucs-admin', + websocketURL: '192.168.124.243:8888/ucs-admin', + // websocketURL: '10.18.1.99:8889/ucs-admin', + POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', + }, + // 测试 + test: { + loginInfo: { + // 视频平台登陆信息 + loginIp: '', + loginPort: '', + userName: '', + userPwd: '', + }, + backUrl: 'http://192.168.124.243:9797', + previewUrl: 'http://192.168.124.243:9796/', + websocketURL: '192.168.124.243:8888/ucs-admin', + POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', + }, + // 内网穿透 + frp: { + loginInfo: { + // 视频平台登陆信息 + loginIp: '', + loginPort: '', + userName: '', + userPwd: '', + }, + backUrl: 'http://124.222.94.39:9797', + previewUrl: 'http://124.222.94.39:9796/', + websocketURL: '124.222.94.39:8888/ucs-admin', + POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', + }, }, - // 研发展厅 - zhanTingDev: { - loginInfo: { - // 视频平台登陆信息 - loginIp: '10.132.191.3', - loginPort: '8320', - userName: 'ynszdz', - userPwd: 'Admin@123', - }, - backUrl: 'http://15.72.183.90:8001', - previewUrl: 'http://15.72.183.90:7008/', - //frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/', - //apiURL: 'http://15.72.183.90:8000/ucs-admin', - // websocketURL: '10.16.5.146:8888/ucs-admin', // 姜永超 - websocketURL: '10.18.1.99:8889/ucs-admin', - // websocketURL: '10.16.5.35:8888/ucs-admin', - POI_URL: - 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', - }, - // 西海岸大数据局 - xihaian: { - loginInfo: { - // 视频平台登陆信息 - loginIp: '', - loginPort: '', - userName: '', - userPwd: '', - }, - // 获取摄像头的后端接口地址 - camreaInfo: { - // cameraUrl: '10.134.135.92:9537', // 西海岸-测试环境 - // cameraUrl: '10.134.135.9:9537', // 西海岸-生产环境 - cameraUrl: '192.168.124.236:9537', // 远雄（不挂vpn可直接连） - }, - backUrl: 'http://10.134.135.9:9797', - previewUrl: 'http://10.134.135.9:9796/', - // websocketURL: '10.134.135.9:8888/ucs-admin', // 正式环境 - // websocketURL: '10.134.135.92:8888/ucs-admin', // 测试环境 - websocketURL: '192.168.124.254:8888/ucs-admin', // 李志成-远雄 - // websocketURL: '10.18.1.99:8889/ucs-admin', // 研发 - POI_URL: - 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', - }, - // 开发 - dev: { - loginInfo: { - // 视频平台登陆信息 - loginIp: '', - loginPort: '', - userName: '', - userPwd: '', - }, - backUrl: 'http://localhost:8001', - previewUrl: 'http://192.168.124.243:9796/', - apiURL: 'http://192.168.124.243:8888/ucs-admin', - websocketURL: '192.168.124.243:8888/ucs-admin', - // websocketURL: '10.18.1.99:8889/ucs-admin', - POI_URL: - 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', - }, - // 测试 - test: { - loginInfo: { - // 视频平台登陆信息 - loginIp: '', - loginPort: '', - userName: '', - userPwd: '', - }, - backUrl: 'http://192.168.124.243:9797', - previewUrl: 'http://192.168.124.243:9796/', - websocketURL: '192.168.124.243:8888/ucs-admin', - POI_URL: - 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', - }, - // 内网穿透 - frp: { - loginInfo: { - // 视频平台登陆信息 - loginIp: '', - loginPort: '', - userName: '', - userPwd: '', - }, - backUrl: 'http://124.222.94.39:9797', - previewUrl: 'http://124.222.94.39:9796/', - websocketURL: '124.222.94.39:8888/ucs-admin', - POI_URL: - 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', - }, - }, } -_global.config = CONFIGITEM.configData[CONFIGITEM.version] +_global.config = CONFIGITEM.configData[CONFIGITEM.version] \ No newline at end of file diff --git a/front/src/api/file.js b/front/src/api/file.js index d5ae6a57..094e0c4d 100644 --- a/front/src/api/file.js +++ b/front/src/api/file.js @@ -10,108 +10,108 @@ 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://10.134.135.92:9537/data_service/placeTypes/getPlaceType', - config2 - ) + return axios.get( + 'http://10.134.135.92:9537/data_service/placeTypes/getPlaceType', + config2 + ) } //西海岸 根据标签树查询视频列表 @@ -124,36 +124,36 @@ export function CameraConditionPlaceType(params) { } // 西海岸--获取摄像头列表的后台地址 (测试环境地址：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 - ) -} + // 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 diff --git a/front/src/supermap/map-showResource.js b/front/src/supermap/map-showResource.js index 82aad594..07390e3e 100644 --- a/front/src/supermap/map-showResource.js +++ b/front/src/supermap/map-showResource.js @@ -42,6 +42,8 @@ function updateProgressBar(processed, total, elapsed, layersArray) { function createMarkerClusterLayer(layerClassName) { let array = []; let markerClusterLayer = null + //let currentZoom = this.map._zoom + //console.log('zzzzzz', currentZoom); if (layerClassName) { // 如果存在类名，表示需要自定义图标 markerClusterLayer = L.markerClusterGroup({ diff --git a/front/src/views/capacityOnTheShelf/Algorithm.vue b/front/src/views/capacityOnTheShelf/Algorithm.vue index 128e67b0..18fc2c41 100644 --- a/front/src/views/capacityOnTheShelf/Algorithm.vue +++ b/front/src/views/capacityOnTheShelf/Algorithm.vue @@ -230,7 +230,7 @@ > - diff --git a/front/src/views/home/components/H5Player.vue b/front/src/views/home/components/H5Player.vue index e1701497..d0494749 100644 --- a/front/src/views/home/components/H5Player.vue +++ b/front/src/views/home/components/H5Player.vue @@ -2,7 +2,7 @@ 海康H5Player --> \ No newline at end of file diff --git a/front/src/views/home/details.vue b/front/src/views/home/details.vue index 9374ebaa..fd09da6c 100644 --- a/front/src/views/home/details.vue +++ b/front/src/views/home/details.vue @@ -8,11 +8,12 @@