Skip to content

M
multiSystem
Commit c45cd5ba authored by 程卓's avatar 程卓
Browse files
Options

区分dashboard(徐汇特殊) ,公共首页的下方接口对接,修复徐汇分支menu菜单错误

parent a51c3b1f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1547 additions and 1024 deletions
src/router/getMicRouters.js
View file @ c45cd5ba
......@@ -48,7 +48,7 @@ async function GetRoutes(router) {
break
default: // 当前仅可使用pudong / xuhui-sit/uat进行打包
MicRouters = yangpu
MicRouters = xuhui
break
}
......
src/router/routes.js
View file @ c45cd5ba
......@@ -24,11 +24,7 @@ const appRoutes = [
component: resolve => require(['@/components/Layout'], resolve), //Layout,
children: [
{
path: '/portal-home', name: 'home', component: resolve => require(['@/views/home'], resolve), //Home,
meta: { title: '首页' },
},
{
path: '/dashBoard', name: 'dashBoard', component: resolve => require(['@/views/dashBoard'], resolve), //Home,
path: '/portal-home', name: 'home', component: resolve => require(['@/views/commenHome'], resolve), //Home,
meta: { title: '首页' },
},
{ path: '/person', name: 'person', component: resolve => require(['@/views/person-center'], resolve), //PersonCenter,
......
src/router/xuhuiRoutes.json
View file @ c45cd5ba
......@@ -2,76 +2,20 @@
"Layout": [
{
"path": "/order/disposal", "name": "Disposal",
"meta": { "title": "处置单列表", "menuPath":false, "menuIcon": "profile","hideInBread":false},
"meta": { "title": "处置单列表", "menuPath":true, "menuIcon": "profile","hideInBread":false},
"children":[
{
"path": "/order/disposal/disposalList", "name": "disposalList",
"meta": { "title": "处置单列表", "menuPath":false, "menuIcon": "profile","hideInBread":false},
"meta": { "title": "处置单列表", "menuPath":true, "menuIcon": "profile","hideInBread":false},
"children": [
{
"path": "/order/disposal/disposalView/:id", "name": "DisposalView",
"meta": { "title": "处置单详情", "menuPath":false, "hideInBread":false }
"meta": { "title": "处置单详情", "menuPath":true, "hideInBread":false }
}
]
}
]
},
{
"path": "/question/month", "name": "month",
"meta": { "title": "检查单","menuIcon": "profile", "menuPath":false, "hideInBread":false },
"children":[
{
"path": "/question/month/monthList", "name": "month",
"meta": { "title": "房办月查列表","menuIcon": "profile", "menuPath":false, "hideInBread":false },
"children": [
{
"path": "/question/month/monthInfo", "name": "monthInfo",
"meta": { "title": "检查详情", "menuPath":false, "hideInBread":false }
}
]
}
]
},
{
"path": "/question/repair", "name": "repairList",
"meta": { "title": "应急报修","menuIcon": "profile", "menuPath":false, "hideInBread":false },
"children":[
{
"path": "/question/repair/repairList", "name": "repairList",
"meta": { "title": "应急报修列表","menuIcon": "profile", "menuPath":false, "hideInBread":false },
"children": [
{
"path": "/question/repair/repairInfo", "name": "repairInfo",
"meta": { "title": "报修详情", "menuPath":false, "hideInBread":false }
}
]
}
]
},
{
"path": "/question/tousu", "name": "tousu",
"meta": { "title": "投诉信息", "menuPath": true, "menuIcon": "profile", "hideInBread": true },
"children": [
{
"path": "/question/tousu/tousuQuestion", "name": "tousuQuestion",
"meta": { "title": "投诉问题排行", "menuPath":true, "hideInBread":false},
"children":[
{
"path": "/question/tousu/tousuQuestion/questionInfo", "name": "questionInfo",
"meta": { "title": "投诉问题列表", "menuPath":false, "hideInBread":false }
},
{
"path": "/question/tousu/tousuQuestion/tousuDetails", "name": "tousuDetails",
"meta": { "title": "投诉问题详情", "menuPath":false, "hideInBread":false }
}
]
},
{
"path": "/question/tousu/tousuDensity", "name": "tousuDensity",
"meta": { "title": "投诉密度排行", "menuPath":true, "hideInBread":false}
}
]
}
]
}
src/server/api.js
View file @ c45cd5ba
......@@ -64,6 +64,7 @@ default: // 默认环境下（开发环境）
// BASE_URL = 'http://31.0.161.39/apiv2'
// BASE_URL = 'http://211.136.105.193/apiv2'
BASE_URL = 'http://yangpu-hm.omniview.pro/api/v2'
// BASE_URL = 'http://xuhui.hm.omniview.pro/api/v2'
// BASE_URL = 'http://pudong.hm.omniview.pro/api/v2'
// BASE_URL = 'http://211.136.105.193/apiv2'
MOCK_URL = 'https://yapi.omniview.pro/mock/283'
......
src/views/commenHome.vue 0 → 100644
View file @ c45cd5ba
<template>
<div class="content">
<xuhui v-if="(this.$api.BASE_URL).indexOf('xuhui') > -1 || (this.$api.BASE_URL).indexOf('31.0.161.39') > -1" />
<home v-else />
</div>
</template>
<script>
import xuhui from '@/views/homeXuhui'
import home from '@/views/home'
export default {
components: {
xuhui,
home
}
}
</script>
<style scoped>
.content{
width: 100%;
height: 100%;
}
</style>
\ No newline at end of file
src/views/dashBoard.vue deleted 100644 → 0
View file @ a51c3b1f
This diff is collapsed.
src/views/home.vue
View file @ c45cd5ba
......@@ -41,13 +41,13 @@
</a-row>
<a-row style="border-top:1px solid lightgrey;padding-top: 10px;">
<a-col :span='7'>
商品 : {{332}}
商品 : {{firstRowInfos.condoRows}}
</a-col>
<a-col :span='7'>
直管 : {{224}}
直管 : {{firstRowInfos.straightAndMixedRows}}
</a-col>
<a-col :span='10'>
保障及其他 : {{321}}
保障及其他 : {{firstRowInfos.otherRows}}
</a-col>
</a-row>
</div>
......@@ -90,7 +90,7 @@
</a-row>
<a-row style="border-top:1px solid lightgrey;padding-top: 10px;">
<a-col :span='12'>
有电梯 : {{332}}
有电梯 : {{firstRowInfos.haveElevatorCount}}
</a-col>
</a-row>
</div>
......@@ -116,10 +116,10 @@
</a-row>
<a-row style="border-top:1px solid lightgrey;padding-top: 10px;">
<a-col :span='12'>
区属物业 : {{111}}
区属物业 : {{firstRowInfos.areaPropCompanyCount}}
</a-col>
<a-col :span='12'>
本市注册 : {{222}}
本市注册 : {{firstRowInfos.cityPropCompanyCount}}
</a-col>
</a-row>
</div>
......@@ -145,10 +145,10 @@
</a-row>
<a-row style="border-top:1px solid lightgrey;padding-top: 10px;">
<a-col :span='12'>
近五个月到期 : {{11}}
近五个月到期 : {{firstRowInfos.willExpireCount}}
</a-col>
<a-col :span='12'>
已过期 : {{5}}
已过期 : {{firstRowInfos.alreadyExpireCount}}
</a-col>
</a-row>
</div>
......@@ -329,6 +329,20 @@ export default {
sect: 0, //已完成小区
theme: 0, //已有主题
receipts: 0, //已开整改单
// 首行四模块下方数据
firstRowInfos: {
alreadyExpireCount: 0,
areaPropCompanyCount: 0,
cityPropCompanyCount: 0,
condoRatio: 0,
condoRows: 0,
haveElevatorCount: 0,
otherRatio: 0,
otherRows: 0,
straightAndMixedRatio: 0,
straightAndMixedRows: 0,
willExpireCount: 0,
},
baseData: {},
showMonthOrYear: false,
......@@ -574,9 +588,32 @@ export default {
url: this.$api.GET_ALREADY_OR_EXPIRE,
}).then(res => {
if (res.code === '200') {
let inner = res.data.content
this.expired = inner.alreadyExpireCount
this.expireInFiveMonth = inner.willExpireCount
const {
alreadyExpireCount=0,
areaPropCompanyCount=0,
cityPropCompanyCount=0,
condoRatio=0,
condoRows=0,
haveElevatorCount=0,
otherRatio=0,
otherRows=0,
straightAndMixedRatio=0,
straightAndMixedRows=0,
willExpireCount=0,
} = this.$com.confirm(res, 'data.content', {})
this.firstRowInfos = {
alreadyExpireCount,
areaPropCompanyCount,
cityPropCompanyCount,
condoRatio,
condoRows,
haveElevatorCount,
otherRatio,
otherRows,
straightAndMixedRatio,
straightAndMixedRows,
willExpireCount,
}
}
})
},
......
src/views/homeXuhui.vue 0 → 100644
View file @ c45cd5ba
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment