北京一号线 步骤操作代码调整

src/jmapNew/theme/beijing_01/menus/dialog/routeControl.vue

@@ -127,8 +127,11 @@ export default {
         // 取消列车进路
         cancelTrainRoute() {
             this.loading = true;
-            commitOperate(menuOperate.Signal.cancelTrainRoute, {}, 2).then((data)=>{
+            commitOperate(menuOperate.Signal.cancelTrainRoute, {}, 2).then(({valid})=>{
-                this.doClose();
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();
@@ -138,9 +141,12 @@ export default {
         // 信号关灯
         signalClose() {
             this.loading = true;
-            commitOperate(menuOperate.Signal.signalClose, {}, 1).then((data)=>{
+            commitOperate(menuOperate.Signal.signalClose, {}, 1).then(({valid, operate})=>{
-                this.doClose();
+                this.loading = false;
-                this.$refs.confirmControl.doShow(data.operate);
+                if (valid) {
+                    this.doClose();
+                    this.$refs.confirmControl.doShow(operate);
+                }
             }).catch(() => {
                 this.loading = false;
                 this.doClose();
@@ -149,8 +155,11 @@ export default {
         // 信号重开
         reopenSignal() {
             this.loading = true;
-            commitOperate(menuOperate.Signal.reopenSignal, {}, 2).then((data)=>{
+            commitOperate(menuOperate.Signal.reopenSignal, {}, 2).then(({valid})=>{
-                this.doClose();
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();

src/jmapNew/theme/beijing_01/menus/dialog/routeHandControl.vue

@@ -279,8 +279,11 @@ export default {
         // 进路交人工控
         humanControl() {
             this.loading = true;
-            commitOperate(menuOperate.Signal.humanControl, {routeCodeList:this.selection}, 2).then((data)=>{
+            commitOperate(menuOperate.Signal.humanControl, {routeCodeList:this.selection}, 2).then(({valid})=>{
-                this.doClose();
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();
@@ -290,8 +293,11 @@ export default {
         // 进路交自动控
         atsAutoControl() {
             this.loading = true;
-            commitOperate(menuOperate.Signal.atsAutoControl, {routeCodeList:this.selection}, 2).then((data)=>{
+            commitOperate(menuOperate.Signal.atsAutoControl, {routeCodeList:this.selection}, 2).then(({valid})=>{
-                this.doClose();
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();

src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue

@@ -225,8 +225,11 @@ export default {
         commit() {
             if (this.row && this.row.canSetting) {
                 this.loading = true;
-                commitOperate(menuOperate.Signal.arrangementRoute, {routeCode:this.row.code}, 2).then((data)=>{
+                commitOperate(menuOperate.Signal.arrangementRoute, {routeCode:this.row.code}, 2).then(({valid})=>{
-                    this.doClose();
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
                 }).catch((error) => {
                     this.loading = false;
                     this.doClose();

src/jmapNew/theme/beijing_01/menus/dialog/sectionControl.vue

@@ -188,8 +188,11 @@ export default {
         },
         sendCommand(operate) { // 发送指令
             this.loading = true;
-            commitOperate(operate, {}, 2).then((data)=>{
+            commitOperate(operate, {}, 2).then(({valid})=>{
-                this.doClose();
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();

src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue

@@ -189,8 +189,11 @@ export default {
         commit() {
             if (this.isConfirm) {
                 this.loading = true;
-                commitOperate(menuOperate.StationStand.setBackStrategy, {standReentryStrategy: this.strategy}, 2).then((data)=>{
+                commitOperate(menuOperate.StationStand.setBackStrategy, {standReentryStrategy: this.strategy}, 2).then(({valid})=>{
-                    this.doClose();
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
                 }).catch((error) => {
                     this.loading = false;
                     this.doClose();

src/jmapNew/theme/beijing_01/menus/dialog/standControl.vue

@@ -266,8 +266,11 @@ export default {
         },
         sendCommand(operate) { // 发送指令
             this.loading = true;
-            commitOperate(operate, {}, 2).then((data)=>{
+            commitOperate(operate, {}, 2).then(({valid})=>{
-                this.doClose();
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();
@@ -278,7 +281,6 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-
             this.loading = false;
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {

src/jmapNew/theme/beijing_01/menus/dialog/standJumpStopControl.vue

@@ -245,8 +245,11 @@ export default {
         // 设置跳停
         setJumpStop() {
             this.loading = true;
-            commitOperate(menuOperate.StationStand.setJumpStop, {trainGroupNumber:this.model.tripNumber}, 2).then((data)=>{
+            commitOperate(menuOperate.StationStand.setJumpStop, {trainGroupNumber:this.model.tripNumber}, 2).then(({valid})=>{
-                this.doClose();
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();
@@ -257,8 +260,11 @@ export default {
         // 取消跳停
         cancelJumpStop() {
             this.loading = true;
-            commitOperate(menuOperate.StationStand.cancelJumpStop, {trainGroupNumber:this.model.tripNumber}, 2).then((data)=>{
+            commitOperate(menuOperate.StationStand.cancelJumpStop, {trainGroupNumber:this.model.tripNumber}, 2).then(({valid})=>{
-                this.doClose();
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();

src/jmapNew/theme/beijing_01/menus/dialog/switchControl.vue

@@ -186,8 +186,11 @@ export default {
 
         sendCommand(operate) { // 发送指令
             this.loading = true;
-            commitOperate(operate, {}, 2).then((data)=>{
+            commitOperate(operate, {}, 2).then(({valid})=>{
-                this.doClose();
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();

src/jmapNew/theme/beijing_01/menus/menuSection.vue

@@ -173,8 +173,10 @@ export default {
         // },
         // 故障解锁
         faultUnlock(selectType) {
-            commitOperate(menuOperate.Section.fault, {sectionCode:selectType.code}, 0).then((data)=>{
+            commitOperate(menuOperate.Section.fault, {sectionCode:selectType.code}, 0).then(({valid, operate})=>{
-                this.$refs.sectionControl.doShow(data.operate, data.selected);
+                if (valid) {
+                    this.$refs.sectionControl.doShow(operate, selectType);
+                }
             });
         },
         undeveloped() {