diff --git a/src/views/Equipment/equipmentOnlineRecordList.vue b/src/views/Equipment/equipmentOnlineRecordList.vue
index b6accff..2af6402 100644
--- a/src/views/Equipment/equipmentOnlineRecordList.vue
+++ b/src/views/Equipment/equipmentOnlineRecordList.vue
@@ -423,7 +423,8 @@ export default {
         method: "get",
         params:{
           orgType:this.orgType,
-          agentId:localStorage.getItem("agentId")
+          agentId:localStorage.getItem("agentId"),
+          orgCode:localStorage.getItem("orgCode"),
         }
       }).then((res) => {
         // console.log(res.data.obj)
diff --git a/src/views/building/index.vue b/src/views/building/index.vue
index b38761d..803d1c5 100644
--- a/src/views/building/index.vue
+++ b/src/views/building/index.vue
@@ -43,12 +43,27 @@
         </div> -->
 
         <div class="div-lab">
-          <div class="label">合同结束日期：</div>
+          <!-- <div class="label">合同结束日期：</div> -->
+          <div class="label" style="min-width: 80px">
+            <el-select
+              v-model="searchForm.timeType"
+              placeholder="请选择"
+              style="width: 100px"
+            >
+              <el-option
+                v-for="item in timeTypeList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </div>
           <el-date-picker
             v-model="starTime"
             class="div-inp"
             @change="timeChange1"
-            style="width:250px;"
+            style="width: 250px"
             type="daterange"
             range-separator="-"
             :default-time="['00:00:00', '23:59:59']"
@@ -95,7 +110,7 @@
             </el-option>
           </el-select>
         </div>
-          <div class="div-lab">
+        <div class="div-lab">
           <div class="label">地区：</div>
           <el-select
             v-model="searchForm.provinceId"
@@ -162,21 +177,14 @@
       </div> -->
       <div class="app-titel" style="margin-top: 10px">
         <div class="label" style="color: #ffffff">筛选相关：</div>
-        <div style="margin-left: 5px;">
-          <el-button
-            @click="screen"
-            type="primary"
-            >筛选</el-button
-          >
+        <div style="margin-left: 5px">
+          <el-button @click="screen" type="primary">筛选</el-button>
         </div>
         <div style="margin-left: 20px">
           <el-button @click="empty">清空筛选条件</el-button>
         </div>
         <div style="margin-left: auto; margin-right: 20px" v-if="orgType != 2">
-          <el-button
-            v-if="cus_build_index_add"
-            type="primary"
-            @click="addHouse"
+          <el-button v-if="cus_build_index_add" type="primary" @click="addHouse"
             >新增</el-button
           >
         </div>
@@ -185,13 +193,19 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :data="tableData" stripe style="width: 100%" >
-
-        <el-table-column prop="propertyName" :show-overflow-tooltip="true"  width="120px" label="楼盘名称" align="center">
+      <el-table :data="tableData" stripe style="width: 100%">
+        <el-table-column
+          prop="propertyName"
+          :show-overflow-tooltip="true"
+          width="120px"
+          label="楼盘名称"
+          align="center"
+        >
         </el-table-column>
 
         <el-table-column
-        :show-overflow-tooltip="true"  width="120px"
+          :show-overflow-tooltip="true"
+          width="120px"
           prop="agentName"
           label="代理商"
           align="center"
@@ -203,7 +217,8 @@
         </el-table-column>
 
         <el-table-column
-        :show-overflow-tooltip="true"  width="120px"
+          :show-overflow-tooltip="true"
+          width="120px"
           prop="corporateName"
           label="公司"
           align="center"
@@ -211,15 +226,26 @@
         >
         </el-table-column>
 
-        <el-table-column :show-overflow-tooltip="true"  width="120px" prop="address" label="楼盘地址" align="center">
+        <el-table-column
+          :show-overflow-tooltip="true"
+          width="120px"
+          prop="address"
+          label="楼盘地址"
+          align="center"
+        >
         </el-table-column>
 
-        <el-table-column width="110px" prop='linkman' label="联系人信息" align="center">
-           <template slot-scope="{ row }">
-            {{ row.linkman +'-' +row.linkmanPhone || "-" }}
+        <el-table-column
+          width="110px"
+          prop="linkman"
+          label="联系人信息"
+          align="center"
+        >
+          <template slot-scope="{ row }">
+            {{ row.linkman + "-" + row.linkmanPhone || "-" }}
           </template>
         </el-table-column>
-          <!-- <el-table-column prop='linkmanPhone' label="联系人手机号" align="center">
+        <!-- <el-table-column prop='linkmanPhone' label="联系人手机号" align="center">
         </el-table-column> -->
 
         <el-table-column prop="managerPhone" label="管理员账号" align="center">
@@ -228,12 +254,21 @@
           </template>
         </el-table-column>
 
-
-
-        <el-table-column prop="houseType" label="楼盘类型" align="center" v-if="orgType != 2">
+        <el-table-column
+          prop="houseType"
+          label="楼盘类型"
+          align="center"
+          v-if="orgType != 2"
+        >
           <template slot-scope="{ row }">
             {{
-              row.houseType == 0 ? "正式" : row.houseType == 1 ? "试用" :row.houseType == 2? "演示":'测试'
+              row.houseType == 0
+                ? "正式"
+                : row.houseType == 1
+                ? "试用"
+                : row.houseType == 2
+                ? "演示"
+                : "测试"
             }}
           </template>
         </el-table-column>
@@ -241,50 +276,91 @@
         <el-table-column
           prop="startWorking"
           label="合同开始日期"
-          align="center" >
+          align="center"
+        >
         </el-table-column>
 
         <el-table-column prop="endWorking" label="合同结束日期" align="center">
         </el-table-column>
 
-
-  <el-table-column label="添加日期" align="center">
-          <template  slot-scope="{ row }">
-            {{row.createTime.substring(0,10)}}
+        <el-table-column label="添加日期" align="center">
+          <template slot-scope="{ row }">
+            {{ row.createTime.substring(0, 10) }}
           </template>
         </el-table-column>
 
         <el-table-column prop="residueTime" label="服务状态" align="center">
           <template slot-scope="scope">
-               <div v-if="scope.row.residueTime >0">服务中({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div>
-              <div v-if="scope.row.residueTime <=0">过期({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div>
+            <div v-if="scope.row.residueTime > 0">
+              服务中({{
+                scope.row.residueTime * 1 >= 0
+                  ? scope.row.residueTime
+                  : scope.row.residueTime * -1
+              }})
+            </div>
+            <div v-if="scope.row.residueTime <= 0">
+              过期({{
+                scope.row.residueTime * 1 >= 0
+                  ? scope.row.residueTime
+                  : scope.row.residueTime * -1
+              }})
+            </div>
           </template>
         </el-table-column>
 
-          <el-table-column prop="lockFlag" label="状态" align="center">
+        <el-table-column prop="lockFlag" label="状态" align="center">
           <template slot-scope="{ row }">
-            {{row.lockFlag==1?'禁用':'启用'}}
+            {{ row.lockFlag == 1 ? "禁用" : "启用" }}
           </template>
         </el-table-column>
 
         <el-table-column label="操作" align="center" fixed="right" width="200">
           <template slot-scope="{ row }">
-            <el-button type="text" v-if="cus_build_index_edit" @click="edit(row)">编辑</el-button>
             <el-button
               type="text"
-              v-if="orgType != 2&&cus_build_index_change"
+              v-if="cus_build_index_edit"
+              @click="edit(row)"
+              >编辑</el-button
+            >
+            <el-button
+              type="text"
+              v-if="orgType != 2 && cus_build_index_change"
               @click="changeAccount(row)"
               >更换账号</el-button
             >
-            <el-button type="text" size="small" v-if="cus_build_index_sys"  @click="editOpera(row,0)">系统运营</el-button>
-            <el-button  type="text" size="small" v-if="cus_build_index_agent" @click="editOpera(row,1)">售后运营</el-button>
-            <el-button  type="text" size="small" v-if="cus_build_index_bindAgent" @click="bindAgent(row)">绑定代理商</el-button>
-            <el-button type="text" v-if="cus_build_index_del" @click="del(row)">删除</el-button>
-            <el-button  type="text" v-if="cus_build_index_open" size="small"  @click="toDisable(row)">{{row.lockFlag==0?'禁用':'启用'}}</el-button>
+            <el-button
+              type="text"
+              size="small"
+              v-if="cus_build_index_sys"
+              @click="editOpera(row, 0)"
+              >系统运营</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              v-if="cus_build_index_agent"
+              @click="editOpera(row, 1)"
+              >售后运营</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              v-if="cus_build_index_bindAgent"
+              @click="bindAgent(row)"
+              >绑定代理商</el-button
+            >
+            <el-button type="text" v-if="cus_build_index_del" @click="del(row)"
+              >删除</el-button
+            >
+            <el-button
+              type="text"
+              v-if="cus_build_index_open"
+              size="small"
+              @click="toDisable(row)"
+              >{{ row.lockFlag == 0 ? "禁用" : "启用" }}</el-button
+            >
           </template>
         </el-table-column>
-
-
       </el-table>
       <div style="display: flex; justify-content: flex-end; margin-top: 10px">
         <el-pagination
@@ -312,10 +388,14 @@
         label-width="150px"
         style="width: 60%"
         :rules="rules"
-
       >
         <el-form-item label="公司" prop="orgCode" v-if="orgType != 2">
-          <el-select :disabled="editFlag==true"  v-model="ruleForm.orgCode" filterable  placeholder="请选择公司">
+          <el-select
+            :disabled="editFlag == true"
+            v-model="ruleForm.orgCode"
+            filterable
+            placeholder="请选择公司"
+          >
             <el-option
               v-for="item in orgList"
               :key="item.id"
@@ -326,7 +406,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="楼盘类型" prop="houseType" v-if="orgType != 2">
-          <el-radio-group v-model="ruleForm.houseType" style="width:400px;">
+          <el-radio-group v-model="ruleForm.houseType" style="width: 400px">
             <el-radio :label="0">正式</el-radio>
             <el-radio :label="1">试用</el-radio>
             <el-radio :label="2">演示</el-radio>
@@ -334,7 +414,11 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="楼盘名称" prop="propertyName">
-          <el-input v-model="ruleForm.propertyName" maxlength="30" clearable></el-input>
+          <el-input
+            v-model="ruleForm.propertyName"
+            maxlength="30"
+            clearable
+          ></el-input>
         </el-form-item>
         <el-form-item
           label="合同起止日期"
@@ -354,7 +438,11 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="联系人" prop="linkman">
-          <el-input v-model="ruleForm.linkman" maxlength="20" clearable></el-input>
+          <el-input
+            v-model="ruleForm.linkman"
+            maxlength="20"
+            clearable
+          ></el-input>
         </el-form-item>
         <el-form-item label="联系手机" prop="linkmanPhone">
           <el-input
@@ -377,10 +465,20 @@
           ></el-cascader>
         </el-form-item>
         <el-form-item label="详细地址" prop="address">
-          <el-input v-model="ruleForm.address"  type="textarea" maxlength="60"  show-word-limit></el-input>
+          <el-input
+            v-model="ruleForm.address"
+            type="textarea"
+            maxlength="60"
+            show-word-limit
+          ></el-input>
         </el-form-item>
         <el-form-item label="管理员账号" prop="managerPhone" v-if="!editFlag">
-          <el-input auto-complete="new-password"  maxlength="11" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)));" v-model="ruleForm.managerPhone"></el-input>
+          <el-input
+            auto-complete="new-password"
+            maxlength="11"
+            onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)));"
+            v-model="ruleForm.managerPhone"
+          ></el-input>
         </el-form-item>
         <el-form-item
           label="管理员密码"
