diff --git a/src/api/admin/log.js b/src/api/admin/log.js
index e9edb54..6a87270 100644
--- a/src/api/admin/log.js
+++ b/src/api/admin/log.js
@@ -1,25 +1,17 @@
-/*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the pig4cloud.com developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
- */
+
 
 import request from '@/router/axios'
 
 export function fetchList(query) {
   return request({
-    url: '/admin/log/page',
+    url: '/admin/log/loginLogPage',
+    method: 'get',
+    params: query
+  })
+}
+export function fetchList1(query) {
+  return request({
+    url: '/admin/log/operateLogPage',
     method: 'get',
     params: query
   })
diff --git a/src/api/modules/api.js b/src/api/modules/api.js
index 893229a..4b82c9a 100644
--- a/src/api/modules/api.js
+++ b/src/api/modules/api.js
@@ -275,6 +275,14 @@ export function areamanagerList(query) {
     params:query
   })
 }
+// 获取当前登录人的区域
+export function findArea(query) {
+  return request({
+    url: 'autoSR/cushouseuserrelationmid/findArea ',
+    method:'get',
+    params:query
+  })
+}
 // 通过地区串获取省市
 export function getParentAndKidList(query) {
   return request({
@@ -310,3 +318,69 @@ export function rolePage(query) {
     params:query
   })
 }
+
+
+// 楼盘管理，获取公司列表
+export function getCompanyList(query) {
+  return request({
+    url: '/autoSR/zkorg/findMyOrg',
+    method:'get',
+    params:query
+  })
+}
+// 获取楼盘管理列表
+export function zkhousePage(query) {
+  return request({
+    url: '/autoSR/zkhouse/page',
+    method:'get',
+    params:query
+  })
+}
+
+// 获取省市
+export function getAreaList(query) {
+  return request({
+    url: '/autoSR/zksysarea/list',
+    method:'get',
+    params:query
+  })
+}
+// 获取当前人的区域的楼盘
+export function findHouseByArea(query) {
+  return request({
+    url: 'autoSR/cushouseuserrelationmid/findHouseByArea',
+    method:'get',
+    params:query
+  })
+}
+// 获取运营人员
+export function getAllOperationsStaff(query) {
+  return request({
+    url: '/admin/user/getAllOperationsStaff',
+    method:'get',
+    params:query
+  })
+}
+// 添加楼盘
+export function addZkhouse(data) {
+  return request({
+    url: '/autoSR/zkhouse',
+    method:'post',
+    data
+  })
+}
+export function editZkhouse(data) {
+  return request({
+    url: '/autoSR/zkhouse',
+    method:'put',
+    data
+  })
+}
+// 更换账号
+export function updateManagerPhone(data) {
+  return request({
+    url: '/autoSR/zkhouse/updateManagerPhone',
+    method:'post',
+    data
+  })
+}
diff --git a/src/const/crud/admin/log.js b/src/const/crud/admin/log.js
index b807404..ddb44b8 100644
--- a/src/const/crud/admin/log.js
+++ b/src/const/crud/admin/log.js
@@ -1,19 +1,3 @@
-/*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the pig4cloud.com developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
- */
 export const tableOption = {
   border: true,
   index: true,
@@ -21,11 +5,13 @@ export const tableOption = {
   stripe: true,
   menuAlign: 'center',
   menuWidth: 150,
+
   align: 'center',
   refreshBtn: true,
   showClomnuBtn: false,
   searchSize: 'mini',
   searchMenuSpan: 6,
+  delBtn:false,
   addBtn: false,
   editBtn: false,
   viewBtn: true,
@@ -51,18 +37,22 @@ export const tableOption = {
   }, {
     label: '客户端',
     prop: 'serviceId'
-  }, {
-    width: 80,
-    label: '请求时间',
-    prop: 'time'
-  }, {
+  },
+  // {
+  //   width: 80,
+  //   label: '请求时间',
+  //   prop: 'time'
+  // },
+  {
     width: 150,
-    label: '创建时间',
+    label: '登录时间',
     prop: 'createTime',
     type: 'datetime',
+    rangeSeparator:"-",
     format: 'yyyy-MM-dd HH:mm',
     valueFormat: 'yyyy-MM-dd HH:mm:ss',
     search: true,
     searchRange: true
   }]
 }
+
diff --git a/src/page/check/chose.vue b/src/page/check/chose.vue
index c066fb3..41e1f8d 100644
--- a/src/page/check/chose.vue
+++ b/src/page/check/chose.vue
@@ -27,7 +27,12 @@
         >
       </div>
       <div class="con">
-        <div v-for="item in list" :key="item.id" class="tab" @click="chose(item)">
+        <div
+          v-for="item in list"
+          :key="item.id"
+          class="tab"
+          @click="chose(item)"
+        >
           <div class="text-1">{{ item.agentName }}</div>
           <div class="text-2">
             服务状态:
@@ -69,7 +74,7 @@
       </el-row>
     </div> -->
     <div class="content" v-if="flag == 2">
-          <div class="search">
+      <div class="search">
         <el-input
           placeholder="请输入内容"
           style="width: 200px; margin-left: 40px; margin-right: 30px"
@@ -86,7 +91,13 @@
         >
       </div>
       <div class="con">
-        <div v-for="item in list" :key="item.id" class="tab" style="height:78px;" @click="chose(item)">
+        <div
+          v-for="item in list"
+          :key="item.id"
+          class="tab"
+          style="height: 78px"
+          @click="chose(item)"
+        >
           <div class="text-1">{{ item.name }}</div>
           <!-- <div class="text-2">
             服务状态:
@@ -96,11 +107,73 @@
               >{{ item.residueTime > 0 ? "服务中" : "已过期" }}</span
             >
           </div> -->
-          <div class="text-3">区域位置:{{ item.address||'暂无' }}</div>
+          <div class="text-3">区域位置:{{ item.address || "暂无" }}</div>
+        </div>
+      </div>
+    </div>
+    <div class="content" v-if="flag == 3">
+      <div class="search">
+        <span style="line-height: 32px; margin-right: 20px">区域:</span>
+        <el-cascader
+          :props="props"
+          v-if="info.selectHouseType == 1"
+          @change="locationsChange"
+          placeholder="省/市"
+          size="small"
+          separator="/"
+          v-model="provice"
+          clearable
+        ></el-cascader>
+        <el-select
+          v-model="area"
+          v-if="info.selectHouseType == 2"
+          placeholder="请选择"
+          class="div-inp"
+        >
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <el-input
+          v-if="info.selectHouseType == 1"
+          placeholder="请输入楼盘名称"
+          style="width: 200px; margin-left: 40px; margin-right: 30px"
+          v-model="propertyName"
+          clearable
+        >
+        </el-input>
+        <el-button
+          style="height: 32px; line-height: 13px"
+          type="primary"
+          size="medium"
+          @click="zkhousePage"
+          >搜索</el-button
+        >
+      </div>
+      <div class="con">
+        <div
+          v-for="item in list"
+          :key="item.id"
+          class="tab"
+          @click="chose(item)"
+        >
+          <div class="text-1">{{ item.propertyName }}</div>
+          <div class="text-2">
+            服务状态:
+            <span
+              style="font-size: 12px"
+              :style="item.residueTime > 0 ? 'color:green;' : 'color:red;'"
+              >{{ item.residueTime > 0 ? "服务中" : "已过期" }}</span
+            >
+          </div>
+          <div class="text-3">{{ item.address }}</div>
         </div>
       </div>
     </div>
-    <div class="content" v-if="flag == 3">这是楼盘</div>
     <el-pagination
       style="margin: 20px auto"
       class="page"
@@ -115,21 +188,61 @@
 </template>
 
 <script>
+import { getAreaList } from "@/api/modules/api";
+import { getStore, setStore } from "@/util/store";
 export default {
   data() {
     return {
+      props: {
+        lazy: true,
+        async lazyLoad(node, resolve) {
+          const { level } = node;
+          if (level == 0) {
+            // console.log(23);
+            const { data } = await getAreaList({ parentId: 0 }); //获取省接口
+            var nodes = data.map((item) => {
+              return {
+                value: item.id,
+                label: item.name,
+                leaf: false,
+              };
+            });
+            resolve(nodes);
+          } else if (level == 1) {
+            const { data } = await getAreaList({ parentId: node.data.value }); //获取市接口
+            var nodes = data.map((item) => {
+              return {
+                value: item.id,
+                label: item.name,
+                leaf: true,
+              };
+            });
+            resolve(nodes);
+          }
+        },
+      },
       flag: 1,
+      provice: [],
+      area:'',
+      provinceId: "", //省id
+      cityId: "", //市id
       currentPage: 1,
+      propertyName: "",
       agentName: "", //代理商名称
-      companyName:'',
-      total:20,
+      companyName: "",
+      total: 20,
       list: [],
+      options: [],
+      info: {},
     };
   },
   mounted() {
     // console.log(this.$route.query)
     // 给定一个标志做判断显隐
     this.flag = this.$route.query.flag;
+    // 获取用户信息
+    this.info = getStore({ name: "userInfo" });
+
     // 获取数据
     if (this.flag == 1) {
       // 获取代理商
@@ -137,9 +250,12 @@ export default {
       this.getAgentList();
     } else if (this.flag == 2) {
       // 获取公司
-      this.getCompanyList()
+      this.getCompanyList();
     } else {
       // 获取楼盘
+      this.zkhousePage();
+      // 获取区域列表
+      this.findArea()
     }
   },
   computed: {},
@@ -155,25 +271,65 @@ export default {
         .then((res) => {
           console.log(res);
           this.list = res.data.records;
-          this.total=res.data.total
+          this.total = res.data.total;
         });
     },
-      getCompanyList() {
+    getCompanyList() {
       this.$api.api
         .zkorg({
           current: this.currentPage,
           size: 10,
           name: this.companyName,
-          orgType:localStorage.getItem('orgType')
+          orgType: localStorage.getItem("orgType"),
         })
         .then((res) => {
           console.log(res);
           this.list = res.data.records;
-          this.total=res.data.total
+          this.total = res.data.total;
         });
     },
+    findArea(){
+      this.$api.api.findArea()
+      .then(res=>{
+        console.log(res)
+        this.options=res.data.records
+      })
+    },
+    zkhousePage() {
+      let obj = {
+        current: this.currentPage,
+        size: this.size,
+        propertyName: this.propertyName,
+      };
+      if(this.info.selectHouseType == 1){
+        this.$api.api.zkhousePage(obj).then((res) => {
+        // console.log(res)
+        this.list = res.data.records;
+        this.total = res.data.total;
+      });
+      }
+      if(this.info.selectHouseType == 2){
+        this.$api.api.findHouseByArea({
+          id:this.area
+        }).then((res) => {
+        // console.log(res)
+        this.list = res.data.records;
+        this.total = res.data.total;
+      });
+      }
+
+    },
     chose(item) {
-      console.log(item)
+      console.log(item);
+      if (this.flag == 1) {
+        localStorage.setItem("agentId", item.id);
+      }
+      if (this.flag == 2) {
+        localStorage.setItem("orgCode", item.orgCode);
+      }
+      if (this.flag == 3) {
+        localStorage.setItem("orgCode", item.orgCode);
+      }
       this.$router.push({ path: "/wel" });
     },
     goback() {
@@ -190,17 +346,23 @@ export default {
         this.getAgentList();
       } else if (this.flag == 2) {
         // 获取公司
-        this.getCompanyList()
+        this.getCompanyList();
       } else {
         // 获取楼盘
       }
     },
+    locationsChange(e) {
+      console.log(e);
+      if (!e) return;
+      this.provinceId = e[0];
+      this.cityId = e[1];
+    },
   },
 };
 </script>
 
 <style lang="scss" scoped >
-.box-center{
+.box-center {
   min-width: 1500px;
 }
 .head {
diff --git a/src/page/check/index.vue b/src/page/check/index.vue
index cbf2dab..391a351 100644
--- a/src/page/check/index.vue
+++ b/src/page/check/index.vue
@@ -58,11 +58,11 @@ export default {
       this.$api.api.getTab().then((res) => {
         // console.log(res)
         // 循环数组，给定各种标志
-        this.tabFlag1 = true;
-        this.tabFlag2 = true;
-        this.tabFlag3 = true;
-        this.tabFlag4 = true;
-        return
+        this.tabFlag1 = false;
+        this.tabFlag2 = false;
+        this.tabFlag3 = false;
+        this.tabFlag4 = false;
+        // return
         res.data.map((item) => {
           if (item.orgType == 0) {
             this.tabFlag1 = true;
diff --git a/src/views/admin/log/index.vue b/src/views/admin/log/index.vue
index 9a0bc47..3fabd55 100644
--- a/src/views/admin/log/index.vue
+++ b/src/views/admin/log/index.vue
@@ -1,19 +1,3 @@
-<!--
-  -    Copyright (c) 2018-2025, lengleng All rights reserved.
-  -
-  - Redistribution and use in source and binary forms, with or without
-  - modification, are permitted provided that the following conditions are met:
-  -
-  - Redistributions of source code must retain the above copyright notice,
-  - this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-  - notice, this list of conditions and the following disclaimer in the
-  - documentation and/or other materials provided with the distribution.
-  - Neither the name of the pig4cloud.com developer nor the names of its
-  - contributors may be used to endorse or promote products derived from
-  - this software without specific prior written permission.
-  - Author: lengleng (wangiegie@gmail.com)
-  -->
 
 <template>
   <div class="log">
diff --git a/src/views/admin/log/log.vue b/src/views/admin/log/log.vue
new file mode 100644
index 0000000..3efc534
--- /dev/null
+++ b/src/views/admin/log/log.vue
@@ -0,0 +1,92 @@
+
+<template>
+  <div class="log">
+    <basic-container>
+      <avue-crud
+        ref="crud"
+        :page.sync="page"
+        :data="tableData"
+        :table-loading="tableLoading"
+        :option="tableOption"
+        :permission="permissionList"
+        @on-load="getList"
+        @search-change="searchChange"
+        @refresh-change="refreshChange"
+        @size-change="sizeChange"
+        @current-change="currentChange"
+        @row-del="handleDel"/>
+    </basic-container>
+  </div>
+</template>
+
+<script>
+  import {delObj, fetchList1} from '@/api/admin/log'
+  import {tableOption} from '@/const/crud/admin/log'
+  import {mapGetters} from 'vuex'
+
+  export default {
+    name: 'Log',
+    data() {
+      return {
+        tableData: [],
+        searchForm: {},
+        page: {
+          total: 0, // 总页数
+          currentPage: 1, // 当前页数
+          pageSize: 20 // 每页显示多少条
+        },
+        tableLoading: false,
+        tableOption: tableOption
+      }
+    },
+    computed: {
+      ...mapGetters(['permissions']),
+      permissionList() {
+        return {
+          delBtn: this.vaildData(this.permissions.sys_log_del, false)
+        }
+      }
+    },
+    methods: {
+      getList(page, params) {
+        this.tableLoading = true
+        fetchList1(Object.assign({
+          descs: 'create_time',
+          current: page.currentPage,
+          size: page.pageSize
+        }, params, this.searchForm)).then(response => {
+          this.tableData = response.data.records
+          this.page.total = response.data.total
+          this.tableLoading = false
+        })
+      },
+      handleDel: function (row) {
+        this.$confirm('是否确认删除ID为"' + row.id + '"的日志?', '警告', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(function () {
+          return delObj(row.id)
+        }).then(() => {
+          this.getList(this.page)
+          this.$message.success('删除成功')
+        })
+      },
+      searchChange(form, done) {
+        this.searchForm = form
+        this.page.currentPage = 1
+        this.getList(this.page, form)
+        done()
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize
+      },
+      currentChange(current) {
+        this.page.currentPage = current
+      },
+      refreshChange() {
+        this.getList(this.page)
+      }
+    }
+  }
+</script>
diff --git a/src/views/admin/user/index.vue b/src/views/admin/user/index.vue
index 4d9464e..80d539e 100644
--- a/src/views/admin/user/index.vue
+++ b/src/views/admin/user/index.vue
@@ -1105,7 +1105,7 @@
         })
         .then(res=>{
           // console.log(res)
-          this.managerList=res.data
+          this.managerList=res.data.records
         })
       },
       // 获取楼盘列表
diff --git a/src/views/building/area.vue b/src/views/building/area.vue
index 7e5fcfe..fa51c81 100644
--- a/src/views/building/area.vue
+++ b/src/views/building/area.vue
@@ -1,291 +1,303 @@
 <template>
   <div class="box-center">
     <div class="center-er">
-           <div class="app-titel">
-                  <div class="app-titel-name">区域管理
-                      <div style="margin-left: 20px" v-if="roleFlag!=1">
-                          <el-select v-model="orgCode"  filterable  @change="getTableList" placeholder="请选择公司">
-                              <el-option
-                                      v-for="item in optionsOrg"
-                                      :key="item.id"
-                                      :label="item.name"
-                                      :value="item.orgCode">
-                              </el-option>
-                          </el-select>
-                      </div>
-                  </div>
-                  <el-button class="app-titel-btn" type="primary" @click="addClick">新增</el-button>
-              </div>
-              <div class="app-box">
-
-                  <el-table
-                          :data="tableData"
-                          border
-                          style="width: 100%"
-                          :header-cell-style="{textAlign: 'center'}"
-                          :cell-style="{ textAlign: 'center' }"
-                  >
-                      <el-table-column
-                              prop="areaName"
-                              label="区域名称"
-                              width="180">
-                      </el-table-column>
-                      <el-table-column
-                              prop="provinceName"
-                              label="负责区域">
-                      </el-table-column>
-                      <el-table-column
-                              label="操作"
-                              width="250">
-                          <template slot-scope="scope">
-                              <el-button type="text" @click="edit(scope.row)">编辑</el-button>
-                              <el-button type="text" @click="del(scope.row)">删除</el-button>
-                          </template>
-                      </el-table-column>
-                  </el-table>
-              </div>
-              <div class="block">
-                  <div class="blockbox">
-                      <el-pagination
-                              @size-change="handleSizeChange"
-                              @current-change="handleCurrentChange"
-                              :current-page="currentPage"
-                              :page-sizes="[10, 12, 16, 20]"
-                              :page-size="10"
-                              layout="total, sizes, prev, pager, next, jumper"
-                              :total="page.total">
-                      </el-pagination>
-                  </div>
-              </div>
-              <el-dialog title="新增区域" :visible.sync="dialogVisible" @close="formClose">
-                  <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
-                      <el-form-item label="区域名称" prop="areaName">
-                          <el-input v-model="ruleForm.areaName"></el-input>
-                      </el-form-item>
-                      <el-form-item label="负责省份" prop="provinceItem">
-                          <el-select v-model="ruleForm.provinceItem" placeholder="请选择负责省份" multiple style="width: 100%">
-                              <el-option
-                                      v-for="item in options"
-                                      :key="item.id"
-                                      :label="item.name"
-                                      :value="item.code">
-                              </el-option>
-                          </el-select>
-                      </el-form-item>
-                  </el-form>
-                  <div slot="footer" class="dialog-footer">
-                      <el-button @click="dialogVisible = false">取 消</el-button>
-                      <el-button type="primary" @click="add">{{editFlag?'编 辑':'确 定'}}</el-button>
-                  </div>
-              </el-dialog>
+      <div class="app-titel">
+        <div class="app-titel-name">
+          区域管理
+          <div style="margin-left: 20px" v-if="orgType == 0">
+            <el-select
+              v-model="orgCode"
+              filterable
+              @change="getTableList"
+              placeholder="请选择公司"
+            >
+              <el-option
+                v-for="item in optionsOrg"
+                :key="item.id"
+                :label="item.name"
+                :value="item.orgCode"
+              >
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+        <el-button class="app-titel-btn" type="primary" @click="addClick"
+          >新增</el-button
+        >
+      </div>
+      <div class="app-box">
+        <el-table
+          :data="tableData"
+          border
+          style="width: 100%"
+          :header-cell-style="{ textAlign: 'center' }"
+          :cell-style="{ textAlign: 'center' }"
+        >
+          <el-table-column prop="areaName" label="区域名称" width="180">
+          </el-table-column>
+          <el-table-column prop="provinceName" label="负责区域">
+          </el-table-column>
+          <el-table-column label="操作" width="250">
+            <template slot-scope="scope">
+              <el-button type="text" @click="edit(scope.row)">编辑</el-button>
+              <el-button type="text" @click="del(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="block">
+        <div class="blockbox">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-sizes="[10, 12, 16, 20]"
+            :page-size="10"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="page.total"
+          >
+          </el-pagination>
+        </div>
+      </div>
+      <el-dialog
+        title="新增区域"
+        :visible.sync="dialogVisible"
+        @close="formClose"
+      >
+        <el-form
+          :model="ruleForm"
+          :rules="rules"
+          ref="ruleForm"
+          label-width="100px"
+        >
+          <el-form-item label="区域名称" prop="areaName">
+            <el-input v-model="ruleForm.areaName"></el-input>
+          </el-form-item>
+          <el-form-item label="负责省份" prop="provinceItem">
+            <el-select
+              v-model="ruleForm.provinceItem"
+              placeholder="请选择负责省份"
+              multiple
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.name"
+                :value="item.code"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="add">{{
+            editFlag ? "编 辑" : "确 定"
+          }}</el-button>
+        </div>
+      </el-dialog>
     </div>
   </div>
 </template>
 
 <script>
 export default {
-  name: "area",
   data() {
     return {
-        tableData: [],
-        page:{
-            pageNum:1,
-            pageSize:10,
-            total:100
-        },
-        currentPage:1,
-        dialogVisible:false,
-        editFlag:false,
-        //公司列表
-        optionsOrg:[],
-        ruleForm:{
-            areaName:'',
-            provinceItem:[],
-        },
-        orgCode:'',
-        rules:{
-            areaName: [
-                { required: true, message: '请输入区域名称', trigger: 'blur' },
-            ],
-            provinceItem: [
-                { required: true, message: '请选择负责省份', trigger: 'change' }
-            ],
-        },
-        options:[],
-        roleFlag:''
+      tableData: [],
+      page: {
+        pageNum: 1,
+        pageSize: 10,
+        total: 100,
+      },
+      currentPage: 1,
+      dialogVisible: false,
+      editFlag: false,
+      //公司列表
+      optionsOrg: [],
+      ruleForm: {
+        areaName: "",
+        provinceItem: [],
+      },
+      orgCode: "",
+      orgType:localStorage.getItem("orgType"),
+      rules: {
+        areaName: [
+          { required: true, message: "请输入区域名称", trigger: "blur" },
+        ],
+        provinceItem: [
+          { required: true, message: "请选择负责省份", trigger: "change" },
+        ],
+      },
+      options: [],
+      roleFlag: "",
     };
   },
-
+  mounted() {
+    //    获取公司列表
+    this.getCompanyList();
+  },
   methods: {
-      addClick(){
-                this.dialogVisible=true
-                this.editFlag=false
-                this.getArea()
-            },
-            edit(row){
-                // console.log(row,'编辑')
-                this.getArea(row.provinceItem)
-                this.editFlag=true
-                this.ruleForm=row
-                this.ruleForm.provinceItem=this.ruleForm.provinceItem.split(',')
-                // this.ruleForm.provinceItem.map(item=>item/1)
-                console.log(this.ruleForm)
-                this.dialogVisible = true
-            },
-            del(row){
-                console.log(row,'删除')
-                this.$confirm(`是否删除区域?`, '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    distinguishCancelAndClose: true,
-                    type: 'warning'
-                }).then(()=>{
-                    axios({
-                        url:`${jypath}/properties/areaDelete`,
-                        method: 'post',
-                        data:{
-                            id:row.id
-                        },
-                    }).then(res=>{
-                        if(res.data.res==1){
-                            this.$message.success('删除成功')
-                            this.getTableList()
-                        }else{
-                            this.$message.warning(res.data.resMsg)
-                        }
-                    })
-                    }
-                )
-            },
-            add(){
-                this.$refs.ruleForm.validate((valid)=>{
-                    if(valid){
-                        // console.log(this.ruleForm)
-                        if(this.editFlag){
-                            axios({
-                                url:`${jypath}/properties/areaUpdate`,
-                                method: 'post',
-                                data:{
-                                    areaName:this.ruleForm.areaName,
-                                    provinceItem:this.ruleForm.provinceItem.join(','),
-                                    id:this.ruleForm.id,
-                                    orgCode:this.orgCode
-                                },
-                            }).then(res=>{
-                                if(res.data.res==1){
-                                    this.$message.success('编辑成功')
-                                    this.dialogVisible = false
-                                }
-                            })
-                        }else{
-                            axios({
-                                url:`${jypath}/properties/areaAdd`,
-                                method: 'post',
-                                data:{
-                                    areaName:this.ruleForm.areaName,
-                                    provinceItem:this.ruleForm.provinceItem.join(','),
-                                    orgCode:this.orgCode
-                                },
-                            }).then(res=>{
-                                if(res.data.res==1){
-                                    this.$message.success('添加成功')
-                                    this.dialogVisible = false
-                                }
-                            })
-                        }
-                    }
-                })
-
-            },
-            formClose(){
-                this.$refs.ruleForm.resetFields()
-                this.getTableList()
-                this.ruleForm={
-                    areaName:'',
-                    provinceItem:[]
-                }
-            },
-            //获取table数据、
-            getTableList(){
-                axios({
-                    url:`${jypath}/properties/queryByPage`,
-                    method: 'get',
-                    params:{
-                        pageNum:this.page.pageNum,
-                        pageSize:this.page.pageSize,
-                        orgCode:this.orgCode
-                    },
-                }).then(res=>{
-                    if(res.data.res==1){
-                        // console.log(res.data.obj.results)
-                        this.tableData=res.data.obj.results
-                        if(res.data.obj.totalRecord!=0&&this.tableData.length==0){
-                            this.page.pageNum--
-                            this.getTableList()
-                        }
-                        this.page.total = res.data.obj.totalRecord;
-                    }
-                })
-            },
-            //获取公司数据、
-            getCompanyList(){
-                axios({
-                    url:`${jypath}/backstage/org/role/findAll`,
-                    method: 'get',
-                }).then(res=>{
-                    if(res.data.res==1){
-                        // console.log(res.data.obj.results)
-                        this.optionsOrg=res.data.obj
-                        if(this.roleFlag!=1){
-                            this.orgCode=this.optionsOrg[0].orgCode
-                        }
-                        this.getTableList()
-
-                    }
-                })
-            },
-            //获取用户数据
-            getDet(){
-                axios({
-                    url:`${jypath}/backstage/account/getUserIdentity`,
-                    method: 'get',
-                }).then(res=>{
-                    if(res.data.res==1){
-                        console.log(res.data.obj)
-                        this.roleFlag=res.data.obj
-                    }
-                })
-            },
-            //获取省份
-            getArea(id){
-                axios({
-                    url:`${jypath}/properties/list`,
-                    method: 'get',
-                    params: {
-                        parentId:0,
-                        parentIds:id,
-                        orgCode:this.orgCode
-                    }
-                }).then(res=>{
-                    if(res.data.res==1){
-                        // console.log(res.data.obj)
-                        this.options=res.data.obj
-                    }
-                })
-            },
-            handleSizeChange(val) {
-                console.log("每页条" + val);
-                this.page.pageSize = val;
-                this.getTableList()
-
-            },
-            handleCurrentChange(val) {
-                console.log("当前页" + val);
-                this.page.pageNum = val;
-                this.getTableList()
-            }
-
+    addClick() {
+      this.dialogVisible = true;
+      this.editFlag = false;
+      this.getArea();
+    },
+    edit(row) {
+      // console.log(row,'编辑')
+      this.getArea(row.provinceItem);
+      this.editFlag = true;
+      this.ruleForm = row;
+      this.ruleForm.provinceItem = this.ruleForm.provinceItem.split(",");
+      // this.ruleForm.provinceItem.map(item=>item/1)
+      console.log(this.ruleForm);
+      this.dialogVisible = true;
+    },
+    del(row) {
+      console.log(row, "删除");
+      this.$confirm(`是否删除区域?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        distinguishCancelAndClose: true,
+        type: "warning",
+      }).then(() => {
+        axios({
+          url: `/autoSR/areamanager/${row.id}`,
+          method: "delete",
+          // params: {
+          //   id: row.id,
+          // },
+        }).then((res) => {
+          if (res.code == 0) {
+            this.$message.success("删除成功");
+            this.getTableList();
+          } else {
+            this.$message.warning(res.resMsg);
+          }
+        });
+      });
+    },
+    add() {
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          // console.log(this.ruleForm)
+          if (this.editFlag) {
+            axios({
+              url: `/autoSR/areamanager`,
+              method: "put",
+              data: {
+                areaName: this.ruleForm.areaName,
+                provinceItem: this.ruleForm.provinceItem.join(","),
+                id: this.ruleForm.id,
+                orgCode: this.orgCode,
+              },
+            }).then((res) => {
+              if (res.code == 0) {
+                this.$message.success("编辑成功");
+                this.dialogVisible = false;
+              }
+            });
+          } else {
+            axios({
+              url: `/autoSR/areamanager`,
+              method: "post",
+              data: {
+                areaName: this.ruleForm.areaName,
+                provinceItem: this.ruleForm.provinceItem.join(","),
+                orgCode: this.orgCode,
+              },
+            }).then((res) => {
+              if (res.code == 0) {
+                this.$message.success("添加成功");
+                this.dialogVisible = false;
+              }
+            });
+          }
+        }
+      });
+    },
+    formClose() {
+      this.$refs.ruleForm.resetFields();
+      this.getTableList();
+      this.ruleForm = {
+        areaName: "",
+        provinceItem: [],
+      };
+    },
+    //获取table数据、
+    getTableList() {
+      axios({
+        url: `/autoSR/areamanager/list`,
+        method: "get",
+        params: {
+          current: this.page.pageNum,
+          size: this.page.pageSize,
+          orgCode: this.orgCode,
+        },
+      }).then((res) => {
+        if (res.code == 0) {
+          console.log(res)
+          this.tableData = res.data.records;
+          if (res.data.total != 0 && this.tableData.length == 0) {
+            this.page.pageNum--;
+            this.getTableList();
+          }
+          this.page.total = res.data.total;
         }
+      });
+    },
+    //获取公司数据、
+    getCompanyList() {
+      axios({
+        url: `/autoSR/zkorg/findMyOrg`,
+        method: "get",
+        params: {
+          orgType: 0,
+        },
+      }).then((res) => {
+        if (res.code == 0) {
+          // console.log(res)
+          this.optionsOrg = res.data;
+          if (this.orgType == 0) {
+            this.orgCode = this.optionsOrg[0].orgCode;
+            console.log(this.orgCode,'123')
+          }
+          if(this.orgType==2){
+            this.orgCode=localStorage.getItem('orgCode')
+          }
+          this.getTableList();
+        }
+      });
+    },
+    //获取省份
+    getArea(id) {
+      axios({
+        url: `autoSR/areamanager/findMyProvince`,
+        method: "get",
+        params: {
+          parentId: 0,
+          parentIds: id,
+          orgCode: this.orgCode,
+        },
+      }).then((res) => {
+        if (res.code == 0) {
+          // console.log(res.obj)
+          this.options = res.data;
+        }
+      });
+    },
+    handleSizeChange(val) {
+      console.log("每页条" + val);
+      this.page.pageSize = val;
+      this.getTableList();
+    },
+    handleCurrentChange(val) {
+      console.log("当前页" + val);
+      this.page.pageNum = val;
+      this.getTableList();
+    },
+  },
 };
 </script>
 
@@ -295,44 +307,44 @@ export default {
   padding: 15px;
   min-width: 1200px;
   padding-bottom: 100px;
-  .center-er{
+  .center-er {
     width: 100%;
     height: 80vh;
     background: #ffffff;
     border-radius: 4px;
 
-        .app-titel {
-            width: 100%;
-            background: #FFFFFF;
-            border-radius: 8px;
-            display: flex;
-            justify-content: space-between;
-            padding: 0 10px;
-              padding-top: 15px;
-        }
-        .app-titel-name{
-            text-align: center;
-            line-height: 40px;
-            display: flex;
-        }
-        .app-titel-btn{
-            height: 30px;
-            margin-top: 5px;
-            line-height: 6px;
-        }
-        .app-box{
-            margin-top: 20px;
-        }
-        .block {
-            width: 100%;
-            margin-top: 26px;
-            /*display: flex;*/
-            text-align: center;
-        }
+    .app-titel {
+      width: 100%;
+      background: #ffffff;
+      border-radius: 8px;
+      display: flex;
+      justify-content: space-between;
+      padding: 0 10px;
+      padding-top: 15px;
+    }
+    .app-titel-name {
+      text-align: center;
+      line-height: 40px;
+      display: flex;
+    }
+    .app-titel-btn {
+      height: 30px;
+      margin-top: 5px;
+      line-height: 6px;
+    }
+    .app-box {
+      margin-top: 20px;
+    }
+    .block {
+      width: 100%;
+      margin-top: 26px;
+      /*display: flex;*/
+      text-align: center;
+    }
 
-        .blockbox {
-            margin-left: auto;
-        }
+    .blockbox {
+      margin-left: auto;
+    }
   }
 }
 </style>
diff --git a/src/views/building/index.vue b/src/views/building/index.vue
index 279a0ea..ed55aaf 100644
--- a/src/views/building/index.vue
+++ b/src/views/building/index.vue
@@ -3,21 +3,51 @@
     <!-- 头 -->
     <div class="app-top">
       <div class="app-titel" style="margin-top: 10px">
-        <div class="label">服务到期：</div>
-        <div class="toptimeqhuan">
-          <div :class="{ tophove: TimetoAhoose == 0 }" @click="tabtimetap(0)">
-            7天内
-          </div>
-          <div :class="{ tophove: TimetoAhoose == 1 }" @click="tabtimetap(1)">
-            15天内
-          </div>
-          <div :class="{ tophove: TimetoAhoose == 2 }" @click="tabtimetap(2)">
-            30天内
+        <div v-if="orgType != 0" class="div-lab">
+          <div class="label">服务到期：</div>
+          <div class="toptimeqhuan">
+            <div
+              :class="{ tophove: searchForm.residueTime == 7 }"
+              @click="tabtimetap(7)"
+            >
+              7天内
+            </div>
+            <div
+              :class="{ tophove: searchForm.residueTime == 15 }"
+              @click="tabtimetap(15)"
+            >
+              15天内
+            </div>
+            <div
+              :class="{ tophove: searchForm.residueTime == 30 }"
+              @click="tabtimetap(30)"
+            >
+              30天内
+            </div>
           </div>
         </div>
-        <div class="label">使用状态：</div>
-        <div>
-          <el-select v-model="value" placeholder="请选择">
+        <div v-if="orgType == 0" class="div-lab">
+          <div class="label">合同结束日期：</div>
+          <el-date-picker
+            v-model="starTime"
+            class="div-inp"
+            @change="timeChange1"
+            type="daterange"
+            range-separator="-"
+            :default-time="['00:00:00', '23:59:59']"
+            value-format="yyyy-MM-dd"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          >
+          </el-date-picker>
+        </div>
+        <div v-if="orgType == 0" class="div-lab">
+          <div class="label">楼盘类型：</div>
+          <el-select
+            v-model="searchForm.houseType"
+            placeholder="请选择"
+            class="div-inp"
+          >
             <el-option
               v-for="item in options"
               :key="item.value"
@@ -27,281 +57,738 @@
             </el-option>
           </el-select>
         </div>
-      </div>
-      <div class="app-titel" style="margin-top: 10px">
-        <div class="label">楼盘名称：</div>
-        <div>
-          <el-input v-model="input" placeholder="请输入内容"></el-input>
+        <div class="div-lab">
+          <div class="label">使用状态：</div>
+          <el-select
+            v-model="searchForm.serviceStatus"
+            placeholder="请选择"
+            class="div-inp"
+          >
+            <el-option
+              v-for="item in options1"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </div>
+        <div v-if="orgType == 0" class="div-lab">
+          <div class="label">运营人员：</div>
+          <el-input
+            v-model="searchForm.operationalPeople"
+            class="div-inp"
+            placeholder="请输入内容"
+          ></el-input>
+        </div>
+        <div v-if="orgType == 0" class="div-lab">
+          <div class="label">代理商名称：</div>
+
+          <el-input
+            class="div-inp"
+            v-model="searchForm.agentName"
+            placeholder="请输入内容"
+          ></el-input>
+        </div>
+
+        <div v-if="orgType != 2" class="div-lab">
+          <div class="label">公司名称：</div>
+          <el-input
+            class="div-inp"
+            v-model="searchForm.corporateName"
+            placeholder="请输入内容"
+          ></el-input>
+        </div>
+
+        <div class="div-lab">
+          <div class="label">楼盘名称：</div>
+          <el-input
+            class="div-inp"
+            v-model="searchForm.propertyName"
+            placeholder="请输入内容"
+          ></el-input>
         </div>
       </div>
+      <!-- <div class="app-titel" style="margin-top: 10px">
+
+      </div> -->
       <div class="app-titel" style="margin-top: 10px">
         <div class="label" style="color: #ffffff">筛选相关：</div>
         <div>
-          <el-button style="background: #2671e2; color: #ffffff"
+          <el-button
+            @click="zkhousePage"
+            style="background: #2671e2; color: #ffffff"
             >筛选</el-button
           >
         </div>
         <div style="margin-left: 20px">
-          <el-button>清空筛选条件</el-button>
+          <el-button @click="empty">清空筛选条件</el-button>
+        </div>
+        <div style="margin-left: auto; margin-right: 20px" v-if="orgType != 2">
+          <el-button
+            style="background: #2671e2; color: #ffffff"
+            @click="addHouse"
+            >新增</el-button
+          >
         </div>
       </div>
     </div>
 
     <!-- 表格 -->
     <div class="cen-tab">
-        <el-table
-          :data="tableData"
-          stripe
-          height="400"
-          style="width: 100%">
-
-          <el-table-column
-            prop="date"
-            label="楼盘名称"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="name"
-            label="楼盘地址"
-             align="center"
-           >
-          </el-table-column>
-          <el-table-column
-            prop="address"
-            label="联系人信息"
-             align="center">
-          </el-table-column>
-
-          <el-table-column
-            prop="date"
-            label="管理员账号"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="name"
-            label="添加日期"
-             align="center"
-           >
-          </el-table-column>
-          <el-table-column
-            prop="address"
-            label="合同开始日期"
-             align="center">
-          </el-table-column>
+      <el-table
+        :data="tableData"
+        stripe
+        height="400"
+        style="width: 100%"
+        border
+      >
+        <el-table-column prop="propertyName" label="楼盘名称" align="center">
+        </el-table-column>
+        <el-table-column
+          prop="agentName"
+          label="代理商"
+          align="center"
+          v-if="orgType == 0"
+        >
+          <template slot-scope="{ row }">
+            {{ row.agentName || "-" }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="corporateName"
+          label="公司"
+          align="center"
+          v-if="orgType != 2"
+        >
+        </el-table-column>
+        <el-table-column prop="address" label="楼盘地址" align="center">
+        </el-table-column>
+        <el-table-column prop="address" label="联系人信息" align="center">
+          <template slot-scope="{ row }">
+            {{ row.linkman || "-" }}-{{ row.linkmanPhone || "-" }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="managerPhone" label="管理员账号" align="center">
+          <template slot-scope="{ row }">
+            {{ row.managerPhone || "-" }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="添加日期" align="center">
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="楼盘类型"
+          align="center"
+          v-if="orgType != 2"
+        >
+          <template slot-scope="{ row }">
+            {{
+              row.houseType == 0 ? "正式" : row.houseType == 1 ? "试用" : "演示"
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="startWorking"
+          label="合同开始日期"
+          align="center"
+        >
+        </el-table-column>
 
-          <el-table-column
-            prop="date"
-            label="合同结束日期"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="name"
-            label="剩余天数"
-             align="center"
-           >
-          </el-table-column>
-          <el-table-column
-            prop="address"
-            label="服务状态"
-             align="center">
-          </el-table-column>
-           <!--  scope -->
-         <el-table-column label="操作" align="center">
-            <template slot-scope="">
-              <div style="color: #2671E2;" @click="toinfoadd()">添加员工</div>
-              <div style="color: #2671E2;" @click="toinfoeditor()">编辑</div>
-              <div style="color: #2671E2;" @click="toinifodelete()">删除</div>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div style="display: flex;justify-content:flex-end;margin-top: 10px;">
-            <el-pagination
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-              :current-page="currentPage4"
-              :page-sizes="[100, 200, 300, 400]"
-              :page-size="100"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="400">
-            </el-pagination>
-        </div>
+        <el-table-column prop="endWorking" label="合同结束日期" align="center">
+        </el-table-column>
+        <el-table-column prop="residueTime" label="剩余天数" align="center">
+        </el-table-column>
+        <el-table-column prop="address" label="服务状态" align="center">
+          <template slot-scope="{ row }">
+            {{ row.serviceStatus == 0 ? "在服务期内" : "已过期" }}
+          </template>
+        </el-table-column>
+        <!--  scope -->
+        <el-table-column label="操作" align="center" fixed="right" width="200">
+          <template slot-scope="{ row }">
+            <el-button type="text" @click="edit(row)">编辑</el-button>
+            <el-button type="text" v-if="orgType != 2" @click="changeAccount(row)">更换账号</el-button>
+            <el-button type="text" v-if="orgType==2">添加员工</el-button>
+            <!-- <el-button type="text">添加员工</el-button> -->
+            <el-button type="text" @click="del(row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div style="display: flex; justify-content: flex-end; margin-top: 10px">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="10"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+        >
+        </el-pagination>
+      </div>
     </div>
 
-
-    <el-dialog title="编辑楼盘" :visible.sync="dialogVisible" >
-      <el-form :model="ruleForm" label-position="labelPosition"  ref="ruleForm" label-width="100px" style="width:60%; margin: 0 auto;">
-          <el-form-item label="楼盘名称：" prop="areaName">
-              <el-input v-model="ruleForm.areaName"></el-input>
-          </el-form-item>
-          <el-form-item label="联系人：" prop="areaName">
-              <el-input v-model="ruleForm.areaName"></el-input>
-          </el-form-item>
-          <el-form-item label="联系手机：" prop="areaName">
-              <el-input v-model="ruleForm.areaName"></el-input>
-          </el-form-item>
-          <el-form-item label="楼盘地址：" prop="areaName">
-              <el-input v-model="ruleForm.areaName"></el-input>
-          </el-form-item>
-          <el-form-item label="详细信息：" prop="areaName">
-              <el-input v-model="ruleForm.areaName"></el-input>
-          </el-form-item>
+    <el-dialog
+      :title="editFlag ? '编辑楼盘' : '新增楼盘'"
+      :visible.sync="dialogVisible"
+      @close="dialogClose"
+    >
+      <el-form
+        :model="ruleForm"
+        label-position="labelPosition"
+        ref="ruleForm"
+        label-width="150px"
+        style="width: 60%"
+        :rules="rules"
+      >
+        <el-form-item label="公司" prop="orgCode" v-if="orgType != 2">
+          <el-select v-model="ruleForm.orgCode" placeholder="请选择公司">
+            <el-option
+              v-for="item in orgList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.orgCode"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="楼盘类型" prop="houseType" v-if="orgType != 2">
+          <el-radio-group v-model="ruleForm.houseType">
+            <el-radio :label="0">正式</el-radio>
+            <el-radio :label="1">试用</el-radio>
+            <el-radio :label="2">演示</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="楼盘名称" prop="propertyName">
+          <el-input v-model="ruleForm.propertyName"></el-input>
+        </el-form-item>
+        <el-form-item
+          label="合同起止日期"
+          prop="startWorking"
+          v-if="orgType != 2"
+        >
+          <el-date-picker
+            v-model="time"
+            @change="timeChange"
+            type="daterange"
+            range-separator="-"
+            :default-time="['00:00:00', '23:59:59']"
+            value-format="yyyy-MM-dd"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="联系人" prop="linkman">
+          <el-input v-model="ruleForm.linkman"></el-input>
+        </el-form-item>
+        <el-form-item label="联系手机" prop="linkmanPhone">
+          <el-input
+            v-model="ruleForm.linkmanPhone"
+            type="tel"
+            maxlength="11"
+            onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)));"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="楼盘地区" prop="provinceId">
+          <el-cascader
+            :props="props"
+            @change="locationsChange"
+            :options="addressOptions"
+            placeholder="省/市"
+            size="small"
+            separator="/"
+            v-model="ruleForm.area"
+            clearable
+          ></el-cascader>
+        </el-form-item>
+        <el-form-item label="详细地址" prop="address">
+          <el-input v-model="ruleForm.address"></el-input>
+        </el-form-item>
+        <el-form-item label="运营人员" prop="operationalPeople" v-if="orgType == 0">
+          <el-select v-model="ruleForm.operationalPeople" placeholder="请选择运营人员">
+            <el-option
+              v-for="item in operationList"
+              :key="item.accountId"
+              :label="item.name"
+              :value="item.accountId"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="管理员账号" prop="managerPhone" v-if="!editFlag">
+          <el-input v-model="ruleForm.managerPhone"></el-input>
+        </el-form-item>
+        <el-form-item
+          label="管理员密码"
+          prop="managerPassword"
+          v-if="!editFlag"
+        >
+          <el-input
+            v-model="ruleForm.managerPassword"
+            type="passsword"
+            show-password
+          ></el-input>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-          <el-button @click="dialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="editor">保存</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="addSure">{{
+          editFlag ? "编辑" : "保存"
+        }}</el-button>
       </div>
-  </el-dialog>
-
-  <el-dialog title="新增用户" :visible.sync="dialogVisible2" >
-      <el-form :model="ruleForm" label-position="labelPosition"  ref="ruleForm" label-width="100px" style="width:60%; margin: 0 auto;">
-          <el-form-item label="用户名：" prop="areaName">
-              <el-input v-model="ruleForm.areaName"></el-input>
-          </el-form-item>
-          <el-form-item label="性别：" prop="areaName">
-              <el-radio-group v-model="ruleForm.resource">
-                <el-radio label="男"></el-radio>
-                <el-radio label="女"></el-radio>
-              </el-radio-group>
-          </el-form-item>
-          <el-form-item label="登录手机：" prop="areaName">
-              <el-input v-model="ruleForm.areaName"></el-input>
-          </el-form-item>
-          <el-form-item label="登录密码：" prop="areaName">
-              <el-input v-model="ruleForm.areaName"></el-input>
-          </el-form-item>
-          <el-form-item label="角色：" prop="areaName">
-              <el-select v-model="ruleForm.region" placeholder="请选择角色">
-                    <el-option label="区域一" value="shanghai"></el-option>
-                    <el-option label="区域二" value="beijing"></el-option>
-                  </el-select>
-          </el-form-item>
-           <el-form-item label="部门：" prop="areaName">
-              <el-select v-model="ruleForm.region" placeholder="请选择部门">
-                    <el-option label="区域一" value="shanghai"></el-option>
-                    <el-option label="区域二" value="beijing"></el-option>
-                  </el-select>
-          </el-form-item>
+    </el-dialog>
+        <el-dialog title="更换账号" :visible.sync="changeFlag" @close='$refs.accountForm.resetFields()' width="400px">
+    <el-form :model="accountForm" label-width="100px" ref="accountForm" :rules="accountRules">
+        <el-form-item label="管理员账号:" prop="managerPhone">
+          <el-input  style="width:200px"  maxlength="11" v-model.number="accountForm.managerPhone"  onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)));" ></el-input>
+        </el-form-item>
+        <el-form-item label="管理员密码:" prop="managerPassword">
+          <el-input  style="width:200px"  show-password  v-model.number="accountForm.managerPassword" ></el-input>
+        </el-form-item>
+    </el-form>
+    <div style="display:flex; justify-content: space-around;" >
+      <el-button @click="changeFlag = false">取 消</el-button>
+      <el-button type="primary" @click="changeSure">确 定</el-button>
+    </div>
+</el-dialog>
+    <!-- <el-dialog title="新增用户" :visible.sync="dialogVisible1">
+      <el-form
+        :model="ruleForm1"
+        label-position="labelPosition"
+        ref="ruleForm1"
+        label-width="100px"
+        style="width: 60%; margin: 0 auto"
+      >
+        <el-form-item label="用户名：" prop="areaName">
+          <el-input v-model="ruleForm1.areaName"></el-input>
+        </el-form-item>
+        <el-form-item label="性别：" prop="areaName">
+          <el-radio-group v-model="ruleForm1.resource">
+            <el-radio label="男"></el-radio>
+            <el-radio label="女"></el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="登录手机：" prop="areaName">
+          <el-input v-model="ruleForm1.areaName"></el-input>
+        </el-form-item>
+        <el-form-item label="登录密码：" prop="areaName">
+          <el-input v-model="ruleForm1.areaName"></el-input>
+        </el-form-item>
+        <el-form-item label="角色：" prop="areaName">
+          <el-select v-model="ruleForm1.region" placeholder="请选择角色">
+            <el-option label="区域一" value="shanghai"></el-option>
+            <el-option label="区域二" value="beijing"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="部门：" prop="areaName">
+          <el-select v-model="ruleForm1.region" placeholder="请选择部门">
+            <el-option label="区域一" value="shanghai"></el-option>
+            <el-option label="区域二" value="beijing"></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-          <el-button @click="dialogVisible2 = false">取 消</el-button>
-          <el-button type="primary" @click="add">保存</el-button>
+        <el-button @click="dialogVisible2 = false">取 消</el-button>
+        <el-button type="primary">保存</el-button>
       </div>
-  </el-dialog>
+    </el-dialog> -->
   </div>
 </template>
 
 <script>
+import { getAreaList } from "@/api/modules/api";
 export default {
   data() {
+    var validatePass = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("请输入手机号"));
+      } else {
+        if (value) {
+          if (!/^1[3456789]\d{9}$/.test(value)) {
+            // alert("手机号码不合法，请重新输入");
+            callback(new Error("手机号码不合法，请重新输入"));
+          }
+        }
+        callback();
+      }
+    };
     return {
-      TimetoAhoose: 2,
-      options: [
-        {
-          value: "1",
-          label: "全部",
+      props: {
+        lazy: true,
+        async lazyLoad(node, resolve) {
+          const { level } = node;
+          // if (level == 0) {
+          //   console.log(23);
+          //   const { data } = await getAreaList({ parentId: 0 }); //获取省接口
+          //   var nodes = data.map((item) => {
+          //     return {
+          //       value: item.id,
+          //       label: item.name,
+          //       leaf: false,
+          //     };
+          //   });
+          //   resolve(nodes);
+          // } else
+          if (level == 1) {
+            const { data } = await getAreaList({ parentId: node.data.value }); //获取市接口
+            var nodes = data.map((item) => {
+              return {
+                value: item.id,
+                label: item.name,
+                leaf: true,
+              };
+            });
+            resolve(nodes);
+          }
         },
+      },
+      editFlag: false,
+      changeFlag:false,
+      starTime: [],
+      searchForm: {
+        corporateName: "",
+        propertyName: "",
+        serviceStatus: "",
+        houseType: "",
+        residueTime: 7,
+        startWorking: "",
+        endWorking: "",
+        agentName: "",
+        operationalPeople: "",
+      },
+      options1: [
         {
-          value: "2",
+          value: "0",
           label: "服务器内",
         },
         {
-          value: "3",
+          value: "1",
           label: "已失效",
         },
       ],
-      currentPage4:4,
-      value: "",
-      input: "",
-      tableData: [
-        {
-          date: "2016-05-03",
-          name: "王小虎",
-          address: " 1518 弄",
-        },
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          address: " 1518 弄",
-        },
-        {
-          date: "2016-05-04",
-          name: "王小虎",
-          address: " 1518 弄",
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          address: " 1518 弄",
-        },
+      options: [
         {
-          date: "2016-05-08",
-          name: "王小虎",
-          address: " 1518 弄",
+          value: "0",
+          label: "正式",
         },
         {
-          date: "2016-05-06",
-          name: "王小虎",
-          address: " 1518 弄",
+          value: "1",
+          label: "试用",
         },
         {
-          date: "2016-05-07",
-          name: "王小虎",
-          address: " 1518 弄",
+          value: "2",
+          label: "演示",
         },
       ],
-      dialogVisible:false,
-      dialogVisible2:false,
-      ruleForm:{
-            areaName:'',
-            provinceItem:[],
+      currentPage: 1,
+      size: "",
+      total: 10,
+      value: "",
+      input: "",
+      tableData: [],
+      orgType: "",
+      orgList: [],
+      operationList: [],
+      dialogVisible: false,
+      dialogVisible1: false,
+      time: [],
+      addressOptions: [],
+      accountForm:{
+        managerPassword:"",
+        managerPhone:'',
+      },
+      accountRules:{
+        managerPhone: [
+          { validator: validatePass, trigger: "change" },
+        ],
+      },
+      ruleForm: {
+        orgCode: "", //公司标识
+        houseType: 0, //楼盘类型
+        propertyName: "", //楼盘名称
+        startWorking: "", //活动开始时间
+        endWorking: "", //活动结束时间
+        linkman: "", //联系人
+        linkmanPhone: "", //联系手机
+        area: [], //楼盘地区
+        address: "", //详细地址
+        operationalPeople: "", //运营人员
+        managerPhone: "", //管理员账号
+        managerPassword: "", //密码
+        provinceId: "", //省id
+        cityId: "", //市id
+      },
+      ruleForm1:{},
+      rules: {
+        orgCode: [{ required: true, message: "请选择公司", trigger: "blur" }],
+        propertyName: [
+          { required: true, message: "请填写楼盘名称", trigger: "change" },
+        ],
+        startWorking: [
+          { required: true, message: "请选择时间", trigger: "change" },
+        ],
+        managerPhone: [
+          { validator: validatePass, trigger: "blur" },
+        ],
+        linkmanPhone: [{ validator: validatePass, trigger: "blur" }],
       },
     };
   },
-  mounted() {},
+  mounted() {
+    this.orgType = localStorage.getItem("orgType");
+    // 获取公司列表数据
+    this.getOrgList();
+    // 获取运营人员
+    this.getAllOperationsStaff();
+    // 获取列表数据
+    this.zkhousePage();
+    // 获取地区选择数据,在这里对回显的时候进行操作，首先先获取一级省的数据
+    this.getProvinceList();
+  },
   methods: {
-    //删除
-    toinifodelete(){
-        this.$confirm('此操作将永久删除, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$message({
-            type: 'success',
-            message: '删除成功!'
+    // 添加楼盘
+    addSure() {
+      // console.log(this.addressOptions)
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          console.log(this.ruleForm);
+          // 编辑
+          if (this.editFlag) {
+            console.log("编辑");
+              this.$api.api.editZkhouse(this.ruleForm).then((res) => {
+              console.log(res);
+              if (res.code == 0) {
+                this.dialogVisible = false;
+                this.$message.success("编辑成功");
+                this.zkhousePage();
+              }
+            });
+          } else {
+            // 添加
+            console.log("添加");
+            this.$api.api.addZkhouse(this.ruleForm).then((res) => {
+              console.log(res);
+              if (res.code == 0) {
+                this.dialogVisible = false;
+                this.$message.success("新增楼盘成功");
+                this.zkhousePage();
+              }
+            });
+          }
+        }
+      });
+    },
+    dialogClose() {
+      this.restFrom();
+    },
+    restFrom() {
+      this.time = [];
+      this.ruleForm={
+        orgCode: "", //公司标识
+        houseType: 0, //楼盘类型
+        propertyName: "", //楼盘名称
+        startWorking: "", //活动开始时间
+        endWorking: "", //活动结束时间
+        linkman: "", //联系人
+        linkmanPhone: "", //联系手机
+        area: [], //楼盘地区
+        address: "", //详细地址
+        operationalPeople: "", //运营人员
+        managerPhone: "", //管理员账号
+        managerPassword: "", //密码
+        provinceId: "", //省id
+        cityId: "", //市id
+      }
+    },
+    // 新增楼盘,弹框显示
+    addHouse() {
+      this.editFlag = false;
+      this.dialogVisible = true;
+    },
+    edit(row) {
+      console.log(row);
+      this.time = [
+        row.startWorking.substring(0, 10),
+        row.endWorking.substring(0, 10),
+      ];
+      // console.log(this.time)
+      this.ruleForm = Object.assign({},row)
+      // 级联选择器回显问题
+      this.loadOptions();
+      this.editFlag = true;
+    },
+    // 更换账号
+    changeAccount(row){
+      this.changeFlag=true
+      this.accountForm.id=row.id
+    },
+    changeSure(){
+      this.$refs.accountForm.validate((valid) => {
+        if(valid){
+          this.$api.api.updateManagerPhone(this.accountForm)
+          .then(res=>{
+              if (res.code == 0) {
+                this.changeFlag = false;
+                this.$message.success("编辑成功");
+                this.zkhousePage();
+              }
+          })
+        }
+      })
+
+    },
+      del(row) {
+      console.log(row, "删除");
+      this.$confirm(`是否删除区域?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        distinguishCancelAndClose: true,
+        type: "warning",
+      }).then(() => {
+        axios({
+          url: `/autoSR/zkhouse/${row.id}`,
+          method: "delete",
+          // params: {
+          //   id: row.id,
+          // },
+        }).then((res) => {
+          if (res.code == 0) {
+            this.$message.success("删除成功");
+            this.zkhousePage();
+          } else {
+            this.$message.warning(res.resMsg);
+          }
+        });
+      });
+    },
+    // 时间改变
+    timeChange(e) {
+      console.log(e);
+      this.ruleForm.startWorking = e[0];
+      this.ruleForm.endWorking = e[1];
+    },
+    // 获取公司列表
+    getOrgList() {
+      this.$api.api
+        .getCompanyList({
+          orgType: this.orgType,
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            this.orgList = res.data;
+          }
+        });
+    },
+    // 获取运营人员地址
+    getAllOperationsStaff() {
+      this.$api.api.getAllOperationsStaff().then((res) => {
+        console.log(res);
+        if (res.code == 0) {
+          this.operationList = res.data;
+        }
+      });
+    },
+    // 获取楼盘列表
+    zkhousePage() {
+      let obj = {
+        current: this.currentPage,
+        size: this.size,
+        ...this.searchForm,
+      };
+      if (this.orgType == 0) {
+        obj.residueTime = "";
+      }
+      this.$api.api.zkhousePage(obj).then((res) => {
+        // console.log(res)
+        this.tableData = res.data.records;
+        this.total = res.data.total;
+      });
+    },
+    getProvinceList(parentId = 0) {
+      let _this = this;
+      getAreaList({ parentId }).then((res) => {
+        console.log(res);
+        // 当他没有值时给addressOptions赋值，这是第一个数组
+        if (res.code == 0) {
+          // _this.$set(_this, 'addressOptions',_this.ruleForm.cityIds&&_this.ruleForm.provinceId ? this.loadOptions(res.data||[] ):res.data)
+          let arr = [];
+          res.data.map((item) => {
+            let obj = {};
+            obj.value = item.id;
+            obj.label = item.name;
+            obj.leaf = false;
+            obj.children=[]
+            arr.push(obj);
           });
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
+          this.addressOptions = arr;
+        }
+      });
+    },
+    loadOptions() {
+      console.log(this.addressOptions);
+      this.addressOptions.map((item,idx) => {
+        if (item.value == this.ruleForm.provinceId) {
+          getAreaList({ parentId: this.ruleForm.provinceId }).then((res) => {
+            if (res.code == 0) {
+              let arr = [];
+              res.data.map((item1) => {
+                let obj = {};
+                obj.value = item1.id;
+                obj.label = item1.name;
+                obj.leaf = true;
+                arr.push(obj);
+              });
+              this.$set(this.addressOptions[idx],'children',arr)
+              this.area = [this.ruleForm.provinceId, this.ruleForm.cityId];
+              // console.log(this.addressOptions[idx]);
+
+              this.addressOptions=Object.assign([],this.addressOptions)
+              this.$forceUpdate()
+              this.dialogVisible = true;
+            }
           });
-        });
+        }
+      });
     },
-    //添加
-    toinfoadd(){
-       this.dialogVisible2=true;
+    empty() {
+      this.starTime = [];
+      this.searchForm = {
+        corporateName: "",
+        propertyName: "",
+        serviceStatus: "",
+        houseType: "",
+        residueTime: 7,
+        startWorking: "",
+        endWorking: "",
+        agentName: "",
+        operationalPeople: "",
+      };
     },
-    //确认添加
-    add(){
-       this.dialogVisible2=false;
+    timeChange1(e) {
+      this.searchForm.startWorking = e[0];
+      this.searchForm.endWorking = e[1];
     },
-    //编辑
-    toinfoeditor(){
-      this.dialogVisible=true;
+    tabtimetap(idx) {
+      this.tabtimetap = idx;
     },
-    //确认编辑
-    editor(){
-      this.dialogVisible=false;
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.size = val;
+      this.zkhousePage();
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.currentPage = val;
+      this.zkhousePage();
+    },
+    locationsChange(e) {
+      console.log(e);
+      if (!e) return;
+      this.ruleForm.provinceId = e[0];
+      this.ruleForm.cityId = e[1];
     },
-     handleSizeChange(val) {
-        console.log(`每页 ${val} 条`);
-      },
-      handleCurrentChange(val) {
-        console.log(`当前页: ${val}`);
-      }
   },
 };
 </script>
@@ -313,10 +800,10 @@ export default {
   min-width: 1200px;
   padding-bottom: 100px;
 }
-.cen-tab{
+.cen-tab {
   width: 100%;
   padding: 15px;
-  background: #FFFFFF;
+  background: #ffffff;
   margin-top: 15px;
 }
 .tophove {
@@ -334,12 +821,14 @@ export default {
     width: 100%;
     display: flex;
     align-items: center;
+    flex-wrap: wrap;
     .label {
       font-size: 14px;
       font-weight: 400;
       color: #32363d;
-      line-height: 14px;
+      line-height: 32px;
       margin-left: 15px;
+      min-width: 100px;
     }
     .toptimeqhuan {
       height: 30px;
@@ -359,4 +848,11 @@ export default {
     }
   }
 }
+.div-lab {
+  display: flex;
+  margin: 5px;
+}
+.div-inp {
+  width: 250px;
+}
 </style>
diff --git a/vue.config.js b/vue.config.js
index 21d84b8..7724654 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,9 +3,9 @@
  * https://cli.vuejs.org/zh/config/
  */
 // const url = 'http://pigx-gateway'
-// const url = 'http://39.97.167.65:9999' //测试
-// const url = 'http://192.168.31.161:9999' //长龙
-const url = 'http://192.168.31.128:9999' //嘉豪
+const url = 'http://39.97.167.65:9999' //测试
+// const url = 'http://192.168.31.160:9999' //长龙/
+// const url = 'http://192.168.31.128:9999' //嘉豪
 
 const CompressionWebpackPlugin = require('compression-webpack-plugin')
 const productionGzipExtensions = ['js', 'css']