Skip to content

李君 / carrefour

Go to a project
Commit 99527382 by tianlonglong
Options

tll

1 parent 6b4a821b
Expand all
Inline Side-by-side
Showing 3 changed files with 32 additions and 18 deletions
src/views/Management/DeskManage/index.vue
...@@ -273,6 +273,7 @@ export default { ...@@ -273,6 +273,7 @@ export default {
this.tableData = []; this.tableData = [];
this.getDeskList(); this.getDeskList();
if (this.ptype == 1) { if (this.ptype == 1) {
console.log(444);
this.loadGateData(); this.loadGateData();
} else { } else {
this.drawFloorMap(); this.drawFloorMap();
...@@ -402,6 +403,7 @@ export default { ...@@ -402,6 +403,7 @@ export default {
.getBoundingClientRect().width; .getBoundingClientRect().width;
item.cheight = (item.cwidth * item.height) / item.width; item.cheight = (item.cwidth * item.height) / item.width;
that.canvasList = canvasList; that.canvasList = canvasList;
console.log(that.canvasList);
}); });
}; };
} }
......
src/views/queueManagement/channelManagement/index.vue
...@@ -288,10 +288,17 @@ export default { ...@@ -288,10 +288,17 @@ export default {
areaId: this.searchForm.areaId, areaId: this.searchForm.areaId,
}) })
.then((res) => { .then((res) => {
console.log(res);
let data = res.data.data; let data = res.data.data;
data.forEach((item) => { data.forEach((item) => {
item.name = this.areaObj.name; let sd = this.tableData.filter(
(item1) => item1.deviceSerialNum == item.serialnum
);
if (sd) {
item.name = sd.map((item2) => item2.name).join(",");
} else {
item.name = "";
}
item.id = item.serialnum; item.id = item.serialnum;
item.picUrl = item.picUrl =
window._vionConfig.picUrl + window._vionConfig.picUrl +
...@@ -303,6 +310,7 @@ export default { ...@@ -303,6 +310,7 @@ export default {
(item.coordinate = JSON.parse(item.coordinate)); (item.coordinate = JSON.parse(item.coordinate));
}); });
this.gateList = data; this.gateList = data;
console.log(this.gateList);
this.drawJoinMap(); this.drawJoinMap();
}); });
// this.drawFloorMap(); // this.drawFloorMap();
...@@ -461,21 +469,24 @@ export default { ...@@ -461,21 +469,24 @@ export default {
}, },
delCoord(data) { delCoord(data) {
data.coordinate = ""; data.coordinate = "";
this.$api.queueManagementApi.updateChannel(data).then((res) => { console.log(data, "gggggggg");
let result = res.data; this.$api.queueManagementApi
if (result.code == 200) { .updateChannel({ ...data, deviceSerialNum: "" })
this.$message({ .then((res) => {
message: result.msg, let result = res.data;
type: "success", if (result.code == 200) {
}); this.$message({
this.getTableData(); message: result.msg,
} else { type: "success",
this.$message({ });
message: result.msg, this.getTableData();
type: "error", } else {
}); this.$message({
} message: result.msg,
}); type: "error",
});
}
});
}, },
editCoord(group) { editCoord(group) {
let { position, points, __zr, cdata, desk } = group; let { position, points, __zr, cdata, desk } = group;
...@@ -487,7 +498,8 @@ export default { ...@@ -487,7 +498,8 @@ export default {
}; };
}); });
desk.coordinate = JSON.stringify(coordinate); desk.coordinate = JSON.stringify(coordinate);
let params = Object.assign({}, desk); let params = Object.assign({}, desk, { deviceSerialNum: cdata.id });
console.log(group, desk, "gggggg");
return this.$api.queueManagementApi.updateChannel(params); return this.$api.queueManagementApi.updateChannel(params);
}, },
}, },
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!