diff --git a/src/components/CMap/components/cmap.vue b/src/components/CMap/components/cmap.vue index 4494f00..fdec804 100644 --- a/src/components/CMap/components/cmap.vue +++ b/src/components/CMap/components/cmap.vue @@ -276,12 +276,18 @@ } this.overlays = [] }, + // 获取数据权限 + getDataScope() { + const dataScope = this.$store.getters.dataScope + return dataScope + }, // 加载海量点 renderPoi(needClear = true) { // 需要清除原有查询条件 if (needClear) { - this.queryString = '' + this.queryString = 'DEPTID IN (' + this.getDataScope() + ')' } + console.log(this.queryString) const { mapLayers, layerInfoManager, layerId, overlayManager } = this // 没有图层信息提示错误 if (layerInfoManager[layerId] == null) { @@ -365,6 +371,8 @@ } if (deptid !== '') { queryList.push('DEPTID=' + deptid) + } else { + queryList.push('DEPTID IN (' + this.getDataScope() + ')') } this.queryString = queryList.join(' and ') this.cleanPoi() diff --git a/src/components/CMap/components/cmap.vue b/src/components/CMap/components/cmap.vue index 4494f00..fdec804 100644 --- a/src/components/CMap/components/cmap.vue +++ b/src/components/CMap/components/cmap.vue @@ -276,12 +276,18 @@ } this.overlays = [] }, + // 获取数据权限 + getDataScope() { + const dataScope = this.$store.getters.dataScope + return dataScope + }, // 加载海量点 renderPoi(needClear = true) { // 需要清除原有查询条件 if (needClear) { - this.queryString = '' + this.queryString = 'DEPTID IN (' + this.getDataScope() + ')' } + console.log(this.queryString) const { mapLayers, layerInfoManager, layerId, overlayManager } = this // 没有图层信息提示错误 if (layerInfoManager[layerId] == null) { @@ -365,6 +371,8 @@ } if (deptid !== '') { queryList.push('DEPTID=' + deptid) + } else { + queryList.push('DEPTID IN (' + this.getDataScope() + ')') } this.queryString = queryList.join(' and ') this.cleanPoi() diff --git a/src/store/getters.js b/src/store/getters.js index 937bbf9..f27b783 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -15,6 +15,7 @@ roleTips: state => state.user.roleTips, // 角色名称列表 deptId: state => state.user.deptId, // 权属单位 deptName: state => state.user.deptName, // 权属单位名称 + dataScope: state => state.user.dataScope, // 数据权限 menus: state => state.permission.menus, // 菜单 permission_routers: state => state.permission.routers, // 用户有权限的路由 addRouters: state => state.permission.addRouters, // 添加的路由 diff --git a/src/components/CMap/components/cmap.vue b/src/components/CMap/components/cmap.vue index 4494f00..fdec804 100644 --- a/src/components/CMap/components/cmap.vue +++ b/src/components/CMap/components/cmap.vue @@ -276,12 +276,18 @@ } this.overlays = [] }, + // 获取数据权限 + getDataScope() { + const dataScope = this.$store.getters.dataScope + return dataScope + }, // 加载海量点 renderPoi(needClear = true) { // 需要清除原有查询条件 if (needClear) { - this.queryString = '' + this.queryString = 'DEPTID IN (' + this.getDataScope() + ')' } + console.log(this.queryString) const { mapLayers, layerInfoManager, layerId, overlayManager } = this // 没有图层信息提示错误 if (layerInfoManager[layerId] == null) { @@ -365,6 +371,8 @@ } if (deptid !== '') { queryList.push('DEPTID=' + deptid) + } else { + queryList.push('DEPTID IN (' + this.getDataScope() + ')') } this.queryString = queryList.join(' and ') this.cleanPoi() diff --git a/src/store/getters.js b/src/store/getters.js index 937bbf9..f27b783 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -15,6 +15,7 @@ roleTips: state => state.user.roleTips, // 角色名称列表 deptId: state => state.user.deptId, // 权属单位 deptName: state => state.user.deptName, // 权属单位名称 + dataScope: state => state.user.dataScope, // 数据权限 menus: state => state.permission.menus, // 菜单 permission_routers: state => state.permission.routers, // 用户有权限的路由 addRouters: state => state.permission.addRouters, // 添加的路由 diff --git a/src/store/modules/user.js b/src/store/modules/user.js index c0bf1fe..a789622 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -11,6 +11,7 @@ deptName: '', // 部门名称 roleList: [], // 角色编号集合 roleNames: [], // 角色名称集合 + dataScope: [], // 数据权限列表 roleTips: [], // 角色标签集合 wellTypes: [], // 支持窨井类型 deviceTypes: [], // 支持设备类型 @@ -47,6 +48,9 @@ SET_DEPTNAME: (state, deptName) => { state.deptName = deptName }, + SET_DATASCOPE: (state, dataScope) => { + state.dataScope = dataScope.join(',') + }, SET_WELLTYPES: (state, wellTypes) => { state.wellTypes = wellTypes }, @@ -107,6 +111,7 @@ commit('SET_ID', data.id) commit('SET_ACCOUNT', data.account) commit('SET_NAME', data.name) + commit('SET_DATASCOPE', data.dataScope) resolve(response) }).catch(error => { reject(error)