- {{ item.title }}
+ style="width:5%">
+ {{ '序号' }}
+
+ {{ '姓名' }}
+
+
+ {{ '调整时间' }}
+
+
+ {{ typeShow }}
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.label}}
+
+
+ {{ '网格' }}
+
+
+ {{ '小区楼栋' }}
+
+
- {{ item }}
-
- 更多>
-
-
- {{ item }}
-
-
+ :style="{width:widthList[indexs]}"
+ :key="indexs">
+ {{ item }}
+
- {{ item.label }}
- {{ item.count }}
+ {{ item.categoryName }}
+ {{ item.total }}
较上月
-
{{ "+2000" }}
+ {{ "+"+ item.immigration }}
{{" "}}
-
{{ "-2000"}}
+ {{ "-"+ item.emigration}}
- {
- tableData.push([
- index + 1,
- item.gridName,
- item.neighborhoodName,
- item.buildingName,
- item.residentNames ? item.residentNames : "暂无",
- ]);
- });
- this.tableData = tableData;
- this.total = data.total;
+ this.agencyInfo = data
+ this.agencyId = this.agencyInfo.agencyId
+ this.level = this.agencyInfo.level === 'grid' ? 'grid' : 'agency'
+
+ //组织级联数据
+ ++this.iscascaderShow
+ this.casOptions = []
+ this.agencyIdArray.length = []
+
+ if (data) {
+ this.casOptions.push(data)
+ this.agencyIdArray.push(this.agencyId)
+ }
+
} else {
+ this.$message.error(msg);
}
+
+ },
+
+ onClickList (item, index) {
+ this.activeIndex = index;
+ this.pageNo = 1;
+ this.categoryKey = item.categoryKey
+
+ this.$refs.ref_recordlist.getUserwarnlist(this.monthId, this.categoryKey, this.pageNo, this.pageSize)
},
+
//获取各类人数
async getCategoryData () {
// const url = "/data/aggregator/icuser/category-data";
const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/icuser/category-data";
let params = {
- agencyId: this.$store.state.user.agencyId,
+ orgType: this.level,
+ orgId: this.agencyId,
+ dateId: this.dateId,
+
};
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
- this.warningList = data;
- this.visibleLoading = false;
- this.getUserwarnlist();
+ this.categoryList = data;
+ if (this.categoryList.length > 0) {
+ this.categoryKey = this.categoryList[0].categoryKey
+ }
+
} else {
}
},
async handleChangeDate (value) {
this.dateIdShow = value
- // await this.getPieChart()
- // this.getPie()
+ this.getApiData()
+
},
async handleChangeAgency (value) {
this.agencyName = this.$refs["myCascader"].getCheckedNodes()[0].label
this.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''
- await this.getPieChart()
- this.getPie()
- console.log(this.agencyIdArray)
+ this.getApiData()
+
},
pageSizeChangeHandleNew (val) {
this.pageNo = 1;
this.pageSize = val;
+ this.$refs.ref_recordlist.getUserwarnlist(this.monthId, this.categoryKey, this.pageNo, this.pageSize)
},
pageCurrentChangeHandleNew (val) {
this.pageNo = val;
this.getUserwarnlist();
+ this.$refs.ref_recordlist.getUserwarnlist(this.monthId, this.categoryKey, this.pageNo, this.pageSize)
+ },
+ },
+ watch: {
+ dateIdShow () {
+ let dataArray = this.dateIdShow.split('-')
+ this.dateId = dataArray.join('')
+ this.monthId = this.dateId.substring(0, 6)
},
+
},
};
diff --git a/src/views/modules/workSys/mapConfig.vue b/src/views/modules/workSys/mapConfig.vue
index d60f7930..b4d1fdda 100644
--- a/src/views/modules/workSys/mapConfig.vue
+++ b/src/views/modules/workSys/mapConfig.vue
@@ -151,6 +151,8 @@ const vueGis = {
//下钻层级记录
runNum: 0,
runAgency: [],
+ center: [],
+ zoom: null,
}
},
@@ -172,11 +174,12 @@ const vueGis = {
methods: {
//切换下级组织
orgChange (index) {
+
this.selAgencyIndex = index
selectedFeatures.clear()
- if (index || index === 0) {
+ if (this.subAgencyArray.length > 0 && (index || index === 0)) {
this.showBtn = true
this.selAgency = this.subAgencyArray[index]
if (this.selAgency.coordinates) {
@@ -210,9 +213,13 @@ const vueGis = {
//返回上一级组织
handleBack () {
+
+ this.center = this.runAgency[this.runNum - 1].center
+ this.zoom = this.runAgency[this.runNum - 1].zoom
this.selAgencyId = ''
this.runNum--
this.runAgency.pop()
+
if (this.runNum === 0) {
this.orgId = ''
this.orgLevel = ''
@@ -336,6 +343,9 @@ const vueGis = {
},
//下钻到下一级
toSubAgency (e) {
+ if (!e.selected[0]) {
+ return false
+ }
if (this.method != 'mAddPolygon' && this.level != 'neighborHood') {
this.selAgencyId = ''
@@ -351,6 +361,11 @@ const vueGis = {
});
this.runNum++
+ this.selPolygon.center = map.getView().getCenter()
+ this.selPolygon.zoom = map.getView().getZoom()
+ console.log('center', map.getView().getCenter())
+ console.log('zoom', map.getView().getZoom())
+
this.runAgency.push(this.selPolygon)
this.selAgencyIndex = 0
this.refreshMap(true)
@@ -374,9 +389,12 @@ const vueGis = {
},
//设置地图定位的中心点和缩放级别
setMapLocation () {
+ this.centerPoint = []
+
+ if (this.center && this.center.length > 0) {
+ this.centerPoint = this.center
+ } else if (this.orgData.longitude && this.orgData.latitude) {
- if (this.orgData.longitude && this.orgData.latitude) {
- this.centerPoint = []
this.centerPoint.push(this.orgData.longitude)
this.centerPoint.push(this.orgData.latitude)
} else {
@@ -384,7 +402,9 @@ const vueGis = {
this.centerPoint = centerPointGlobal
}
- this.setZoom(this.orgData.agencyLevel)
+ if (!this.zoom) {
+ this.setZoom(this.orgData.agencyLevel)
+ }
},
//根据组织层级设置缩放级别