合并

CODE/smart-community-word/.idea/workspace.xml

@@ -2,10 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="051ae1e0-ece1-4622-91c0-3f05ac339943" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/IBuildingOwnerInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/IBuildingOwnerInfoController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/IBuildingOwnerInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/IBuildingOwnerInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/BuildingOwnerInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/BuildingOwnerInfoController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpAnnouncement.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpAnnouncement.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/IBuildingOwnerInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/IBuildingOwnerInfoService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/api/buildingOwnerInfo.js" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/api/buildingOwnerInfo.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/store/modules/buildingOwnerInfo.js" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/store/modules/buildingOwnerInfo.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/building/buildingdata/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/building/buildingdata/index.vue" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../smart-community/eureka-sever/target/" />
     <ignored path="$PROJECT_DIR$/../smart-community/app-api/target/" />
@@ -27,75 +31,33 @@
     <SUITE FILE_PATH="coverage/smart_community_word$PropertyApplication.ic" NAME="PropertyApplication Coverage Results" MODIFIED="1552024801928" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/IBuildingOwnerInfo.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="432">
-              <caret line="17" column="27" lean-forward="true" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="38" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoImpl.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="216">
-              <caret line="23" column="6" lean-forward="true" selection-start-line="23" selection-start-column="6" selection-end-line="23" selection-end-column="6" />
-            </state>
-          </provider>
-        </entry>
-      </file>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/RoleController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="335">
-              <caret line="81" column="38" selection-start-line="81" selection-start-column="35" selection-end-line="81" selection-end-column="46" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="280">
-              <caret line="37" column="18" lean-forward="true" selection-start-line="37" selection-start-column="18" selection-end-line="37" selection-end-column="18" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java">
+        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/BuildingOwnerInfoController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="440">
-              <caret line="369" column="57" lean-forward="true" selection-start-line="369" selection-start-column="47" selection-end-line="369" selection-end-column="67" />
+            <state relative-caret-position="424">
+              <caret line="171" column="4" selection-start-line="171" selection-start-column="4" selection-end-line="171" selection-end-column="4" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java">
+        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="116">
-              <caret line="421" column="11" selection-start-line="421" selection-start-column="11" selection-end-line="422" selection-end-column="80" />
+            <state relative-caret-position="-1402">
+              <caret line="376" column="24" selection-start-line="376" selection-start-column="24" selection-end-line="376" selection-end-column="24" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java">
+        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/TpBuildingMapper.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="351">
-              <caret line="139" column="50" lean-forward="true" selection-start-line="139" selection-start-column="34" selection-end-line="139" selection-end-column="56" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/BaseController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="197">
-              <caret line="18" column="27" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="27" />
+            <state relative-caret-position="438">
+              <caret line="32" column="15" lean-forward="true" selection-start-line="32" selection-start-column="15" selection-end-line="32" selection-end-column="15" />
             </state>
           </provider>
         </entry>
@@ -139,6 +101,8 @@
       <find>TpTicket::getId</find>
       <find>QueryWrapper&lt;</find>
       <find>/role/{id}</find>
+      <find>ding</find>
+      <find>/building/address</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -147,11 +111,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpTicketRecord.java" />
-        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/TpTicketController.java" />
-        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/TpTicketService.java" />
-        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/TaUserMapper.java" />
-        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/TaUserMapper.xml" />
         <option value="$PROJECT_DIR$/../smart-community/community-common/src/main/java/com/community/commom/constant/Constant.java" />
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/ImageController.java" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpTicketRecord.java" />
@@ -196,6 +155,13 @@
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/IBuildingOwnerInfo.java" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoImpl.java" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/IBuildingOwnerInfoService.java" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/TpBuildingMapper.java" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpAnnouncement.java" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpBuilding.java" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/TpBuildingMapper.xml" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/BuildingOwnerInfoController.java" />
       </list>
     </option>
   </component>
@@ -217,9 +183,8 @@
     <option name="jreName" value="1.8" />
     <option name="vmOptions" value="-DarchetypeCatalog=internal" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds" extendedState="1">
     <option name="x" value="35" />
-    <option name="y" value="29" />
     <option name="width" value="1703" />
     <option name="height" value="1047" />
   </component>
