Skip to content

M
mobi
Commit e6e4a5f1 authored by levante's avatar levante
Browse files
Options

micSyslist解决冲突

parents c770971b b2667ea6
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 78 deletions
src/router/getMicRouters.js
View file @ e6e4a5f1
......@@ -48,7 +48,7 @@ async function GetRoutes(router) {
break
default: // 当前仅可使用pudong / xuhui-sit/uat进行打包
MicRouters = yangpu
MicRouters = xuhui
break
}
......
src/router/micSystemsList.json
View file @ e6e4a5f1
......@@ -6,14 +6,9 @@
"activeRule": "/pudong"
},
{
"name": "czd",
"entry": "http://10.220.105.137:81/czd",
"activeRule": "/czd"
},
{
"name": "checkorder",
"entry": "http://10.220.105.137:81/checkorder",
"activeRule": "/checkorder"
"name": "danger",
"entry": "http://10.220.105.137:81/dangerweb",
"activeRule": "/danger"
},
{
"name": "order",
......@@ -22,7 +17,7 @@
},
{
"name": "documents",
"entry": "http://31.0.161.39/documents",
"entry": "http://10.216.118.142/documents",
"activeRule": "/documents"
}
],
......@@ -38,46 +33,11 @@
"entry": "http://pudong.hm.omniview.pro/dangerweb",
"activeRule": "/danger"
},
{
"name": "czd",
"entry": "http://pudong.hm.omniview.pro/czd",
"activeRule": "/czd"
},
{
"name": "checkorder",
"entry": "http://pudong.hm.omniview.pro/checkorder",
"activeRule": "/checkorder"
},
{
"name": "order",
"entry": "http://xuhui.hm.omniview.pro/order",
"activeRule": "/order"
},
{
"name": "question",
"entry": "http://xuhui.hm.omniview.pro/question",
"activeRule": "/question"
},
{
"name": "hp_order",
"entry": "http://huangpu.hm.omniview.pro/order",
"activeRule": "/hp_order"
},
{
"name": "hp_question",
"entry": "http://huangpu.hm.omniview.pro/question",
"activeRule": "/hp_question"
},
{
"name": "documentOne",
"entry": "http://yangpu-hm.omniview.pro/documentOne",
"activeRule": "/documentOne"
},
{
"name": "documentTwo",
"entry": "http://yangpu-hm.omniview.pro/documentTwo",
"activeRule": "/documentTwo"
},
{
"name": "documents",
"entry": "http://yangpu-hm.omniview.pro/documents",
......
src/server/api.js
View file @ e6e4a5f1
......@@ -5,6 +5,8 @@ let BASE_URL = '', MOCK_URL='',
* 1、此处配置当前项目在不同环境下的API请求前缀
* 2、前端服务间、后端服务间需做跨域处理
*/
// console.log(window.location)
console.log(window.location)
switch (process.env.NODE_ENV) {
case 'devol': // 本地线上部署环境下
BASE_URL = 'http://xuhui.hm.omniview.pro/api/v2'
......@@ -63,8 +65,8 @@ case 'huangpu-prod':
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://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'
......@@ -235,5 +237,6 @@ export default {
//日志管理
GET_RIZHI: '/service-log/operateRecord', //日志列表
GET_RIZHI_INFO: '/service-log/operateRecord/{id}', //日志详情
GET_XIAOQUTOTAL: '/service-basicdatasync-ddd/summary/community/totare', //查询小区住宅面积，总楼栋数，总户数信息
}
src/util/mixins.js
View file @ e6e4a5f1
......@@ -15,22 +15,20 @@ export const permission = {
url: this.$api.GET_REDIS.replace('{id}', '?message='+ res.data.content.id),
}).then(res => {
if (res.code == '200') {
console.log(1)
// console.log(1)
}
})
// 本地存储用户基本信息
let userInfo = res.data.content, name, oldSysAuthCode, isAllPerm = false
let userInfo = res.data.content, name, isAllPerm = false
if(!res.data || !res.data.content){
userInfo = {}
name = ''
oldSysAuthCode = []
}else{
userInfo = res.data.content
name = userInfo.username = res.data.content.name||res.data.content.phone
this.$store.commit('SET_USERINFO', userInfo)
this.$cookie.set('userName', name)
this.$store.commit('SET_USERNAME', name)
oldSysAuthCode = getOldSysAuthCode(userInfo.sysDicSet)
// 获取用户是否为超级管理权限
isAllPerm = userInfo.isAllPerm?userInfo.isAllPerm:false
}
......@@ -44,9 +42,7 @@ export const permission = {
}).then(res => {
// 当前用户全部权限编码，包含菜单及功能操作
if(res.data!=undefined && res.data!=null && res.data.content!=undefined && res.data.content!=null){
authCodeList = res.data.content.concat(oldSysAuthCode)
}else{
authCodeList = oldSysAuthCode
authCodeList = res.data.content
}
// 写入vuex
this.$store.commit('SET_MENU', {authMenuAll, authCodeList, isAllPerm})
......@@ -89,14 +85,9 @@ export const permission = {
params: {}
}).then(res => {
// 当前用户全部权限编码，包含菜单及功能操作
const oldSysDatas = !this.$store.state.userInfos ? []: this.$store.state.userInfos.sysDicSet
let authCodeList = []
const oldSysAuthCode = getOldSysAuthCode(oldSysDatas)
if(res.data!=undefined && res.data!=null && res.data.content!=undefined && res.data.content!=null){
authCodeList = res.data.content.concat(oldSysAuthCode)
}else{
authCodeList = oldSysAuthCode
authCodeList = res.data.content
}
authMenuAll = getSideMenu(routes, authCodeList)
this.$store.commit('SET_MENU', {authMenuAll, authCodeList, isAllPerm})
......@@ -135,16 +126,6 @@ export {
checkHideInBread
}
function getOldSysAuthCode(syslist){
const oldSysAuthCode = []
if(syslist == undefined || syslist == null || 'object' != typeof syslist) return oldSysAuthCode
for(let i=0;i<syslist.length;i++){
oldSysAuthCode.push(syslist[i].sysCode)
}
return oldSysAuthCode
}
/**
* 递归遍历所有router，找到某一个router节点
* @param {Array} allRouter 某一层级的route节点,必传
......
src/views/home.vue
View file @ e6e4a5f1
......@@ -44,7 +44,7 @@
商品 : {{firstRowInfos.condoRows}}
</a-col>
<a-col :span='7'>
直管 : {{firstRowInfos.straightAndMixedRows}}
直管 : {{firstRowInfos.straight}}
</a-col>
<a-col :span='10'>
保障及其他 : {{firstRowInfos.otherRows}}
......@@ -606,7 +606,7 @@ export default {
haveElevatorCount=0,
otherRatio=0,
otherRows=0,
straightAndMixedRatio=0,
straight=0,
straightAndMixedRows=0,
willExpireCount=0,
} = this.$com.confirm(res, 'data.content', {})
......@@ -619,7 +619,7 @@ export default {
haveElevatorCount,
otherRatio,
otherRows,
straightAndMixedRatio,
straight,
straightAndMixedRows,
willExpireCount,
}
......
src/views/houseData/basicInfo.vue
View file @ e6e4a5f1
......@@ -3,7 +3,7 @@
<div class="routerWapper">
<div v-if="$route.path == '/houseData/basicInfo' && $permission('000101')" class="layoutMargin layoutPadding">
<a-form :form="form" class="protalForm" >
<a-row class="formItem" type="flex" :justify="simpleSearchForm ? 'end' : ''" align="top" :gutter="simpleSearchForm ? 16 : 0">
<a-row class="formItem" type="flex">
<a-col span="8">
<a-form-item label="小区名称" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-input placeholder="请输入查询内容" v-decorator="['stNameFrst_l']" />
......@@ -404,6 +404,7 @@ export default {
// setTimeout(() => {
this.getConfig(),
this.getSearchParams()
this.getXiaoqu()
// }, 0)
})
}
......@@ -419,6 +420,19 @@ export default {
}
})
},
getXiaoqu(){
this.$ajax.get({
url: this.$api.GET_XIAOQUTOTAL,
}).then(res => {
if (res.code == '200') {
const contentTotal = res.data.content
this.pagination.total= contentTotal.sectCount
this.pagination.totStCnstArea= contentTotal.stCnstArea
this.pagination.totUnits= contentTotal.totUnits
this.pagination.totHous= contentTotal.totHous
}
})
},
closeMoreSearch() {
this.simpleSearchForm = true
},
......@@ -584,10 +598,6 @@ export default {
if(this.$store.state.userInfos.orgType == 2){
this.showCom = false
}
this.pagination.total= this.$com.confirm(res, 'data.totalRows', 0)
this.pagination.totStCnstArea= this.$com.confirm(res, 'data.totStCnstArea', 0)
this.pagination.totUnits= this.$com.confirm(res, 'data.totUnits', 0)
this.pagination.totHous= this.$com.confirm(res, 'data.totHous', 0)
this.tableData = this.$com.confirm(res, 'data.content', [])
// 处理显示的字段
......
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