wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

展厅问题修改

This commit is contained in:
wuhongjian 2022-11-21 20:38:14 +08:00
parent 82a188251a
commit 8e53d92898
6 changed files with 140 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
front/public/index.html
View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2022-03-29 16:45:25 * @Date: 2022-03-29 16:45:25
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-08-29 09:55:26 * @LastEditTime: 2022-11-21 20:17:38
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<!DOCTYPE html> <!DOCTYPE html>
@ -85,7 +85,7 @@
properly without JavaScript enabled. Please enable it to continue. properly without JavaScript enabled. Please enable it to continue.
</strong> </strong>
</noscript> </noscript>
<div id="app"> <div id="app" style="background: #010519">
<div class="first-loading-wrp"> <div class="first-loading-wrp">
<div class="loading-wrp"> <div class="loading-wrp">
<span class="dot dot-spin"> <span class="dot dot-spin">

4
front/public/static/config/basicConfig.js
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-08-29 09:57:31 * @LastEditTime: 2022-11-21 19:37:54
* @Description: 系统静态参数配置 * @Description: 系统静态参数配置
*/ */
var _global = {} var _global = {}
@ -72,7 +72,7 @@ var CONFIGITEM = {
}, },
backUrl: 'http://192.168.124.243:9797', backUrl: 'http://192.168.124.243:9797',
previewUrl: 'http://192.168.124.243:9796/', 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: 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',
}, },

8
front/src/utils/request.js
View File

@ -146,7 +146,7 @@ instance.interceptors.response.use(
// } // }
}, },
(error) => { (error) => {
// debugger debugger
console.log('接口error', error) console.log('接口error', error)
if (loadingInstance) loadingInstance.close() if (loadingInstance) loadingInstance.close()
@ -159,6 +159,12 @@ instance.interceptors.response.use(
setAccessToken(response.headers.token) setAccessToken(response.headers.token)
} }
if (response.headers.redirect) { if (response.headers.redirect) {
if (response.headers.redirect === '/#/login') {
setAccessToken('')
setTimeout(() => {
location.reload()
}, 1000)
}
window.location.replace(response.headers.redirect) window.location.replace(response.headers.redirect)
return Promise.resolve() return Promise.resolve()
} }

19
front/src/views/home/DetailsPageconetent.vue
View File

@ -1337,20 +1337,6 @@
pageSize: paramsGetResources.pageSize, //分页大小 pageSize: paramsGetResources.pageSize, //分页大小
} }
getDataResource(dataResourceParams).then((res) => { 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) => { res.data.data.list.forEach((val) => {
val.id = val.serviceId // id val.id = val.serviceId // id
val.name = val.serviceName // 名字 val.name = val.serviceName // 名字
@ -1363,7 +1349,6 @@
resourceList.data = res.data.data.list || [] resourceList.data = res.data.data.list || []
resourceTotal.value = res.data.data.total || '' resourceTotal.value = res.data.data.total || ''
loading.value = false loading.value = false
}
}) })
} else if ( } else if (
paramsGetResources.type !== '数据资源' && paramsGetResources.type !== '数据资源' &&
@ -2095,7 +2080,7 @@
.talk-monitor { .talk-monitor {
position: fixed; position: fixed;
bottom: 0.5rem; bottom: 0.5rem;
right: 0.1rem; right: calc(100% - 19rem);
z-index: 9999; z-index: 9999;
cursor: pointer; cursor: pointer;
@ -2120,7 +2105,7 @@
position: fixed; position: fixed;
z-index: 10; z-index: 10;
bottom: 1.56rem; bottom: 1.56rem;
right: 0.1rem; right: calc(100% - 19rem);
cursor: pointer; cursor: pointer;
background: #e3edfc; background: #e3edfc;
p { p {

22
front/src/views/newHome/components/CapabilityConvergence.vue
View File

@ -127,23 +127,6 @@
pageSize: paramsGetResources.pageSize, //分页大小 pageSize: paramsGetResources.pageSize, //分页大小
}).then((res) => { }).then((res) => {
console.log('数据资源==================>', res.data.data) 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) => { res.data.data.list.forEach((val) => {
val.id = val.serviceId // id val.id = val.serviceId // id
val.name = val.serviceName // 名字 val.name = val.serviceName // 名字
@ -159,7 +142,6 @@
// if (interfaceSuccess.value == 5) { // if (interfaceSuccess.value == 5) {
// mybus.emit('chagneNum', object) // mybus.emit('chagneNum', object)
// } // }
}
}) })
} else { } else {
let type = paramsGetResources.type let type = paramsGetResources.type
@ -292,7 +274,7 @@
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.capability-convergence { .capability-convergence {
height: 7.2rem; height: 7.2rem;
background: url('~@/assets/newHome/Convergence-bg.png') no-repeat; background: url('~@/assets/newHome/Convergence-bg.png') no-repeat;
background-size: 100%; background-size: 100%;
@ -400,5 +382,5 @@
} }
} }
} }
} }
</style> </style>

4
front/src/views/newHome/components/WorkDynamics.vue
View File

@ -320,7 +320,7 @@
router.push({ router.push({
path: '/DetailsPageconetent', path: '/DetailsPageconetent',
query: { query: {
select: "基础设施", select: '基础设施',
}, },
}) })
} }
@ -596,7 +596,7 @@
display: flex; display: flex;
position: fixed; position: fixed;
bottom: 1.56rem; bottom: 1.56rem;
right: 1.9rem; right: calc(100% - 19rem);
z-index: 10; z-index: 10;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;