Compare commits

...

2 Commits

Author SHA1 Message Date
wuhongjian 2c4752c97b bug修复 2022-10-13 18:13:19 +08:00
wuhongjian 0c83991e6c bug修复 2022-10-13 18:08:14 +08:00
4 changed files with 24 additions and 13 deletions

View File

@ -2,14 +2,14 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2022-08-25 14:37:49 * @Date: 2022-08-25 14:37:49
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-10-13 14:49:32 * @LastEditTime: 2022-10-13 16:46:41
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
*/ */
var _global = {} var _global = {}
var CONFIGITEM = { var CONFIGITEM = {
// version: 'qingdao', // 青岛 // version: 'qingdao', // 青岛
// version: 'xihaian', // 西海岸 // version: 'xihaian', // 西海岸
version: 'test', // 测试 version: 'dev', // 测试
// version: 'frp', // 内网穿透 // version: 'frp', // 内网穿透
// version: 'xihaian', // 开发 // version: 'xihaian', // 开发
vNum: 'v0.8.7.2', vNum: 'v0.8.7.2',
@ -43,7 +43,7 @@ var CONFIGITEM = {
}, },
dev: { dev: {
previewUrl: 'http://localhost:8080/', 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' websocketURL: 'ws://192.168.124.236:8888/renren-admin/websocket'
} }
} }

View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23 * @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-10-13 13:50:44 * @LastEditTime: 2022-10-13 18:10:05
* @Description: 系统静态参数配置 * @Description: 系统静态参数配置
*/ */
var _global = {} var _global = {}
@ -11,7 +11,7 @@ var CONFIGITEM = {
// version: 'xihaian', // 西 // version: 'xihaian', // 西
// version: 'dev', // // version: 'dev', //
// version: 'zhanTingDev', // dev (2022-09-13:) // version: 'zhanTingDev', // dev (2022-09-13:)
version: 'test', // version: 'qingdao', //
//version: 'frp', // 穿 //version: 'frp', // 穿
vNum: 'v0.8.7.2', vNum: 'v0.8.7.2',
configData: { configData: {
@ -28,8 +28,7 @@ var CONFIGITEM = {
previewUrl: 'http://15.72.183.90:7008/', previewUrl: 'http://15.72.183.90:7008/',
//frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/', //frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
//apiURL: 'http://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: '15.72.183.90:8000/renren-admin',
websocketURL: '192.168.124.254:8888/renren-admin', // -
POI_URL: POI_URL:
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
}, },
@ -86,7 +85,7 @@ var CONFIGITEM = {
}, },
backUrl: 'http://localhost:8001', backUrl: 'http://localhost:8001',
previewUrl: 'http://192.168.124.236:9796/', 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', // websocketURL: '10.18.1.99:8889/renren-admin',
POI_URL: POI_URL:
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',

View File

@ -25,7 +25,19 @@
" "
> >
<template #title>点击查看详情</template> <template #title>点击查看详情</template>
<span class="hover-click num" @click="showDetail(item.type)"> <!-- 临时临时临时 -->
<span
v-show="item.type === '用户量'"
class="hover-click num"
@click="showDetail(item.type)"
>
482
</span>
<span
v-show="item.type !== '用户量'"
class="hover-click num"
@click="showDetail(item.type)"
>
{{ item.amount }} {{ item.amount }}
</span> </span>
</a-tooltip> </a-tooltip>

View File

@ -35,7 +35,7 @@
</div> </div>
<div v-loading="loadingData"> <div v-loading="loadingData">
<searchResultList <searchResultList
v-if="number === 0" v-if="number === 1"
v-show="resourceList.data && resourceList.data.length > 0" v-show="resourceList.data && resourceList.data.length > 0"
:resourceList="resourceList" :resourceList="resourceList"
:resourceTotal="resourceTotal" :resourceTotal="resourceTotal"
@ -124,14 +124,14 @@
const titleName = ref([ const titleName = ref([
{ {
name: '赋能场景', name: '赋能场景',
index: 1, index: 0,
}, },
{ {
name: '打包模式', name: '打包模式',
index: 0, index: 1,
}, },
]) ])
let number = ref(1) let number = ref(0)
// //
const paramsGetResources = { const paramsGetResources = {
page: currentPage.value, page: currentPage.value,