diff --git a/src/assets/scss/modules/visual/houseStatic.scss b/src/assets/scss/modules/visual/houseStatic.scss
index 665448d5..339245a0 100644
--- a/src/assets/scss/modules/visual/houseStatic.scss
+++ b/src/assets/scss/modules/visual/houseStatic.scss
@@ -164,17 +164,19 @@
display: flex;
justify-content: flex-start;
margin-top: 30px;
+
.cz-tip-dot {
- margin-top:2px;
- width: 20px;
- height: 10px;
+ margin-top:1px;
+ width: 18px;
+ height: 8px;
background: #ff7800;
border-radius: 4px;
}
>span{
margin-left:10px;
+ font-size: 10px;
}
}
@@ -184,14 +186,15 @@
margin-top: 30px;
.ld-tip-dot{
- margin-top:2px;
- width: 20px;
- height: 10px;
+ margin-top:1px;
+ width: 18px;
+ height: 8px;
background: #00E5ED;
border-radius: 4px;
}
>span{
margin-left:10px;
+ font-size: 10px;
}
}
@@ -269,6 +272,11 @@
}
}
+ .table_item:hover{
+ background: url('../../../img/modules/visual/hover-bac.png') no-repeat
+ center;
+ background-size: 100% 100%;
+ }
.item_dark{
background: #082586;
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 43afa3df..eb376ac9 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -59,6 +59,7 @@
:data="tableData"
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
border
+ @sort-change="handleSortChange"
:height="tableHeight"
v-loading="tableLoading"
style="width: 100%"
@@ -106,6 +107,24 @@
+
+
+
+ {{scope.row.sort}}
+
+
+
+
+
{
+ item.isChange = false
if (item.agencyId === this.staffAgencyId) {
item.showBtn = true
this.validTableDataNum++
@@ -649,4 +686,17 @@ export default {
diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
index f6437d36..944306dc 100644
--- a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
+++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
@@ -281,21 +281,25 @@ export default {
};
},
async mounted () {
- this.dataLoading = true
+
await this.getApiData()
- this.dataLoading = false
+
},
methods: {
async getApiData () {
+ this.dataLoading = true
this.housePieInitState = false
this.userPieInitState = false
this.getHousechart()
this.getUserchart()
- this.getSubuserhouselist()
this.getHousePie()
this.getUserPie()
+
+ await this.getSubuserhouselist()
+ this.dataLoading = false
+
},
housePieInitOk (dom) {
console.log('pie准备好了', dom)
@@ -310,7 +314,6 @@ export default {
},
-
async getHousechart (node, resolve) {
if (this.$refs.housePieChart) {
this.$refs.housePieChart.showLoading()
@@ -567,16 +570,19 @@ export default {
// this.getTable()
},
- handleToSubAgency (item) {
+ async handleToSubAgency (item) {
+ if (!this.dataLoading) {
+ this.toSubAgency(item)
+
+ await this.getApiData()
+ }
- this.toSubAgency(item)
- this.getApiData()
},
- //下钻到下一级 type点击的类型:polygon 点击多边形(分为点击组织/小区) people 点击详情
+ //下钻到下一级
async toSubAgency (item) {
this.runNum++
@@ -586,6 +592,7 @@ export default {
orgName: this.orgName,
}
+
this.runAgencyArray.push(obj)
this.orgId = item.orgId