Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

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) {

src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenu.vue

@@ -58,7 +58,16 @@ export default {
     mounted() {
         this.$nextTick(() => {
             this.$store.dispatch('config/updateMenuBar');
+            const _that = this;
+            window.onclick = function (e) {
+                if (!_that.$store.state.training.trainingStart) {
+                    _that.$refs.menuBar && _that.$refs.menuBar.blankClickClose();
+                }
+            };
         });
+    },
+    beforeDestroy() {
+        window.onclick = function (e) {};
     }
 };
 </script>

src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenuBar.vue

@@ -372,6 +372,9 @@ export default {
                     this.$refs.helpAbout.doShow(operate);
                 }
             });
+        },
+        blankClickClose() {
+            this.$refs.menuBar.doClose();
         }
     }
 };

src/jmapNew/theme/chengdu_03/menus/localWorkMenu.vue

@@ -33,7 +33,16 @@ export default {
     mounted() {
         this.$nextTick(() => {
             this.$store.dispatch('config/updateMenuBar');
+            const _that = this;
+            window.onclick = function (e) {
+                if (!_that.$store.state.training.trainingStart) {
+                    _that.$refs.menuBar && _that.$refs.menuBar.blankClickClose();
+                }
+            };
         });
+    },
+    beforeDestroy() {
+        window.onclick = function (e) {};
     }
 };
 </script>

src/jmapNew/theme/chengdu_03/menus/localWorkMenuBar.vue

@@ -328,6 +328,9 @@ export default {
                     this.$refs.helpAbout.doShow(operate);
                 }
             });
+        },
+        blankClickClose() {
+            this.$refs.menuBar.doClose();
         }
     }
 };

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() {

src/jmapNew/theme/datie_02/menus/ctcWorkMenu.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="menus" :style="{width: width + 'px'}">
+  <div class="menus" :style="{width: width + 'px', height: '100%'}">
     <div class="title">{{ `哈尔滨局CTC3.0(车务终端A机)--王岗：${dateString}第一班 18:00 管理员代--` }}</div>
     <menu-bar ref="menuBar" :selected="selected" />
     <div style="position: absolute; top: 64px;z-index: 10;background: #F0F0F0;padding: 2px;height: 65px;width: 100%;">

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) {

src/views/organization/trainingManage/index.vue

@@ -25,6 +25,7 @@ export default {
             queryForm: {
                 labelWidth: '100px',
                 reset: false,
+                notRecord: true,
                 queryObject: {
                     mapId: {
                         type: 'select',