Merge branch 'dev-0420' into dev

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;

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 @@
         <el-table-column prop="totalHouseNum"
                          label="总户数">
         </el-table-column>
+        <el-table-column prop="sort"
+                         sortable="custom"
+                         min-width="120"
+                         label="序号">
+          <template slot-scope="scope">
+            <div @click="handleEditSort(scope.row)">
+              <span v-if="!scope.row.isChange">{{scope.row.sort}}</span>
+              <el-input-number v-else
+                               @blur="onInputBlur(scope.row)"
+                               v-model="scope.row.sort"
+                               class="item_width_4"
+                               :min="1"
+                               :max="99"
+                               label="描述文字"></el-input-number>
+            </div>
+
+          </template>
+        </el-table-column>
 
         <el-table-column label="操作"
                          fixed="right"
@@ -212,6 +231,23 @@ export default {
   },
   methods: {
 
+    handleSortChange () {
+
+    },
+
+    handleEditSort (row) {
+      if (!row.isChange) {
+        row.isChange = true
+      }
+
+    },
+
+    onInputBlur (row) {
+
+      row.isChange = false
+      console.log(row.sort)
+
+    },
 
     checkSelect (row, index) {
       let isChecked = false;
@@ -252,6 +288,7 @@ export default {
         this.validTableDataNum = 0
         this.total = data.total
         data.list.forEach(item => {
+          item.isChange = false
           if (item.agencyId === this.staffAgencyId) {
             item.showBtn = true
             this.validTableDataNum++
@@ -649,4 +686,17 @@ export default {
 </script>
 <style lang="scss" scoped >
 @import "@/assets/scss/modules/visual/communityManage.scss";
+
+.item_width_4 {
+  width: 100px;
+}
+
+/deep/.el-input-number--medium .el-input-number__decrease,
+/deep/.el-input-number--medium .el-input-number__increase {
+  width: 26px;
+}
+/deep/.el-input-number--medium .el-input__inner {
+  padding-left: 0px;
+  padding-right: 0px;
+}
 </style>

src/views/modules/base/resi.vue

@@ -3,7 +3,10 @@
     <el-card class="resi-card">
       <el-collapse v-if="openSearch" v-model="activeNames">
         <el-collapse-item v-for="item in searchList" :key="item.itemGroupId" 
-          :title="item.groupName" :name="item.itemGroupId">
+           :name="item.itemGroupId">
+           <template slot="title">
+              <div class="collapse-title">{{ item.groupName }}</div>
+            </template>
           <resi-search v-if="searchList.length > 0"
                   :ref="'resiSearch' + item.itemGroupId"
                   :form-list="item.queryItemList"
@@ -17,6 +20,7 @@
                   ref="resiSearch"
                   :form-list="searchList[0].queryItemList"
                   :column-name="defaultCategotyKey"
+                  :show-grid="true"
                   :is-arrow="true"
                   @search="handleSearch" />
       </template>
@@ -59,14 +63,14 @@
                      :loading="importLoading">{{importBtnTitle}}</el-button>
         </el-upload>
 
-        <el-button size="small"
+        <!-- <el-button size="small"
                    class="diy-button--reset"
                    :loading="exportBtn"
-                   @click="handleExport">{{exportBtnTitle}}</el-button>
+                   @click="handleExport">{{exportBtnTitle}}</el-button> -->
         <el-button
-                     class="diy-button--add"
+                     class="diy-button--reset"
                      size="small"
-                     @click="diyExport">自定义导出</el-button>
+                     @click="diyExport">导出</el-button>
         <el-button
                      class="diy-button--add"
                      size="small"
@@ -410,8 +414,8 @@ export default {
   computed: {
     ...mapGetters(['clientHeight', 'iframeHeight']),
     tableHeight() {
-      const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
-      const _h = this.clientHeight - 280 - this.searchH
+      const h = this.clientHeight - this.searchH - 310 + this.iframeHeigh
+      const _h = this.clientHeight - 310 - this.searchH
       return this.$store.state.inIframe ? h : _h
     }
   },
@@ -1358,6 +1362,9 @@ export default {
     // border-right: 1px solid rgba(33, 149, 254, 1);
   }
 }
+.collapse-title {
+  font-weight: bold;
+}
 .resi-table {
   ::v-deep .el-button--text {
     text-decoration: underline;

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