处理冲突文件

#    src/jmapNew/theme/nanjing_02/menus/menuBar.vue

src/jmapNew/config/skinCode/fuzhou_01.js

@@ -224,8 +224,8 @@ class SkinCode extends defaultStyle {
                 z:1,
                 mergentR: 4,										// 站台紧急关闭半径
                 mergentN: 4, 										// 站台紧急关闭边数
-                insideOffset: { x: 0, y: 25 }, 				// 内站台紧急关闭偏移量
+                insideOffset: { x: 0, y: 18 }, 				// 内站台紧急关闭偏移量
-                outsideOffset: { x: 0, y: -25 }, 			// 外站台紧急关闭偏移量
+                outsideOffset: { x: 0, y: -18 }, 			// 外站台紧急关闭偏移量
                 closeColor: '#F61107' 							// 站台紧急关闭颜色
             },
             // 扣车元素 普通扣车
@@ -733,7 +733,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.FloodGate] = {};
         this[deviceType.DirectionRod] = {};
-		this[deviceType.IndicatorLight] = {};
+        this[deviceType.IndicatorLight] = {};
     }
 }
 

src/jmapNew/shape/StationStand/emergent/EEmergentRhombus.js

@@ -48,9 +48,9 @@ class EEmergentRhombus extends Group {
         this.hideMode();
     }
 
-	setColor(color) {
+    setColor(color) {
         this.emergent && this.emergent.setStyle('stroke', color);
-	}
+    }
 
     setState(model) {
         // 紧急停车

src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue

@@ -149,6 +149,16 @@ export default {
                     handler: this.cancelStoppage,
                     cmdType:CMD.Stand.CMD_STAND_REMOVE_FAULT
                 },
+                {
+                    label: '站台紧急停车',
+                    handler: this.emergencyClose,
+                    cmdType: CMD.Stand.CMD_STAND_EMERGENCY_CLOSE
+                },
+                {
+                    label: '取消站台紧急停车',
+                    handler: this.cancelEmergencyClose,
+                    cmdType: CMD.Stand.CMD_STAND_CANCEL_EMERGENCY_CLOSE
+                },
                 {
                     label: this.$t('menu.menuSection.triggerFaultManagement'),
                     handler: this.triggerFaultManagement,
@@ -306,6 +316,22 @@ export default {
                 }
             });
         },
+        // 站台紧急停车
+        emergencyClose() {
+            commitOperate(menuOperate.StationStand.emergencyClose, { standCode: this.selected.code }, 3).then(({valid, operate}) => {
+            }).catch(error=>{
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
+            });
+        },
+        // 取消站台紧急停车
+        cancelEmergencyClose() {
+            commitOperate(menuOperate.StationStand.cancelEmergencyClose, { standCode: this.selected.code }, 3).then(({valid, operate}) => {
+            }).catch(error=> {
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
+            });
+        },
         triggerFaultManagement() {
             this.$store.dispatch('training/setTriggerFaultCount', this.selected);
         }

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

@@ -79,7 +79,7 @@
                 <el-button size="mini" plain :disabled="trainOperateType==='update'" @click="handleTrainOperate('update')">车次号修改</el-button>
                 <el-button size="mini" plain :disabled="trainOperateType==='delete'" @click="handleTrainOperate('delete')">车次号删除</el-button>
                 <el-button size="mini" plain :disabled="trainOperateType==='create'" @click="handleTrainOperate('create')">车次号创建</el-button>
-                <el-button size="mini" plain :disabled="true">车次号步进</el-button>
+                <el-button size="mini" plain :disabled="trainOperateType==='move'" @click="handleTrainOperate('create')">车次号步进</el-button>
               </div>
             </el-row>
             <el-row style="height: 25px;line-height: 25px;border-top: 2px solid #7E8076;border-left: 2px solid #6A6B64;border-right: 2px solid #FBFBFA;">
@@ -117,6 +117,19 @@
               <el-col :span="7" style="height: 25px;line-height: 25px;">新车组号</el-col>
               <el-col :span="17"><el-input v-model="formModelNewGroup" size="mini" style="height: 20px;" /></el-col>
             </el-row>
+            <el-row v-if="trainOperateType === 'move'" style="display: flex;align-items: center;">
+              <el-col :span="7" style="height: 25px;line-height: 25px;">新轨道号</el-col>
+              <el-col :span="17">
+                <el-select v-model="formModelNewSection" filterable size="mini" style="height: 20px;" placeholder="请选择">
+                  <el-option
+                    v-for="item in handleSectionList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-col>
+            </el-row>
           </div>
         </el-col>
         <el-col v-if="trainOperationShow" :span="6" style="padding: 1px;">