@@ -229,8 +194,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -238,10 +201,109 @@
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="community" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="community" type="462c0819:PsiDirectoryNode" />
+              <item name="huiju" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="community" type="462c0819:PsiDirectoryNode" />
+              <item name="huiju" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="community" type="462c0819:PsiDirectoryNode" />
+              <item name="huiju" type="462c0819:PsiDirectoryNode" />
+              <item name="model" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="mapper" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -251,7 +313,7 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1553765723250" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1553826988423" />
     <property name="last_opened_file_path" value="D:/java/workspace/heishi/wx_project" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -262,8 +324,12 @@
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
   </component>
   <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="E:\idesWord\smartCommunity\CODE\smart-community\property-api\src\main\resources\mapper" />
+    </key>
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="com.community.huiju.dao" />
+      <recent name="com.community.huiju.model" />
       <recent name="com.community.huiju.vo" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
@@ -286,7 +352,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Spring Boot.ZuulApplication">
+  <component name="RunManager" selected="Spring Boot.PropertyApplication">
     <configuration default="true" type="Applet">
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
       <method v="2">
@@ -411,17 +477,18 @@
       <workItem from="1551756299155" duration="11716000" />
       <workItem from="1551834513428" duration="31209000" />
       <workItem from="1551920868695" duration="9458000" />
+      <workItem from="1553821766053" duration="4517000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="163147000" />
+    <option name="totallyTimeSpent" value="172594000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
+    <frame x="35" y="0" width="1703" height="1047" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.23187633" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2093731" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -431,8 +498,8 @@
       <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.6998934" weight="0.3530067" />
-      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.8544776" visible="true" weight="0.2026726" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.6998934" weight="0.100222714" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.8544776" visible="true" weight="0.20472442" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -440,7 +507,7 @@
       <window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.49946696" weight="0.32962137" />
       <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
       <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.14552239" side_tool="true" weight="0.37750557" />
-      <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.49969268" weight="0.27784026" />
+      <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.49969268" weight="0.32739422" />
       <window_info anchor="bottom" id="Java Enterprise" order="12" sideWeight="0.49946696" weight="0.32962137" />
       <window_info anchor="bottom" id="Database Changes" order="13" />
       <window_info anchor="bottom" id="Version Control" order="14" sideWeight="0.49946696" weight="0.32850778" />
@@ -559,135 +626,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/TpTicketController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="43" column="63" selection-start-line="43" selection-start-column="63" selection-end-line="43" selection-end-column="63" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/TpAnnouncementController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1377">
-          <caret line="67" column="65" selection-start-line="67" selection-start-column="59" selection-end-line="67" selection-end-column="77" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="446">
-          <caret line="35" column="7" lean-forward="true" selection-start-line="35" selection-start-column="7" selection-end-line="35" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="250" column="2" selection-start-line="250" selection-start-column="2" selection-end-line="250" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/MessageController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="29" column="13" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/TicketController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="536">
-          <caret line="164" column="54" selection-start-line="164" selection-start-column="47" selection-end-line="164" selection-end-column="65" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/ToCommunitiesMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="458">
-          <caret line="141" column="52" selection-start-line="141" selection-start-column="52" selection-end-line="141" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpTransaction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="588">
-          <caret line="38" column="10" selection-start-line="38" selection-start-column="10" selection-end-line="38" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/ToCommunitiesMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="227">
-          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TransactionServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="426">
-          <caret line="44" column="24" selection-start-line="44" selection-start-column="24" selection-end-line="44" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/TransactionController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="324">
-          <caret line="32" column="13" lean-forward="true" selection-start-line="32" selection-start-column="13" selection-end-line="32" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/Message.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2411">
-          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://F:/maven3.5/maven/serverRepository/org/springframework/spring-core/5.0.8.RELEASE/spring-core-5.0.8.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="104" selection-start-line="104" selection-end-line="104" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/MessageMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="59" column="19" selection-start-line="59" selection-start-column="19" selection-end-line="59" selection-end-column="19" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/MessageMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1849">
-          <caret line="136" column="29" lean-forward="true" selection-start-line="136" selection-start-column="12" selection-end-line="136" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/TpAnnouncementService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="480">
-          <caret line="26" column="23" lean-forward="true" selection-start-line="26" selection-start-column="17" selection-end-line="26" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/ISysRoleService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="324">
-          <caret line="13" column="17" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="121">
-          <caret line="120" column="48" lean-forward="true" selection-start-line="120" selection-start-column="48" selection-end-line="120" selection-end-column="48" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/ITpActivityService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="345">
@@ -941,7 +879,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="280">
+        <state relative-caret-position="366">
           <caret line="37" column="18" lean-forward="true" selection-start-line="37" selection-start-column="18" selection-end-line="37" selection-end-column="18" />
         </state>
       </provider>
