init

src/api/modules/api.js

@@ -562,3 +562,28 @@ export function equipmentbind(data) {
     data
   })
 }
+
+// 获取设备状态检测
+export function equipmentZxOn(data) {
+  return request({
+    url: 'autoSR/zk/equipment/zxOn',
+    method:'post',
+    data
+  })
+}
+// 设备删除
+export function equipmentZxOnDelete(query) {
+  return request({
+    url: 'autoSR/zk/equipment/delete',
+    method:'get',
+    params:query
+  })
+}
+// 设备状态监控列表
+export function equipmentZxOnFindByPage(data) {
+  return request({
+    url: 'autoSR/zk/equipment/findByPage',
+    method:'post',
+    data
+  })
+}

src/views/Equipment/index.vue

@@ -247,6 +247,25 @@
         </el-table-column>
         <el-table-column prop="name" label="上传状态" align="center">
         </el-table-column> -->
+        <el-table-column
+          prop="autoSwitch"
+          label="自动转写开关"
+          align="center"
+          width="100"
+        >
+          <template slot-scope="{ row }">
+            {{ row.autoSwitch == 0 ? "已关闭" : "已开启" }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="defaultTransliteration"
+          label="转写方式"
+          align="center"
+        >
+          <template slot-scope="{ row }">
+            {{ row.defaultTransliteration == 0 ? "科大讯飞" : "思必驰" }}
+          </template>
+        </el-table-column>
         <el-table-column
           prop="acceptanceStatus"
           label="设备状态"
@@ -261,7 +280,7 @@
                 : row.acceptanceStatus == 2
                 ? "维修中"
                 : row.acceptanceStatus == 3
-                ? "维修中"
+                ? "更换中"
                 : "已报损"
             }}
           </template>
@@ -294,6 +313,7 @@
         </el-table-column>
         <el-table-column prop="name" label="关机类型" align="center">
         </el-table-column> -->
+
         <el-table-column
           prop="createTime"
           label="添加时间"
@@ -339,9 +359,16 @@
                   v-if="row.receiveType == 2"
                   >归还</el-dropdown-item
                 >
+                <!-- <el-dropdown-item
+                  command="receive"
+                  >领用</el-dropdown-item
+                > -->
                 <el-dropdown-item command="infotranscription"
                   >转写方式</el-dropdown-item
                 >
+                <el-dropdown-item command="isAutoSwitch"
+                  >自动转写</el-dropdown-item
+                >
                 <el-dropdown-item
                   command="acceptance"
                   v-if="row.acceptanceStatus == 1"
@@ -355,7 +382,7 @@
                 <el-dropdown-item command="toinfobinding" v-if="orgType == 0"
                   >绑定</el-dropdown-item
                 >
-                <el-dropdown-item command="infoeditor">修改</el-dropdown-item>
+                <!-- <el-dropdown-item command="infoeditor">修改</el-dropdown-item> -->
                 <el-dropdown-item command="toinifodelete"
                   >删除</el-dropdown-item
                 >
@@ -578,6 +605,55 @@
         <el-button type="primary" @click="Masstransfer()">保存</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog
