From f795484416e42308845a4c018f24be6308acf095 Mon Sep 17 00:00:00 2001 From: gongjiale <942894820@qq.com> Date: Mon, 21 Nov 2022 14:19:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=E5=B7=A6=E4=BE=A7?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/public/static/config/basicConfig.js | 229 +++++++++--------- front/src/views/home/DetailsPageconetent.vue | 2 +- .../home/detailsPageInfrastructureTreeXha.vue | 4 +- 3 files changed, 120 insertions(+), 115 deletions(-) diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js index b6641aa4..1659fe20 100644 --- a/front/public/static/config/basicConfig.js +++ b/front/public/static/config/basicConfig.js @@ -7,117 +7,122 @@ */ 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', - }, - // 研发展厅 - 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', - }, + // 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/', + // 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] \ No newline at end of file +_global.config = CONFIGITEM.configData[CONFIGITEM.version] diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index f1a19858..dcc77b9b 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -2065,7 +2065,7 @@ background: rgba(245, 243, 243, 0.3); .details-pageconetent-left { - max-height: 6.9rem; + max-height: 8.5rem; position: absolute; width: 2.5rem; top: 0.17rem; diff --git a/front/src/views/home/detailsPageInfrastructureTreeXha.vue b/front/src/views/home/detailsPageInfrastructureTreeXha.vue index e8780a55..964cddf8 100644 --- a/front/src/views/home/detailsPageInfrastructureTreeXha.vue +++ b/front/src/views/home/detailsPageInfrastructureTreeXha.vue @@ -291,9 +291,9 @@ export default defineComponent({ text-align: left; position: relative; display: inline-block; - width: 30%; + width: 45%; margin-bottom: 10px; - margin-left: 6px; + margin-left: 10px; .glgknum { // width: 100px;