@@ -974,6 +912,144 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpBuilding.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="108">
+          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/TpAnnouncementService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="480">
+          <caret line="26" column="23" lean-forward="true" selection-start-line="26" selection-start-column="17" selection-end-line="26" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/IBuildingOwnerInfoService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="231">
+          <caret line="88" column="19" selection-start-line="88" selection-start-column="19" selection-end-line="88" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpBuildingMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="513">
+          <caret line="70" column="34" lean-forward="true" selection-start-line="70" selection-start-column="5" selection-end-line="70" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="202">
+          <caret line="69" column="72" lean-forward="true" selection-start-line="69" selection-start-column="6" selection-end-line="69" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpBillStatementMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret selection-end-line="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/TpAnnouncementMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/TpBuildingOwnerInfoMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="54">
+          <caret line="2" selection-start-line="2" selection-end-line="2" selection-end-column="70" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/BillMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/TpBuildingMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="183">
+          <caret line="9" column="56" lean-forward="true" selection-start-line="9" selection-start-column="56" selection-end-line="9" selection-end-column="56" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/Message.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="191">
+          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TaSysRole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpAnnouncement.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="405">
+          <caret line="15" column="51" selection-start-line="15" selection-start-column="28" selection-end-line="15" selection-end-column="51" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpBuilding.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="89">
+          <caret line="11" column="47" selection-start-line="11" selection-start-column="47" selection-end-line="11" selection-end-column="47" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpBuildingOwnerInfo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="42">
+          <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1402">
+          <caret line="376" column="24" selection-start-line="376" selection-start-column="24" selection-end-line="376" selection-end-column="24" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/TpBuildingMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="438">
+          <caret line="32" column="15" lean-forward="true" selection-start-line="32" selection-start-column="15" selection-end-line="32" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/BuildingOwnerInfoController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="424">
+          <caret line="171" column="4" selection-start-line="171" selection-start-column="4" selection-end-line="171" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/BuildingOwnerInfoController.java

@@ -158,4 +158,16 @@ public class BuildingOwnerInfoController extends BaseController {
         ResponseBean userParent=iBuildingOwnerInfoService.updataApprove(paramets);
         return userParent;
     }
+
+    @ApiOperation(value = "小区楼栋资料表",nickname ="小区楼栋资料表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="phase:期,building:楼栋 ,unit:单元,level:楼层，roomNo:户号， pageNum:每页显示多少条,pageSzie:当前页数"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")})
+    @RequestMapping(value="/buildinglist",method = RequestMethod.POST)
+    public ResponseBean buildinglist(@RequestBody String paramets,HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean buildinglist=iBuildingOwnerInfoService.buildinglist(paramets,userElement);
+        return buildinglist;
+    }
+    
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpBuildingMapper.java

