|
@@ -13,6 +13,29 @@
|
|
|
<!--
|
|
|
要resetFields起作用,必须配置:model和prop
|
|
|
-->
|
|
|
+ <el-form
|
|
|
+ ref="queryForm"
|
|
|
+ :model="queryModel"
|
|
|
+ inline
|
|
|
+ class="demo-form-inline"
|
|
|
+ label-width="100px"
|
|
|
+ >
|
|
|
+ <el-form-item label="设备编号" prop="deviceNo">
|
|
|
+ <el-input type="text" size="mini" v-model="queryModel.deviceNo" ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="设备名称" prop="deviceName">
|
|
|
+ <el-input type="text" size="mini" v-model="queryModel.deviceName" ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item>
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ size="mini"
|
|
|
+ icon="ios-search"
|
|
|
+ @click="changePage(1)"
|
|
|
+ :loading="loading"
|
|
|
+ >查询</el-button>
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
<el-divider></el-divider>
|
|
|
<el-row class="button-group">
|
|
|
<el-button
|
|
@@ -33,18 +56,18 @@
|
|
|
@selection-change="handleSelectionChange"
|
|
|
>
|
|
|
<el-table-column type="selection" :selectable="disableSelect" width="55"></el-table-column>
|
|
|
- <el-table-column prop="device.deviceNo" label="设备编号" width="220"></el-table-column>
|
|
|
- <el-table-column prop="device.aliasName" label="设备名称" width="180"></el-table-column>
|
|
|
- <el-table-column prop="device.typeN" label="类型" width="120"></el-table-column>
|
|
|
- <el-table-column prop="bound" label="绑定状态" width="120">
|
|
|
- <template slot-scope="{row}">{{row.bound ? "已绑定" : "未绑定"}}</template>
|
|
|
+ <el-table-column prop="deviceNo" label="设备编号" width="220"></el-table-column>
|
|
|
+ <el-table-column prop="aliasName" label="设备名称" width="180"></el-table-column>
|
|
|
+ <el-table-column prop="isBind" label="类型" width="120"></el-table-column>
|
|
|
+ <el-table-column prop="isBind" label="绑定状态" width="120">
|
|
|
+ <template slot-scope="{row}">{{row.isBind == 0? "未绑定" : "已绑定"}}</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="操作">
|
|
|
<template slot-scope="{row}">
|
|
|
- <span v-if="!row.bound">
|
|
|
+ <span v-if="row.isBind == 0">
|
|
|
<el-button size="mini" type="success" @click="handleBound(row)">绑定设备</el-button>
|
|
|
</span>
|
|
|
- <span v-if="row.bound">
|
|
|
+ <span v-else>
|
|
|
<el-button size="mini" type="danger" @click="handleUnBound(row)">解除绑定</el-button>
|
|
|
</span>
|
|
|
</template>
|
|
@@ -83,6 +106,11 @@ export default {
|
|
|
|
|
|
return {
|
|
|
formModel: {},
|
|
|
+ queryModel: {
|
|
|
+ deviceNo: "",
|
|
|
+ deviceName: "",
|
|
|
+ personId: ""
|
|
|
+ },
|
|
|
tableData: [],
|
|
|
pageIndex: 1,
|
|
|
pageSize: 10,
|
|
@@ -123,6 +151,9 @@ export default {
|
|
|
|
|
|
formData.append("companyId", self.companyId);
|
|
|
|
|
|
+ formData.append("deviceNo", self.queryModel.deviceNo);
|
|
|
+ formData.append("deviceName", self.queryModel.deviceName);
|
|
|
+
|
|
|
if (this.field != null) {
|
|
|
formData.append("field", this.field);
|
|
|
}
|
|
@@ -167,7 +198,7 @@ export default {
|
|
|
var self = this;
|
|
|
|
|
|
var idList = this.multipleSelection.map(record => {
|
|
|
- return record.device.id;
|
|
|
+ return record.id;
|
|
|
});
|
|
|
|
|
|
this.$confirm("是否绑定?", "提示", "warning").then(result => {
|
|
@@ -210,7 +241,7 @@ export default {
|
|
|
self.loading = true;
|
|
|
var formData = new FormData();
|
|
|
formData.append("companyId", self.companyId);
|
|
|
- formData.append("deviceIds", record.device.id);
|
|
|
+ formData.append("deviceIds", record.id);
|
|
|
return companyInfoApi.bindDevice(formData).then(function(response) {
|
|
|
self.loading = false;
|
|
|
|
|
@@ -244,7 +275,7 @@ export default {
|
|
|
self.loading = true;
|
|
|
var formData = new FormData();
|
|
|
formData.append("companyId", self.companyId);
|
|
|
- formData.append("deviceIds", record.device.id);
|
|
|
+ formData.append("deviceIds", record.id);
|
|
|
return companyInfoApi.unbindDevice(formData).then(function(response) {
|
|
|
self.loading = false;
|
|
|
var jsonData = response.data;
|