diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index 18c4a157..c8a0d7c2 100644 --- a/src/views/modules/base/community/buildTable.vue +++ b/src/views/modules/base/community/buildTable.vue @@ -180,7 +180,7 @@ export default { computed: { tableHeight () { - return (this.clientHeight - 220) + return (this.clientHeight - 300) }, diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index 4fc23e5e..a57e6a1e 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -185,7 +185,7 @@ export default { computed: { tableHeight () { - return (this.clientHeight - 320) + return (this.clientHeight - 300) }, rowHeight () { diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index 8a065fb7..797b047e 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -63,6 +63,7 @@ :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}" v-loading="tableLoading" border + :height="tableHeight" style="width: 100%">
- +
- +
- +
@@ -18,7 +18,7 @@
+ src="../../../../assets/img/shuju/title-tip.png" />
志愿者服务情况
@@ -43,7 +43,7 @@
+ class="echart-org">
@@ -69,7 +69,7 @@
+ class="echart-org">
@@ -80,7 +80,7 @@
+ src="../../../../assets/img/shuju/title-tip.png" />
多元化治理平面图
@@ -97,11 +97,11 @@
+ v-for="item in legendArray" + :key="item.optionValue"> + :src="item.url" />
{{item.optionLabel}}
@@ -351,7 +351,7 @@ export default { this.$message.error(msg) } }, - async getAgencyList() { + async getAgencyList () { // const url = "/gov/org/customeragency/staffinagencylist"; // const url = '/gov/org/customeragency/agencygridtree' const url = '/gov/org/customeragency/staffinagencylist' @@ -372,25 +372,26 @@ export default { this.$message.error(msg) } }, - getTreeData(data){ + getTreeData (data) { if (!Array.isArray(data)) return [] let arr = data.map(item => { let _item = {} if (item.subAgencyList) { if (item.subAgencyList.length === 0) { - _item = { + _item = { label: item.agencyName, value: item.agencyId + '-' + item.level, level: item.level, - children: undefined + children: undefined } - } else _item = { + } else _item = { label: item.agencyName, value: item.agencyId + '-' + item.level, level: item.level, - children: this.getTreeData(item.subAgencyList)} + children: this.getTreeData(item.subAgencyList) + } } else { - _item = { + _item = { label: item.agencyName, value: item.agencyId + '-' + item.level, level: item.level, @@ -497,16 +498,16 @@ export default { }, - handleCascader(val) { + handleCascader (val) { console.log('val-vvv', val) if (val.length > 0) { const _arr = val[val.length - 1].split('-') - const orgType = _arr[1] !== 'grid' ? 'agency': 'grid' + const orgType = _arr[1] !== 'grid' ? 'agency' : 'grid' // this.getServicePie(_arr[0], orgType) this.getPie(_arr[0]) this.getMapUnitList(_arr[0]) } - + }, //加载地图数据 loadMap () { @@ -514,7 +515,7 @@ export default { //mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray this.$refs.map.loadMap(this.agencyInfo, null, null, this.distributionsList, this.iconUrlArray, null) } else { - this.$refs.map.refreshMap(null, this.unitMapList) + this.$refs.map.refreshMap(null, this.distributionsList) } }, @@ -641,7 +642,7 @@ export default { .title-label { font-size: 16px; font-weight: 800; - + ::v-deep .el-input { width: 180px; .el-input__inner { @@ -652,7 +653,7 @@ export default { border: 0; } .el-icon-arrow-down::before { - content: "\e790"; + content: "\e790"; } } }