From aaa16a110567ddb7824bd6810aafb7b1d22a5b5a Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Mon, 24 Oct 2022 14:26:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/public/static/config/basicConfig.js | 12 ++++++------ front/src/api/personalCenter.js | 2 +- .../views/capacitySquare/components/algorithm.vue | 6 +++--- .../views/capacitySquare/components/application.vue | 10 +++++----- front/src/views/capacitySquare/components/layer.vue | 6 +++--- front/src/views/home/infrastructurePage.vue | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js index 98099ffc..82af318a 100644 --- a/front/public/static/config/basicConfig.js +++ b/front/public/static/config/basicConfig.js @@ -1,8 +1,8 @@ /* * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 - * @LastEditors: Light - * @LastEditTime: 2022-10-22 11:08:16 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-10-24 11:50:52 * @Description: 系统静态参数配置 */ var _global = {} @@ -13,7 +13,7 @@ var CONFIGITEM = { // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加) // version: 'qingdao', // 测试 //version: 'frp', // 内网穿透 - vNum: 'v0.8.7.2', + vNum: 'v0.8.14.2', configData: { // 青岛市大数据局 qingdao: { @@ -27,8 +27,8 @@ var CONFIGITEM = { 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', + apiURL: 'http://15.72.183.90:8000/renren-admin', + websocketURL: '15.72.183.90:8000/renren-admin', // websocketURL: '192.168.124.233:8888/renren-admin', POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', @@ -87,7 +87,7 @@ var CONFIGITEM = { }, backUrl: 'http://localhost:8001', previewUrl: 'http://192.168.124.243:9796/', - websocketURL: '192.168.124.243:8888/renren-admin', + websocketURL: '192.168.124.254:8888/renren-admin', // websocketURL: '10.18.1.99:8889/renren-admin', POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', diff --git a/front/src/api/personalCenter.js b/front/src/api/personalCenter.js index 5410444e..ebeae89d 100644 --- a/front/src/api/personalCenter.js +++ b/front/src/api/personalCenter.js @@ -308,4 +308,4 @@ export function getDeviceDetail(deviceId) { url: `/device/${deviceId}`, method: 'get', }) -} \ No newline at end of file +} diff --git a/front/src/views/capacitySquare/components/algorithm.vue b/front/src/views/capacitySquare/components/algorithm.vue index 406a7ffa..ec9112c5 100644 --- a/front/src/views/capacitySquare/components/algorithm.vue +++ b/front/src/views/capacitySquare/components/algorithm.vue @@ -53,9 +53,9 @@ }).then((res) => { dictList.value = ['全部'] res.data.data.list.map((val) => { - if (val.dictLabel !== '其他') { - dictList.value.push(val.dictLabel) - } + // if (val.dictLabel !== '其他') { + dictList.value.push(val.dictLabel) + // } }) }) const params = { diff --git a/front/src/views/capacitySquare/components/application.vue b/front/src/views/capacitySquare/components/application.vue index e73ff94e..d5b07b34 100644 --- a/front/src/views/capacitySquare/components/application.vue +++ b/front/src/views/capacitySquare/components/application.vue @@ -1,8 +1,8 @@