@@ -240,6 +253,18 @@ export default {
             return (this.trainOperateType === 'create' && this.formModelNewTrip && this.formModelNewTrip.length === 7 && this.formModelNewGroup && this.formModelNewGroup.length === 6) ||
 				(this.trainOperateType === 'update' && this.formModelNewTrip && this.formModelNewTrip.length === 7) || (this.trainOperateType === 'delete') ||
 				(this.trainOperateType === 'move' && this.formModelNewSection);
+        },
+        handleSectionList() {
+            const list = [];
+            this.sectionList.forEach(item => {
+                if ((item.type === '01' && !item.parentCode) || item.type === '04') {
+                    list.push({label: item.name, value: item.code});
+                } else if (item.type === '02') {
+                    const parentSection = this.$store.getters['map/getDeviceByCode'](item.parentCode) || {};
+                    list.push({label: parentSection.name + item.name, value: item.code});
+                }
+            });
+            return list;
         }
     },
     watch: {
@@ -248,8 +273,7 @@ export default {
                 '01': 'Local',		// 现地工作站
                 '02': 'Center'		// 中心调度工作站
             };
-
+            if (this.selected._type && !this.trainOperationShow) {
-            if (this.selected._type) {
                 const control = this.getStationControl(this.selected);
                 const type = State2SimulationMap[this.$store.state.training.prdType];
                 if (control.controlMode != type) {
@@ -753,7 +777,12 @@ export default {
             this.clearAllMenuShow();
         },
         handleTrainParam() {
-            this.formModelSectionName = this.selectedObj.name;
+            if (this.selectedObj.type === '02') {
+                const parentSection = this.$store.getters['map/getDeviceByCode'](this.selectedObj.parentCode);
+                this.formModelSectionName = parentSection.name + this.selectedObj.name;
+            } else {
+                this.formModelSectionName = this.selectedObj.name;
+            }
             this.trainOperateType = '';
             this.$store.state.map.activeTrainList.forEach(trainCode => {
                 const trainModel = this.$store.getters['map/getDeviceByCode'](trainCode);
@@ -776,6 +805,7 @@ export default {
                 this.formModelNewGroup = '';
                 this.trainOperateType = '';
                 this.trainOperationShow = flag;
+                this.formModelNewSection = '';
             }
         },
         trainCommit() {

src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue

@@ -124,6 +124,14 @@ export default {
                 this.$refs.noticeInfo.doShow();
             });
         },
+        // 取消站台紧急停车
+        cancelEmergencyClose() {
+            commitOperate(menuOperate.StationStand.cancelEmergencyClose, { standCode: this.selected.code }, 3).then(({valid, operate}) => {
+            }).catch(error=> {
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
+            });
+        },
         // 设置故障
         setStoppage() {
             commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
@@ -140,14 +148,6 @@ export default {
                 }
             });
         },
-        // 取消站台紧急停车
-        cancelEmergencyClose() {
-            commitOperate(menuOperate.StationStand.cancelEmergencyClose, { standCode: this.selected.code }, 3).then(({valid, operate}) => {
-            }).catch(error=> {
-                console.error(error);
-                this.$refs.noticeInfo.doShow();
-            });
-        },
         triggerFaultManagement() {
             this.$store.dispatch('training/setTriggerFaultCount', this.selected);
         }

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

@@ -8,7 +8,8 @@
               <el-button style="width: 100px;line-height: 19px;" plain @click="login">{{ loginText }}</el-button>
             </el-row>
             <el-row>
-              <input v-model="inputStr" :type="modelType" style="width: 100px;height:20px;" :disabled="isLogin||this.loginText == '登录'" @keyup.enter="validateData">
+              <span v-if="isLogin">{{ inputStr }}</span>
+              <input v-if="!isLogin" v-model="inputStr" :type="modelType" style="width: 100px;height:20px;" :disabled="this.loginText == '登录'" @keyup.enter="validateData">
             </el-row>
           </div>
         </el-col>

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

@@ -422,10 +422,10 @@ export default {
         handleSectionList() {
             const list = [];
             this.sectionList.forEach(item => {
-                if (item.type === '01' || item.type === '04') {
+                if ((item.type === '01' && !item.parentCode) || item.type === '04') {
                     list.push({label: item.name, value: item.code});
                 } else if (item.type === '02') {
-                    const parentSection = this.$store.getters['map/getDeviceByCode'](this.selectedObj.parentCode) || {};
+                    const parentSection = this.$store.getters['map/getDeviceByCode'](item.parentCode) || {};
                     list.push({label: parentSection.name + item.name, value: item.code});
                 }
             });