@@ -388,12 +486,12 @@
           v-if="!editFlag"
         >
           <el-input
-          auto-complete="new-password"
+            auto-complete="new-password"
             v-model="ruleForm.managerPassword"
             maxlength="18"
             type="passsword"
             show-password
-            :disabled='passFlag'
+            :disabled="passFlag"
           ></el-input>
         </el-form-item>
       </el-form>
@@ -403,7 +501,7 @@
           <!-- {{
           editFlag ? "编辑" : "保存"
         }} -->
-        保存
+          保存
         </el-button>
       </div>
     </el-dialog>
@@ -431,7 +529,7 @@
         <el-form-item label="管理员密码:" prop="managerPassword">
           <el-input
             style="width: 200px"
-            :disabled='passFlag'
+            :disabled="passFlag"
             show-password
             v-model="accountForm.managerPassword"
           ></el-input>
@@ -443,8 +541,10 @@
       </div>
     </el-dialog>
 
-
-    <el-dialog  :title="sysFlag==0?'绑定系统运营':'绑定售后运营'" :visible.sync="operaVisible">
+    <el-dialog
+      :title="sysFlag == 0 ? '绑定系统运营' : '绑定售后运营'"
+      :visible.sync="operaVisible"
+    >
       <el-form
         :model="operaForm"
         label-position="labelPosition"