+      title="领用"
+      :visible.sync="receiveVisible"
+      @close="resetReceive"
+    >
+      <el-form
+        :model="receiveForm"
+        label-position="labelPosition"
+        ref="receiveForm"
+        :rules="receiveRules"
+        label-width="100px"
+      >
+        <el-form-item label="楼盘" prop="batchId">
+          <el-select
+            v-model="receiveForm.batchId"
+            style="width: 80%"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.batchId"
+              :value="item.batchId"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="顾问" prop="batchId">
+          <el-select
+            v-model="receiveForm.houseList"
+            style="width: 80%"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.batchId"
+              :value="item.batchId"
+            >
+            </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>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -690,6 +766,7 @@ export default {
       dialogVisible3: false,
       dialogVisible4: false,
       dialogVisible5: false,
+      receiveVisible: false,
       ruleForm: {
         areaName: "",
         provinceItem: [],
@@ -710,6 +787,11 @@ export default {
         desc: "",
         acceptanceStatus: "0",
       },
+      receiveForm: {},
+      receiveRules: {
+        houseId: [{ required: true, message: "请选择楼盘", trigger: "blur" }],
+        batchId: { required: true, message: "请选择顾问", trigger: "blur" },
+      },
       addRules: {
         imei: [{ required: true, message: "请填写设备号", trigger: "blur" }],
         batchId: { required: true, message: "请选择批次号", trigger: "blur" },
@@ -747,6 +829,12 @@ export default {
       console.log(row);
       this[e](row);
     },
+    receive(row) {
+      this.receiveVisible = true;
+      // this.bindForm.imeis = row.imei;
+    },
+    saveReceive() {},
+    resetReceive() {},
     selChange() {
       this.changeValue = "";
       this.searchForm.imei = "";
@@ -862,13 +950,13 @@ export default {
       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(',')
-          }
+          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.equipmentbind(obj).then((res) => {
             console.log(res);
             this.$message.success("绑定成功");
@@ -1030,6 +1118,38 @@ export default {
           });
         });
     },
+    // 自动转写开关
+    isAutoSwitch(row) {
+      this.$confirm(
+        `确认${row.autoSwitch == 0 ? "开启" : "关闭"}自动转写?`,
+        "提示",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(() => {
+          this.$api.api
+            .equipmentZxOn({
+              id: row.id,
+              autoSwitch: row.autoSwitch == 0 ? 1 : 0,
+            })
+            .then((res) => {
+              this.$message({
+                type: "success",
+                message: "修改成功!",
+              });
+              this.equipmentManagement();
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消",
+          });
+        });
+    },
     // 转写开关
     infotranscription(row) {
       this.$confirm(
@@ -1045,7 +1165,7 @@ export default {
       )
         .then(() => {
           this.$api.api
-            .equipmentUnbind({
+            .updateTranslationMethod({
               id: row.id,
               defaultTransliteration: row.defaultTransliteration == 0 ? 1 : 0,
             })
@@ -1092,17 +1212,24 @@ export default {
         });
     },
     //删除
-    toinifodelete() {
+    toinifodelete(row) {
       this.$confirm("此操作将永久删除, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          this.$message({
-            type: "success",
-            message: "删除成功!",
-          });
+          this.$api.api
+            .equipmentZxOnDelete({
+              id: row.id,
+            })
+            .then((res) => {
+              this.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+              this.equipmentManagement();
+            });
         })
         .catch(() => {
           this.$message({

src/views/Equipment/state.vue

@@ -1,42 +1,189 @@
 <template>
-
   <div class="box-center">
     <!-- 头 -->
     <div class="app-top">
       <div class="app-titel" style="margin-top: 5px">
-        <div class="label">设备编号：</div>
-        <div>
-         <el-input v-model="value"></el-input>
+        <div class="div-lab">
+          <div class="label">添加时间</div>
+          <el-date-picker
+            v-model="time"
+            type="daterange"
+            class="div-inp"
+            range-separator="-"
+            start-placeholder="开始日期"
+            :default-time="['00:00:00', '23:59:59']"
+            value-format="yyyy-MM-dd"
+            end-placeholder="结束日期"
+            @change="timeChange"
+          >
+          </el-date-picker>
         </div>
-        <div class="label">领用人姓名：</div>
-        <div>
-         <el-input v-model="value"></el-input>
+
+        <div class="div-lab">
+          <el-input
+            v-model="changeValue"
+            clearable
+            placeholder="请输入"
+            @change="selectChange"
+            style="width: 363px"
+          >
+            <el-select
+              v-model="selflag"
+              slot="prepend"
+              class="input-with-select"
+              style="width: 115px"
+              placeholder="请选择"
+              @change="selChange"
+            >
+              <el-option label="设备编号" value="1"></el-option>
+              <!-- <el-option label="版本号" value="2"></el-option> -->
+              <el-option label="批次号" value="3"></el-option>
+              <el-option label="代理商名称" value="4"></el-option>
+              <el-option label="公司名称" value="5"></el-option>
+              <el-option label="楼盘名称" value="6"></el-option>
+            </el-select>
+          </el-input>
         </div>
-         <div class="label">楼盘名称：</div>
-         <div >
-          <el-input v-model="value"></el-input>
+
+        <!-- <div class="div-lab">
+          <div class="label">售出状态</div>
+          <el-select
+            class="div-inp"
+            multiple
+            clearable
+            collapse-tags
+            v-model="searchForm.keywordsId"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </div> -->
+
+        <div class="div-lab">
+          <div class="label">领用状态</div>
+          <el-select
+            class="div-inp"
+            clearable
+            collapse-tags
+            v-model="searchForm.receiveType"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in receiveTypeList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </div>
+
+        <div class="div-lab">
+          <div class="label">在线状态</div>
+          <el-select
+            class="div-inp"
+            clearable
+            collapse-tags
+            v-model="searchForm.online"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in onlineList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </div>
+
+        <div class="div-lab">
+          <div class="label">录音状态</div>
+          <el-select
+            class="div-inp"
+            multiple
+            clearable
+            collapse-tags
+            v-model="searchForm.audioStatus"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in audioStatusList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </div>
+
+        <div class="div-lab">
+          <div class="label">上传状态</div>
+          <el-select
+            class="div-inp"
+            multiple
+            clearable
+            collapse-tags
+            v-model="searchForm.uploadStatus"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in uploadStatusList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </div>
+
+        <div class="div-lab">
+          <div class="label">关机状态</div>
+          <el-select
+            class="div-inp"
+            multiple
+            clearable
+            collapse-tags
+            v-model="searchForm.offStatus"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in offStatusList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
         </div>
       </div>
 
-       <div class="app-titel" style="margin-top: 15px">
+      <!-- <div class="app-titel" style="margin-top: 15px">
         <div class="label">设备电量：</div>
         <div>
-         <el-input v-model="value"></el-input>
+          <el-input v-model="value"></el-input>
         </div>
         <div class="label">是否在线：</div>
         <div>
-           <el-select v-model="value" placeholder="请选择">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
-            </el-select>
+          <el-select v-model="value" placeholder="请选择">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
         </div>
-      </div>
+      </div> -->
       <div class="app-titel" style="margin-top: 15px">
-        <div class="label" style="color: #ffffff">筛选相关：</div>
+        <!-- <div class="label" style="color: #ffffff">筛选相关：</div> -->
         <div style="margin-left: 20px">
           <el-button style="background: #2671e2; color: #ffffff"
             >筛选</el-button
@@ -45,10 +192,10 @@
         <div style="margin-left: 20px">
           <el-button>清空筛选条件</el-button>
         </div>
-         <div style="margin-left: 20px">
+        <div style="margin-left: 20px">
           <el-button>批量开启指示灯</el-button>
         </div>
-         <div style="margin-left: 20px">
+        <div style="margin-left: 20px">
           <el-button>批量关闭指示灯</el-button>
         </div>
       </div>
@@ -56,108 +203,130 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <div class="tongji">在线数量：0     离线数量：279</div>
-        <el-table
-          :data="tableData"
-          stripe
-          height="400"
-           @selection-change="handleSelectionChange"
-          style="width: 100%">
-           <el-table-column
-              type="selection"
-              width="55">
-            </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="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>
+      <div class="tongji">在线数量：0 离线数量：279</div>
+      <el-table
+        :data="tableData"
+        stripe
+        height="400"
+        @selection-change="handleSelectionChange"
+        style="width: 100%"
+      >
+        <el-table-column type="selection" width="55"> </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="name" 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="name" label="上传状态" align="center">
+        </el-table-column>
+        <el-table-column prop="name" 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="name"
-            label="信号强度"
-             align="center"
-           > </el-table-column>
-            <el-table-column
-            prop="name"
-            label="楼盘名称"
-             align="center"
-           > </el-table-column>
-
-            <el-table-column
-            prop="name"
-            label="更新时间"
-             align="center"
-           > </el-table-column>
-            <el-table-column
-            prop="name"
-            label="开机时间"
-             align="center"
-           > </el-table-column>
-             <el-table-column
-            prop="name"
-            label="关机时间"
-             align="center"
-           > </el-table-column>
-             <el-table-column
-            prop="name"
-            label="关机状态"
-             align="center"
-           > </el-table-column>
-           <!--  scope -->
-         <el-table-column label="操作" align="center">
-            <template slot-scope="">
-              <div style="color: #2671E2;" @click="toinifoThereturn()">修改指示灯状态</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="name" label="电池电量" align="center">
+        </el-table-column>
+        <el-table-column prop="name" label="信号强度" align="center">
+        </el-table-column>
+        <el-table-column prop="name" label="待上传文件" align="center">
+        </el-table-column>
+        <el-table-column prop="name" label="更新时间" align="center">
+        </el-table-column>
+        <el-table-column prop="name" label="开机时间" align="center">
+        </el-table-column>
+        <el-table-column prop="name" label="关机时间" align="center">
+        </el-table-column>
+        <el-table-column prop="name" label="关机类型" align="center">
+        </el-table-column>
+        <!--  scope -->
+        <el-table-column label="操作" align="center">
+          <template slot-scope="">
+            <!-- <div style="color: #2671e2" @click="toinifoThereturn()">
+              修改指示灯状态
+            </div> -->
+            <el-dropdown @command="handleCommand($event, row)">
+              <span style="color: #409eff; font-size: 12px; margin-left: 10px">
+                更多<i class="el-icon-arrow-down el-icon--right"></i>
+              </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
+                >
+                <el-dropdown-item command="receive">领用</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </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="size"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+        >
+        </el-pagination>
+      </div>
     </div>
+    <el-dialog
+      title="领用"
+      :visible.sync="receiveVisible"
+      @close="resetReceive"
+    >
+      <el-form
+        :model="receiveForm"
+        label-position="labelPosition"
+        ref="receiveForm"
+        :rules="receiveRules"
+        label-width="100px"
+      >
+        <el-form-item label="楼盘" prop="batchId">
+          <el-select
+            v-model="receiveForm.batchId"
+            style="width: 80%"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in options1"
+              :key="item.id"
+              :label="item.batchId"
+              :value="item.batchId"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="顾问" prop="batchId">
+          <el-select
+            v-model="receiveForm.houseList"
+            style="width: 80%"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in options1"
+              :key="item.id"
+              :label="item.batchId"
+              :value="item.batchId"
+            >
+            </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>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -179,79 +348,256 @@ export default {
           label: "离线",
         },
       ],
-      currentPage4:4,
-      value: "",
-      input: "",
-      tableData: [
+      onlineList: [
+        {
+          value: "0",
+          label: "在线",
+        },
+        {
+          value: "1",
+          label: "离线",
+        },
+      ],
+      audioStatusList: [
+        {
+          value: true,
+          label: "开启",
+        },
+        {
+          value: false,
+          label: "关闭",
+        },
+      ],
+      uploadStatusList: [
         {
-          date: "2016-05-03",
-          name: "王小虎",
-          address: " 1518 弄",
+          value: true,
+          label: "无上传",
         },
         {
-          date: "2016-05-02",
-          name: "王小虎",
-          address: " 1518 弄",
+          value: false,
+          label: "上传中",
         },
+      ],
+      equipmentStatusList: [
         {
-          date: "2016-05-04",
-          name: "王小虎",
-          address: " 1518 弄",
+          value: "0",
+          label: "已验收",
         },
         {
-          date: "2016-05-01",
-          name: "王小虎",
-          address: " 1518 弄",
+          value: "1",
+          label: "未验收",
         },
         {
-          date: "2016-05-08",
-          name: "王小虎",
-          address: " 1518 弄",
+          value: "2",
+          label: "维修中",
         },
         {
-          date: "2016-05-06",
-          name: "王小虎",
-          address: " 1518 弄",
+          value: "3",
+          label: "更换中",
         },
         {
-          date: "2016-05-07",
-          name: "王小虎",
-          address: " 1518 弄",
+          value: "4",
+          label: "已报损",
         },
       ],
-       multipleSelection:[],
-
+      offStatusList: [
+        {
+          value: "1",
+          label: "正常关机",
+        },
+        {
+          value: "2",
+          label: "低电关机",
+        },
+        {
+          value: "3",
+          label: "异常关机",
+        },
+      ],
+      receiveTypeList: [
+        {
+          value: "1",
+          label: "未领用",
+        },
+        {
+          value: "2",
+          label: "使用中",
+        },
+        {
+          value: "3",
+          label: "已归还",
+        },
+      ],
+      options1: [],
+      houseList: [],
+      searchForm: {
+        name: "",
+        imei: "", //设备号
+        batchId: "", //批次号
+        // equipmentType: "", //设备类型
+        receiveType: "", //领用状态
+        defaultTransliteration: "", //转写方式
+        startDate: "", //开始时间
+        endDate: "", //结束时间
+        agentName: "", //代理商名称
+        orgName: "", //公司名称
+        houseName: "", //楼盘名称
+        acceptanceStatus: "", //设备状态
+        audioStatus: "", //录音状态
+        uploadStatus: "", //上传状态
+        offStatus: "", //关机状态
+        online: "",
+      },
+      receiveForm: {},
+      receiveRules: {},
+      addRules: {
+        houseId: [{ required: true, message: "请选择楼盘", trigger: "blur" }],
+        batchId: { required: true, message: "请选择顾问", trigger: "blur" },
+      },
+      receiveVisible: false,
+      currentPage: 1,
+      size: 10,
+      total: 10,
+      value: "",
+      input: "",
+      time: [],
+      selflag: "1",
+      changeValue: "",
+      tableData: [],
+      multipleSelection: [],
     };
   },
-  mounted() {},
+  mounted() {
+    this.getTableList();
+  },
   methods: {
-    //批量归还
-    toinifoThereturn(){
-      this.$confirm('确认更改吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.$message({
-          type: 'success',
-          message: '更改成功!'
+    getTableList() {
+      this.$api.api
+        .equipmentZxOnFindByPage({
+          size: this.size,
+          current: this.currentPage,
+          orgType: localStorage.getItem("orgType"),
+          orgCode: localStorage.getItem("orgCode"),
+          agentId: localStorage.getItem("agentId"),
+          houseId: localStorage.getItem("houseId"),
+          ...this.searchForm,
+        })
+        .then((res) => {
+          // console.log(res);
+          this.tableData = res.data.records;
+          this.total = res.data.total;
         });
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '更改归还'
+    },
+    receive(row) {
+      this.receiveVisible = true;
+      // this.bindForm.imeis = row.imei;
+    },
+    saveReceive() {},
+    resetReceive() {},
+    handleCommand(e, row) {
+      console.log(row);
+      this[e](row);
+    },
+    //归还
+    toinifoThereturn(row) {
+      this.$confirm("确认归还吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$api.api
+            .equipmentUnbind({
+              imeis: row.imei,
+            })
+            .then((res) => {
+              this.$message({
+                type: "success",
+                message: "归还成功!",
+              });
+              this.equipmentManagement();
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消归还",
+          });
         });
-      });
     },
-     handleSelectionChange(val) {
-        this.multipleSelection = val;
-      },
-     handleSizeChange(val) {
-        console.log(`每页 ${val} 条`);
-      },
-      handleCurrentChange(val) {
-        console.log(`当前页: ${val}`);
+    timeChange(e) {
+      if (e) {
+        this.searchForm.startDate = e[0];
+        this.searchForm.endDate = e[1];
+      }
+    },
+    selChange() {
+      this.changeValue = "";
+      this.searchForm.imei = "";
+      this.searchForm.batchId = "";
+      this.searchForm.agentName = "";
+      this.searchForm.orgName = "";
+      this.searchForm.houseName = "";
+    },
+    selectChange(e) {
+      this.searchForm.imei = "";
+      this.searchForm.batchId = "";
+      this.searchForm.agentName = "";
+      this.searchForm.orgName = "";
+      this.searchForm.houseName = "";
+      if (!e) retun;
+      if (this.selflag == 1) {
+        // 设备编号
+        this.searchForm.imei = e;
+      }
+      if (this.selflag == 3) {
+        // 批次号
+        this.searchForm.batchId = e;
       }
+      if (this.selflag == 4) {
+        // 代理商名称
+        this.searchForm.agentName = e;
+      }
+      if (this.selflag == 5) {
+        // 公司名称
+        this.searchForm.orgName = e;
+      }
+      if (this.selflag == 6) {
+        // 楼盘名称
+        this.searchForm.houseName = e;
+      }
+    },
+    //批量归还
+    toinifoThereturn() {
+      this.$confirm("确认更改吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "更改成功!",
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "更改归还",
+          });
+        });
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.size = val;
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.currentPage = val;
+    },
   },
 };
 </script>
@@ -263,15 +609,15 @@ export default {
   min-width: 1200px;
   padding-bottom: 100px;
 }
-.tongji{
+.tongji {
   padding-bottom: 10px;
   font-size: 16px;
   color: red;
 }
-.cen-tab{
+.cen-tab {
   width: 100%;
   padding: 15px;
-  background: #FFFFFF;
+  background: #ffffff;
   margin-top: 15px;
 }
 .tophove {
@@ -289,12 +635,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;
@@ -314,4 +662,11 @@ export default {
     }
   }
 }
+.div-lab {
+  display: flex;
+  margin: 5px;
+}
+.div-inp {
+  width: 250px;
+}
 </style>

vue.config.js

@@ -4,8 +4,8 @@
  */
 // const url = 'http://pigx-gateway'
 // const url = 'http://39.97.167.65:9999' //测试
-const url = 'http://192.168.31.160:9999' //长龙
-// const url = 'http://192.168.31.129:9999' //嘉豪
+// const url = 'http://192.168.31.160:9999' //长龙
+const url = 'http://192.168.31.133:9999' //嘉豪
 // const url = 'http://192.168.31.100:9999' //王笑
 
 const CompressionWebpackPlugin = require('compression-webpack-plugin')