卡斯柯调整

src/jmapNew/shape/Section/index.js

@@ -184,7 +184,7 @@ export default class Section extends Group {
                 { time: 500, styles: { stroke: this.style.backgroundColor } },
                 { time: 1000, styles: { stroke: this.style.Section.line.blockColor } }
             ]);
-        } else {
+        } else if (this.model.type !== '03') {
             this.line && this.line.setStyle({
                 stroke: this.style.Section.line.blockColor,
                 lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
@@ -193,7 +193,7 @@ export default class Section extends Group {
         if (this.style.Section.cross && this.model.type == '05') {
             this.line.setCrossBlock();
         }
-        if (this.style.Section.block && this.style.Section.block.blockGlint && this.line) {
+        if (this.style.Section.block && this.style.Section.block.blockGlint && this.line && this.model.type !== '03') {
             this.line.animateStyle(true, [
                 { time: 1000, styles: { stroke: this.style.backgroundColor } },
                 { time: 2000, styles: { stroke: this.style.Section.line.blockColor } }

src/jmapNew/shape/Switch/ESwLnversion.js

@@ -59,11 +59,10 @@ class ESwLnversion extends Group {
         return this.relocShelter;
     }
 
-    animateStyle(color1, color2) {
+    animateStyle(cb) {
-        this.relocShelter.animateStyle(true)
+        this.eachChild((child) => {
-            .when(0, {stroke: color1})
+            cb(child);
-            .when(500, {stroke: color2})
+        });
-            .when(1000, {stroke: color1}).start();
     }
 
 }

src/jmapNew/shape/Switch/ESwLocal.js

@@ -56,11 +56,10 @@ class ESwLocal extends Group {
         this.locShelter.setStyle(data);
     }
 
-    animateStyle(color1, color2) {
+    animateStyle(cb) {
-        this.locShelter.animateStyle(true)
+        this.eachChild((child) => {
-            .when(0, {stroke: color1})
+            cb(child);
-            .when(500, {stroke: color2})
+        });
-            .when(1000, {stroke: color1}).start();
     }
     getLocal() {
         return this.locShelter;

src/jmapNew/shape/Switch/ETriangle.js

@@ -65,11 +65,10 @@ class ETriangle extends Group {
         });
     }
 
-    animateStyle(color1, color2) {
+    animateStyle(cb) {
-        this.section.animateStyle(true)
+        this.eachChild((child) => {
-            .when(0, {stroke: color1})
+            cb(child);
-            .when(500, {stroke: color2})
+        });
-            .when(1000, {stroke: color1}).start();
     }
 
 }

src/jmapNew/shape/Switch/index.js

@@ -335,9 +335,21 @@ export default class Switch extends Group {
             bColor = '#FF0';
         }
         // 南京二号线道岔短闪两部分相位不同
-        this.shapeModelA && this.shapeModelA.animateStyle(aColor, this.style.backgroundColor);
+        this.shapeModelA && this.shapeModelA.animateStyle(item => {
+            item.animateStyle(true)
+                .when(0, { stroke: this.style.backgroundColor })
+                .when(1000, { stroke: aColor })
+                .when(2000, { stroke: this.style.backgroundColor })
+                .start();
+        });
         setTimeout(() => {
-            this.shapeModelB && this.shapeModelB.animateStyle(bColor, this.style.backgroundColor);
+            this.shapeModelB && this.shapeModelB.animateStyle(item => {
+                item.animateStyle(true)
+                    .when(0, { stroke: this.style.backgroundColor })
+                    .when(1000, { stroke: bColor })
+                    .when(2000, { stroke: this.style.backgroundColor })
+                    .start();
+            });
         }, 100);
         if (split) {
             this.shapeModelA.hide();
@@ -351,7 +363,6 @@ export default class Switch extends Group {
         this.shapeModelB.show();
         this.shapeModelC.show();
         this.shapeModelC.setColor(this.style.backgroundColor);
-        this.shapeModelB.animateStyle();
         this.style.Switch.shapeFlash && this.shapeFlashing(split);
         this.setTextColor(this.style.Switch.text.lossColor);
         this.style.Switch.text.faultFlashing && this.nameTextAnimation();

src/jmapNew/theme/nanjing_02/menus/menuButton.vue

@@ -346,7 +346,7 @@ export default {
             this.pushTempData([]); // 清空执行栏
             this.selectedObj = this.selected;
             this.rightClickDialogVisible = false;
-            if (this.selectedObj._type && (val._event == MouseEvent.Left || (val._event == MouseEvent.Right || this.$store.state.training.prdType === '01'))) {
+            if (this.selectedObj._type && (val._event == MouseEvent.Left || (val._event == MouseEvent.Right && this.$store.state.training.prdType === '01'))) {
                 const type = this.State2SimulationMap[this.$store.state.training.prdType];
                 this.modeMatch = this.stationContorl.controlMode == type;
                 // 道岔区段 道岔计轴区段 都是道岔操作

src/jmapNew/theme/ningbo_01/operationConfig.js

@@ -863,8 +863,8 @@ export default {
             trainingType: 'Station',
             productTypes: ['01'],
             stepVOList: [
-                { deviceType: '05', orderNum: 1, operateCode: '602', tip: '鼠标右键菜单选择【全站取消联锁自动触发】'},
+                { deviceType: '05', orderNum: 1, operateCode: '602', tip: '鼠标右键菜单选择【全站取消联锁自动触发】'}
-                { deviceType: '05', orderNum: 2, operateCode: '602', tip: '鼠标左键点击【确定】' }
+                // { deviceType: '05', orderNum: 2, operateCode: '602', tip: '鼠标左键点击【确定】' }
             ]
         },
         {
@@ -877,8 +877,8 @@ export default {
             trainingType: 'Station',
             productTypes: ['01'],
             stepVOList: [
-                { deviceType: '05', orderNum: 1, operateCode: '601', tip: '鼠标右键菜单选择【全站设置联锁自动触发】'},
+                { deviceType: '05', orderNum: 1, operateCode: '601', tip: '鼠标右键菜单选择【全站设置联锁自动触发】'}
-                { deviceType: '05', orderNum: 2, operateCode: '601', tip: '鼠标左键点击【确定】' }
+                // { deviceType: '05', orderNum: 2, operateCode: '601', tip: '鼠标左键点击【确定】' }
             ]
         }
     ]