@@ -534,56 +634,58 @@ export default {
         callback(new Error("请输入管理员账号"));
       } else {
         if (value) {
-          this.passFlag=false
+          this.passFlag = false;
           if (!/^1[3456789]\d{9}$/.test(value)) {
             // alert("手机号码不合法，请重新输入");
             callback(new Error("手机号格式错误，请重新输入"));
-          }else{
-          // 验证电话号码
-          this.$api.api.verPhone(value).then((res) => {
-            // console.log(res);
-            // 判断数据是否已经有了
-            if (res.data) {
-              // 由用户
-              this.$api.api.userVerify({
-                houseId:this.accountForm.id,
-                orgType:3,
-                accountId:res.data.sysUser.accountId,
-                username:res.data.sysUser.username,
-                agentId:localStorage.getItem('agentId'),
-                orgCode:localStorage.getItem('orgCode'),
-              })
-              .then(res1=>{
-                this.resetFlag=true
-                this.passFlag=true
-                if(this.changeFlag){
-                  this.accountForm.managerPassword=res.data.sysUser.resultPwd
-                }else{
-                  this.ruleForm.managerPassword=res.data.sysUser.resultPwd
+          } else {
+            // 验证电话号码
+            this.$api.api.verPhone(value).then((res) => {
+              // console.log(res);
+              // 判断数据是否已经有了
+              if (res.data) {
+                // 由用户
+                this.$api.api
+                  .userVerify({
+                    houseId: this.accountForm.id,
+                    orgType: 3,
+                    accountId: res.data.sysUser.accountId,
+                    username: res.data.sysUser.username,
+                    agentId: localStorage.getItem("agentId"),
+                    orgCode: localStorage.getItem("orgCode"),
+                  })
+                  .then((res1) => {
+                    this.resetFlag = true;
+                    this.passFlag = true;
+                    if (this.changeFlag) {
+                      this.accountForm.managerPassword =
+                        res.data.sysUser.resultPwd;
+                    } else {
+                      this.ruleForm.managerPassword =
+                        res.data.sysUser.resultPwd;
+                    }
+                    callback();
+                  })
+                  .catch((err) => {
+                    console.log(err);
+                    //
+                    this.resetFlag = false;
+                    callback(new Error(err));
+                  });
+              } else {
+                // 没有用户
+                // console.log("没有用户");
+                // callback(new Error("没有管理员账号"));
+                if (this.changeFlag) {
+                  this.accountForm.managerPassword = "";
+                } else {
+                  this.ruleForm.managerPassword = "";
                 }
+                this.resetFlag = true;
+                this.passFlag = false;
                 callback();
-              })
-              .catch(err=>{
-                console.log(err)
-                //
-                this.resetFlag=false
-                callback(new Error(err));
-              })
-            } else {
-              // 没有用户
-              // console.log("没有用户");
-              // callback(new Error("没有管理员账号"));
-                if(this.changeFlag){
-                  this.accountForm.managerPassword=''
-                }else{
-                  this.ruleForm.managerPassword=''
-                }
-              this.resetFlag=true
-              this.passFlag=false
-              callback();
-
-            }
-          });
+              }
+            });
           }
         }
         callback();
@@ -622,22 +724,23 @@ export default {
       editFlag: false,
       changeFlag: false,
       operaVisible: false,
-      resetFlag:false,
-      passFlag:false,
+      resetFlag: false,
+      passFlag: false,
       starTime: [],
       searchForm: {
         corporateName: "",
         propertyName: "",
-        provinceId:'',
+        provinceId: "",
         serviceStatus: "",
         houseType: "",
+        timeType:'0',
         // residueTime: 7,
         startWorking: "",
         endWorking: "",
         agentName: "",
         operationalPeople: "",
       },
-      areaList:[],
+      areaList: [],
       options1: [
         {
           value: "0",
@@ -666,13 +769,23 @@ export default {
           label: "测试",
         },
       ],
+      timeTypeList: [
+        {
+          value: "0",
+          label: "添加时间",
+        },
+        {
+          value: "1",
+          label: "合同结束日期",
+        },
+      ],
       currentPage: 1,
       size: 10,
       total: 10,
       value: "",
       input: "",
-      sysFlag:'0',
-      idx:'0',
+      sysFlag: "0",
+      idx: "0",
       tableData: [],
       optionsoperationalPeople: [],
       orgType: "",
@@ -680,7 +793,7 @@ export default {
       operationList: [],
       dialogVisible: false,
       dialogVisible1: false,
-      agentVisible:false,
+      agentVisible: false,
       time: [],
       addressOptions: [],
       accountForm: {
@@ -690,10 +803,16 @@ export default {
       accountRules: {
         managerPhone: [
           { required: true, message: "请填写账号", trigger: "blur" },
-          { validator: validatePass1, trigger: "blur" }],
+          { validator: validatePass1, trigger: "blur" },
+        ],
         managerPassword: [
           { required: true, message: "请填写密码", trigger: "blur" },
-          { min: 6, max: 18, message: '请输入6~18位，数字或字母组合的密码', trigger: 'blur' }
+          {
+            min: 6,
+            max: 18,
+            message: "请输入6~18位，数字或字母组合的密码",
+            trigger: "blur",
+          },
         ],
       },
       ruleForm: {
@@ -711,10 +830,10 @@ export default {
         managerPassword: "", //密码
         provinceId: "", //省id
         cityId: "", //市id
-        agentId:localStorage.getItem('agentId')
+        agentId: localStorage.getItem("agentId"),
       },
       ruleForm1: {},
-      optionsagentId:[],
+      optionsagentId: [],
       rules: {
         orgCode: [{ required: true, message: "请选择公司", trigger: "blur" }],
         propertyName: [
@@ -722,19 +841,24 @@ export default {
         ],
         managerPassword: [
           { required: true, message: "请填写密码", trigger: "blur" },
-          { min: 6, max: 18, message: '请输入6~18位，数字或字母组合的密码', trigger: 'blur' }
+          {
+            min: 6,
+            max: 18,
+            message: "请输入6~18位，数字或字母组合的密码",
+            trigger: "blur",
+          },
         ],
         startWorking: [
           { required: true, message: "请选择时间", trigger: "change" },
         ],
         managerPhone: [
-            { required: true, message: "请填写账号", trigger: "change" },
-            { validator: validatePass1, trigger: "blur" }
-          ],
+          { required: true, message: "请填写账号", trigger: "change" },
+          { validator: validatePass1, trigger: "blur" },
+        ],
         linkmanPhone: [{ validator: validatePass, trigger: "blur" }],
-        provinceId:[
-           { required: false, message: "请选择省市", trigger: "change" },
-        ]
+        provinceId: [
+          { required: false, message: "请选择省市", trigger: "change" },
+        ],
       },
       operaForm: {
         operationalPeople: "",
@@ -748,11 +872,11 @@ export default {
         agentId: [{ required: true, message: "请选择代理商", trigger: "blur" }],
       },
       agentForm: {
-        agentId:'',
+        agentId: "",
       },
     };
   },
-    computed: {
+  computed: {
     ...mapGetters(["permissions"]),
   },
   created() {
@@ -761,36 +885,35 @@ export default {
     this.cus_build_index_change = this.permissions["cus_build_index_change"];
     this.cus_build_index_sys = this.permissions["cus_build_index_sys"];
     this.cus_build_index_agent = this.permissions["cus_build_index_agent"];
-    this.cus_build_index_bindAgent = this.permissions["cus_build_index_bindAgent"];
+    this.cus_build_index_bindAgent =
+      this.permissions["cus_build_index_bindAgent"];
     this.cus_build_index_del = this.permissions["cus_build_index_del"];
     this.cus_build_index_open = this.permissions["cus_build_index_open"];
   },
   mounted() {
-      if(this.$route.query.serviceStatus){
-        this.starTime=this.$route.query.residueTime;
-        this.searchForm.startWorking=this.starTime[0];
-        this.searchForm.endWorking=this.starTime[1];
-        this.searchForm.serviceStatus=this.$route.query.serviceStatus;
-        this.searchForm.houseType='0'
-      }
+    if (this.$route.query.serviceStatus) {
+      this.starTime = this.$route.query.residueTime;
+      this.searchForm.startWorking = this.starTime[0];
+      this.searchForm.endWorking = this.starTime[1];
+      this.searchForm.serviceStatus = this.$route.query.serviceStatus;
+      this.searchForm.houseType = "0";
+    }
     this.orgType = localStorage.getItem("orgType");
     // 获取公司列表数据
     this.getOrgList();
     // 获取运营人员
     // this.getAllOperationsStaff();
     // 获取地区列表
-    this.getCityList()
+    this.getCityList();
     // 获取列表数据
     this.zkhousePage();
-
   },
   methods: {
-    getCityList(){
-      this.$api.api.getAreaList({parentId:0})
-      .then(res=>{
+    getCityList() {
+      this.$api.api.getAreaList({ parentId: 0 }).then((res) => {
         // console.log(res,'地区列表');
-        this.areaList=res.data
-      })
+        this.areaList = res.data;
+      });
     },
     bindAgent(row) {
       // console.log(row);
@@ -820,7 +943,7 @@ export default {
         this.optionsagentId = res.data;
         this.agentForm.orgCode = row.orgCode;
         this.agentForm.houseId = row.id;
-        this.agentForm.agentId=row.agentId
+        this.agentForm.agentId = row.agentId;
       });
     },
     saveOpera() {
@@ -833,7 +956,7 @@ export default {
               accountIds: this.operaForm.operationalPeople.join(","),
               orgId: this.operaForm.orgId,
               orgCode: this.operaForm.orgCode,
-              operationType:this.idx==0?'1':'2'
+              operationType: this.idx == 0 ? "1" : "2",
             })
             .then((res) => {
               console.log(res);
@@ -844,23 +967,23 @@ export default {
         }
       });
     },
-    editOpera(row,idx) {
+    editOpera(row, idx) {
       // console.log(row,idx);
       // 获取运营人员列表
       this.operaForm.orgId = row.id;
       this.operaForm.orgCode = row.orgCode;
-      this.sysFlag=idx
-      this.idx=idx
-      this.AllOperationsStaff(idx,row);
-      this.zkoperationrecordFindByOrg(row.id,idx,row.agentId);
+      this.sysFlag = idx;
+      this.idx = idx;
+      this.AllOperationsStaff(idx, row);
+      this.zkoperationrecordFindByOrg(row.id, idx, row.agentId);
     },
-    zkoperationrecordFindByOrg(orgId,idx,agentId) {
+    zkoperationrecordFindByOrg(orgId, idx, agentId) {
       this.$api.api
         .zkoperationrecordFindByOrg({
-          orgType:3,
+          orgType: 3,
           orgId,
           agentId,
-          operationType:this.idx==0?'1':'2'
+          operationType: this.idx == 0 ? "1" : "2",
         })
         .then((res) => {
           // console.log(res);
@@ -878,30 +1001,32 @@ export default {
         });
     },
     //获取运营人员
-    AllOperationsStaff(idx,row) {
+    AllOperationsStaff(idx, row) {
       console.log(idx);
       this.optionsoperationalPeople = [];
-      if(idx==1){
-        this.$api.http.getAllOperationsStaffByAgent({
-              agentId:row.agentId
-            }).then((res) => {
-              this.optionsoperationalPeople= res.data
-              this.operaVisible = true;
-            });
-      }else{
-        this.$api.http.getAllOperationsStaff().then((res) => {
-            this.optionsoperationalPeople= res.data
+      if (idx == 1) {
+        this.$api.http
+          .getAllOperationsStaffByAgent({
+            agentId: row.agentId,
+          })
+          .then((res) => {
+            this.optionsoperationalPeople = res.data;
             this.operaVisible = true;
           });
+      } else {
+        this.$api.http.getAllOperationsStaff().then((res) => {
+          this.optionsoperationalPeople = res.data;
+          this.operaVisible = true;
+        });
       }
 
       // this.$api.api.getAllOperationsStaffByAgent({agentId}).then((res) => {
       //   this.optionsoperationalPeople = res.data;
       // });
     },
-    screen(){
-      this.currentPage=1
-      this.zkhousePage()
+    screen() {
+      this.currentPage = 1;
+      this.zkhousePage();
     },
     addSurequxiao() {
       this.dialogVisible = false;
@@ -910,8 +1035,8 @@ export default {
     addSure() {
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
-          if(!this.resetFlag){
-              return
+          if (!this.resetFlag) {
+            return;
           }
           // 编辑
           if (this.editFlag) {
@@ -937,30 +1062,41 @@ export default {
         }
       });
     },
-    toDisable(row){
-      this.$confirm(`确定${row.lockFlag==0?'禁用'+'-'+row.propertyName+'-':'启用'+'-'+row.propertyName+'-'}楼盘吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
+    toDisable(row) {
+      this.$confirm(
+        `确定${
+          row.lockFlag == 0
+            ? "禁用" + "-" + row.propertyName + "-"
+            : "启用" + "-" + row.propertyName + "-"
+        }楼盘吗？`,
+        "提示",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(() => {
           // return
           // console.log(123);
-            this.$api.api.editZkhouse({id:row.id,lockFlag:row.lockFlag==0?1:0}).then((res) => {
-                 if(res.code==0){
-                     this.$message({
-                      type: 'success',
-                      message: '操作成功!'
-                    });
-                    this.zkhousePage();
-                 }else{
-                    this.$message.error(res.message);
-                 }
-            })
+          this.$api.api
+            .editZkhouse({ id: row.id, lockFlag: row.lockFlag == 0 ? 1 : 0 })
+            .then((res) => {
+              if (res.code == 0) {
+                this.$message({
+                  type: "success",
+                  message: "操作成功!",
+                });
+                this.zkhousePage();
+              } else {
+                this.$message.error(res.message);
+              }
+            });
         })
-        .catch(err=>{
+        .catch((err) => {
           // console.log('关闭');
           // console.log(err);
-        })
+        });
     },
     dialogClose() {
       this.restFrom();
@@ -989,11 +1125,11 @@ export default {
     addHouse() {
       this.editFlag = false;
       this.dialogVisible = true;
-      this.passFlag=false
+      this.passFlag = false;
     },
     edit(row) {
       console.log(row);
-      this.resetFlag=true
+      this.resetFlag = true;
       this.time = [
         row.startWorking.substring(0, 10),
         row.endWorking.substring(0, 10),
@@ -1011,14 +1147,14 @@ export default {
     // 更换账号
     changeAccount(row) {
       this.changeFlag = true;
-      this.passFlag=false
+      this.passFlag = false;
       this.accountForm.id = row.id;
     },
     changeSure() {
-        if(!this.resetFlag){
-            this.$message.error('平台用户与楼盘用户不能重复添加！')
-            return
-        }
+      if (!this.resetFlag) {
+        this.$message.error("平台用户与楼盘用户不能重复添加！");
+        return;
+      }
       this.$refs.accountForm.validate((valid) => {
         if (valid) {
           this.$api.api.updateManagerPhone(this.accountForm).then((res) => {
@@ -1066,7 +1202,7 @@ export default {
       this.$api.api
         .getCompanyList({
           orgType: this.orgType,
-          agentId:localStorage.getItem('agentId')
+          agentId: localStorage.getItem("agentId"),
         })
         .then((res) => {
           if (res.code == 0) {
@@ -1164,24 +1300,25 @@ export default {
         corporateName: "",
         propertyName: "",
         serviceStatus: "",
-        provinceId:'',
+        provinceId: "",
         houseType: "",
+        timeType:'0',
         // residueTime: 7,
         startWorking: "",
         endWorking: "",
         agentName: "",
         operationalPeople: "",
       };
-      this.currentPage=1
-      this.zkhousePage()
+      this.currentPage = 1;
+      this.zkhousePage();
     },
     timeChange1(e) {
-      if(e){
-            this.searchForm.startWorking = e[0];
-            this.searchForm.endWorking = e[1];
-      }else{
-         this.searchForm.startWorking = '';
-         this.searchForm.endWorking = '';
+      if (e) {
+        this.searchForm.startWorking = e[0];
+        this.searchForm.endWorking = e[1];
+      } else {
+        this.searchForm.startWorking = "";
+        this.searchForm.endWorking = "";
       }
     },
     tabtimetap(idx) {
@@ -1266,7 +1403,6 @@ export default {
 .div-lab {
   display: flex;
   margin: 5px;
-
 }
 .div-inp {
   width: 250px;