@@ -0,0 +1,19 @@
+package com.community.huiju.dao;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.community.huiju.model.TpBuilding;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface TpBuildingMapper extends BaseMapper<TpBuilding> {
+
+    /**
+     * 楼栋资料库列表
+     * @param page
+     * @param tpBuilding
+     * @return
+     */
+    IPage<TpBuilding> buildinglist(Page<TpBuilding> page, @Param("tpBuilding") TpBuilding tpBuilding);
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpAnnouncement.java

@@ -1,5 +1,4 @@
 package com.community.huiju.model;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpBuilding.java

@@ -0,0 +1,29 @@
+package com.community.huiju.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TpBuilding implements Serializable {
+    private Integer id;
+
+    private Integer communityId;
+
+    private String phase;
+
+    private String building;
+
+    private String unit;
+
+    private String level;
+
+    private String roomNo;
+
+    private Date createDate;
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/IBuildingOwnerInfoService.java

@@ -87,4 +87,12 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      * @return
      */
     ResponseBean deleteIds(List<Integer> ids, Integer propertyUserId);
+
+    /**
+     * 楼栋资料库列表
+     * @param paramets
+     * @param userElement
+     * @return
+     */
+    ResponseBean buildinglist(String paramets, UserElement userElement);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -24,8 +24,7 @@ import com.community.huiju.service.ITaUserService;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.ibatis.binding.MapperMethod;
-import org.apache.ibatis.session.SqlSession;
+
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -78,6 +77,9 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
     @Autowired
     private IBillInvoiceService iBillInvoiceService;
+
+    @Autowired
+    private TpBuildingMapper tpBuildingMapper;
     
     public static final Logger logger = LoggerFactory.getLogger(BuildingOwnerInfoServiceImpl.class);
     
@@ -763,6 +765,32 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         return responseBean;
     }
 
+    @Override
+    public ResponseBean buildinglist(String paramets, UserElement userElement) {
+        ResponseBean responseBean= new ResponseBean();
+
+        TpBuilding   tpBuilding= JSONObject.parseObject(paramets, TpBuilding.class);
+        JSONObject object= JSONObject.parseObject(paramets);
+
+        Integer pageNum = object.getInteger("pageNum");
+        Integer pageSize = object.getInteger("pageSize");
+
+        Page<TpBuilding> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+
+        IPage<TpBuilding> pageInfo = tpBuildingMapper.buildinglist(page,tpBuilding);
+        List<TpBuilding> tpBuildingList = pageInfo.getRecords();
+
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("list", tpBuildingList);
+        map.put("total", pageInfo.getTotal());
+        map.put("pageNum", pageInfo.getCurrent());
+        map.put("pageSize", pageInfo.getSize());
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
     /**
      * 根据 手机号 和 小区Id 查询用户
      * @param phone

CODE/smart-community/property-api/src/main/resources/mapper/TpBuildingMapper.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TpBuildingMapper" >
+  <sql id="Base_Column_List" >
+    id, community_id, phase, building, unit, `level`, room_no, create_date
+  </sql>
+  <select id="buildinglist" resultType="com.community.huiju.model.TpBuilding">
+    select
+    <include refid="Base_Column_List" />
+    from tp_building
+    <where>
+      <if test="tpBuilding.phase != null and tpBuilding.phase != ''" >
+        phase = #{tpBuilding.phase,jdbcType=VARCHAR}
+      </if>
+      <if test="tpBuilding.building != null and tpBuilding.building != ''" >
+        and building = #{tpBuilding.building,jdbcType=VARCHAR}
+      </if>
+      <if test="tpBuilding.unit != null and tpBuilding.unit != ''" >
+        and unit = #{tpBuilding.unit,jdbcType=VARCHAR}
+      </if>
+      <if test="tpBuilding.level != null and tpBuilding.level != ''" >
+        and `level` = #{tpBuilding.level,jdbcType=VARCHAR}
+      </if>
+      <if test="tpBuilding.roomNo != null and tpBuilding.roomNo != ''" >
+       and room_no = #{tpBuilding.roomNo,jdbcType=VARCHAR}
+      </if>
+    </where>
+    ORDER BY
+    phase ASC,
+    building ASC,
+    unit ASC,
+    `level` ASC,
+    room_no ASC
+  </select>
+</mapper>

VUECODE/smart-property-manage/src/api/buildingOwnerInfo.js

@@ -112,3 +112,36 @@ export function getByIdBuildingId(buildingId) {
   })
 }
 
+// 获取楼栋业主信息列表
+export function communityBuildinglist(data) {
+  return request({
+    url: '/buildinglist',
+    method: 'post',
+    data: {
+      phase: data.phase,
+      building: data.building,
+      unit: data.unit,
+      level: data.level,
+      roomNo: data.roomNo,
+      ownerName: data.ownerName,
+      pageNum: data.pageNum,
+      pageSize: data.pageSize
+    }
+  })
+}
+// 查询小区楼栋资料库
+export function BuildingHouse(data) {
+  const config = {
+    url: '/Buildinghouse',
+    method: 'post',
+    data: {
+      phase: data.phase,
+      building: data.building,
+      unit: data.unit,
+      level: data.level,
+      roomNo: data.roomNo
+    }
+  }
+  return request(config)
+}
+

VUECODE/smart-property-manage/src/store/modules/buildingOwnerInfo.js

@@ -1,5 +1,5 @@
 
-import { buildingAddress, buildingList, deleteBuilding, addBuilding, updateBuilding, getByIdBuildingId, userPassCertification, updataPassCertification } from '@/api/buildingOwnerInfo'
+import { buildingAddress, buildingList, deleteBuilding, addBuilding, updateBuilding, getByIdBuildingId, userPassCertification, updataPassCertification, communityBuildinglist, puildingHouse } from '@/api/buildingOwnerInfo'
 
 const buildingOwnerInfo = {
   state: {
@@ -86,6 +86,24 @@ const buildingOwnerInfo = {
           reject(error)
         })
       })
+    },
+    CommunityBuildinglist({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        communityBuildinglist(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    BuildingHouse({ commit }, data) { // 小区楼栋资料 查询 楼栋/单元/楼层/户号
+      return new Promise((resolve, reject) => {
+        puildingHouse(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

VUECODE/smart-property-manage/src/views/building/buildingdata/index.vue

@@ -1,82 +1,112 @@
 <template>
     <div>
             <el-form :inline="true"  class="form-listQuery">
-      <el-form-item class="filter-item" label="期">
-        <el-input  placeholder="期" />
+      <el-form-item label="楼盘库">
+        <el-select v-model="listQuery.phase" placeholder="期/区" @change="buildSelectChange(0)">
+          <!--<el-option label="选择楼栋" value="-1" />-->
+          <el-option
+            v-for="item in phaseList"
+            :key="item.id"
+            :label="item.phase"
+            :value="item.phase"/>
+        </el-select>
+        <el-select v-model="listQuery.building" placeholder="栋" @change="buildSelectChange(1)">
+          <!--<el-option label="选择楼栋" value="-1" />-->
+          <el-option
+            v-for="item in buildingList"
+            :key="item.id"
+            :label="item.building"
+            :value="item.building"/>
+        </el-select>
+        <el-select v-model="listQuery.unit" placeholder="单元" @change="buildSelectChange(2)">
+          <!--<el-option label="选择单元" value="-1" />-->
+          <el-option
+            v-for="item in unitList"
+            :key="item.id"
+            :label="item.unit"
+            :value="item.unit"/>
+        </el-select>
+        <el-select v-model="listQuery.level" placeholder="楼层" @change="buildSelectChange(3)">
+          <!--<el-option label="选择楼层" value="-1" />-->
+          <el-option
+            v-for="item in levelList"
+            :key="item.id"
+            :label="item.level"
+            :value="item.level"/>
+        </el-select>
+        <el-select v-model="listQuery.roomNo" placeholder="户号">
+          <!--<el-option label="选择户号" value="-1" />-->
+          <el-option
+            v-for="item in roomNoList"
+            :key="item.id"
+            :label="item.roomNo"
+            :value="item.roomNo"/>
+        </el-select>
+        <el-form-item label="业主名称">
+          <el-input v-model="listQuery.ownerName" placeholder="业主名称" />
+        </el-form-item>
       </el-form-item>
-      <el-form-item class="filter-item" label="栋" >
-        <el-input  placeholder="栋" />
-      </el-form-item>
-      <el-form-item class="filter-item" label="单元" >
-        <el-input  placeholder="单元" />
-      </el-form-item>
-      <el-form-item class="filter-item" label="楼层" >
-        <el-input  placeholder="楼层" />
-      </el-form-item>
-          <el-form-item class="filter-item" label="栋" >
-        <el-input  placeholder="栋" />
-      </el-form-item>
-
-      <el-button
-          size="mini"
-          type="danger"
-          @click="handleDelete(scope.$index, scope.row)">批量删除</el-button>
-
-          <el-button
-          size="mini"
-          type="danger"
-          @click="handleDelete(scope.$index, scope.row)">添加信息</el-button>
-
-          
+      <el-form-item>
+        <el-button type="info" @click="emptyListQuery">清空</el-button>
+        <el-button type="primary" @click="conditionsQuery">查询</el-button>
+      </el-form-item>       
     </el-form>
   <el-table
-    :data="tableData5"
+    :data="tableData"
     style="width: 100%"> 
     <el-table-column
       type="selection"
       width="55">
     </el-table-column>
-    <el-table-column type="expand">
+    <!-- <el-table-column type="expand">
       <template slot-scope="props">
         <el-form label-position="left" inline class="demo-table-expand">
           <el-form-item label="楼层">
-            <span>{{ props.row.name }}</span>
+            <span>{{ props.row.level }}</span>
           </el-form-item>
           <el-form-item label="户号">
-            <span>{{ props.row.shop }}</span>
-          </el-form-item> 
-           <el-button
-          size="mini"
-          type="danger"
-          @click="handleDelete(scope.$index, scope.row)">删除</el-button><br>
-        <el-form-item label="楼层">
-            <span>{{ props.row.name }}</span>
-          </el-form-item>
-          <el-form-item label="户号">
-            <span>{{ props.row.shop }}</span>
-          </el-form-item> 
-           <el-button
+            <span>{{ props.row.roomNo }}</span>
+            <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+             <el-button
           size="mini"
           type="danger"
           @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+          </el-form-item> 
         </el-form>
       </template>
-    </el-table-column>
+    </el-table-column> -->
     <el-table-column
       label="期"
-      prop="name">
+      prop="phase">
     </el-table-column>
     <el-table-column
       label="楼栋"
-      prop="desc">
+      prop="building">
     </el-table-column>
     <el-table-column
       label="单元"
-      prop="desc">
+      prop="unit">
+    </el-table-column>
+    <el-table-column
+      label="楼层"
+      prop="level">
     </el-table-column>
-    
-  </el-table>
+    <el-table-column
+      label="户号"
+      prop="roomNo">
+    </el-table-column>
+    </el-table>
+   <div class="block">
+        <el-pagination
+        :current-page="listQuery.pageNum"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="listQuery.pageSize"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
     </div>
+  </div>
 </template>
 
 <style>
@@ -94,44 +124,98 @@
   }
 </style>
 
+
 <script>
   export default {
     data() {
       return {
-        tableData5: [{
-          id: '12987122',
-          name: '好滋好味鸡蛋仔',
-          category: '江浙小吃、小吃零食',
-          desc: '荷兰优质淡奶，奶香浓而不腻',
-          address: '上海市普陀区真北路',
-          shop: '王小虎夫妻店',
-          shopId: '10333'
-        }, {
-          id: '12987123',
-          name: '好滋好味鸡蛋仔',
-          category: '江浙小吃、小吃零食',
-          desc: '荷兰优质淡奶，奶香浓而不腻',
-          address: '上海市普陀区真北路',
-          shop: '王小虎夫妻店',
-          shopId: '10333'
-        }, {
-          id: '12987125',
-          name: '好滋好味鸡蛋仔',
-          category: '江浙小吃、小吃零食',
-          desc: '荷兰优质淡奶，奶香浓而不腻',
-          address: '上海市普陀区真北路',
-          shop: '王小虎夫妻店',
-          shopId: '10333'
-        }, {
-          id: '12987126',
-          name: '好滋好味鸡蛋仔',
-          category: '江浙小吃、小吃零食',
-          desc: '荷兰优质淡奶，奶香浓而不腻',
-          address: '上海市普陀区真北路',
-          shop: '王小虎夫妻店',
-          shopId: '10333'
-        }]
+        listQuery: {
+        phase: '',
+        building: '',
+        unit: '',
+        level: '',
+        roomNo: '',
+        ownerName: '',
+        pageNum: 1,
+        pageSize: 10
+      },
+      total: 0, // 数据总数
+      phaseList: [], // 期 集合
+      buildingInfoLists: [], // 表格数据集合
+      buildingList: [], // seletc 楼栋集合
+      unitList: [], // seletc 单元集合
+      levelList: [], // seletc 层 集合
+      roomNoList: [], //  seletc 户号集合
+      listLoading: true, // 加载圈
+      deleteIds: [], // 需要删除的id集合
+      tableData: []
       }
-    }
+    },
+      mounted() {
+    // 获取数据
+    this.dataQuery()
+  },
+    methods: {
+    dataQuery() { // 查询数据
+        this.listLoading = true
+        this.$store.dispatch('CommunityBuildinglist', this.listQuery).then((res) => {
+        const resData = res.data
+        this.userPassCertification = resData.list
+        this.listQuery.pageNum = resData.pageNum
+        this.listQuery.pageSize = 10
+        this.total = resData.total
+        this.tableData = resData.list
+        console.log('this.tableData',this.tableData)
+        this.listLoading = false
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error BuildingInfoList')
+      })
+    }    
+    },
+    buildSelectChange(value) { // select 的 change
+      switch (value) {
+        case 0: // 查询栋
+          this.buildingList = []
+          this.unitList = []
+          this.levelList = []
+          this.roomNoList = []
+          this.listQuery.building = ''
+          this.listQuery.unit = ''
+          this.listQuery.level = ''
+          this.listQuery.roomNo = ''
+          this.getBuild()
+          break
+        case 1: // 查询 单元
+          this.unitList = []
+          this.levelList = []
+          this.roomNoList = []
+          this.listQuery.unit = ''
+          this.listQuery.level = ''
+          this.listQuery.roomNo = ''
+          this.getUnit()
+          break
+        case 2: // 查询 楼层
+          this.levelList = []
+          this.roomNoList = []
+          this.listQuery.level = ''
+          this.listQuery.roomNo = ''
+          this.getLevel()
+          break
+        case 3: // 查询 户号
+          this.roomNoList = []
+          this.listQuery.roomNo = ''
+          this.getRoomNo()
+          break
+      }
+    },
   }
-</script>
+  
+</script>
+<style>
+.block{
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 10px;
+}
+</style>