diff --git a/src/jmapNew/painter.js b/src/jmapNew/painter.js index 271c5f914..6615d0fb6 100644 --- a/src/jmapNew/painter.js +++ b/src/jmapNew/painter.js @@ -155,7 +155,7 @@ class Painter { trainDevice.instance && this.mapInstanceLevel[deviceType.Train].remove(trainDevice.instance); trainDevice.instance = null; trainDevice.zrOptions = this.$jmap.$options; - this.add(trainDevice); + curModel.sectionModel.instance && this.add(trainDevice); }); if (this.screenFlag) { diff --git a/src/jmapNew/theme/components/menus/dialog/cmdManage.vue b/src/jmapNew/theme/components/menus/dialog/cmdManage.vue index 8b3e1f03a..7828dd94e 100644 --- a/src/jmapNew/theme/components/menus/dialog/cmdManage.vue +++ b/src/jmapNew/theme/components/menus/dialog/cmdManage.vue @@ -38,18 +38,18 @@ {{ getStateInfo(scope.row.rcvCompanies).time || '' }} - + - + - + @@ -352,7 +352,10 @@ export default { }, findDisCmdObj(obj, val) { return Object.values(obj).find(item => { - return item.rcvCompanies[0].id == val; + const find = item.rcvCompanies.find(ii => { + return ii.id == val; + }); + return find; }); }, searchCmd() { diff --git a/src/views/newMap/display/terminals/dispatchCmd.vue b/src/views/newMap/display/terminals/dispatchCmd.vue index 3e8d9ae7e..301fea982 100644 --- a/src/views/newMap/display/terminals/dispatchCmd.vue +++ b/src/views/newMap/display/terminals/dispatchCmd.vue @@ -1324,20 +1324,16 @@ export default { console.log('tabClick'); }, selectionChange(selection) { + this.command.rcvCompanies = []; selection.forEach(item => { - const find = this.command.rcvCompanies.find(every => { - return item.code == every.code; - }); - if (!find) { - const obj = { - name: item.name, - rsCompany: true, - cpType: item.cpType, - code: item.code, - ...item - }; - this.command.rcvCompanies.push(obj); - } + const obj = { + name: item.name, + rsCompany: true, + cpType: item.cpType, + code: item.code, + ...item + }; + this.command.rcvCompanies.push(obj); }); }, getCompanyIdList(sum) {