|
@@ -194,7 +194,7 @@
|
|
|
title="设备台账"
|
|
title="设备台账"
|
|
|
v-model="addshow">
|
|
v-model="addshow">
|
|
|
|
|
|
|
|
- <el-table :data="alldevice" height="400px">
|
|
|
|
|
|
|
+ <el-table :data="alldevice" ref="tableref" height="400px">
|
|
|
<el-table-column type="selection" width="55" fixed="left" />
|
|
<el-table-column type="selection" width="55" fixed="left" />
|
|
|
<el-table-column v-for="item in columns.filter(i=>i.visible)" :prop="item.prop" :label="item.label" ></el-table-column>
|
|
<el-table-column v-for="item in columns.filter(i=>i.visible)" :prop="item.prop" :label="item.label" ></el-table-column>
|
|
|
</el-table>
|
|
</el-table>
|
|
@@ -212,6 +212,10 @@
|
|
|
/>
|
|
/>
|
|
|
|
|
|
|
|
</div>
|
|
</div>
|
|
|
|
|
+ <div slot="footer" class="dialog-footer" style="text-align: right" >
|
|
|
|
|
+ <el-button @click="addshow = false">取 消</el-button>
|
|
|
|
|
+ <el-button type="primary" @click="dosave">保 存</el-button>
|
|
|
|
|
+ </div>
|
|
|
|
|
|
|
|
|
|
|
|
|
</el-dialog>
|
|
</el-dialog>
|
|
@@ -231,6 +235,7 @@ import {listModbusTcp} from "@/api/data/modbusTcp";
|
|
|
import {updateGateway} from "@/api/data/gateway";
|
|
import {updateGateway} from "@/api/data/gateway";
|
|
|
import {listGatewayEquipmentSbook,updateEquipmentSbook} from "@/api/data/equipmentSbook"
|
|
import {listGatewayEquipmentSbook,updateEquipmentSbook} from "@/api/data/equipmentSbook"
|
|
|
import {ElMessage} from "element-plus";
|
|
import {ElMessage} from "element-plus";
|
|
|
|
|
+import {cloneDeep} from "lodash";
|
|
|
|
|
|
|
|
|
|
|
|
|
const route = useRoute();
|
|
const route = useRoute();
|
|
@@ -261,8 +266,8 @@ const columns = ref([
|
|
|
{label: '供货厂家', prop: 'supplier', visible: true},
|
|
{label: '供货厂家', prop: 'supplier', visible: true},
|
|
|
{label: '备注', prop: 'remark', visible: true},
|
|
{label: '备注', prop: 'remark', visible: true},
|
|
|
|
|
|
|
|
-])
|
|
|
|
|
-
|
|
|
|
|
|
|
+]);
|
|
|
|
|
+const tableref = ref(null);
|
|
|
const currentgateway = ref({
|
|
const currentgateway = ref({
|
|
|
"sn": "",
|
|
"sn": "",
|
|
|
"name": "",
|
|
"name": "",
|
|
@@ -293,7 +298,20 @@ const deleterow =(item)=>{
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+const dosave = () => {
|
|
|
|
|
+ let data = tableref.value.getSelectionRows();
|
|
|
|
|
+ if(data.length==0) {
|
|
|
|
|
+ ElMessage.warning("请选择要关联的设备");
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ data[0].gatewayId = currentgateway.value.id;
|
|
|
|
|
+ updateEquipmentSbook(cloneDeep(data[0])).then(res => {
|
|
|
|
|
+ ElMessage.success("关联成功");
|
|
|
|
|
+ getalldata();
|
|
|
|
|
+ });
|
|
|
|
|
|
|
|
|
|
+ addshow.value = false;
|
|
|
|
|
+}
|
|
|
const savedata = () => {
|
|
const savedata = () => {
|
|
|
updateGateway(currentgateway.value).then(res => {
|
|
updateGateway(currentgateway.value).then(res => {
|
|
|
ElMessage.success("修改成功")
|
|
ElMessage.success("修改成功")
|
|
@@ -349,7 +367,9 @@ const pagedata = ref({
|
|
|
|
|
|
|
|
const getalldevicedata = () => {
|
|
const getalldevicedata = () => {
|
|
|
listGatewayEquipmentSbook({gatewayId:0, ...pagedata1.value}).then(res => {
|
|
listGatewayEquipmentSbook({gatewayId:0, ...pagedata1.value}).then(res => {
|
|
|
- alldevice.value = res.rows;
|
|
|
|
|
|
|
+ const {rows,total,page,size} = res;
|
|
|
|
|
+ alldevice.value = rows;
|
|
|
|
|
+ pagedata1.value = {total:total,current:page, size:10};
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
|
const onchangepage1 = (page) => {
|
|
const onchangepage1 = (page) => {
|
|
@@ -364,7 +384,9 @@ const pagedata1 = ref({
|
|
|
});
|
|
});
|
|
|
const getalldata = () => {
|
|
const getalldata = () => {
|
|
|
listGatewayEquipmentSbook({...pagedata.value,gatewayId:currentgateway.value.id}).then(res => {
|
|
listGatewayEquipmentSbook({...pagedata.value,gatewayId:currentgateway.value.id}).then(res => {
|
|
|
- tabledata.value = res.rows;
|
|
|
|
|
|
|
+ const {rows,total,page,size} = res;
|
|
|
|
|
+ tabledata.value = rows;
|
|
|
|
|
+ pagedata.value = {total:total,current:page, size:10};
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
|
|
|
|