定时任务和设备联调

main
xuechunyuan 2 years ago
parent c957256093
commit cb38e05a02
  1. 30
      src/views/wirelessintrusion/deployment/list.vue
  2. 11
      src/views/wirelessintrusion/device/list.vue

@ -198,14 +198,13 @@ export default {
editBtn: this.vaildData(this.permission.notice_edit, false) editBtn: this.vaildData(this.permission.notice_edit, false)
}; };
}, },
ids() { ids() {
let ids = []; let ids = [];
this.selectionList.forEach(ele => { this.selectionList.forEach(ele => {
ids.push(ele.id); ids.push(ele.id);
}); });
return ids.join(","); return ids.join(",");
} },
}, },
mounted() { mounted() {
this.loadDict(); this.loadDict();
@ -273,8 +272,7 @@ export default {
}, },
// //
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = val.map(item => item.id); this.multipleSelection = val;
console.log(this.multipleSelection)
}, },
// //
submitForm() { submitForm() {
@ -287,11 +285,15 @@ export default {
}) })
return; return;
} }
let ids = this.multipleSelection.join(","); let ids = [], deviceId = [];
console.log(ids) this.multipleSelection.forEach(ele => {
let tags = JSON.parse(ele.tags)
ids.push(ele.id);
deviceId.push(tags.sectorNo);
});
this.submitLoading = true; this.submitLoading = true;
if (this.addForm.id > 0) { if (this.addForm.id > 0) {
cornJobUpdate({ ...this.addForm, deviceId: ids }).then((res) => { cornJobUpdate({ ...this.addForm, deviceId: deviceId.join(","), ids: ids.join(",") }).then((res) => {
this.submitLoading = false; this.submitLoading = false;
this.dialogVisible = false; this.dialogVisible = false;
this.onLoad(this.page); this.onLoad(this.page);
@ -303,7 +305,7 @@ export default {
this.submitLoading = false; this.submitLoading = false;
}) })
} else { } else {
cornJobSave({ ...this.addForm, deviceId: ids }).then(res => { cornJobSave({ ...this.addForm, deviceId: deviceId.join(","), ids: ids.join(",") }).then(res => {
this.submitLoading = false; this.submitLoading = false;
this.dialogVisible = false; this.dialogVisible = false;
this.onLoad(this.page); this.onLoad(this.page);
@ -444,11 +446,11 @@ export default {
}) })
this.tableData = data.records; this.tableData = data.records;
this.$refs.multipleTable.clearSelection(); this.$refs.multipleTable.clearSelection();
this.multipleSelection = this.addForm.deviceId ? this.addForm.deviceId.split(",") : []; let multipleSelection = this.addForm.ids ? this.addForm.ids.split(",") : [];
if (this.multipleSelection.length > 0) { // if (multipleSelection.length > 0) { //
this.$nextTick(() => { this.$nextTick(() => {
this.tableData.forEach(row => { // this.tableData.forEach(row => { //
this.multipleSelection.forEach(item => { // multipleSelection.forEach(item => { //
if (row.id === parseInt(item)) { if (row.id === parseInt(item)) {
this.$refs.multipleTable.toggleRowSelection(row, true); // this.$refs.multipleTable.toggleRowSelection(row, true); //
} }
@ -476,11 +478,11 @@ export default {
}) })
this.tableData = data.rows; this.tableData = data.rows;
this.$refs.multipleTable.clearSelection(); this.$refs.multipleTable.clearSelection();
this.multipleSelection = this.addForm.deviceId ? this.addForm.deviceId.split(",") : []; let multipleSelection = this.addForm.ids ? this.addForm.ids.split(",") : [];
if (this.multipleSelection.length > 0) { // if (multipleSelection.length > 0) { //
this.$nextTick(() => { this.$nextTick(() => {
this.tableData.forEach(row => { // this.tableData.forEach(row => { //
this.multipleSelection.forEach(item => { // multipleSelection.forEach(item => { //
if (row.id === parseInt(item)) { if (row.id === parseInt(item)) {
this.$refs.multipleTable.toggleRowSelection(row, true); // this.$refs.multipleTable.toggleRowSelection(row, true); //
} }

@ -143,12 +143,13 @@ export default {
span: 12, span: 12,
labelWidth: 120, labelWidth: 120,
hide: true, hide: true,
}, {
label: "最后上线时间",
span: 24,
prop: "lastOnline",
labelWidth: 120
}, },
// {
// label: "线",
// span: 24,
// prop: "lastOnline",
// labelWidth: 120
// },
] ]
}, },
data: [], data: [],

Loading…
Cancel
Save