init

src/api/modules/api.js

@@ -580,9 +580,90 @@ export function equipmentZxOnDelete(query) {
   })
 }
 // 设备状态监控列表
-export function equipmentZxOnFindByPage(data) {
+export function equipmentZxOnFindByPage(query) {
   return request({
     url: 'autoSR/zk/equipment/findByPage',
+    method:'get',
+    params:query
+  })
+}
+
+//楼盘获取顾问列表
+export function getUserByHouseId(query) {
+  return request({
+    url: '/admin/user/getUserByHouseId',
+    method:'get',
+    params:query
+  })
+}
+//设备领用
+export function equipmentReceiving(data) {
+  return request({
+    url: 'autoSR/zk/equipment/receiving',
+    method:'post',
+    data
+  })
+}
+//设备指示灯
+export function batchOperateIndicator(data) {
+  return request({
+    url: 'autoSR/zk/equipment/batchOperateIndicator',
+    method:'post',
+    data
+  })
+}
+//状态检测绑定
+export function zkequipmentBind(data) {
+  return request({
+    url: 'autoSR/zk/equipment/bind',
+    method:'post',
+    data
+  })
+}
+//状态检测绑定
+export function zkequipmentUnbind(data) {
+  return request({
+    url: 'autoSR/zk/equipment/unbind',
+    method:'post',
+    data
+  })
+}
+//状态检测批量归还
+export function zkequipmentEquipmentBack(data) {
+  return request({
+    url: 'autoSR/zk/equipment/equipmentBack',
+    method:'post',
+    data
+  })
+}
+//批量绑定批次号
+export function zkequipmentBindBatchId(data) {
+  return request({
+    url: 'autoSR/zk/equipment/bindBatchId',
+    method:'post',
+    data
+  })
+}
+// WiFi管理
+export function wifiFindById(query) {
+  return request({
+    url: '/autoSR/equipment/wifi/findById',
+    method:'get',
+    params:query
+  })
+}
+//Wifi修改
+export function wifiUpdate(data) {
+  return request({
+    url: '/autoSR/equipment/wifi/update',
+    method:'post',
+    data
+  })
+}
+//Wifi添加
+export function wifiInsert(data) {
+  return request({
+    url: '/autoSR/equipment/wifi/insert',
     method:'post',
     data
   })

src/views/Equipment/index.vue

@@ -174,20 +174,28 @@
       </div>
       <div class="app-titel" style="margin-top: 15px">
         <!-- <div class="label" style="color: #ffffff">筛选相关：</div> -->
-        <div style="margin-left: 20px">
+        <!-- <div style="margin-left: 20px">
           <el-button
             @click="Batchreturn()"
             type="primary"
             :disabled="multipleSelection.length == 0"
             >批量归还</el-button
           >
-        </div>
+        </div> -->
         <div style="margin-left: 20px">
           <el-button
             @click="infoMasstransfer()"
             type="primary"
             :disabled="multipleSelection.length == 0"
-            >批量转移</el-button
+            >批量绑定</el-button
+          >
+        </div>
+        <div style="margin-left: 20px">
+          <el-button
+            @click="zkequipmentUnbind()"
+            type="primary"
+            :disabled="multipleSelection.length == 0"
+            >批量解绑</el-button
           >
         </div>
         <div style="margin-left: 20px">
@@ -544,15 +552,21 @@
       title="批量绑定批次号"
       width="40%"
       :visible.sync="dialogVisible4"
+      @close="resetBatch"
     >
       <el-form
-        :model="ruleForm"
+        :model="batchForm"
         label-position="labelPosition"
-        ref="ruleForm"
+        ref="batchForm"
         label-width="140px"
+        :rules="batchRules"
       >
         <el-form-item label="批次号" prop="batchId">
-          <el-select v-model="value" style="width: 80%" placeholder="请选择">
+          <el-select
+            v-model="batchForm.batchId"
+            style="width: 80%"
+            placeholder="请选择"
+          >
             <el-option
               v-for="item in batchList"
               :key="item.id"
@@ -767,6 +781,10 @@ export default {
       dialogVisible4: false,
       dialogVisible5: false,
       receiveVisible: false,
+      batchForm: {
+        batchId: "",
+        imeis: "",
+      },
       ruleForm: {
         areaName: "",
         provinceItem: [],
@@ -792,6 +810,9 @@ export default {
         houseId: [{ required: true, message: "请选择楼盘", trigger: "blur" }],
         batchId: { required: true, message: "请选择顾问", trigger: "blur" },
       },
+      batchRules: {
+        batchId: { required: true, message: "请选择批次号", trigger: "blur" },
+      },
       addRules: {
         imei: [{ required: true, message: "请填写设备号", trigger: "blur" }],
         batchId: { required: true, message: "请选择批次号", trigger: "blur" },
@@ -872,6 +893,7 @@ export default {
       }
     },
     reset() {
+      this.changeValue = "";
       this.searchForm = {
         name: "",
         imei: "", //设备号
@@ -889,6 +911,7 @@ export default {
         uploadStatus: "", //上传状态
         offStatus: "", //关机状态
       };
+      this.equipmentManagement();
     },
     resetImei() {
       this.addForm = {
@@ -937,14 +960,69 @@ export default {
     infoBulkbinding() {
       this.dialogVisible4 = true;
     },
+    resetBatch() {
+      this.batchForm = {
+        batchId: "",
+        imeis: "",
+      };
+    },
     //批量绑定确认
     Bulkbinding() {
+      this.$refs.batchForm.validate((valid) => {
+        if (valid) {
+          let arr = [];
+          this.multipleSelection.map((item) => arr.push(item.imei));
+          let obj = {
+            batchId: this.batchForm.batchId,
+            imeis: arr.join(","),
+          };
+          this.$api.api.zkequipmentBindBatchId(obj).then((res) => {
+            console.log(res);
+            this.$message.success("绑定成功");
+            this.equipmentManagement();
+            this.dialogVisible5 = false;
+          });
+        }
+      });
       this.dialogVisible4 = false;
     },
     //批量转移
     infoMasstransfer() {
       this.dialogVisible5 = true;
     },
+    zkequipmentUnbind() {
+      this.$confirm("确认批量解绑吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let str = [];
+          this.multipleSelection.map((item) => {
+            if (item.receiveType != 2) {
+              str.push(item.imei);
+            }
+          });
+          console.log(str);
+          this.$api.api
+            .zkequipmentUnbind({
+              imeis: str.join(","),
+            })
+            .then((res) => {
+              this.$message({
+                type: "success",
+                message: "操作成功!",
+              });
+              this.getTableList();
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消操作",
+          });
+        });
+    },
     //批量转移确认
     Masstransfer() {
       this.$refs.allbindForm.validate((valid) => {
@@ -974,7 +1052,7 @@ export default {
     },
     //批量归还
     Batchreturn() {
-      this.$confirm("确认批量归还吗?", "提示", {
+      this.$confirm("确认批量解绑吗?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -993,7 +1071,7 @@ export default {
             .then((res) => {
               this.$message({
                 type: "success",
-                message: "批量归还成功!",
+                message: "操作成功!",
               });
               this.equipmentManagement();
             });
@@ -1001,7 +1079,7 @@ export default {
         .catch(() => {
           this.$message({
             type: "info",
-            message: "已取消批量归还",
+            message: "已取消操作",
           });
         });
     },

src/views/Equipment/state.vue

@@ -90,7 +90,7 @@
             class="div-inp"
             clearable
             collapse-tags
-            v-model="searchForm.online"
+            v-model="searchForm.onLine"
             placeholder="请选择"
           >
             <el-option
@@ -110,7 +110,7 @@
             multiple
             clearable
             collapse-tags
-            v-model="searchForm.audioStatus"
+            v-model="searchForm.simAudioStatus"
             placeholder="请选择"
           >
             <el-option
@@ -185,29 +185,67 @@
       <div class="app-titel" style="margin-top: 15px">
         <!-- <div class="label" style="color: #ffffff">筛选相关：</div> -->
         <div style="margin-left: 20px">
-          <el-button style="background: #2671e2; color: #ffffff"
+          <el-button style="background: #2671e2; color: #ffffff" @click="screen"
             >筛选</el-button
           >
         </div>
         <div style="margin-left: 20px">
-          <el-button>清空筛选条件</el-button>
+          <el-button @click="reset">清空筛选条件</el-button>
         </div>
         <div style="margin-left: 20px">
-          <el-button>批量开启指示灯</el-button>
+          <el-button
+            @click="openAllLight()"
+            type="primary"
+            :disabled="multipleSelection.length == 0"
+            >批量开启指示灯</el-button
+          >
+        </div>
+        <div style="margin-left: 20px">
+          <el-button
+            @click="closeAllLight()"
+            type="primary"
+            :disabled="multipleSelection.length == 0"
+            >批量关闭指示灯</el-button
+          >
         </div>
         <div style="margin-left: 20px">
-          <el-button>批量关闭指示灯</el-button>
+          <el-button
+            @click="Batchreturn()"
+            type="primary"
+            :disabled="multipleSelection.length == 0"
+            >批量归还</el-button
+          >
+        </div>
+        <div style="margin-left: 20px">
+          <el-button
+            @click="infoMasstransfer()"
+            type="primary"
+            :disabled="multipleSelection.length == 0"
+            >批量转移</el-button
+          >
+        </div>
+        <div style="margin-left: 20px">
+          <el-button
+            @click="zkequipmentUnbind()"
+            type="primary"
+            :disabled="multipleSelection.length == 0"
+            >批量解绑</el-button
+          >
         </div>
       </div>
     </div>
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <div class="tongji">在线数量：0 离线数量：279</div>
+      <div class="tongji">
+        在线设备：{{ onLineCount || 0 }} 正在工作设备：{{
+          workingCount || 0
+        }}
+        离线设备：{{ offLineCount || 0 }}
+      </div>
       <el-table
         :data="tableData"
         stripe
-        height="400"
         @selection-change="handleSelectionChange"
         style="width: 100%"
       >
@@ -221,48 +259,84 @@
         <el-table-column prop="userName" label="领用人" align="center">
         </el-table-column>
         <el-table-column prop="onLine" label="在线状态" align="center">
-          <template slot-scope="{row}">
-            {{row.onLine==1?'在线':'离线'}}
+          <template slot-scope="{ row }">
+            {{ row.onLine == 1 ? "在线" : "离线" }}
           </template>
         </el-table-column>
         <el-table-column prop="date" label="离线天数" align="center">
         </el-table-column>
         <el-table-column prop="simAudioStatus" label="录音状态" align="center">
-                    <template slot-scope="{row}">
-            {{row.simAudioStatus?'开启':'关闭'}}
+          <template slot-scope="{ row }">
+            {{ row.simAudioStatus ? "开启" : "关闭" }}
           </template>
         </el-table-column>
-        <el-table-column prop="simAudioUploadStatus" label="上传状态" align="center">
-                              <template slot-scope="{row}">
-            {{row.simAudioUploadStatus?'上传中':'无上传'}}
+        <el-table-column
+          prop="simAudioUploadStatus"
+          label="上传状态"
+          align="center"
+        >
+          <template slot-scope="{ row }">
+            {{ row.simAudioUploadStatus ? "上传中" : "无上传" }}
           </template>
         </el-table-column>
         <el-table-column prop="lightStatus" label="开机指示灯" align="center">
-                                        <template slot-scope="{row}">
-            {{row.lightStatus=='on'?'开启':'关闭'}}
+          <template slot-scope="{ row }">
+            {{ row.lightStatus == "on" ? "开启" : "关闭" }}
           </template>
         </el-table-column>
 
-        <el-table-column prop="name" label="电池电量" width="200" align="center">
+        <el-table-column
+          prop="name"
+          label="电池电量"
+          width="200"
+          align="center"
+        >
           <template slot-scope="{ row }">
-            <el-progress :percentage="80" :color="customColors"></el-progress>
+            <el-progress
+              :percentage="row.electricity / 1"
+              :color="customColors"
+            ></el-progress>
           </template>
         </el-table-column>
         <el-table-column prop="signalDevice" label="信号强度" align="center">
         </el-table-column>
         <el-table-column prop="name" label="待上传文件" align="center">
         </el-table-column>
-        <el-table-column width="150" prop="updateTime" label="更新时间" align="center">
+        <el-table-column
+          width="150"
+          prop="updateTime"
+          label="更新时间"
+          align="center"
+        >
         </el-table-column>
-        <el-table-column prop="name" label="开机时间" align="center">
+        <el-table-column
+          prop="openTime"
+          width="150"
+          label="开机时间"
+          align="center"
+        >
         </el-table-column>
-        <el-table-column prop="name" label="关机时间" align="center">
+        <el-table-column
+          prop="closeTime"
+          width="150"
+          label="关机时间"
+          align="center"
+        >
         </el-table-column>
-        <el-table-column prop="name" label="关机类型" align="center">
+        <el-table-column prop="offStatus" label="关机类型" align="center">
+          <template slot-scope="{ row }">
+            {{
+              row.lightStatus == 1
+                ? "正常关机"
+                : row.lightStatus == 1
+                ? "低电关机"
+                : "异常关机"
+            }}
+          </template>
         </el-table-column>
         <!--  scope -->
-        <el-table-column label="操作" align="center">
-          <template slot-scope="">
+        <el-table-column label="操作" align="center" fixed="right" width="200">
+          <template slot-scope="{ row }">
             <!-- <div style="color: #2671e2" @click="toinifoThereturn()">
               修改指示灯状态
             </div> -->
@@ -272,10 +346,18 @@
               </span>
               <el-dropdown-menu slot="dropdown">
                 <!-- <el-dropdown-item command="toinifoThereturn" v-if="row.receiveType == 2" >归还</el-dropdown-item> -->
-                <el-dropdown-item command="toinifoThereturn"
+                <el-dropdown-item command="toinifoThereturn" v-if="row.userName"
                   >归还</el-dropdown-item
                 >
-                <el-dropdown-item command="receive">领用</el-dropdown-item>
+                <el-dropdown-item command="receive" v-if="!row.userName"
+                  >领用</el-dropdown-item
+                >
+                <el-dropdown-item command="lightStatusChange"
+                  >{{
+                    row.lightStatus == "on" ? "关闭" : "开启"
+                  }}指示灯</el-dropdown-item
+                >
+                <el-dropdown-item command="wifiShow">WiFi管理</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -307,41 +389,120 @@
         label-width="100px"
       >
         <el-form-item label="楼盘" prop="batchId">
+          <el-input
+            v-model="receiveForm.bindHouseName"
+            style="width: 80%"
+            disabled
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="顾问" prop="batchId">
           <el-select
-            v-model="receiveForm.batchId"
+            v-model="receiveForm.accountId"
             style="width: 80%"
             placeholder="请选择"
           >
             <el-option
-              v-for="item in options1"
-              :key="item.id"
-              :label="item.batchId"
-              :value="item.batchId"
+              v-for="item in userList"
+              :key="item.accountId"
+              :label="item.name"
+              :value="item.accountId"
             >
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="顾问" prop="batchId">
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="receiveVisible = false">取 消</el-button>
+        <el-button type="primary" @click="saveReceive()">保存</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog
+      title="批量转移"
+      width="40%"
+      :visible.sync="dialogVisible5"
+      @close="resetBind"
+    >
+      <el-form
+        :model="bindForm"
+        label-position="labelPosition"
+        ref="allbindForm"
+        :rules="bindRules"
+        label-width="140px"
+      >
+        <el-form-item label="楼盘" prop="houseId">
           <el-select
-            v-model="receiveForm.houseList"
+            filterable
+            v-model="bindForm.houseId"
             style="width: 80%"
             placeholder="请选择"
+            @change="houseChange"
           >
             <el-option
-              v-for="item in options1"
+              v-for="item in houseList"
               :key="item.id"
-              :label="item.batchId"
-              :value="item.batchId"
+              :label="item.propertyName"
+              :value="item.id"
             >
             </el-option>
           </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="receiveVisible = false">取 消</el-button>
-        <el-button type="primary" @click="saveReceive()">保存</el-button>
+        <el-button @click="dialogVisible5 = false">取 消</el-button>
+        <el-button type="primary" @click="Masstransfer()">保存</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog title="WiFi管理" width="40%" :visible.sync="wifiVisible">
+      <el-form
+        :model="wifiForm"
+        :rules="wifiRule"
+        ref="wifiForm"
+        label-width="100px"
+        class="demo-ruleForm"
+      >
+        <el-form-item label="设备号" prop="imei">
+          <el-input v-model="wifiForm.imei" disabled></el-input>
+        </el-form-item>
+        <div>主WiFi</div>
+        <el-form-item label="wifi名称" prop="masterWifiName">
+          <el-input v-model="wifiForm.masterWifiName"></el-input>
+        </el-form-item>
+        <el-form-item label="wifi密码" prop="masterWifiPassword">
+          <el-input
+            v-model="wifiForm.masterWifiPassword"
+            show-password
+          ></el-input>
+        </el-form-item>
+        <div>备用一</div>
+        <el-form-item label="wifi名称" prop="spareOneWifiName">
+          <el-input v-model="wifiForm.spareOneWifiName"></el-input>
+        </el-form-item>
+        <el-form-item label="wifi密码" prop="spareOneWifiPassword">
+          <el-input
+            v-model="wifiForm.spareOneWifiPassword"
+            show-password
+          ></el-input>
+        </el-form-item>
+        <div>备用二</div>
+        <el-form-item label="wifi名称" prop="spareTwoWifiName">
+          <el-input v-model="wifiForm.spareTwoWifiName"></el-input>
+        </el-form-item>
+        <el-form-item label="wifi密码" prop="spareTwoWifiPassword">
+          <el-input
+            v-model="wifiForm.spareTwoWifiPassword"
+            show-password
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="wifiVisible = false" type="primary"
+            >取消</el-button
+          >
+          <el-button @click="wifiEdit">确定</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
   </div>
 </template>
 
@@ -366,11 +527,11 @@ export default {
       onlineList: [
         {
           value: "0",
-          label: "在线",
+          label: "离线",
         },
         {
           value: "1",
-          label: "离线",
+          label: "在线",
         },
       ],
       audioStatusList: [
@@ -458,13 +619,45 @@ export default {
         orgName: "", //公司名称
         houseName: "", //楼盘名称
         acceptanceStatus: "", //设备状态
-        audioStatus: "", //录音状态
+        simAudioStatus: "", //录音状态
         uploadStatus: "", //上传状态
         offStatus: "", //关机状态
-        online: "",
+        onLine: "",
+      },
+      bindRules: {
+        houseId: [{ required: true, message: "请选择楼盘", trigger: "blur" }],
+      },
+      bindForm: {
+        remark: "",
+        houseId: "",
+        // choic: "3",
+      },
+      wifiForm: {
+        // imei:"",
+        // masterWifiName:"",
+        // masterWifiPassword:'',
+        // spareOneWifiName:"",
+        // spareOneWifiPassword:'',
+        // spareTwoWifiName:'',
+        // spareTwoWifiPassword:'',
+      },
+      receiveForm: {
+        houseId: "",
+        bindHouseName: "",
+        accountId: "",
       },
-      receiveForm: {},
       receiveRules: {},
+      wifiRule: {
+        masterWifiPassword: [
+          { min: 8, max: 16, message: "长度在 8 到 16 位", trigger: "blur" },
+        ],
+        spareOneWifiPassword: [
+          { min: 8, max: 16, message: "长度在 8 到 16 位", trigger: "blur" },
+        ],
+        spareTwoWifiPassword: [
+          { min: 8, max: 16, message: "长度在 8 到 16 位", trigger: "blur" },
+        ],
+      },
       addRules: {
         houseId: [{ required: true, message: "请选择楼盘", trigger: "blur" }],
         batchId: { required: true, message: "请选择顾问", trigger: "blur" },
@@ -480,12 +673,91 @@ export default {
       changeValue: "",
       tableData: [],
       multipleSelection: [],
+      userList: [],
+      onLineCount: "",
+      offLineCount: "",
+      workingCount: "",
+      dialogVisible5: false,
+      wifiVisible: false,
+      customColors: [
+        { color: "#f56c6c", percentage: 20 },
+        { color: "#e6a23c", percentage: 40 },
+        { color: "#5cb87a", percentage: 60 },
+        { color: "#1989fa", percentage: 80 },
+        { color: "#6f7ad3", percentage: 100 },
+      ],
     };
   },
   mounted() {
     this.getTableList();
+    // 获取列表
+    this.zkhousePage();
   },
   methods: {
+    // wifi
+    wifiShow(row) {
+      this.wifiVisible = true;
+      // 获取wifi数据
+      this.wifiFindById(row.id);
+    },
+    //
+    wifiFindById(id) {
+      this.$api.api
+        .wifiFindById({
+          id,
+        })
+        .then((res) => {
+          // console.log(res);
+          // this.wifiForm=res.data
+          this.wifiForm = {
+            imei: res.data.imei,
+            masterWifiName: res.data.masterWifiName,
+            masterWifiPassword: res.data.masterWifiPassword,
+            spareOneWifiName: res.data.spareOneWifiName,
+            spareOneWifiPassword: res.data.spareOneWifiPassword,
+            spareTwoWifiName: res.data.spareTwoWifiName,
+            spareTwoWifiPassword: res.data.spareTwoWifiPassword,
+          };
+          if (!res.data.receiveType) {
+            this.wifiForm.id = res.data.id;
+          }
+        });
+    },
+    wifiEdit() {
+      // console.log(this.wifiForm);
+      // return
+      this.$refs.wifiForm.validate((valid) => {
+        if (valid) {
+          if (
+            this.wifiForm.masterWifiName &&
+            !this.wifiForm.masterWifiPassword
+          ) {
+            this.$message.warning("请检查主WiFi密码是否填写");
+            return;
+          }
+          if (
+            this.wifiForm.spareOneWifiName &&
+            !this.wifiForm.spareOneWifiPassword
+          ) {
+            this.$message.warning("请检查备用一密码是否填写");
+            return;
+          }
+          if (
+            this.wifiForm.spareTwoWifiName &&
+            !this.wifiForm.spareTwoWifiPassword
+          ) {
+            this.$message.warning("请检查备用二密码是否填写");
+            return;
+          }
+          this.$api.api.wifiUpdate(this.wifiForm).then((res) => {
+            // console.log(res);
+            this.$message.success("修改成功");
+            this.wifiVisible = false;
+          });
+        }
+      });
+    },
+    resetWifi() {},
     getTableList() {
       this.$api.api
         .equipmentZxOnFindByPage({
@@ -500,19 +772,292 @@ export default {
         .then((res) => {
           // console.log(res);
           this.tableData = res.data.list.records;
+          this.onLineCount = res.data.onLineCount;
+          this.offLineCount = res.data.offLineCount;
+          this.workingCount = res.data.workingCount;
           this.total = res.data.total;
         });
     },
+    //批量
+    Batchreturn() {
+      this.$confirm("确认批量归还吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let str = [];
+          this.multipleSelection.map((item) => {
+            str.push(item.imei);
+          });
+          this.$api.api
+            .zkequipmentEquipmentBack({
+              imeis: str.join(","),
+            })
+            .then((res) => {
+              this.$message({
+                type: "success",
+                message: "批量归还成功!",
+              });
+              this.getTableList();
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消批量归还",
+          });
+        });
+    },
+    zkequipmentUnbind() {
+      this.$confirm("确认批量解绑吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let str = [];
+          this.multipleSelection.map((item) => {
+            if (item.receiveType != 2) {
+              str.push(item.imei);
+            }
+          });
+          console.log(str);
+          this.$api.api
+            .zkequipmentUnbind({
+              imeis: str.join(","),
+            })
+            .then((res) => {
+              this.$message({
+                type: "success",
+                message: "操作成功!",
+              });
+              this.getTableList();
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消操作",
+          });
+        });
+    },
+    zkhousePage() {
+      this.$api.api
+        .findHouseByUser({
+          orgType: localStorage.getItem("orgType"),
+        })
+        .then((res) => {
+          // console.log(res)
+          this.houseList = res.data;
+          // this.searchForm.houseId = res.data[0].id;
+          // 列表获取
+          // this.correctFindbypage();
+        });
+    },
+    //批量转移
+    infoMasstransfer() {
+      this.dialogVisible5 = true;
+    },
+    houseChange(e) {
+      console.log(e);
+      let idx = this.houseList.findIndex((item) => item.id == e);
+      if (idx != -1) {
+        this.bindForm.orgCode = this.houseList[idx].orgCode;
+      }
+    },
+    Masstransfer() {
+      this.$refs.allbindForm.validate((valid) => {
+        if (valid) {
+          console.log(this.bindForm);
+          let arr = [];
+          this.multipleSelection.map((item) => arr.push(item.imei));
+          let obj = {
+            houseId: this.bindForm.houseId,
+            orgCode: this.bindForm.orgCode,
+            imeis: arr.join(","),
+          };
+          this.$api.api.zkequipmentBind(obj).then((res) => {
+            console.log(res);
+            this.$message.success("绑定成功");
+            this.getTableList();
+            this.dialogVisible5 = false;
+          });
+        }
+      });
+    },
+    resetBind() {
+      this.bindForm = {
+        remark: "",
+        houseId: "",
+      };
+    },
+    screen() {
+      this.currentPage = 1;
+      // console.log(this.searchForm);
+      this.getTableList();
+    },
+    reset() {
+      this.changeValue = "";
+      this.searchForm = {
+        name: "",
+        imei: "", //设备号
+        batchId: "", //批次号
+        // equipmentType: "", //设备类型
+        receiveType: "", //领用状态
+        defaultTransliteration: "", //转写方式
+        startDate: "", //开始时间
+        endDate: "", //结束时间
+        agentName: "", //代理商名称
+        orgName: "", //公司名称
+        houseName: "", //楼盘名称
+        acceptanceStatus: "", //设备状态
+        simAudioStatus: "", //录音状态
+        uploadStatus: "", //上传状态
+        offStatus: "", //关机状态
+        onLine: "",
+      };
+      this.getTableList();
+    },
     receive(row) {
       this.receiveVisible = true;
       // this.bindForm.imeis = row.imei;
+      this.receiveForm.houseId = row.propertyId;
+      this.receiveForm.bindHouseName = row.bindHouseName;
+      this.receiveForm.imei = row.imei;
+      this.getUserByHouseId(row.propertyId);
+    },
+    saveReceive() {
+      this.$refs.receiveForm.validate((valid) => {
+        if (valid) {
+          this.$api.api.equipmentReceiving(this.receiveForm).then((res) => {
+            // console.log(res);
+            this.receiveVisible = false;
+            this.getTableList();
+            this.$message({
+              type: "success",
+              message: "领用成功!",
+            });
+          });
+        }
+      });
+    },
+    resetReceive() {
+      this.receiveForm = {
+        houseId: "",
+        bindHouseName: "",
+        accountId: "",
+      };
     },
-    saveReceive() {},
-    resetReceive() {},
     handleCommand(e, row) {
       console.log(row);
       this[e](row);
     },
+    // 顾问列表
+    getUserByHouseId(houseId) {
+      this.$api.api
+        .getUserByHouseId({
+          houseId,
+        })
+        .then((res) => {
+          // console.log(res);
+          this.userList = res.data;
+        });
+    },
+    // 指示灯开启关闭
+    lightStatusChange(row) {
+      this.$confirm(
+        `确认${row.lightStatus == "on" ? "关闭" : "开启"}指示灯吗?`,
+        "提示",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(() => {
+          this.$api.api
+            .batchOperateIndicator({
+              imeis: row.imei,
+              lightStatus: row.lightStatus == "on" ? "off" : "on",
+            })
+            .then((res) => {
+              this.$message({
+                type: "success",
+                message: "操作成功!",
+              });
+              this.getTableList();
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消操作",
+          });
+        });
+    },
+    openAllLight() {
+      this.$confirm(`确认开启指示灯吗?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let str = [];
+          this.multipleSelection.map((item) => {
+            str.push(item.imei);
+          });
+          this.$api.api
+            .batchOperateIndicator({
+              imeis: str.join(","),
+              lightStatus: "on",
+            })
+            .then((res) => {
+              this.$message({
+                type: "success",
+                message: "操作成功!",
+              });
+              this.getTableList();
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消操作",
+          });
+        });
+    },
+    closeAllLight() {
+      this.$confirm(`确认关闭指示灯吗?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let str = [];
+          this.multipleSelection.map((item) => {
+            str.push(item.imei);
+          });
+          this.$api.api
+            .batchOperateIndicator({
+              imeis: str.join(","),
+              lightStatus: "off",
+            })
+            .then((res) => {
+              this.$message({
+                type: "success",
+                message: "操作成功!",
+              });
+              this.getTableList();
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消操作",
+          });
+        });
+    },
     //归还
     toinifoThereturn(row) {
       this.$confirm("确认归还吗?", "提示", {
@@ -522,7 +1067,7 @@ export default {
       })
         .then(() => {
           this.$api.api
-            .equipmentUnbind({
+            .zkequipmentEquipmentBack({
               imeis: row.imei,
             })
             .then((res) => {
@@ -530,7 +1075,7 @@ export default {
                 type: "success",
                 message: "归还成功!",
               });
-              this.equipmentManagement();
+              this.getTableList();
             });
         })
         .catch(() => {
@@ -582,26 +1127,26 @@ export default {
         this.searchForm.houseName = e;
       }
     },
-    //批量归还
-    toinifoThereturn() {
-      this.$confirm("确认更改吗?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$message({
-            type: "success",
-            message: "更改成功!",
-          });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "更改归还",
-          });
-        });
-    },
+    // //批量归还
+    // toinifoThereturn() {
+    //   this.$confirm("确认更改吗?", "提示", {
+    //     confirmButtonText: "确定",
+    //     cancelButtonText: "取消",
+    //     type: "warning",
+    //   })
+    //     .then(() => {
+    //       this.$message({
+    //         type: "success",
+    //         message: "更改成功!",
+    //       });
+    //     })
+    //     .catch(() => {
+    //       this.$message({
+    //         type: "info",
+    //         message: "更改归还",
+    //       });
+    //     });
+    // },
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },