diff --git a/front/public/index.html b/front/public/index.html index e6feb11d..2c9c78f9 100644 --- a/front/public/index.html +++ b/front/public/index.html @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-03-29 16:45:25 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-08-29 09:55:26 + * @LastEditTime: 2022-11-21 20:17:38 * @Description: 告诉大家这是什么 --> @@ -85,7 +85,7 @@ properly without JavaScript enabled. Please enable it to continue. -
+
diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js index 3d02e283..f3185381 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-08-29 09:57:31 + * @LastEditTime: 2022-11-21 19:37:54 * @Description: 系统静态参数配置 */ var _global = {} @@ -72,7 +72,7 @@ var CONFIGITEM = { }, backUrl: 'http://192.168.124.243:9797', previewUrl: 'http://192.168.124.243:9796/', - websocketURL: '192.168.124.243:8888/renren-admin', + websocketURL: '221.0.232.149:7082/renren-admin', POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', }, diff --git a/front/src/utils/request.js b/front/src/utils/request.js index 24446dc5..bf39fb68 100644 --- a/front/src/utils/request.js +++ b/front/src/utils/request.js @@ -146,7 +146,7 @@ instance.interceptors.response.use( // } }, (error) => { - // debugger + debugger console.log('接口error', error) if (loadingInstance) loadingInstance.close() @@ -159,6 +159,12 @@ instance.interceptors.response.use( setAccessToken(response.headers.token) } if (response.headers.redirect) { + if (response.headers.redirect === '/#/login') { + setAccessToken('') + setTimeout(() => { + location.reload() + }, 1000) + } window.location.replace(response.headers.redirect) return Promise.resolve() } diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index 5279f043..3dbf664c 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -1337,33 +1337,18 @@ pageSize: paramsGetResources.pageSize, //分页大小 } getDataResource(dataResourceParams).then((res) => { - if (whoShow1.value.itShowQingDao) { - res.data.data.data.forEach((val) => { - val.id = val.guid // id - val.name = val.zyname // 名字 - val.sjlCount = val.sjcczl // 数据量 - val.applyCount = val.syqk // 申请量 - val.deptName = val.TGBM // 部门 - val.createDate = val.fbrq // 发布时间 - val.description = val.xgxt // 描述 - }) - resourceList.data = res.data.data.data || [] - resourceTotal.value = res.data.data.rows || '' - loading.value = false - } else if (whoShow1.value.itShowXiHaiAn) { - res.data.data.list.forEach((val) => { - val.id = val.serviceId // id - val.name = val.serviceName // 名字 - val.sjlCount = val.requestQuantity // 数据量 - val.applyCount = val.requestCount // 申请量 - val.deptName = val.departmentName // 部门 - val.createTime = val.createTime.split('.')[0] - val.createDate = val.createTime // 发布时间 - }) - resourceList.data = res.data.data.list || [] - resourceTotal.value = res.data.data.total || '' - loading.value = false - } + res.data.data.list.forEach((val) => { + val.id = val.serviceId // id + val.name = val.serviceName // 名字 + val.sjlCount = val.requestQuantity // 数据量 + val.applyCount = val.requestCount // 申请量 + val.deptName = val.departmentName // 部门 + val.createTime = val.createTime.split('.')[0] + val.createDate = val.createTime // 发布时间 + }) + resourceList.data = res.data.data.list || [] + resourceTotal.value = res.data.data.total || '' + loading.value = false }) } else if ( paramsGetResources.type !== '数据资源' && @@ -2095,7 +2080,7 @@ .talk-monitor { position: fixed; bottom: 0.5rem; - right: 0.1rem; + right: calc(100% - 19rem); z-index: 9999; cursor: pointer; @@ -2120,7 +2105,7 @@ position: fixed; z-index: 10; bottom: 1.56rem; - right: 0.1rem; + right: calc(100% - 19rem); cursor: pointer; background: #e3edfc; p { diff --git a/front/src/views/newHome/components/CapabilityConvergence.vue b/front/src/views/newHome/components/CapabilityConvergence.vue index 22690f49..450cd3fd 100644 --- a/front/src/views/newHome/components/CapabilityConvergence.vue +++ b/front/src/views/newHome/components/CapabilityConvergence.vue @@ -127,39 +127,21 @@ pageSize: paramsGetResources.pageSize, //分页大小 }).then((res) => { console.log('数据资源==================>', res.data.data) - if (whoShow1.value.itShowQingDao) { - res.data.data.data.forEach((val) => { - val.id = val.guid // id - val.name = val.zyname // 名字 - val.sjlCount = val.sjcczl // 数据量 - val.applyCount = val.syqk // 申请量 - val.deptName = val.TGBM // 部门 - val.createDate = val.fbrq // 发布时间 - val.description = val.xgxt // 描述 - }) - obj.value = res.data.data.data || [] - object.sjNum = res.data.data.rows - // interfaceSuccess.value++ - // if (interfaceSuccess.value == 5) { - // mybus.emit('chagneNum', object) - // } - } else if (whoShow1.value.itShowXiHaiAn) { - res.data.data.list.forEach((val) => { - val.id = val.serviceId // id - val.name = val.serviceName // 名字 - val.sjlCount = val.requestQuantity // 数据量 - val.applyCount = val.requestCount // 申请量 - val.deptName = val.departmentName // 部门 - val.createTime = val.createTime.split('.')[0] - val.createDate = val.createTime // 发布时间 - }) - obj.value = res.data.data.list || [] - object.sjNum = res.data.data.total - // interfaceSuccess.value++ - // if (interfaceSuccess.value == 5) { - // mybus.emit('chagneNum', object) - // } - } + res.data.data.list.forEach((val) => { + val.id = val.serviceId // id + val.name = val.serviceName // 名字 + val.sjlCount = val.requestQuantity // 数据量 + val.applyCount = val.requestCount // 申请量 + val.deptName = val.departmentName // 部门 + val.createTime = val.createTime.split('.')[0] + val.createDate = val.createTime // 发布时间 + }) + obj.value = res.data.data.list || [] + object.sjNum = res.data.data.total + // interfaceSuccess.value++ + // if (interfaceSuccess.value == 5) { + // mybus.emit('chagneNum', object) + // } }) } else { let type = paramsGetResources.type @@ -292,113 +274,113 @@ } diff --git a/front/src/views/newHome/components/WorkDynamics.vue b/front/src/views/newHome/components/WorkDynamics.vue index c2a83e73..fe57c618 100644 --- a/front/src/views/newHome/components/WorkDynamics.vue +++ b/front/src/views/newHome/components/WorkDynamics.vue @@ -320,7 +320,7 @@ router.push({ path: '/DetailsPageconetent', query: { - select: "基础设施", + select: '基础设施', }, }) } @@ -596,7 +596,7 @@ display: flex; position: fixed; bottom: 1.56rem; - right: 1.9rem; + right: calc(100% - 19rem); z-index: 10; flex-direction: column; justify-content: space-between;