Merge branch 'dev' into test

# Conflicts:
#	src/views/modules/base/community/community.vue
#	src/views/modules/visual/components/screen-map/index.vue

src/views/modules/base/community/community.vue

@@ -48,7 +48,7 @@
 
               </el-input>
             </el-form-item>
-            <el-form-item label="联系方式"
+            <el-form-item label="房主手机"
                           prop="ownerPhone">
               <el-input v-model="ownerPhone"
                         class="item_width_2"
@@ -131,50 +131,15 @@
                        class="diy-button--reset"
                        @click="resetSearch">重置</el-button>
           </div>
-        </el-form>
-      </div>
-      <div class=div_left_table>
-        <build-table v-if="selTreeObj.level==='neighborHood'&&!showRoomTable"
-                     ref="ref_neighTable"
-                     :staffAgencyId="staffAgencyId"
-                     :showImportBtn="showImportBtn"
-                     :ownerName="ownerName"
-                     :ownerPhone="ownerPhone"
-                     :rentFlag="rentFlag"
-                     :purpose="purpose"
-                     :remark="remark"
-                     :updateStartDate="updateStartDate"
-                     :updateEndDate="updateEndDate"
-                     @toNextLevel="toNextLevel"
-                     @refreshTree="refreshTree"></build-table>
-
-        <room-table v-if="showRoomTable||selTreeObj.level==='building'"
-                    :staffAgencyId="staffAgencyId"
-                    :showImportBtn="showImportBtn"
-                    :ownerName="ownerName"
-                    :ownerPhone="ownerPhone"
-                    :rentFlag="rentFlag"
-                    :purpose="purpose"
-                    :remark="remark"
-                    :updateStartDate="updateStartDate"
-                    :updateEndDate="updateEndDate"
-                    ref="ref_buildingTable"
-                    @refreshTree="refreshTree"></room-table>
-
-        <community-table v-if="selTreeObj.level!=='building'&&selTreeObj.level!=='neighborHood'&&!showRoomTable"
-                         @toNextLevel="toNextLevel"
-                         :staffAgencyId="staffAgencyId"
-                         :ownerName="ownerName"
-                         :ownerPhone="ownerPhone"
-                         :rentFlag="rentFlag"
-                         :purpose="purpose"
-                         :remark="remark"
-                         :updateStartDate="updateStartDate"
-                         :updateEndDate="updateEndDate"
-                         ref="ref_communityTable"
-                         @refreshTree="refreshTree"></community-table>
-      </div>
-    </div>
+        </div>
+        <div class="resi-cell">
+          <div class="resi-cell-label">房主手机</div>
+          <div class="resi-cell-value">
+            <el-input v-model="ownerPhone"
+                      size="small"
+                      clearable
+                      placeholder="请输入内容">
+            </el-input>
 
   </div>
 </template>
@@ -269,7 +234,7 @@ export default {
 
     await this.loadOrgData()
     await this.loadTree()
-    // await this.loadOpenNode()
+    await this.loadOpenNode()
 
     await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
     if (this.treeData.length > 0) {
@@ -347,8 +312,6 @@ export default {
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
-        this.openNodes = []
-        this.openNodes.push(data[0].id)
 
         this.treeData = data
         if (!isRefresh && data.length > 0) {
@@ -559,47 +522,6 @@ export default {
 
 <style lang="scss" scoped >
 @import "@/assets/scss/modules/visual/communityManage.scss";
-@import "@/assets/scss/modules/management/list-main.scss";
-</style>
-
-<style lang="scss" scoped >
-.div_main {
-  display: flex;
-}
-.scrollar {
-  margin-top: 10px;
-}
-
-.div_tree {
-  flex: 0 0 280px;
-  background-color: #ffffff;
-  border-radius: 5px;
-  padding: 10px;
-  overflow-y: hidden;
-}
-.filter_tree {
-  overflow-x: auto;
-}
-
-// .div_table {
-//   margin-left: 15px;
-//   // flex: 1;
-//   width: calc(100% - 300px);
-//   background-color: #ffffff;
-//   border-radius: 5px;
-//   padding: 10px;
-// }
-.div_left {
-  // flex: 1;
-  width: calc(100% - 300px);
-}
-.div_left_table {
-  margin-top: 10px;
-  margin-left: 15px;
-  background-color: #ffffff;
-  border-radius: 5px;
-  padding: 10px;
-}
 </style>
 
 

src/views/modules/plugins/stats/factagencyuserhousedaily.vue

@@ -3,7 +3,7 @@
     <div class="mode-block resi-container">
       <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item label="组织机构" label-width="100px"
+        <el-form-item label="所属组织" label-width="100px"
                       prop="agencyId">
           <!-- <el-select
                   v-model.trim="dataForm.agencyId"