泰雷兹 宁波三号线 控制权转移代码调整

src/jmapNew/config/skinCode/ningbo_03.js

@@ -239,7 +239,9 @@ class SkinCode extends defaultStyle {
                 fontWeight:'normal', // 字体粗细
                 textPadding:[0, 0], // 字体边距
                 borderColor:'', // 字体边框颜色
-                textBorderWidth:0 // 字体边框宽度
+                textBorderWidth:0, // 字体边框宽度
+                isSpecialType:true, // 特雷兹特殊类型
+                noneModeColor:'#ff0' // 无模式时字体颜色
             },
 
             kmPostShow: false,										// 公里标显示

src/jmapNew/shape/Station/index.js

@@ -385,7 +385,12 @@ export default class Station extends Group {
         this.substationControl && this.substationControl.setColor(this.style.Station.StationControl.lamp.grayColor);
         this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.greenColor);
         this.centerControl && this.centerControl.setTextColor(this.style.Station.StationControl.lamp.greenColor); // 文字颜色
+        if (this.style.Station.stationText.isSpecialType) {
+            // simulationRoleList
+        } else {
             this.stationText.setColor('#1fdc1f');
+        }
+
         this.stationControlText && this.stationControlText.setStyle({text:'CC', textFill:this.style.Station.StationControl.text.centerControlColor});
         //
         //
@@ -411,8 +416,12 @@ export default class Station extends Group {
         //         this.subheadText && this.subheadText.setStyle('textFill', '#fff');
         //     }
         // }
+        if (this.style.Station.stationText.isSpecialType) {
+
+        } else {
             this.stationText.setColor('#fff');
         }
+    }
 
     handleEmergency() { // 紧急站控
         this.emergencyControl && this.emergencyControl.setColor(this.style.Station.StationControl.lamp.redColor);
@@ -427,8 +436,12 @@ export default class Station extends Group {
         //         this.subheadText && this.subheadText.setStyle('textFill', '#fff');
         //     }
         // }
+        if (this.style.Station.stationText.isSpecialType) {
+
+        } else {
             this.stationText.setColor('#fff');
         }
+    }
 
     handleInterlock() { // 联锁控  成都三号线
         this.emergencyControl && this.emergencyControl.setColor(this.style.Station.StationControl.lamp.grayColor);
@@ -448,6 +461,9 @@ export default class Station extends Group {
         if (this.style.Station.stationText.noneModeFlash) {
             this.stationText.setAnimateStyle(this.noneBeforeMode);
         }
+        if (this.style.Station.stationText.isSpecialType) {
+            this.stationText.setColor(this.style.Station.stationText.noneModeColor);
+        }
     }
 
     recover() {
@@ -462,8 +478,12 @@ export default class Station extends Group {
 
         this.substationArrowsControl && this.substationArrowsControl.setColor(this.style.Station.StationControl.lamp.grayColor);
         this.emergencyArrowsControl && this.emergencyArrowsControl.setColor(this.style.Station.StationControl.lamp.grayColor);
+        if (this.style.Station.stationText.isSpecialType) {
+
+        } else {
             this.stationText && this.stationText.stopAnimate();
         }
+    }
 
     // 设置状态
     setState(model) {

src/jmapNew/theme/ningbo_03/menus/menuBar.vue

@@ -356,7 +356,7 @@ export default {
                                     {
                                         title: '取消CBTC列车进路',
                                         click: this.cancelCbtcRoute
-                                    },
+                                    }
                                     // {
                                     //     title: 'VOBC切换',
                                     //     click: this.undeveloped
@@ -727,6 +727,38 @@ export default {
                             }
                         ]
                     },
+                    {
+                        title: '用户权限(U)',
+                        operate: OperationEvent.Command.mBar.userManage,
+                        children: [
+                            {
+                                title: '转移控制',
+                                operate: OperationEvent.Command.commandNingBo3.line_user,
+                                children: [
+                                    {
+                                        title: '请求区域控制权',
+                                        click: this.authorizeRequest,
+                                        operate: OperationEvent.Command.commandNingBo3.line_user_request
+                                    },
+                                    {
+                                        title: '授权转移',
+                                        click: this.authorizeTransfer,
+                                        operate: OperationEvent.Command.commandNingBo3.line_user_transfer
+                                    },
+                                    {
+                                        title: '下放站控',
+                                        click: this.authorizeDevolution,
+                                        operate: OperationEvent.Command.commandNingBo3.line_user_devolution
+                                    },
+                                    {
+                                        title: '收回站控',
+                                        click: this.authorizeReclaim,
+                                        operate: OperationEvent.Command.commandNingBo3.line_user_reclaim
+                                    }
+                                ]
+                            }
+                        ]
+                    }
                     // {
                     //     title: '视图(V)',
                     //     operate: '',

src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue

@@ -21,10 +21,10 @@
     <div class="message" style="color:#ff0000;font-size:14px;margin-left:10px">{{ message }}</div>
     <el-row justify="center" class="button-group">
       <el-col :span="4" :offset="1">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit(true)">确定(O)</el-button>
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="status==''" @click="commit(true)">确定(O)</el-button>
       </el-col>
       <el-col :span="4" :offset="2">
-        <el-button :id="domIdApply" @click="commit(false)">应用(A)</el-button>
+        <el-button :id="domIdApply" :disabled="status==''" @click="commit(false)">应用(A)</el-button>
       </el-col>
       <el-col :span="4" :offset="2">
         <el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
@@ -50,7 +50,7 @@ export default {
     },
     data() {
         return {
-            status: true,
+            status: '',
             operate: null,
             loading: false,
             dialogShow: false,
@@ -107,11 +107,16 @@ export default {
         'selected': function(val) {
             if (val) {
                 const sationEle = this.$store.getters['map/getDeviceByCode'](val.code);
-                if (this.prdType == '02') {
+                if (this.prdType == '01' && sationEle && sationEle.controlMode == 'Center') {
-                    this.status = sationEle && sationEle.controlMode != 'Center';
+                    this.status = 'Center';
-                } else {
+                } else if (this.prdType == '02' && sationEle && sationEle.controlMode != 'Center') {
-                    this.status = sationEle && sationEle.controlMode == 'Center';
+                    this.status = 'Local';
                 }
+                // if (this.prdType == '02') {
+                //
+                // } else {
+                //     this.status = sationEle && sationEle.controlMode == 'Center';
+                // }
             }
         }
     },
@@ -122,7 +127,7 @@ export default {
             this.$nextTick(e => {
                 this.$refs.table.setCurrentRow();
                 this.$store.dispatch('training/emitTipFresh');
-			})
+            });
         },
         doClose() {
             this.dialogShow = false;
@@ -160,21 +165,23 @@ export default {
             });
         },
         commit(isClose = true) {
+            debugger;
             const val = this.selected || {};
             const steps = {
                 operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
                 over: true,
-                param: {stationCode:val.code}
+                param: {stationCodes:[val.code]}
             };
 
-			steps.cmdType = this.status ? CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL : CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL;
+            // steps.cmdType = this.status ? CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL : CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL;
+            steps.cmdType = this.status == 'Center' ? CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL : CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL;
 
             this.$store.dispatch('training/nextNew', steps).then(({ valid }) => {
                 if (valid) {
                     isClose && this.doClose();
                     this.$emit('commandSuccess', val.code);
                 }
-            }).catch((error) => {
+            }).catch(() => {
                 isClose && this.doClose();
                 this.$refs.noticeInfo.doShow();
             });