From 0c83991e6c2f8ff945ced5290706c16fc1736511 Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Thu, 13 Oct 2022 18:08:14 +0800 Subject: [PATCH] =?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 --- back/public/config/basicConfig.js | 6 +++--- front/public/static/config/basicConfig.js | 6 +++--- .../abilityStatistics/components/AbilityTotal.vue | 14 +++++++++++++- front/src/views/home/integrationServices.vue | 2 +- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/back/public/config/basicConfig.js b/back/public/config/basicConfig.js index 8f8c94c0..913ffc94 100644 --- a/back/public/config/basicConfig.js +++ b/back/public/config/basicConfig.js @@ -2,14 +2,14 @@ * @Author: hisense.wuhongjian * @Date: 2022-08-25 14:37:49 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-10-13 14:49:32 + * @LastEditTime: 2022-10-13 16:46:41 * @Description: 告诉大家这是什么 */ var _global = {} var CONFIGITEM = { // version: 'qingdao', // 青岛 // version: 'xihaian', // 西海岸 - version: 'test', // 测试 + version: 'dev', // 测试 // version: 'frp', // 内网穿透 // version: 'xihaian', // 开发 vNum: 'v0.8.7.2', @@ -43,7 +43,7 @@ var CONFIGITEM = { }, dev: { previewUrl: 'http://localhost:8080/', - apiURL: 'http://192.168.124.236:8888/renren-admin', + apiURL: 'http://192.168.124.233:8888/renren-admin', websocketURL: 'ws://192.168.124.236:8888/renren-admin/websocket' } } diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js index 4e0eaedd..98ece7ec 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-10-13 13:50:44 + * @LastEditTime: 2022-10-13 16:47:03 * @Description: 系统静态参数配置 */ var _global = {} @@ -11,7 +11,7 @@ var CONFIGITEM = { // version: 'xihaian', // 西海岸 // version: 'dev', // 开发 // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加) - version: 'test', // 测试 + version: 'dev', // 测试 //version: 'frp', // 内网穿透 vNum: 'v0.8.7.2', configData: { @@ -86,7 +86,7 @@ var CONFIGITEM = { }, backUrl: 'http://localhost:8001', previewUrl: 'http://192.168.124.236:9796/', - websocketURL: '192.168.124.236:8888/renren-admin', + websocketURL: '192.168.124.233: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/views/abilityStatistics/components/AbilityTotal.vue b/front/src/views/abilityStatistics/components/AbilityTotal.vue index 9c26c740..66dfc5bd 100644 --- a/front/src/views/abilityStatistics/components/AbilityTotal.vue +++ b/front/src/views/abilityStatistics/components/AbilityTotal.vue @@ -25,7 +25,19 @@ " > - + + + 482 + + {{ item.amount }} diff --git a/front/src/views/home/integrationServices.vue b/front/src/views/home/integrationServices.vue index 92a04545..4e7370c2 100644 --- a/front/src/views/home/integrationServices.vue +++ b/front/src/views/home/integrationServices.vue @@ -148,7 +148,7 @@ // 读取本地存储:表单赋值 const handleSetSearchData = () => { if (storageSearchInfo) { - number.value = storageSearchInfo.type == '打包模式' ? 1 : 0 + number.value = storageSearchInfo.type == '打包模式' ? 0 : 1 // 搜索名称 searchValue.value = storageSearchInfo.name currentPage.value = storageSearchInfo.page