From 0093b8bae1bb6f3a4bb9c705c831fad8ed196005 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Tue, 11 Jul 2023 14:17:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/skinCode/datie_02.js       |  6 +--
 src/jmapNew/shape/graph/Train/TrainBody.js    | 42 +++++++++----------
 .../menus/dialog/trainOperation.vue           |  2 +-
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/jmapNew/config/skinCode/datie_02.js b/src/jmapNew/config/skinCode/datie_02.js
index 052a0d3c1..19e620e24 100644
--- a/src/jmapNew/config/skinCode/datie_02.js
+++ b/src/jmapNew/config/skinCode/datie_02.js
@@ -867,12 +867,12 @@ class SkinCode extends defaultStyle {
                         type: '03',
                         serviceNumber: '---',
                         // nameFormat: 'groupNumber:serviceNumber'
-                        nameFormat:'tripNumber'
+                        nameFormat:'groupNumber'
                     },
                     {
                         type: '03',
                         // nameFormat: 'serviceNumber:trainNumber'
-                        nameFormat:'tripNumber'
+                        nameFormat:'groupNumber'
                     }
                 ], // 特殊列车类型需设置显示格式
                 lrPadding: 4, // 两边间隔
@@ -881,7 +881,7 @@ class SkinCode extends defaultStyle {
                 trainSidelineColor: '#F00',
                 trainSidelineStopColor: '#000',
                 // trainNameFormat: 'serviceNumber:targetCode'// 列车显示格式
-                trainNameFormat:'tripNumber'
+                trainNameFormat:'groupNumber'
             },
             directionArrow: {
             },
diff --git a/src/jmapNew/shape/graph/Train/TrainBody.js b/src/jmapNew/shape/graph/Train/TrainBody.js
index 716381aa0..4c93f8959 100644
--- a/src/jmapNew/shape/graph/Train/TrainBody.js
+++ b/src/jmapNew/shape/graph/Train/TrainBody.js
@@ -2,7 +2,7 @@ import Group from 'zrender/src/container/Group';
 import TrainBodyBox from './TrainBodyBox';
 // import '../StationStand/EDetain';
 import ETextName from '../element/ETextName'; // 名称文字 (共有)
-import EMouse from './EMouse';
+// import EMouse from './EMouse';
 import store from '@/store/index';
 import Circle from 'zrender/src/graphic/shape/Circle';
 import BoundingRect from 'zrender/src/core/BoundingRect';
@@ -21,26 +21,26 @@ export default class TrainBody extends Group {
     }
 
     createMouse() {
-        this.mouseEvent = new EMouse(this);
-        this.add(this.mouseEvent);
-        if (this.deviceModel.__down) {
-            store.dispatch('map/setTrainDetails', this.deviceModel);
-            this.mouseEvent.mouseover();
-        }
-        if (this.deviceModel.__click) {
-            this.mouseEvent.mouseClick();
-        }
-        this.on('mouseover', () => {
-            store.dispatch('map/setTrainDetails', this.deviceModel);
-            this.mouseEvent.mouseover();
-        });
-        this.on('mouseout', () => {
-            store.dispatch('map/setTrainDetails', null);
-            this.mouseEvent.mouseout();
-        });
-        this.on('click', () => {
-            this.mouseEvent.mouseClick();
-        });
+        // this.mouseEvent = new EMouse(this);
+        // this.add(this.mouseEvent);
+        // if (this.deviceModel.__down) {
+        //     store.dispatch('map/setTrainDetails', this.deviceModel);
+        //     this.mouseEvent.mouseover();
+        // }
+        // if (this.deviceModel.__click) {
+        //     this.mouseEvent.mouseClick();
+        // }
+        // this.on('mouseover', () => {
+        //     store.dispatch('map/setTrainDetails', this.deviceModel);
+        //     this.mouseEvent.mouseover();
+        // });
+        // this.on('mouseout', () => {
+        //     store.dispatch('map/setTrainDetails', null);
+        //     this.mouseEvent.mouseout();
+        // });
+        // this.on('click', () => {
+        //     this.mouseEvent.mouseClick();
+        // });
     }
 
     create() {
diff --git a/src/jmapNew/theme/components/menus/dialog/trainOperation.vue b/src/jmapNew/theme/components/menus/dialog/trainOperation.vue
index 5addb257a..8b324f1b0 100644
--- a/src/jmapNew/theme/components/menus/dialog/trainOperation.vue
+++ b/src/jmapNew/theme/components/menus/dialog/trainOperation.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     v-dialogDrag
-    title="Train operation"
+    title="Train Control"
     :visible.sync="dialogVisible"
     width="30%"
     :modal="false"