From b923e7ac2d204b7f9bf6d5aed12ad719f9f33172 Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Thu, 25 Aug 2022 15:07:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/public/config/basicConfig.js | 48 +++++++++ back/public/index.html | 55 ++--------- back/src/element-ui/theme-variables.scss | 2 +- front/public/index.html | 59 +++-------- front/public/static/config/basicConfig.js | 114 +++++++++++++++------- front/public/static/config/footerData.js | 48 --------- front/public/static/config/location.js | 14 +-- front/public/static/config/mapConfig.js | 63 +----------- front/src/api/file.js | 45 ++++----- front/src/supermap/map-init.js | 4 +- front/src/utils/location.js | 7 +- 11 files changed, 188 insertions(+), 271 deletions(-) create mode 100644 back/public/config/basicConfig.js delete mode 100644 front/public/static/config/footerData.js diff --git a/back/public/config/basicConfig.js b/back/public/config/basicConfig.js new file mode 100644 index 00000000..200a514d --- /dev/null +++ b/back/public/config/basicConfig.js @@ -0,0 +1,48 @@ +/* + * @Author: hisense.wuhongjian + * @Date: 2022-08-25 14:37:49 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-08-25 14:55:59 + * @Description: 告诉大家这是什么 + */ +var _global = {} +var CONFIGITEM = { + // version: 'qingdao', //青岛 + // version: 'xihaian', // 西海岸 + // version: 'test', // 测试 + // version: 'frp', // 内网穿透 + version: 'dev', // 开发 + vNum: 'v0.8.7.1', + configData: { + // 青岛市大数据局 + qingdao: { + previewUrl: 'http://15.72.183.90:7008/', + apiURL: 'http://15.72.183.90:8000/renren-admin', + websocketURL: 'ws://15.72.183.90:8000/renren-admin/websocket' + }, + // 西海岸大数据局 + xihaian: { + previewUrl: 'http://10.134.135.9:9796/', + apiURL: 'http://10.134.135.9:8888/renren-admin', + websocketURL: 'ws://10.134.135.9:8888/renren-admin/websocket' + }, + // 测试 + test: { + previewUrl: 'http://192.168.124.243:9796/', + apiURL: 'http://192.168.124.243:8888/renren-admin', + websocketURL: 'ws://192.168.124.243:8888/renren-admin/websocket' + }, + // 内网穿透 + fpr: { + previewUrl: 'http://124.222.94.39:9796/', + apiURL: 'http://124.222.94.39:8888/renren-admin', + websocketURL: 'ws://124.222.94.39:8888/renren-admin/websocket' + }, + dev: { + previewUrl: 'http://localhost:8080/', + apiURL: 'http://192.168.124.236:8888/renren-admin', + websocketURL: 'ws://192.168.124.236:8888/renren-admin/websocket' + } + } +} +_global.config = CONFIGITEM.configData[CONFIGITEM.version] diff --git a/back/public/index.html b/back/public/index.html index 9aff360c..6dfeafc1 100644 --- a/back/public/index.html +++ b/back/public/index.html @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-04-11 10:11:40 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-08-01 14:42:22 + * @LastEditTime: 2022-08-25 14:51:36 * @Description: 告诉大家这是什么 --> @@ -11,10 +11,11 @@ + - - - <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> - <% } %> - - <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %> - - <% } %> - - <% if (process.env.VUE_APP_NODE_ENV === 'prod:uat') { %> - - <% } %> - - <% if (process.env.VUE_APP_NODE_ENV === 'prod') { %> - - <% } %>
diff --git a/back/src/element-ui/theme-variables.scss b/back/src/element-ui/theme-variables.scss index 9a9bacf4..019304d9 100644 --- a/back/src/element-ui/theme-variables.scss +++ b/back/src/element-ui/theme-variables.scss @@ -486,7 +486,7 @@ $--cascader-tag-background: #f0f2f5; /* Group -------------------------- */ -$--group-option-flex: 0 0 (1/5) * 100% !default; +$--group-option-flex: 0 0 20% !default; $--group-option-offset-bottom: 12px !default; $--group-option-fill-hover: rgba($--color-black, 0.06) !default; $--group-title-color: $--color-black !default; diff --git a/front/public/index.html b/front/public/index.html index 3266447f..2000c733 100644 --- a/front/public/index.html +++ b/front/public/index.html @@ -1,8 +1,8 @@ @@ -26,47 +26,6 @@ - - - @@ -74,10 +33,9 @@ - + - @@ -108,7 +66,16 @@ - + + diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js index 0a408c80..608add8e 100644 --- a/front/public/static/config/basicConfig.js +++ b/front/public/static/config/basicConfig.js @@ -2,55 +2,95 @@ * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-04-01 10:51:45 + * @LastEditTime: 2022-08-25 14:05:51 * @Description: 系统静态参数配置 */ var _global = {} var CONFIGITEM = { - version: 'qingdao', + // version: 'qingdao', //青岛 + version: 'xihaian', // 西海岸 + //version: 'dev', // 开发 + //version: 'test', // 测试 + //version: 'frp', // 内网穿透 + vNum: 'v0.8.7.1', configData: { + // 青岛市大数据局 qingdao: { - // bdMapUrl: 'http://15.2.21.238:9890/tiles-sd/tiles', - // bdMapUrl: 'http://15.72.178.129:9890/tiles-sd/tiles', - bdMapUrl: 'http://15.72.178.148:9890/tiles-sd/tiles', - fileService: 'http://15.72.178.148:1080/files/', - websocketService: 'ws://15.72.178.136:8777', - gisService: 'http://15.72.178.148:8585', - pageOfficeService: 'http://15.72.178.136:9393/', - refreshTimerFlag: true, loginInfo: { // 视频平台登陆信息 - // loginIp: '10.132.191.3', - loginPort: '8320', - // userName: 'chengshiyunnao', - // userPwd: 'QDyjj@2021', loginIp: '10.132.191.3', + loginPort: '8320', userName: 'ynszdz', userPwd: 'Admin@123', - channelList: [ - '37020002001310000022', - '37020001001310000210', - '37020002001310000026', - '37020002001310000031' - ], - channels: [ - { channelId: '37020002001310000022' }, - { channelId: '37020001001310000210' }, - { channelId: '37020002001310000026' }, - { channelId: '37020002001310000031' } - ], - name_32: - 'General_DSS-LightWeight-Client_x86_V2.1.0.2110.R.20211106.exe', - url_32: - '/static/General_DSS-LightWeight-Client_x86_V2.1.0.2110.R.20211106.exe', - name_64: - 'General_DSS-LightWeight-Client_x64_V2.1.0.2110.R.20211106.exe', - url_64: - '/static/General_DSS-LightWeight-Client_x64_V2.1.0.2110.R.20211106.exe' }, - MAX_CIRCLE_RADIUS: 20000, - maxMapZoom: 10 + 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/renren-admin', + websocketURL: '15.72.183.90:8000/renren-admin', + POI_URL: + 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', }, - } + // 西海岸大数据局 + xihaian: { + loginInfo: { + // 视频平台登陆信息 + loginIp: '', + loginPort: '', + userName: '', + userPwd: '', + }, + backUrl: 'http://10.134.135.9:9797', + previewUrl: 'http://10.134.135.9:9796/', + websocketURL: '10.134.135.9:8888/renren-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.236:9796/', + websocketURL: '192.168.124.236:8888/renren-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/renren-admin', + POI_URL: + 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', + }, + // 内网穿透 + fpr: { + 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/renren-admin', + POI_URL: + 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', + }, + }, } _global.config = CONFIGITEM.configData[CONFIGITEM.version] diff --git a/front/public/static/config/footerData.js b/front/public/static/config/footerData.js deleted file mode 100644 index 87f76588..00000000 --- a/front/public/static/config/footerData.js +++ /dev/null @@ -1,48 +0,0 @@ -/* - * @Author: zhangfeihu - * @Date: 2022-06-16 16:37:31 - * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-06-20 16:18:04 - * @FilePath: \qiantai\front\public\static\config\footerData.js - * @Description: 底部菜单数据配置配置 - */ -// const footerDataList = { -// 市局 -// company: { -// left: '青岛市大数据发展管理局建设', -// right: '海信网络科技股份有限公司' -// }, -// address: [ -// { -// name: '鲁IC备00000000号', -// value: '政府标识码3702000106', -// }, -// { -// name: '版权所有：青岛市大数据发展管理局', -// value: '地址：山东省青岛市香港中路17号市级机关办公楼', -// }, -// { -// name: '电话：0532-8561234', -// value: '传真：0532-2145122', -// }, -// ] -// 西海岸 -// company: { -// left: '青岛西海岸新区大数据发展促进局建设', -// right: 'v0.81' -// }, -// address: [ -// { -// name: '鲁IC备00000000号', -// value: '政府标识码3702000106', -// }, -// { -// name: '版权所有：青岛西海岸新区大数据发展促进局', -// value: '地址：青岛市西海岸新区长江中路369号', -// }, -// { -// name: '电话：0532-86986596', -// value: '传真：0532-86986596', -// }, -// ] -// } diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js index 50a18864..900c698e 100644 --- a/front/public/static/config/location.js +++ b/front/public/static/config/location.js @@ -1,13 +1,14 @@ /* * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 - * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-08-22 18:21:31 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-08-25 14:06:25 * @Description: 数据资源参数配置 */ -//const newLocation = 'qingdao' +// eslint-disable-next-line no-undef +const newLocation = CONFIGITEM.version // const newLocation = 'baotou' -const newLocation = 'qingdao' +// const newLocation = 'xihaian' // 数据资源数据 const whoShow = {} @@ -23,7 +24,7 @@ const mapTestNum = {} // 底部数据 const footerDataList = {} // qingdao -if (newLocation === 'qingdao') { +if (newLocation !== 'baotou' && newLocation !== 'xihaian') { whoShow.itShowQingDao = true infrastructure.deptName = '青岛市大数据发展管理局' infrastructure.deptId = '1067246875800000066' @@ -502,7 +503,8 @@ else if (newLocation === 'xihaian') { footerDataList.footerList = { company: { left: '青岛西海岸新区大数据发展促进局建设', - right: 'v0.8.3.3', + // eslint-disable-next-line no-undef + right: CONFIGITEM.vNum, }, address: [ { diff --git a/front/public/static/config/mapConfig.js b/front/public/static/config/mapConfig.js index ca89b5fc..16513f8b 100644 --- a/front/public/static/config/mapConfig.js +++ b/front/public/static/config/mapConfig.js @@ -2,21 +2,21 @@ * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-08-02 18:19:32 + * @LastEditTime: 2022-08-25 11:16:44 * @Description: 地图静态参数配置 */ var _mapConfig = {} ;(function () { var L = window.L || {} - // // 定义底图初始化化参数 // 请在此处更改你的配置********************************************** - var CONFIGKEY = 'qingdao_highgo' + // eslint-disable-next-line no-undef + var CONFIGKEY = CONFIGITEM.version === 'xihaian' ? 'xihaian' : 'qingdao' // var CONFIGKEY = 'dev'; // 请在上面更改你的配置*********************************************** var BASECONFIGITEM = { - qingdao: { + xihaian: { base: 'xihaian', CURRENT_MAP_OPTIONS: { // crs: CRS_4490, @@ -26,7 +26,7 @@ var _mapConfig = {} zoom: 10, }, }, - qingdao_highgo: { + qingdao: { DATABASE_TYPE: 'Highgo', POI_TYPE: 'Supermap', // POI接口类型 'Supermap'、'Amap'、'Survey_Institute' ISERVER_URL: '15.2.21.238:8090', @@ -78,59 +78,6 @@ var _mapConfig = {} icon: 'other_map.png', }, }, - //测试环境地图 - dev: { - DATABASE_TYPE: 'Highgo', - POI_TYPE: 'Supermap', // POI接口类型 'Supermap'、'Amap'、'Survey_Institute' - ISERVER_URL: '15.2.21.238:8090', - WORKPLACE_NAME: 'HIMAP-HIGHGO', - MAP_NAME: 'QDMAP', - DATASOURCE_NAME: 'HISENSE_map', - ATMOSPHERE_URL: 'http://15.2.21.151:9015/service-main', - CURRENT_MAP_OPTIONS: { - // crs: CRS_4490, - center: [36.17, 120.13], - maxZoom: 7, - minZoom: 0, - zoom: 3, - }, - BDMAP_CONFIG: { - location: 'qingdao', - _initpos: { - point: [120.392795, 36.072854], - zoom: 2, - }, - _keyframes: [ - [121.6011191295479, 36.73422934263509], - [119.83371870221472, 36.082854], - [120.25937000453506, 36.34563716789656], - ], - }, - MAP_VENDOR: 'Supermap', // 地图厂商 Supermap bdmap 3dbdmap - TITLE_LAYER: { - mapUrl: - 'http://15.72.177.174:8195/portalproxy/TileServer/arcgis/rest/services/normal2021/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F', - type: 'tiled', - name: '矢量', - icon: 'vector_map.png', - }, - TITLE_LAYER_REMOTE: { - mapUrl: - 'http://q3d.qd.gov.cn:8195/portalproxy/s9arfiqe/TileServer/arcgis/rest/services/normal2021_test/MapServer?key=p9PW1ipy9P3QHILzmsNOk8Gc', - type: 'tiled', - name: '矢量', - icon: 'vector_map.png', - }, - // TITLE_LAYER_REMOTE: { mapUrl: 'http://15.72.177.174:8195/portalproxy/TileServer/arcgis/rest/services/normal2021/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F', type: 'tiled', name: '矢量', icon: 'vector_map.png' }, - // TITLE_LAYER_REMOTE: { mapUrl: 'http://15.2.21.238:8090/iserver/services/map-ugcv5-QingdaoRemoteImageMap/rest/maps/QingdaoRemoteImageMap', type: 'remote', name: '影像', icon: 'satellite_map.png' }, - TITLE_LAYER_DARK: { - mapUrl: - 'http://15.2.21.238:8090/iserver/services/map-ugcv5-shandong/rest/maps/shandong', - type: 'dark', - name: '其他', - icon: 'other_map.png', - }, - }, } var MAPCONFIGMIXTRE = { CURRENT_SERVER_NAME: CONFIGKEY, diff --git a/front/src/api/file.js b/front/src/api/file.js index 70115607..be2bf1fb 100644 --- a/front/src/api/file.js +++ b/front/src/api/file.js @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-04-20 17:16:35 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-07-11 19:02:33 + * @LastEditTime: 2022-08-25 14:13:30 * @Description: 告诉大家这是什么 */ import request from '@/utils/request' @@ -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,9 @@ 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 ) } @@ -101,14 +101,15 @@ export function getHls(params) { export function getCameraInfoByAreaId(params) { return axios.get( 'http://10.134.135.92:9537/data_service/getCamera/getCameraInfoByAreaId?areaId=' + - params.areaId, + params.areaId, config2 ) } //能力集市基础设施-摄像头 export function getCameraByCondition(params) { return axios.get( - 'http://10.134.135.92:9537/data_service/getCamera/getCameraByCondition?' + params, + 'http://10.134.135.92:9537/data_service/getCamera/getCameraByCondition?' + + params, config2 ) } diff --git a/front/src/supermap/map-init.js b/front/src/supermap/map-init.js index 580cab82..fc90354b 100644 --- a/front/src/supermap/map-init.js +++ b/front/src/supermap/map-init.js @@ -134,7 +134,7 @@ export function HieimpMap() { // console.log('地市级行政区划', result); // }); switch (_mapConfig.config.CURRENT_SERVER_NAME) { - case 'qingdao_highgo': + case 'qingdao': if (type === 'tiled') { tileMapUrl = _mapConfig.config.TITLE_LAYER.mapUrl } else if (type === 'remote') { @@ -144,7 +144,7 @@ export function HieimpMap() { } renderMapFun(mapId, tileMapUrl, centerPoint) break - case 'qingdao': + case 'xihaian': const tileMap = L.map(mapId, { crs: L.CRS.EPSG4326, // renderer: L.svg(), diff --git a/front/src/utils/location.js b/front/src/utils/location.js index 63fa730e..5c3d2e31 100644 --- a/front/src/utils/location.js +++ b/front/src/utils/location.js @@ -1,13 +1,14 @@ /* * @Author: hisense.liangjunhua * @Date: 2022-08-22 18:22:16 - * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-08-23 09:31:02 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-08-25 10:55:57 * @Description: 告诉大家这是什么 */ const returnLocationStr = () => { - return 'qingdao' + // eslint-disable-next-line no-undef + return CONFIGITEM.version === 'xihaian' ? 'xihaian' : 'qingdao' } export default returnLocationStr