From f2039927dbacad84b2055344261617a1dcf5da3e Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Wed, 19 Apr 2023 10:42:38 +0800
Subject: [PATCH] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit d082dc2fbc970cccf3ba1f3daee80a9d3a5ecd30
Author: dong <58670809@qq.com>
Date:   Wed Apr 19 10:41:17 2023 +0800

    修改收令单位不显示调度命令问题

commit c52925960c20d076c253e086a4e18e7085d09442
Merge: a3bc0de08 1f5d891c5
Author: joylink_zhangsai <1021828630@qq.com>
Date:   Tue Apr 18 16:25:03 2023 +0800

    Merge remote-tracking branch 'origin/test' into test

commit a3bc0de08a0c6ef2afdbbf5210619f80d9700b10
Author: joylink_zhangsai <1021828630@qq.com>
Date:   Tue Apr 18 16:24:34 2023 +0800

    处理列车异常显示问题 by fan

commit 1f5d891c55a2b28420affb35be6389badfdea61a
Author: dong <58670809@qq.com>
Date:   Mon Apr 17 14:40:39 2023 +0800

    修改苏电院交控线路顶部菜单展开后没法收回去问题

commit 0d50ac586b4ca3411960ddd04d638e5782ddbf53
Author: dong <58670809@qq.com>
Date:   Mon Apr 17 13:26:39 2023 +0800

    修改弹窗没有高度问题

commit 73c9c0777eccbce97cae036e368b61fca518f0dd
Author: dong <58670809@qq.com>
Date:   Fri Apr 14 16:25:38 2023 +0800

    去掉实训管理查询项缓存
---
 src/jmapNew/painter.js                        |  2 +-
 .../components/menus/dialog/cmdManage.vue     | 11 ++++++----
 .../newMap/display/terminals/dispatchCmd.vue  | 22 ++++++++-----------
 3 files changed, 17 insertions(+), 18 deletions(-)

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 @@
                   <span style="margin-left: 10px">{{ getStateInfo(scope.row.rcvCompanies).time || '' }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="发令单位">
+              <el-table-column label="发令单位" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <span style="margin-left: 10px">{{ scope.row.sendCompany ? scope.row.sendCompany.name : '' }}</span>
                 </template>
               </el-table-column>
-              <el-table-column prop="sender" label="发令人" />
+              <el-table-column prop="sender" label="发令人" show-overflow-tooltip />
               <el-table-column label="签否">
                 <template slot-scope="scope">
                   <span style="margin-left: 10px">{{ getSignedStatus(getStateInfo(scope.row.rcvCompanies)) }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="签收人">
+              <el-table-column label="签收人" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <span style="margin-left: 10px">{{ getSignedBy(scope.row.rcvCompanies) || '' }}</span>
                 </template>
@@ -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) {