diff --git a/src/jmapNew/theme/components/menus/childDialog/noticeInfo.vue b/src/jmapNew/theme/components/menus/childDialog/noticeInfo.vue
index c4bcf0c1e..e0f57f3b6 100644
--- a/src/jmapNew/theme/components/menus/childDialog/noticeInfo.vue
+++ b/src/jmapNew/theme/components/menus/childDialog/noticeInfo.vue
@@ -7,7 +7,7 @@
:visible.sync="show"
width="360px"
:before-close="doClose"
- :z-index="2000"
+ :z-index="2010"
:modal="false"
:close-on-click-modal="false"
append-to-body
diff --git a/src/views/newMap/displayBaSiDi/tmt.vue b/src/views/newMap/displayBaSiDi/tmt.vue
index 480b64824..3d79b373b 100644
--- a/src/views/newMap/displayBaSiDi/tmt.vue
+++ b/src/views/newMap/displayBaSiDi/tmt.vue
@@ -162,7 +162,7 @@
位置：
-
+
方向：
-
+
设置该列车为自动排列：
- 开启
- 关闭
+ 开启
+ 关闭
@@ -239,7 +239,7 @@
当前位置：
-
+
- 修改
+ 修改
创建
删除
- 步进
+ 步进
关闭
+
@@ -278,9 +279,13 @@
import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
export default {
name: 'RouteCreate',
+ components: {
+ NoticeInfo
+ },
data() {
return {
dialogShow: false,
@@ -314,7 +319,13 @@ export default {
return '列监';
},
createDisable() {
- return !(this.groupNumber1 && this.groupNumber1.length === 4 && this.newSectionCode && this.newTrainCode && this.newTrainCode.length === 8);
+ return !(this.groupNumber1 && this.groupNumber1.length === 4 && this.nowSectionCode && this.newTrainCode && this.newTrainCode.length === 8);
+ },
+ updateDisable() {
+ return !(this.newTrainCode && this.newTrainCode.length === 8);
+ },
+ moveDisable() {
+ return !this.newSectionCode;
}
},
watch: {
@@ -338,6 +349,8 @@ export default {
this.nowTrainCode = selected.destinationCode + selected.serviceNumber + (selected.tripNumber.substr(1, 2));
this.nowSectionCode = selected.sectionCode;
this.groupNumber1 = selected.code;
+ this.direction = selected.right ? 'right' : 'left';
+ this.operationType = 'show';
}
this.$nextTick(function () {
@@ -354,10 +367,22 @@ export default {
this.activeIndex = tab;
},
trainFind() {
+ // this.$store.state.map.activeTrainList
+ this.tableData = [];
if (this.trainCode) {
- const train = this.$store.getters['map/getDeviceByCode'](this.trainCode);
- this.tableData = train ? [train] : [];
- } else { this.tableData = []; }
+ this.$store.state.map.activeTrainList.forEach(item => {
+ const train = this.$store.getters['map/getDeviceByCode'](item);
+ const temp = train.destinationCode + train.serviceNumber + (train.tripNumber.substr(1, 2));
+ if (temp.includes(this.trainCode)) {
+ this.tableData.push(train);
+ }
+ });
+ } else {
+ this.$store.state.map.activeTrainList.forEach(item => {
+ const train = this.$store.getters['map/getDeviceByCode'](item);
+ this.tableData.push(train);
+ });
+ }
this.operationType = 'show';
},
resetTrainCode() {
@@ -365,6 +390,9 @@ export default {
this.tableData = [];
},
changeOperationType(type) {
+ if (type === 'create') {
+ this.changeShowMode();
+ }
this.operationType = type;
},
trainCommit() {
@@ -373,7 +401,7 @@ export default {
over: true
};
if (this.operationType === 'update') {
- params.groupNumber = this.trainModel.groupNumber;
+ params.groupNumber = this.groupNumber1;
params.serviceNumber = this.newTrainCode.slice(3, 6);
params.tripNumber = '0' + this.newTrainCode.slice(6, 8);
step.cmdType = CMD.TrainWindow.CMD_TRAIN_SET_PLAN;
@@ -403,10 +431,12 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.changeShowMode('');
+ this.changeShowMode();
}
}).catch((error) => {
+ this.changeShowMode();
console.error(error);
+ this.$refs.noticeInfo.doShow(error.message);
});
},
changeShowMode() {
@@ -414,6 +444,9 @@ export default {
this.nowSectionCode = '';
this.newSectionCode = '';
this.newTrainCode = '';
+ this.direction = '';
+ this.groupNumber1 = '';
+ this.tableData = [];
},
cancel() {
const operate = {