-
+
+
@@ -43,22 +51,33 @@ export default {
}
},
id:{
- type:String,
+ type: Number,
default() {
return -1;
}
},
+ index: {
+ type: Number,
+ default() {
+ return -1;
+ }
+ },
className:{
type:String,
default() {
return '';
}
+ },
+ isNextBtn:{
+ type: Boolean,
+ default() {
+ return false;
+ }
}
},
data() {
return {
- classA:'-1',
- tempClassA: -1
+ active: -1
};
},
computed: {
@@ -70,6 +89,13 @@ export default {
'mode'
])
},
+ watch: {
+ index(val) {
+ if (val == -1) {
+ this.active = -1;
+ }
+ }
+ },
methods:{
getDomId(item) {
if (item && item.operate) {
@@ -79,44 +105,45 @@ export default {
},
hookClick(item, event) {
this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
- const idArray = this.id.split(':');
- if (idArray.length <= 1) { this.$store.dispatch('menuOperation/changeMenuBar', ''); }
if (item && typeof item.click == 'function') {
if (item.children && item.children.length > 0) {
- this.selectedClassA(item, this.id);
+ this.selectedClass(item, this.id);
} else {
item.click(item.operate);
+ this.doClose(-1);
this.$store.dispatch('menuOperation/changeMenuBar', '');
}
}
},
- setClassA(index) {
- this.classA = index;
- },
- selectedClassA(item, index) {
+ selectedClass(item, index) {
const order = this.order || 0;
if (this.mode !== TrainingMode.TEACH) { // 编辑模式下可显示
- this.popupMenuA(item, index);
+ this.popupMenu(item, index);
} else if (this.steps[order] && this.steps[order].type == 'bar') { // 操作步骤没有顶部操作顶部菜单都不可显示
- this.popupMenuA(item, index);
+ this.popupMenu(item, index);
}
},
- // 弹出顶部菜单操作
- popupMenuA(item, index) {
- // this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
- // this.clickEvent();
+ popupMenu(item, index) {
const operate = {
type: 'bar',
operation: item.operate.operation
};
+
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
- this.classA = index;
+ this.$emit('active', index);
this.$store.dispatch('menuOperation/changeMenuBar', index);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
});
- }
+ },
+ doActive(index) {
+ this.active = index;
+ },
+ doClose() {
+ this.active = -1;
+ this.$emit('close');
+ }
}
};
@@ -236,9 +263,23 @@ export default {
display: flex;
flex-direction: column;
padding:0;
- max-height: 200px;
+ // max-height: 200px;
overflow: auto;
position: fixed;
border-left: 1px #CACACA solid;
}
+ .menu-li-block .triangle{
+ display: block;
+ width: 0;
+ height: 0;
+ border-top: 5px solid transparent;
+ border-left: 8px solid #49413e;
+ border-bottom: 5px solid transparent;
+ right: 10px;
+ position: absolute;
+ top: 10px;
+ }
+ .menu-li-block .label.triPad{
+ padding-right:35px;
+ }
diff --git a/src/jmapNew/theme/components/menus/menuBar.vue b/src/jmapNew/theme/components/menus/menuBar.vue
index a2ae1888d..39247a160 100644
--- a/src/jmapNew/theme/components/menus/menuBar.vue
+++ b/src/jmapNew/theme/components/menus/menuBar.vue
@@ -1,13 +1,16 @@
-
- 运行图名称:
-
-
+
@@ -109,7 +108,6 @@ export default {
$menuItemPadding: 5px;
#menuBar {
- z-index: 36;
position: absolute;
width: inherit;
height: $height;
diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js
index 33b4c9793..0722692cd 100644
--- a/src/jmapNew/theme/components/utils/menuOperate.js
+++ b/src/jmapNew/theme/components/utils/menuOperate.js
@@ -479,18 +479,19 @@ export const menuOperate = {
* @param {*} over 0为首次操作，1为中间操作，2为最后操作，3为直接一次性操作
* @param {*} val 教学模式val 校验模式判断
*/
-export function commitOperate(operate, paramList, over, val) {
+export function commitOperate(operate, paramList, over, fillStep={}) {
const step = {
start: true,
operation: operate.operation,
param:{}
};
- if (val) { step.val = val; }
- step.param = paramList;
+
+ step.param = paramList;
if (over == 0 || over == 3) {
const codeList = Object.values(paramList);
step.code = codeList[0];
}
+
if (over != 0 && over != 3) {
delete step.start;
}
@@ -503,6 +504,7 @@ export function commitOperate(operate, paramList, over, val) {
step.code = codeList[0];
}
+ Object.assign(step, fillStep)
return new Promise(function(resolve, reject) {
store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeHandControl.vue
index 2ae4163c8..722bb37eb 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeHandControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeHandControl.vue
@@ -252,7 +252,7 @@ export default {
// 进路交人工控
humanControl() {
this.loading = true;
- commitOperate(menuOperate.Signal.humanControl, {routeCodeList:this.selection}, 2, `${this.selection[0]}`).then(({valid})=>{
+ commitOperate(menuOperate.Signal.humanControl, {routeCodeList:this.selection}, 2, {val: `${this.selection[0]}`}).then(({valid})=>{
this.loading = false;
if (valid) {
this.doClose();
@@ -266,7 +266,7 @@ export default {
// 进路交自动控
atsAutoControl() {
this.loading = true;
- commitOperate(menuOperate.Signal.atsAutoControl, {routeCodeList:this.selection}, 2, `${this.selection[0]}`).then(({valid})=>{
+ commitOperate(menuOperate.Signal.atsAutoControl, {routeCodeList:this.selection}, 2, {val: `${this.selection[0]}`}).then(({valid})=>{
this.loading = false;
if (valid) {
this.doClose();
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeSelection.vue
index 316980494..34c120391 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeSelection.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeSelection.vue
@@ -222,7 +222,7 @@ export default {
commit() {
if (this.row && this.row.canSetting) {
this.loading = true;
- commitOperate(menuOperate.Signal.arrangementRoute, {routeCode: this.row.code}, 1, `${this.row.code}`).then(({valid, operate})=>{
+ commitOperate(menuOperate.Signal.arrangementRoute, {routeCode: this.row.code}, 1, {val: `${this.row.code}`}).then(({valid, operate})=>{
this.loading = false;
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standControl.vue
index 6368ca8e0..b59e2e645 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standControl.vue
@@ -144,7 +144,7 @@ export default {
},
sendCommand(operate, val) { // 发送指令
this.loading = true;
- commitOperate(operate, {}, 2, val).then(({valid})=>{
+ commitOperate(operate, {}, 2, { val }).then(({valid})=>{
this.loading = false;
if (valid) {
this.doClose();
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainEditNumber.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainEditNumber.vue
index 08a6a1ba4..f502c7627 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainEditNumber.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainEditNumber.vue
@@ -121,13 +121,3 @@ export default {
}
};
-
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainMove.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainMove.vue
index 785e57426..d7b08de6d 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainMove.vue
@@ -186,8 +186,6 @@ export default {
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userDelete.vue
index 5dcfe1322..60e9e86e9 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userDelete.vue
@@ -126,13 +126,3 @@ export default {
}
};
-
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue
index 1ee0765f8..caa0513c0 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue
@@ -172,13 +172,3 @@ export default {
}
};
-
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/helpAbout.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/helpAbout.vue
index ed22508c4..e7756e8c8 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/helpAbout.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/helpAbout.vue
@@ -125,8 +125,6 @@ export default {
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue
index 5e34f4b57..93e99626e 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue
@@ -16,7 +16,7 @@
-
{{ $t('menu.menuDialog.purpose') }}
-
-
-
-
-
-
-
- 确定(O)
-
-
- 应用(A)
-
-
- 关闭(C)
-
-
- 帮助(H)
-
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/initializeSignalCanBlock.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/initializeSignalCanBlock.vue
deleted file mode 100644
index 9bf9ef641..000000000
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/initializeSignalCanBlock.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-
-
+
+
+
+
+
+ {{ getSectionStatus(scope.row) }}
+
+
+
+
+ {{ getProcess(scope.row.code) }}
+
+
+
+
+
+
+
+
+
+
+ 确定(O)
+
+
+ 应用(A)
+
+
+ 关闭(C)
+
+
+ 帮助(H)
+
+
+
+
+
+
+
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue
index aac458c90..eddfc6fac 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue
@@ -478,8 +478,8 @@ export default {
},
getRouteDirection(route) {
- const signalEle = this.$store.getters['map/getDeviceByCode'](route.startSignalCode);
- if (signalEle.right) {
+ const elem = this.$store.getters['map/getDeviceByCode'](route.startSignalCode);
+ if (elem.right) {
return '0';
} else {
return '1';
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLimitSpeed.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLimitSpeed.vue
index 41f1ba52e..98c57656d 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLimitSpeed.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLimitSpeed.vue
@@ -1,8 +1,8 @@
-
+
-
-
+
+
@@ -28,12 +28,12 @@
-
+
-
+
- 确定(O)
+ 确定(O)
- 应用(A)
+ 应用(A)
关闭(C)
@@ -68,23 +68,39 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
import CMD from '@/scripts/cmdPlugin/CommandEnum';
export default {
- name: 'SwitchActive',
+ props: {
+ initCacheMap: {
+ type: Object,
+ default() {
+ return {}
+ }
+ },
+ initInfo: {
+ type: Object,
+ default() {
+ return {}
+ }
+ },
+ updateDone: {
+ type: Number,
+ default: 0
+ }
+ },
components: {
NoticeInfo
},
data() {
return {
+ title: '',
status: false,
standStatus: true,
allChecked: false,
dialogShow: false,
loading: false,
active: false,
- command: false,
+ command: true,
activeName: 'first',
- tempData: [],
operate: null,
- speedLimitValue: 0,
limitList: [
{ name: '5', value: 5 },
{ name: '10', value: 10 },
@@ -102,7 +118,11 @@ export default {
{ name: '70', value: 70 },
{ name: '75', value: 75 },
{ name: '80', value: 80 }
- ]
+ ],
+ sure: false,
+ speedLimitValue: 0,
+ currentSelect: null,
+ noInit: true
};
},
computed: {
@@ -112,9 +132,24 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
- selected() {
- return this.$store.state.menuOperation.selected;
- },
+ tempList() {
+ return this.sectionList.filter(el => ['01', '04'].includes(el.type) )
+ },
+ isLimitSpeed() {
+ return this.operate && this.operate.operation === OperationEvent.Command.commandNingBo3.line_section_limitSpeed.operation;
+ },
+ initSelect() {
+ return this.initInfo.initSelect||{};
+ },
+ initParams() {
+ return this.initInfo.initParams||{};
+ },
+ cmdType() {
+ return this.isLimitSpeed ? CMD.Section.CMD_SECTION_SET_LIMIT_SPEED : CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED;
+ },
+ disabled() {
+ return !this.currentSelect || (this.isLimitSpeed? !this.speedLimitValue: !this.currentSelect.speedUpLimit) || this.noInit;
+ },
domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm1.domId : '';
},
@@ -123,9 +158,6 @@ export default {
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close1.domId : '';
- },
- title() {
- return '确认/取消设置临时限速区域';
}
},
watch: {
@@ -133,74 +165,140 @@ export default {
if (this.show) {
this.commit();
}
- }
+ },
+ updateDone() {
+ if (this.currentSelect) {
+ this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code]||{}).done != 'one';
+ }
+ }
},
methods: {
- doShow(operate, selected, value) {
- this.tempData = [];
- this.sectionList.forEach(item => {
- if (item.type === '01' || item.type === '04') {
- this.tempData.push(item);
- }
- });
- this.command = true;
- this.$store.dispatch('menuOperation/setSelected', {device: selected});
- // 如果不是断点激活，而是第一次显示，则需要设置初始值
- this.operate = operate;
- this.speedLimitValue = value;
+ getCacheMap() {
+ return this.initCacheMap[this.cmdType.value]||{};
+ },
+ doShow(operate, sure) {
+ this.operate = operate;
+ this.sure = sure;
+
+ if (this.isLimitSpeed) {
+ this.title = `${sure ? '确认/取消设置临时限速区域' : '初始化设置临时限速区域'}`;
+ } else {
+ this.title = `${sure ? '清除临时限速区域' : '初始化清除临时限速区域'}`;
+ }
+
+ this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
+ this.speedLimitValue = this.initParams.value||0;
this.dialogShow = true;
this.$nextTick(function () {
- this.$refs.singleTable1.setCurrentRow(selected);
- this.$refs.singleTable2.setCurrentRow(this.limitList[value / 5 - 1]);
+ this.$refs.singleTable1.setCurrentRow(sure? this.tempList.find(el => el.code == this.initSelect.code): null);
+ this.isLimitSpeed && this.$refs.singleTable2.setCurrentRow(this.limitList[this.initParams.value / 5 - 1]);
this.$store.dispatch('training/emitTipFresh');
});
},
doClose() {
this.loading = false;
this.dialogShow = false;
+ this.sure && (this.currentSelect = null);
+ this.sure && (this.speedLimitValue = 0);
+ this.sure && this.$refs.singleTable1.setCurrentRow();
+ this.sure && this.isLimitSpeed && this.$refs.singleTable2.setCurrentRow();
+ this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
+ Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
+ )
this.$store.dispatch('training/emitTipFresh');
+ },
+ commit(isClose = true) {
+ if (this.currentSelect &&
+ this.currentSelect.code == this.initSelect.code &&
+ this.speedLimitValue == this.initParams.value) {
+ const cacheMap= this.getCacheMap();
+ const isOK = this.command&&(!this.sure || this.sure&&cacheMap[this.currentSelect.code])
+ const operate = {
+ cmdType: this.sure&&isOK? this.cmdType: null,
+ operation: isClose ? OperationEvent.Command.common.confirm1.operation : OperationEvent.Command.common.apply1.operation,
+ over: this.sure,
+ param: {sectionCode: this.currentSelect.code, speedLimitValue:this.speedLimitValue}
+ };
+
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ if (isOK) {
+ this.$root.$emit('appendCache', this.cmdType.value, this.currentSelect.code, { done: this.sure? 'two': 'one'});
+ } else {
+ this.$root.$emit('removeCache', this.cmdType.value, this.currentSelect.code);
+ }
+ this.$emit('updateDone')
+ this.$store.dispatch('map/flushMapRef');
+ isClose && this.doClose();
+ }
+ }).catch(() => {
+ this.$refs.noticeInfo.doShow();
+ });
+ } else {
+ this.$messageBox('两次选择不一致');
+ }
},
selectLine1(val) {
- this.$refs.singleTable1.setCurrentRow(this.selected);
+ if (!val) { return; }
+ const step = {
+ code: val.code,
+ operation: OperationEvent.Command.common.choose.operation,
+ val: val.code
+ };
+
+ this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
+ this.$emit('updateDone')
+ this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.sure || this.$emit('initSelect', this.currentSelect, {value: this.speedLimitValue});
+ }
+ }).catch(() => {
+ this.$refs.noticeInfo.doShow();
+ });
},
selectLine2(val) {
- this.$refs.singleTable2.setCurrentRow(this.limitList[this.speedLimitValue / 5 - 1]);
+ if (!val) { return; }
+ const step = {
+ operation: OperationEvent.Command.common.choose1.operation,
+ val: val.value
+ };
+
+ this.speedLimitValue = val.value;
+ this.$emit('updateDone')
+ this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.sure || this.$emit('initSelect', this.currentSelect, {value: this.speedLimitValue});
+ }
+ }).catch(() => {
+ this.$refs.noticeInfo.doShow();
+ });
},
getStationName(val) {
const stationElm = this.$store.getters['map/getDeviceByCode'](val.stationCode);
return stationElm.name;
},
getIsLimit(code) {
- const sectionEle = this.$store.getters['map/getDeviceByCode'](code);
- return sectionEle.speedUpLimit > 0 ? '开启' : '关闭';
+ const elem = this.$store.getters['map/getDeviceByCode'](code);
+ return elem.speedUpLimit > 0 ? '开启' : '关闭';
},
getLimitSpeed(code) {
- const sectionEle = this.$store.getters['map/getDeviceByCode'](code);
- return sectionEle.speedUpLimit > 0 ? sectionEle.speedUpLimit : 0;
+ const elem = this.$store.getters['map/getDeviceByCode'](code);
+ return elem.speedUpLimit > 0 ? elem.speedUpLimit : 0;
},
getProcess(code) {
- if (this.selected && this.selected.code === code) {
- return '等待确认/取消';
- } else {
- return '';
- }
- },
- commit(isClose = true) {
- const operate = {
- cmdType: this.speedLimitValue ? CMD.Section.CMD_SECTION_SET_LIMIT_SPEED : CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED,
- // cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED,
- operation: isClose ? OperationEvent.Command.common.confirm1.operation : OperationEvent.Command.common.apply1.operation,
- over: true,
- param: {sectionCode: this.selected.code, speedLimitValue:this.speedLimitValue}
- };
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- if (valid) {
- isClose && this.doClose();
- this.$emit('commandSuccess', this.selected.code, this.speedLimitValue);
- }
- }).catch(() => {
- this.$refs.noticeInfo.doShow();
- });
+ const cacheMap = this.getCacheMap();
+ const cache = cacheMap[code];
+ if (cache) {
+ if (this.sure) {
+ return cache.done == 'two' ? this.isLimitSpeed? '确认设置限速完成': '确认清除限速完成' : '等待确认/取消';
+ } else {
+ return cache.done == 'one' ? '已初始化' : ''
+ }
+ }
+ return '';
},
cancel() {
const operate = {
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLock.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLock.vue
index 25ac033bb..8274325d4 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLock.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLock.vue
@@ -101,7 +101,6 @@ export default {
},
methods: {
doShow(operate) {
- // 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {
this.$store.dispatch('training/emitTipFresh');
@@ -120,7 +119,6 @@ export default {
commit() {
},
handleClick() {
-
},
cancel() {
const operate = {
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionOpen.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionOpen.vue
index c59569e84..e57d4af47 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionOpen.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionOpen.vue
@@ -1,8 +1,8 @@
-
-
+
+
@@ -21,8 +21,8 @@
-
-
- 确定(O)
+ 确定(O)
- 应用(A)
+ 应用(A)
关闭(C)
@@ -56,12 +56,30 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
import CMD from '@/scripts/cmdPlugin/CommandEnum';
export default {
- name: 'SwitchActive',
components: {
NoticeInfo
},
+ props: {
+ initCacheMap: {
+ type: Object,
+ default() {
+ return {}
+ }
+ },
+ initInfo: {
+ type: Object,
+ default() {
+ return {}
+ }
+ },
+ updateDone: {
+ type: Number,
+ default: 0
+ }
+ },
data() {
return {
+ title: '',
status: false,
standStatus: true,
allChecked: false,
@@ -69,10 +87,12 @@ export default {
loading: false,
active: false,
activeName: 'first',
- tempData: [],
radio: '1',
operate: null,
- command: true
+ command: true,
+ sure: false,
+ currentSelect: null,
+ noInit: true
};
},
computed: {
@@ -80,14 +100,23 @@ export default {
'sectionList'
]),
isBlock() {
- return !!this.operate && this.operate.isBlock;
+ return this.operate && this.operate.operation.includes(OperationEvent.Command.commandNingBo3.line_section_close.operation);
},
+ cmdType() {
+ return this.isBlock ? CMD.Section.CMD_SECTION_BLOCK : CMD.Section.CMD_SECTION_UNBLOCK
+ },
+ initSelect() {
+ return this.initInfo.initSelect||{};
+ },
+ disabled() {
+ return !this.currentSelect || (this.isBlock? this.currentSelect.blockade: !this.currentSelect.blockade) || this.noInit;
+ },
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
- selected() {
- return this.$store.state.menuOperation.selected;
- },
+ tempList() {
+ return this.sectionList.filter(el => ['01', '04'].includes(el.type) )
+ },
domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose1.domId : '';
},
@@ -99,9 +128,6 @@ export default {
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close1.domId : '';
- },
- title() {
- return this.isBlock ? '确认/取消关闭轨道' : '确认/取消开放轨道';
}
},
watch: {
@@ -109,80 +135,114 @@ export default {
if (this.show) {
this.commit();
}
- }
+ },
+ updateDone() {
+ if (this.currentSelect) {
+ this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code]||{}).done != 'one';
+ }
+ }
},
methods: {
- doShow(operate) {
- this.tempData = [];
- this.sectionList.forEach(item => {
- if (item.type === '01' || item.type === '04') {
- this.tempData.push(item);
- }
- });
- this.operate = operate;
+ getCacheMap() {
+ return this.initCacheMap[this.cmdType.value]||{};
+ },
+ doShow(operate, sure) {
+ this.operate = operate;
+ this.sure = sure;
+
+ if (sure) {
+ this.title = `${this.isBlock ? '确认/取消关闭轨道' : '确认/取消开放轨道'}`;
+ } else {
+ this.title = `${this.isBlock ? '初始化关闭轨道': '初始化开放轨道'}`;
+ }
+
+ this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
this.dialogShow = true;
this.$nextTick(function () {
- this.$refs.sectionable.setCurrentRow(this.selected);
+ this.$refs.table.setCurrentRow(sure? this.tempList.find(el => el.code == this.initSelect.code): null);
this.$store.dispatch('training/emitTipFresh');
});
},
doClose() {
this.loading = false;
this.dialogShow = false;
+ this.sure && (this.currentSelect = null);
+ this.sure && this.$refs.table.setCurrentRow();
+ this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
+ Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
+ )
this.$store.dispatch('training/emitTipFresh');
},
- handleChangeLine(val) {
+ commit(isClose = true) {
+ if (this.currentSelect &&
+ this.currentSelect.code == this.initSelect.code) {
+ const cacheMap= this.getCacheMap();
+ const isOK = this.command&&(!this.sure || this.sure&&cacheMap[this.currentSelect.code])
+ const operate = {
+ cmdType: this.sure&&isOK? this.cmdType: null,
+ operation: isClose ? OperationEvent.Command.common.confirm1.operation : OperationEvent.Command.common.apply1.operation,
+ over: this.sure,
+ param: {sectionCode: this.currentSelect.code}
+ };
+
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ if (isOK) {
+ this.$root.$emit('appendCache', this.cmdType.value, this.currentSelect.code, { done: this.sure? 'two': 'one'});
+ } else {
+ this.$root.$emit('removeCache', this.cmdType.value, this.currentSelect.code);
+ }
+ this.$emit('updateDone')
+ this.$store.dispatch('map/flushMapRef');
+ isClose && this.doClose();
+ }
+ }).catch(() => {
+ isClose && this.isClose();
+ this.$refs.noticeInfo.doShow();
+ });
+ } else {
+ this.$messageBox('两次选择不一致');
+ }
+ },
+ handleChangeLine(val) {
if (!val) { return; }
const step = {
code: val.code,
operation: OperationEvent.Command.common.choose1.operation,
val: val.code
};
+
+ this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
+ this.$emit('updateDone')
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$store.dispatch('menuOperation/setSelected', {device: val});
- this.$refs.sectionable.setCurrentRow(this.selected);
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.sure || this.$emit('initSelect', this.currentSelect);
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
});
},
- getProcess(code) {
- if (this.selected && this.selected.code === code) {
- return '等待确认/取消';
- } else {
- return '';
- }
+ getProcess(code) {
+ const cacheMap = this.getCacheMap();
+ const cache = cacheMap[code];
+ if (cache) {
+ if (this.sure) {
+ return cache.done == 'two' ? this.isBlock ? '确认关闭轨道完成' : '确认开放轨道完成' : '等待确认/取消';
+ } else {
+ return cache.done == 'one' ? '已初始化' : ''
+ }
+ }
+ return '';
},
getStationName(val) {
const stationElm = this.$store.getters['map/getDeviceByCode'](val.stationCode);
return stationElm.name;
},
getSectionStatus(code) {
- const sectionElm = this.$store.getters['map/getDeviceByCode'](code);
- return sectionElm.blockade ? '关闭双向：所有列车' : '打开';
- },
- commit(isClose = true) {
- if (this.command) {
- const operate = {
- cmdType: this.isBlock ? CMD.Section.CMD_SECTION_BLOCK : CMD.Section.CMD_SECTION_UNBLOCK,
- operation: isClose ? OperationEvent.Command.common.confirm1.operation : OperationEvent.Command.common.apply1.operation,
- over: true,
- param: {sectionCode: this.selected.code}
- };
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- if (valid) {
- isClose && this.doClose();
- this.$emit('commandSuccess', this.selected.code);
- }
- }).catch(() => {
- isClose && this.isClose();
- this.$refs.noticeInfo.doShow();
- });
- } else {
- this.cancel();
- }
+ const elem = this.$store.getters['map/getDeviceByCode'](code);
+ return elem.blockade ? '关闭双向：所有列车' : '打开';
},
cancel() {
const operate = {
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionShow.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionShow.vue
index 1dd12fd84..6f66c3d56 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionShow.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionShow.vue
@@ -2,7 +2,7 @@
-
+
@@ -40,7 +40,7 @@
打印(P)
- 关闭(C)
+ 关闭(C)
帮助(H)
@@ -71,7 +71,6 @@ export default {
active: false,
selectShow: false,
activeName: 'first',
- tempData: [],
radio: '1'
};
},
@@ -82,9 +81,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
- selected() {
- return this.$store.state.menuOperation.selected;
- },
+ tempList() {
+ return this.sectionList.filter(el => ['01', '04'].includes(el.type) )
+ },
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@@ -107,13 +106,7 @@ export default {
},
methods: {
doShow(operate) {
- this.tempData = [];
- this.sectionList.forEach(item => {
- if (item.type === '01' || item.type === '04') {
- this.tempData.push(item);
- }
- });
- // 如果不是断点激活，而是第一次显示，则需要设置初始值
+ this.operate = operate;
this.dialogShow = true;
this.$nextTick(function () {
this.$store.dispatch('training/emitTipFresh');
@@ -135,16 +128,16 @@ export default {
return stationElm.name;
},
getLimitSpeed(code) {
- const sectionEle = this.$store.getters['map/getDeviceByCode'](code);
- return sectionEle.speedUpLimit > 0 ? sectionEle.speedUpLimit : 0;
+ const elem = this.$store.getters['map/getDeviceByCode'](code);
+ return elem.speedUpLimit > 0 ? elem.speedUpLimit : 0;
},
getSectionStatus(val) {
- const sectionEle = this.$store.getters['map/getDeviceByCode'](val.code);
- return sectionEle.blockade ? '关闭双向：所有列车' : '打开';
+ const elem = this.$store.getters['map/getDeviceByCode'](val.code);
+ return elem.blockade ? '关闭双向：所有列车' : '打开';
},
getIsLimit(code) {
- const sectionEle = this.$store.getters['map/getDeviceByCode'](code);
- return sectionEle.speedUpLimit > 0 ? '开启' : '关闭';
+ const elem = this.$store.getters['map/getDeviceByCode'](code);
+ return elem.speedUpLimit > 0 ? '开启' : '关闭';
},
cancel() {
const operate = {
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalBlock.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalBlock.vue
index 29a5ace9d..d6e3a07f0 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalBlock.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalBlock.vue
@@ -1,10 +1,10 @@
-
+
-
+
确认
@@ -38,10 +38,10 @@
- 确定(O)
+ 确定(O)
- 应用(A)
+ 应用(A)
关闭(C)
@@ -61,34 +61,63 @@ import { mapGetters } from 'vuex';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
export default {
- name: 'SignalBlock',
+ props: {
+ initCacheMap: {
+ type: Object,
+ default() {
+ return {}
+ }
+ },
+ initInfo: {
+ type: Object,
+ default() {
+ return {}
+ }
+ },
+ updateDone: {
+ type: Number,
+ default: 0
+ }
+ },
components: {
NoticeInfo
},
data() {
return {
+ title: '',
status: false,
command: true,
allChecked: false,
dialogShow: false,
loading: false,
operate: {},
- title: ''
+ sure: false,
+ currentSelect: null,
+ noInit: true
};
},
computed: {
...mapGetters('map', [
'signalList'
]),
- needBlock() {
- return this.operate && this.operate.needBlock;
+ isBlock() {
+ return this.operate && this.operate.operation.includes(OperationEvent.Command.commandNingBo3.line_signal_block.operation);
},
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
- selected() {
- return this.$store.state.menuOperation.selected;
- },
+ tempList() {
+ return this.signalList;
+ },
+ initSelect() {
+ return this.initInfo.initSelect||{};
+ },
+ cmdType() {
+ return this.isBlock ? CMD.Signal.CMD_SIGNAL_BLOCK : CMD.Signal.CMD_SIGNAL_UNBLOCK
+ },
+ disabled() {
+ return !this.currentSelect || (this.isBlock? this.currentSelect.blockade: !this.currentSelect.blockade) || this.noInit;
+ },
domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm1.domId : '';
},
@@ -104,62 +133,113 @@ export default {
if (this.show) {
this.commit();
}
- }
+ },
+ updateDone() {
+ if (this.currentSelect) {
+ this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code]||{}).done != 'one';
+ }
+ }
},
methods: {
- doShow(operate) {
- this.operate = operate;
- // 如果不是断点激活，而是第一次显示，则需要设置初始值
- this.title = this.needBlock ? '确认/取消信号机封锁' : '确认/取消信号机解除封锁';
+ getCacheMap() {
+ return this.initCacheMap[this.cmdType.value]||{};
+ },
+ doShow(operate, sure) {
+ this.operate = operate;
+ this.sure = sure;
+
+ if (sure) {
+ this.title = `${this.isBlock ? '确认/取消信号机封锁' : '确认/取消信号机解除封锁'}`;
+ } else {
+ this.title = `${this.isBlock ? '初始化信号机封锁': '初始化信号机解除封锁'}`;
+ }
+
+ this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
this.dialogShow = true;
this.$nextTick(function () {
- this.$refs.table.setCurrentRow(this.selected);
+ this.$refs.table.setCurrentRow(sure? this.tempList.find(el => el.code == this.initSelect.code): null);
this.$store.dispatch('training/emitTipFresh');
});
},
doClose() {
this.loading = false;
this.dialogShow = false;
+ this.sure && (this.currentSelect = null);
+ this.sure && this.$refs.table.setCurrentRow();
+ this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
+ Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
+ )
this.$store.dispatch('training/emitTipFresh');
},
commit(isClose = false) {
- if (this.command) {
- const operate = {
- cmdType: this.needBlock ? CMD.Signal.CMD_SIGNAL_BLOCK : CMD.Signal.CMD_SIGNAL_UNBLOCK,
- operation: isClose ? OperationEvent.Command.common.confirm1.operation : OperationEvent.Command.common.apply1.operation,
- over: true,
- param: {signalCode: this.selected.code}
- };
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- if (valid) {
- isClose && this.doClose();
- this.$emit('commandSuccess', this.selected.code);
- }
- }).catch(() => {
- isClose && this.doClose();
- this.$refs.noticeInfo.doShow();
- });
- } else {
- this.cancel();
- }
+ if (this.currentSelect &&
+ this.currentSelect.code == this.initSelect.code) {
+ const cacheMap= this.getCacheMap();
+ const isOK = this.command&&(!this.sure || this.sure&&cacheMap[this.currentSelect.code])
+ const operate = {
+ cmdType: this.sure&&isOK? this.cmdType: null,
+ operation: isClose ? OperationEvent.Command.common.confirm1.operation : OperationEvent.Command.common.apply1.operation,
+ over: this.sure,
+ param: {signalCode: this.currentSelect.code}
+ };
+
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ if (isOK) {
+ this.$root.$emit('appendCache', this.cmdType.value, this.currentSelect.code, { done: this.sure? 'two': 'one'});
+ } else {
+ this.$root.$emit('removeCache', this.cmdType.value, this.currentSelect.code);
+ }
+ this.$emit('updateDone')
+ this.$store.dispatch('map/flushMapRef');
+ isClose && this.doClose();
+ }
+ }).catch(() => {
+ isClose && this.doClose();
+ this.$refs.noticeInfo.doShow();
+ });
+ } else {
+ this.$messageBox('两次选择不一致');
+ }
},
handleCurrentChange(val) {
- this.$refs.table.setCurrentRow(this.selected);
+ if (!val) { return; }
+ const step = {
+ code: val.code,
+ operation: OperationEvent.Command.common.choose.operation,
+ val: val.code
+ };
+
+ this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
+ this.$emit('updateDone')
+ this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.sure || this.$emit('initSelect', this.currentSelect);
+ }
+ }).catch(() => {
+ this.$refs.noticeInfo.doShow();
+ });
},
getSignalStatus(code) {
- const signalEle = this.$store.getters['map/getDeviceByCode'](code);
- if (signalEle.blockade) {
- return '锁闭的';
- } else {
- return '未设锁闭';
- }
+ const elem = this.$store.getters['map/getDeviceByCode'](code);
+ return elem.blockade? '锁闭的': '未设锁闭';
},
getProcess(code, type) {
- if (this.selected.code === code && ((type === 'lock' && this.needBlock) || (type === 'unlock' && !this.needBlock))) {
- return '等待确认/取消';
- } else {
- return '';
- }
+ const blockType = this.isBlock ? 'lock': 'unlock';
+ const cacheMap = this.getCacheMap();
+ const cache = cacheMap[code];
+ if (blockType==type) {
+ if (cache) {
+ if (this.sure) {
+ return cache.done == 'two' ? this.isBlock ? '确认封锁完成' : '确认解除封锁完成' : '等待确认/取消';
+ } else {
+ return cache.done == 'one' ? '已初始化' : ''
+ }
+ }
+ }
+ return '';
},
cancel() {
const operate = {
@@ -196,7 +276,7 @@ export default {
}
.set-status-title{
position: relative;
- top: 115px;
+ top: 108px;
background: #F0F0F0;
width: 40px;
text-align: center;
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalCanBlock.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalCanBlock.vue
index de966f947..236592f08 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalCanBlock.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalCanBlock.vue
@@ -1,10 +1,10 @@
-
+
-
+
- 确定(O)
+ 确定(O)
- 应用(A)
+ 应用(A)
关闭(C)
@@ -51,25 +51,45 @@
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userAdd.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userAdd.vue
index 2e12f7275..d8db8dd18 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userAdd.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userAdd.vue
@@ -155,13 +155,3 @@ export default {
}
};
-
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userDelete.vue
index 7f69f9c55..830cdbb23 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userDelete.vue
@@ -126,13 +126,3 @@ export default {
}
};
-
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userEdit.vue
index a39d2cb7c..cfcf9623e 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userEdit.vue
@@ -172,13 +172,3 @@ export default {
}
};
-
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/helpAbout.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/helpAbout.vue
index 5cb02272a..0c5b43b25 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/helpAbout.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/helpAbout.vue
@@ -123,13 +123,3 @@ export default {
}
};
-
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/manageUser.vue
index 873e4e30c..81cab565c 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/manageUser.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/manageUser.vue
@@ -294,10 +294,8 @@ export default {
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/trainTranstalet.vue
index 472c7d98c..59fbc5b60 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/trainTranstalet.vue
@@ -16,7 +16,7 @@
-
diff --git a/src/views/planMonitor/editTool/menus/lookup.vue b/src/views/planMonitor/editTool/menus/lookup.vue
deleted file mode 100644
index d393189ba..000000000
--- a/src/views/planMonitor/editTool/menus/lookup.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
- {{ $t('global.confirm') }}
- {{ $t('global.cancel') }}
-
-
-
-
-
-
diff --git a/src/views/planMonitor/editTool/menus/modifyingBeginTime.vue b/src/views/planMonitor/editTool/menus/modifyingBeginTime.vue
deleted file mode 100644
index 162ded887..000000000
--- a/src/views/planMonitor/editTool/menus/modifyingBeginTime.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
- {{ $t('planMonitor.modifying.modifyStartTime') }}
-
-
-
-
- {{ $t('global.confirm') }}
- {{ $t('global.cancel') }}
-
-
-
-
-
diff --git a/src/views/planMonitor/editTool/menus/modifyingRouting.vue b/src/views/planMonitor/editTool/menus/modifyingRouting.vue
deleted file mode 100644
index 80cf50afe..000000000
--- a/src/views/planMonitor/editTool/menus/modifyingRouting.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/views/planMonitor/editTool/menus/updateStationIntervalTime.vue b/src/views/planMonitor/editTool/menus/updateStationIntervalTime.vue
deleted file mode 100644
index f0c3f258d..000000000
--- a/src/views/planMonitor/editTool/menus/updateStationIntervalTime.vue
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('global.confirm') }}
- {{ $t('global.cancel') }}
-
-
-
-
-
-
diff --git a/src/views/planMonitor/editTool/routingoperate/runplanConfig.vue b/src/views/planMonitor/editTool/routingoperate/runplanConfig.vue
deleted file mode 100644
index 31794b50a..000000000
--- a/src/views/planMonitor/editTool/routingoperate/runplanConfig.vue
+++ /dev/null
@@ -1,212 +0,0 @@
-
-
@@ -59,31 +49,22 @@ import MenuBar from './menuBar';
import StatusBar from './statusBar';
import Schedule from './schedule';
import Parameter from './menus/parameter/index';
-import OffLine from './menus/offLine';
-import AddPlanningTrain from './menus/addPlanningTrain';
-import EditPlanningTrain from './menus/editPlanningTrain';
-import EditPlanName from './menus/editPlanName';
-import DuplicateTrain from './menus/duplicateTrain';
-import MovePlaningTrain from './menus/movePlaningTrain';
-import SystermOut from './menus/systermOut';
-import AddTask from './menus/addTask';
-import DeleteTask from './menus/deleteTask';
-import ModifyingTask from './menus/modifyingTask';
-import ModifyingRouting from './menus/modifyingRouting';
-import ModifyingBeginTime from './menus/modifyingBeginTime';
-import EditStationBetweenTime from './menus/editStationBetweenTime';
-import AddSmoothRunTime from './menus/addSmoothRunTime';
-import EditSmoothRunTime from './menus/editSmoothRunTime';
-// import ModifyingStationIntervalTime from './menus/modifyingStationIntervalTime';
-// import PopulatingGenericData from './menus/populatingGenericData';
-import PopulatingGenericData from '../editTool/menus/populatingGenericData';
-import CreateEmptyPlan from './menus/createEmptyPlan';
-import GernaratePlan from '../editTool/menus/gernaratePlanTrain';
-import ModifyingStationStopTime from '../editTool/menus/modifyingStationStopTime';
-import ModifyingStationIntervalTime from '../editTool/menus/modifyingStationIntervalTime';
+import OffLine from '../components/menus/offLine';
+import AddPlanningTrain from '../components/menus/addPlanningTrain';
+import EditPlanningTrain from '../components/menus/editPlanningTrain';
+import EditPlanName from '../components/menus/editPlanName';
+import DuplicateTrain from '../components/menus/duplicateTrain';
+import SystermOut from '../components/menus/systermOut';
+import AddTask from '../components/menus/addTask';
+import DeleteTask from '../components/menus/deleteTask';
+import ModifyingTask from '../components/menus/modifyingTask';
+import GernaratePlan from '../components/menus/gernaratePlanTrain';
+import MovePlaningTrain from '../components/menus/movePlaningTrain';
+import ModifyingStationIntervalTime from '../components/menus/modifyingStationIntervalTime';
+import ModifyingStationStopTime from '../components/menus/modifyingStationStopTime';
+import PopulatingGenericData from '../components/menus/populatingGenericData';
import { deletePlanService } from '@/api/runplan';
import { checkLoginLine } from '@/api/login';
-import { getRpListByMapId } from '@/api/runplan';
import { loadMapDataById } from '@/utils/loaddata';
export default {
@@ -102,16 +83,12 @@ export default {
AddTask,
DeleteTask,
ModifyingTask,
- ModifyingRouting,
- ModifyingBeginTime,
- EditStationBetweenTime,
- AddSmoothRunTime,
- EditSmoothRunTime,
+ // AddSmoothRunTime,
+ // EditSmoothRunTime,
ModifyingStationIntervalTime,
- CreateEmptyPlan,
+ ModifyingStationStopTime,
EditPlanName,
GernaratePlan,
- ModifyingStationStopTime,
MovePlaningTrain
},
data() {
@@ -120,18 +97,19 @@ export default {
timeDemon: null,
runPlanList: [],
loadRunPlanId: '',
- loadRunPlanName: ''
+ loadRunPlanName: '',
+ runplanLoading:false
};
},
computed: {
lineCode() {
- return this.$route.query.lineCode;
- },
- width() {
- return this.$store.state.app.width;
- },
- height() {
- return this.$store.state.app.height;
+ return this.$route.query.lineCode || '02';
+ }
+ },
+ watch: {
+ '$store.state.map.mapDataLoadedCount': function (val) {
+ this.loadRunPlanId = this.$route.query.planId;
+ this.runplanLoading = false;
}
},
created() {
@@ -141,6 +119,7 @@ export default {
this.timeDemon = setInterval(() => {
checkLoginLine();
}, 5000 * 60);
+ this.loadRunPlanName = this.$route.query.planName;
if (this.$route.query.mapId) {
this.refreshRunPlanList(true);
await this.loadMap();
@@ -166,6 +145,11 @@ export default {
}
});
},
+ async loadMap() {
+ this.runplanLoading = true;
+ // 加载地图数据
+ loadMapDataById(this.$route.query.mapId, 'parse');
+ },
handleConfirm(params) {
if (params.operate == 'AddPlanningTrain') {
// 添加计划
@@ -173,13 +157,14 @@ export default {
} else if (params.operate == 'DeletePlanningTrain') {
// 删除计划
const model = {
- planId: this.loadRunPlanId,
+ planId: this.$route.query.planId,
serviceNumber: params.serviceNumber
};
deletePlanService(model).then(resp => {
this.$message.success(this.$t('tip.deletePlanSuccessfully'));
- this.$store.dispatch('runPlan/setDraftSelected', {});
+ this.$store.dispatch('runPlan/setSelected', {});
this.$store.dispatch('runPlan/refresh');
+ // this.$refs.openRunPlan.loadRunPlanData(Object.assign({refresh: true}, this.$route.query));
}).catch(() => {
this.$messageBox(this.$t('tip.deletePlanFailed'));
});
@@ -193,37 +178,19 @@ export default {
refresh() {
this.$store.dispatch('runPlan/refresh');
},
- async loadMap() {
- this.runplanLoading = true;
- // 加载地图数据
- loadMapDataById(this.$route.query.mapId, 'parse');
- },
- refreshRunPlanList(planId) {
- getRpListByMapId(this.$route.query.mapId).then(resp => {
- this.runPlanList = resp.data || [];
- if (planId && this.runPlanList.length) {
- this.runPlanList.forEach(item => {
- if (item.id === planId) {
- this.loadRunPlanId = item.id;
- this.loadRunPlanName = item.name;
- }
- });
- } else {
- this.loadRunPlanId = '';
- this.loadRunPlanName = '';
- }
- }).catch(() => {
- this.$message.error('获取草稿运行图列表失败');
- });
+ refreshRunPlanList(firstLoad) {
+
},
doClose() {
- // this.$emit('doClose');
- window.close();
+ this.$emit('doClose');
},
loadingRunPlan(param) {
this.loadRunPlanId = param.planId;
this.loadRunPlanName = param.planName;
},
+ checkIsLoadRunPlan(planId) {
+ this.refreshRunPlanList(planId === this.loadRunPlanId);
+ },
modifyRunPlanName() {
if (this.loadRunPlanId && this.loadRunPlanName) {
this.$refs.editPlan.doShow({id: this.loadRunPlanId, name: this.loadRunPlanName});
@@ -233,7 +200,7 @@ export default {
},
refreshRunPlanName(name) {
this.$refs.schedule.refreshRunPlanName(name);
- this.refreshRunPlanList();
+ this.$router.replace({ path: this.$route.path, query: { ...this.$route.query, planName: name }});
}
}
};
@@ -274,298 +241,4 @@ export default {
.planEdit__tool {
overflow: hidden !important;
}
-
- /* .planEdit__tool .el-dialog {
- overflow: hidden !important;
- background: rgba(202, 221, 253, 0.88);;
- box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
- border: 2px solid #727375;
- border-radius: 4px;
- color: #000;
- font-size: 14px;
- }
-
- .planEdit__tool .el-dialog .el-dialog__header {
- height: 30px;
- padding: 5px;
- }
-
- .planEdit__tool .el-dialog .el-dialog__footer {
- background: #ECE9D8;
- opacity: 1;
- }
-
- .planEdit__tool .el-dialog .el-dialog__body {
- padding-top: 10px;
- padding-bottom: 10px;
- padding-left: 5px;
- padding-right: 5px;
- margin: 0px 3px 3px 3px;
- border: 2px solid rgba(120, 121, 123, 0.5);
- box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
- color: #000;
- background: #ECE9D8;
- opacity: 1;
- }
-
- .planEdit__tool .el-dialog .el-dialog__title {
- font-size: 16px;
- }
-
- .planEdit__tool .el-dialog .el-dialog__headerbtn {
- background: -webkit-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
- background: -o-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
- background: -moz-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
- background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
- border: 1px solid white;
- border-radius: 4px;
- top: 0px;
- right: 3px;
- line-height: 26px;
- width: 26px;
- }
-
- .planEdit__tool .el-dialog .el-dialog__headerbtn .el-icon-close:before {
- font-size: 16px;
- }
-
- .planEdit__tool .el-dialog .el-dialog__headerbtn .el-dialog__close {
- color: #fff;
- }
-
- .planEdit__tool .el-dialog .el-tabs--top {
- border: 2px outset #FEFEFD;
- border-radius: 4px;
- }
-
- .planEdit__tool .el-dialog .el-tabs__item {
- height: 30px;
- line-height: 30px;
- text-align: center;
- color: #000 !important;
- border-right: 2px outset #fff;
- padding-left: 10px !important;
- padding-right: 10px !important;
- }
-
- .planEdit__tool .el-dialog .el-tab-pane {
- margin: 10px !important;
- }
-
- .planEdit__tool .el-dialog .el-tabs--card>.el-tabs__header .el-tabs__item.is-active {
- border-bottom: none
- }
-
- .planEdit__tool .el-dialog .el-tabs--card>.el-tabs__header .el-tabs__item:not(.is-active) {
- border-bottom: 2px inset #fff
- }
-
- .planEdit__tool .el-dialog .el-form {
- background: #ECE9D8 !important;
- }
-
- .planEdit__tool .el-dialog .el-card {
- background: #ECE9D8 !important;
- }
-
- .planEdit__tool .el-dialog .el-button {
- height: 32px;
- line-height: 32px;
- padding: 0px;
- width: 80px;
- border: 2px outset #E2E2E2;
- border-radius: 0px !important;
- color: #000;
- background: #ECE9D8;
- }
-
- .planEdit__tool .el-dialog .expand {
- width: 120px;
- }
-
- .planEdit__tool .el-dialog .el-button:focus span {
- border: 1px dashed gray;
- }
-
- .planEdit__tool .el-dialog .el-button:active {
- border: 2px inset #E2E2E2;
- }
-
- .planEdit__tool .el-dialog .el-button:disabled {
- border: 2px inset #E2E2E2;
- }
-
- .planEdit__tool .el-dialog .el-button:disabled span {
- border: 0px;
- }
-
- .planEdit__tool .el-dialog .button-group {
- margin-top: 10px;
- }
-
- .planEdit__tool .el-dialog .el-input {
- border: 2px inset #E9E9E9;
- }
-
- .planEdit__tool .el-dialog .el-input .el-input__inner {
- color: #000;
- background: #fff !important;
- border: 0px;
- border-radius: 0px !important;
- box-sizing: border-box;
- }
-
- .planEdit__tool .el-dialog .el-input.is-disabled .el-input__inner {
- background: #F0F0F0 !important;
- }
-
- .planEdit__tool .el-dialog .el-textarea {
- border: 2px inset #E9E9E9;
- border-radius: 0px;
- }
-
- .planEdit__tool .el-dialog .el-textarea .el-textarea__inner {
- color: #000;
- background: #fff !important;
- border: 0px;
- border-radius: 0px !important;
- box-sizing: border-box;
- }
-
- .planEdit__tool .el-dialog .el-textarea.is-disabled .el-textarea__inner {
- background: #F0F0F0 !important;
- }
-
- .planEdit__tool .el-dialog .el-table {
- border: 2px inset #E9E9E9;
- color: #000 !important;
- }
-
- .planEdit__tool .el-dialog .el-table .cell {
- line-height: unset !important;
- }
-
- .planEdit__tool .el-dialog .el-table th.is-leaf {
- background: #ECE9D8 !important;
- border-right: 1px solid #BDBDBD !important;
- border-bottom: 1px solid #BDBDBD !important;
- color: #000 !important;
- height: 20px !important;
- padding: 0px;
- }
-
- .planEdit__tool .el-dialog .el-table tr td {
- height: 20px !important;
- padding: 0px;
- }
-
- .planEdit__tool .el-dialog .el-table .el-table__empty-text {
- top: 15px !important;
- }
-
- .planEdit__tool .el-dialog .current-row>td {
- background: #316AC5 !important;
- color: #fff !important;
- }
-
- .planEdit__tool .el-dialog .el-checkbox__inner {
- border: 1px inset #dcdfe6 !important;
- }
-
- .planEdit__tool .el-dialog .el-checkbox__label {
- color: #000 !important;
- }
-
- .planEdit__tool .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
- background: #E6E6E6 !important;
- }
-
- .planEdit__tool .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
- color: #C5C9CC !important;
- }
-
- .planEdit__tool .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
- background: #fff !important;
- border: 1px inset #dcdfe6 !important;
- }
-
- .planEdit__tool .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
- position: absolute;
- -webkit-box-sizing: content-box;
- box-sizing: content-box;
- content: "";
- border: 1px solid #000;
- border-left: 0;
- border-top: 0;
- height: 7px;
- left: 4px;
- top: 1px;
- }
-
- .planEdit__tool .el-dialog .el-radio__inner {
- border: 1px inset #dcdfe6 !important;
- }
-
- .planEdit__tool .el-dialog .el-radio__label {
- color: #000 !important;
- }
-
- .planEdit__tool .el-dialog .el-radio__input.is-checked .el-radio__inner {
- background: #fff !important;
- border: 1px inset #dcdfe6 !important;
- }
-
- .planEdit__tool .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
- width: 4px;
- height: 4px;
- border-radius: 100%;
- background-color: #000 !important;
- position: absolute;
- left: 50%;
- top: 50%;
- }
-
- .planEdit__tool .el-dialog .el-radio.is-disabled .el-radio__inner {
- background: #E6E6E6 !important;
- }
-
- .planEdit__tool .el-dialog .el-radio.is-disabled .el-radio__label {
- color: #C5C9CC !important;
- }
-
- .planEdit__tool .el-dialog .base-label {
- background: rgba(0, 0, 0, x);
- position: relative;
- left: -15px;
- top: -18px;
- }
-
- .planEdit__tool .el-dialog .el-form-item label {
- font-weight: normal !important;
- color: #000 !important;
- }
-
- .planEdit__tool .el-dialog .context {
- height: 100px;
- border: 2px inset #E2E2E2;
- overflow-y: scroll;
- }
-
- .planEdit__tool .el-dialog .table {
- margin-top: 10px;
- }
-
- .planEdit__tool .el-dialog .notice {
- margin-left: 62px;
- line-height: 30px;
- }
-
- .planEdit__tool .el-dialog .button-group {
- margin-top: 10px;
- }
-
- .planEdit__tool .el-dialog .el-tree__empty-block {
- background: #E9E9E9 !important;
- color: #000 !important;
- } */
diff --git a/src/views/planMonitor/newEditTool/menuBar.vue b/src/views/planMonitor/newEditTool/menuBar.vue
index 438ef1d3e..f3ec2df08 100644
--- a/src/views/planMonitor/newEditTool/menuBar.vue
+++ b/src/views/planMonitor/newEditTool/menuBar.vue
@@ -37,11 +37,9 @@
-
+
{{ $t('menu.menuDialog.terminalTwo') }}
@@ -155,3 +155,11 @@ export default {
}
};
+
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue
index c25ca98f5..11396f069 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue
@@ -205,4 +205,11 @@ export default {
.elrow{
margin-top:4px;
}
+
+ .fuzhou-01__systerm .el-dialog .base-label {
+ left: -10px;
+ top: -24px;
+ padding: 0 5px;
+ background-color: #F0F0F0;
+ }
diff --git a/src/jmapNew/theme/fuzhou_01/operationConfig.js b/src/jmapNew/theme/fuzhou_01/operationConfig.js
index 42705fb3a..255a66872 100644
--- a/src/jmapNew/theme/fuzhou_01/operationConfig.js
+++ b/src/jmapNew/theme/fuzhou_01/operationConfig.js
@@ -821,12 +821,12 @@ export default {
minDuration: 8,
operateType: 'Signal_Open_Auto_Setting',
skinCode: '02',
- trainingName: '自排开({3})',
- trainingRemark: '自排开',
+ trainingName: '进路交ATS自动控({3})',
+ trainingRemark: '进路交ATS自动控',
trainingType: 'Signal',
productTypes: ['02'],
stepVOList: [
- { deviceType: '04', orderNum: 1, operateCode: '315', tip: '鼠标右键菜单选择【自排开】' },
+ { deviceType: '04', orderNum: 1, operateCode: '315', tip: '鼠标右键菜单选择【进路交ATS自动控】' },
{ deviceType: '04', orderNum: 2, operateCode: '3151', tip: '鼠标左键选择控制状态为"人工"的进路', val: '{4}' },
{ deviceType: '04', orderNum: 3, operateCode: '315', tip: '鼠标左键点击【确定】按钮', val: '{4}' }
]
@@ -836,12 +836,12 @@ export default {
minDuration: 8,
operateType: 'Signal_Close_Auto_Setting',
skinCode: '02',
- trainingName: '自排关({3})',
- trainingRemark: '自排关',
+ trainingName: '进路交人工控({3})',
+ trainingRemark: '进路交人工控',
trainingType: 'Signal',
productTypes: ['02'],
stepVOList: [
- { deviceType: '04', orderNum: 1, operateCode: '314', tip: '鼠标右键菜单选择【自排关】' },
+ { deviceType: '04', orderNum: 1, operateCode: '314', tip: '鼠标右键菜单选择【进路交人工控】' },
{ deviceType: '04', orderNum: 2, operateCode: '3141', tip: '鼠标左键选择进路({3})', val: '{4}' },
{ deviceType: '04', orderNum: 3, operateCode: '314', tip: '鼠标左键点击【确定】按钮', val: '{4}' }
]
diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
index e912541aa..74f88555b 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
@@ -262,8 +262,8 @@ export default {
cmdType: '',
securityCommand: '',
switchRelevanceSectionList: [], // 道岔关联的区段列表
- param: {},
- stationObj: null,
+ param: {},
+ stationObj: null,
selectedObj: null,
oldClickObj: null, // 上一次点击对象
route: null, // 进路对象
@@ -317,12 +317,12 @@ export default {
commandId() {
return OperationEvent.Command.commandHaerbin.confirm.domId;
},
- mapDevice() {
- return this.$store.state.map.mapDevice;
- },
- actualSelected() {
- return adapter.adapterAsDevice(this.selected, this.mapDevice);
- },
+ mapDevice() {
+ return this.$store.state.map.mapDevice;
+ },
+ actualSelected() {
+ return adapter.adapterAsDevice(this.selected, this.mapDevice);
+ },
setDetainTrainId() {
return OperationEvent.StationStand.setDetainTrain.menuButton.domId;
},
@@ -367,8 +367,8 @@ export default {
this.selectedObj = this.actualSelected;
this.rightClickDialogVisible = false;
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;
+ const type = this.State2SimulationMap[this.$store.state.training.prdType];
+ this.modeMatch = this.stationContorl.controlMode == type;
// 道岔区段 道岔计轴区段 都是道岔操作
if (this.selectedObj._type == 'Section' && (this.selectedObj.type == '03' || this.selectedObj.type == '04')) {
this.selectedObj = this.selectedObj.switch;
@@ -378,34 +378,42 @@ export default {
operation: 'click',
code: this.selectedObj.code,
subType:this.$store.state.menuOperation.subType
- };
+ };
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) { this.handleDeviceMenu(); }
}).catch((error) => {
console.error(error);
- EventBus.$emit('sendMsg', {message: '命令执行失败！'});
+ if (error && error.code == '10017') {
+ EventBus.$emit('sendMsg', {message: error.message});
+ } else {
+ EventBus.$emit('sendMsg', {message: '命令执行失败！'});
+ }
});
if (val._type != 'Psd' && val._type != 'StationStand') {
this.dialogVisible = !this.isLocal;
}
this.handleIbpShow();
} else {
- const step = {
+ const step = {
operation: 'click',
- code: '',
- subType:this.$store.state.menuOperation.subType
- };
+ code: '',
+ subType:this.$store.state.menuOperation.subType
+ };
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
- this.handleBasicMenu();
- this.dialogVisible = false;
- }
+ this.handleBasicMenu();
+ this.dialogVisible = false;
+ }
}).catch((error) => {
console.error(error);
- EventBus.$emit('sendMsg', {message: '命令执行失败！'});
- });
+ if (error && error.code == '10017') {
+ EventBus.$emit('sendMsg', {message: error.message});
+ } else {
+ EventBus.$emit('sendMsg', {message: '命令执行失败！'});
+ }
+ });
}
},
@@ -417,30 +425,30 @@ export default {
},
'$store.state.map.mapStationStateUpdateCount': function() {
this.initCentralizedStationList([...this.menuCmdList]);
- },
- '$store.state.training.steps': function(steps) {
- this.initTrainingStation(steps);
- this.handleBasicMenu();
- }
+ },
+ '$store.state.training.steps': function(steps) {
+ this.initTrainingStation(steps);
+ this.handleBasicMenu();
+ }
},
mounted() {
- this.param = {};
- this.initMenus();
+ this.param = {};
+ this.initMenus();
this.handleBasicMenu();
EventBus.$on('sendMsg', ({message = ''}) => {
this.tempData = [{name: message}];
});
},
methods: {
- initTrainingStation(steps) {
- if (steps && steps.length) {
- const code = steps[0].code;
- this.stationObj = this.getStationControl(this.$store.getters['map/getDeviceByCode'](code));
- if (this.stationObj) {
- this.$store.dispatch('map/setShowCentralizedStationCode', this.stationObj.code);
- }
- }
- },
+ initTrainingStation(steps) {
+ if (steps && steps.length) {
+ const code = steps[0].code;
+ this.stationObj = this.getStationControl(this.$store.getters['map/getDeviceByCode'](code));
+ if (this.stationObj) {
+ this.$store.dispatch('map/setShowCentralizedStationCode', this.stationObj.code);
+ }
+ }
+ },
initCentralizedStationList(list) {
const stationContorl = this.stationContorl;
this.menuCmdList = new Array(15).fill({});
@@ -453,7 +461,7 @@ export default {
},
checkBelongCentralizedStationByInputStr(inputStr) {
const stationContorl = this.stationContorl;
- return stationContorl && stationContorl.depot? false: stationContorl.jp == inputStr;
+ return stationContorl && stationContorl.depot ? false : stationContorl.jp == inputStr;
},
interceptLogin(cb) {
return (args) => {
@@ -537,23 +545,23 @@ export default {
this.stationDialogVisible = true;
}
},
- getStationControl(selected={}) {
+ getStationControl(selected = {}) {
let control = null;
- let model = this.$store.getters['map/getDeviceByCode'](selected.code)||{};
+ const model = this.$store.getters['map/getDeviceByCode'](selected.code) || {};
if (model._type == 'StationStand') {
control = this.$store.getters['map/getDeviceStationCodeByStationCode'](model.deviceStationCode);
} else if (model._type == 'Station') {
- if (model.centralized) {
+ if (model.centralized) {
control = model;
- } else {
- this.stationList.forEach(el => {
- if (el.centralized &&
+ } else {
+ this.stationList.forEach(el => {
+ if (el.centralized &&
el.chargeStationCodeList.includes(model.code)) {
- control = this.$store.getters['map/getDeviceByCode'](el.code);
- return;
- }
- })
- }
+ control = this.$store.getters['map/getDeviceByCode'](el.code);
+ return;
+ }
+ });
+ }
} else if (model._type == 'Train') { // 车次窗单独处理
control = model;
} else if (model._type == 'TrainWindow') {
@@ -563,7 +571,7 @@ export default {
} else if (model._type == 'Psd') {
const stand = this.$store.getters['map/getDeviceByCode'](model.standCode);
control = this.$store.getters['map/getDeviceStationCodeByStationCode'](stand.deviceStationCode);
- } else if (model._type){
+ } else if (model._type) {
control = this.$store.getters['map/getDeviceStationCodeByStationCode'](model.stationCode);
}
return control;
@@ -741,7 +749,7 @@ export default {
let tip = '';
if (this.cmdType === CMD.Section.CMD_SECTION_SET_LIMIT_SPEED) {
tip = '轨道区段限速设定';
- } else if (this.cmdType === CMD.SECTION.CMD_SWITCH_SET_LIMIT_SPEED) {
+ } else if (this.cmdType === CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED) {
tip = '道岔区段限速设定';
}
this.menuCmdList = new Array(15).fill({ name: '' });
@@ -763,9 +771,9 @@ export default {
this.rightClickDialogVisible = false;
- if (![OperationEvent.Command.common.choose].includes(row.operate)) {
- this.commandInfo = row;
- }
+ if (![OperationEvent.Command.common.choose].includes(row.operate)) {
+ this.commandInfo = row;
+ }
if (row.commandTip) {
EventBus.$emit('sendMsg', {message: row.commandTip});
@@ -777,20 +785,20 @@ export default {
this.canCommand = false;
step.operation = this.operate;
- if (row.next) {
- step.val = row.name;
- }
+ if (row.next) {
+ step.val = row.name;
+ }
- if (row.fillStationCode) {
- const station = this.stationObj||{};
- step.code = station.code;
- }
+ if (row.fillStationCode) {
+ const station = this.stationObj || {};
+ step.code = station.code;
+ }
- if (row.param) {
- this.param = row.param;
- }
+ if (row.param) {
+ this.param = row.param;
+ }
- step.param = this.param;
+ step.param = this.param;
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.checkConfirmParam();
@@ -799,7 +807,11 @@ export default {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
}).catch((error) => {
- EventBus.$emit('sendMsg', {message: '命令执行失败！'});
+ if (error && error.code == '10017') {
+ EventBus.$emit('sendMsg', {message: error.message});
+ } else {
+ EventBus.$emit('sendMsg', {message: '命令执行失败！'});
+ }
});
}
},
@@ -830,7 +842,11 @@ export default {
}).catch((error) => {
this.doClose();
this.handleClose();
- EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}失败`});
+ if (error && error.code == '10017') {
+ EventBus.$emit('sendMsg', {message: error.message});
+ } else {
+ EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}失败`});
+ }
});
},
clickCr1Confirm() {
@@ -848,7 +864,11 @@ export default {
}, 10000);
}
}).catch((error) => {
- EventBus.$emit('sendMsg', {message: '命令执行失败！'});
+ if (error && error.code == '10017') {
+ EventBus.$emit('sendMsg', {message: error.message});
+ } else {
+ EventBus.$emit('sendMsg', {message: '命令执行失败！'});
+ }
this.doClose();
});
},
@@ -865,13 +885,17 @@ export default {
this.doClose();
this.handleDeviceMenu();
this.handleClose();
- EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}成功`});
+ EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}成功`});
}
}).catch((error) => {
this.doClose();
this.handleDeviceMenu();
this.handleClose();
- EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}失败`});
+ if (error && error.code == '10017') {
+ EventBus.$emit('sendMsg', {message: error.message});
+ } else {
+ EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}失败`});
+ }
});
},
handleRightClickClose() {
@@ -964,7 +988,11 @@ export default {
}
}).catch((error) => {
console.error(error);
- EventBus.$emit('sendMsg', {message: '命令执行失败！'});
+ if (error && error.code == '10017') {
+ EventBus.$emit('sendMsg', {message: error.message});
+ } else {
+ EventBus.$emit('sendMsg', {message: '命令执行失败！'});
+ }
});
} else {
EventBus.$emit('sendMsg', {message: '请输入正确的车次号'});
@@ -983,7 +1011,11 @@ export default {
}).catch((error) => {
console.error(error);
this.handleStationClose();
- EventBus.$emit('sendMsg', {message: '命令执行失败！'});
+ if (error && error.code == '10017') {
+ EventBus.$emit('sendMsg', {message: error.message});
+ } else {
+ EventBus.$emit('sendMsg', {message: '命令执行失败！'});
+ }
});
},
stationCommand(row) {
@@ -1001,7 +1033,11 @@ export default {
}
}).catch((error) => {
console.error(error);
- EventBus.$emit('sendMsg', {message: '命令执行失败！'});
+ if (error && error.code == '10017') {
+ EventBus.$emit('sendMsg', {message: error.message});
+ } else {
+ EventBus.$emit('sendMsg', {message: '命令执行失败！'});
+ }
});
},
stationDetainTrain() {
@@ -1121,7 +1157,7 @@ export default {
{ name: '车队单关', commandTip: '对单架信号机关闭车队模式', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch },
{ name: '设置保护', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch },
{ name: '未评限区', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }
- ];
+ ];
this.stationParamList = this.$store.state.training.prdType === '01' ? [
{ name: '关站信号', commandTip: '封锁车站所有信号机', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch || !['Local'].includes(stationControl.controlMode) }
] : [
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/buttonConfirm.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/buttonConfirm.vue
index 83814b18a..2c9d6dae1 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/buttonConfirm.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/buttonConfirm.vue
@@ -26,7 +26,7 @@
- 确认
+ 确认
@@ -35,7 +35,7 @@
-
+
- 确认
+ 确认
@@ -92,9 +92,15 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
- confirmId() {
- return this.operation.domId;
- }
+ configmId1() {
+ return OperationEvent.Command.common.confirm1.domId;
+ },
+ confirmId2() {
+ return OperationEvent.Command.common.confirm2.domId;
+ },
+ selectedId(){
+ return OperationEvent.Command.common.select.domId;
+ }
},
mounted() {
@@ -105,6 +111,7 @@ export default {
this.dialogShow = true;
this.confirmIndex = false;
this.operation = operate.operation;
+ this.value = '';
if (this.operation === OperationEvent.StationLight.SetOrCancelForceLight.confirm1.operation) {
this.value1 = '5';
}
@@ -113,25 +120,37 @@ export default {
this.dialogShow = false;
if (this.timer) { clearInterval(this.timer); }
},
+ onChange(val) {
+ commitOperate({operation: OperationEvent.Command.common.select.operation}, {}, 1, {val}).then(({valid, operate})=>{
+ if (valid) {
+ }
+ });
+ },
confirm1() {
this.status = '发送First request消息成功，请等待服务器！';
- setTimeout(() => {
- this.confirmIndex = true;
- this.time = 30;
- this.status = '收到First request消息！';
- this.timer = setInterval(() => {
- this.time = this.time - 1;
- if (this.time < 0) { this.doClose(); }
- }, 1000);
- }, 1000);
+ commitOperate({operation: OperationEvent.Command.common.confirm1.operation}, {}, 1).then(({valid, operate})=>{
+ if (valid) {
+ setTimeout(() => {
+ this.confirmIndex = true;
+ this.time = 30;
+ this.status = '收到First request消息！';
+ this.timer = setInterval(() => {
+ this.time = this.time - 1;
+ if (this.time < 0) { this.doClose(); }
+ }, 1000);
+ }, 1000);
+ }
+ });
},
confirm2() {
if (this.value1 !== this.value2) {
this.status = '确认操作失败！';
return;
}
+
if (this.operation === OperationEvent.StationLight.SetOrCancelForceLight.confirm1.operation) {
- commitOperate({operate: this.operation, cmdType: CMD.Station.CMD_STATION_SET_OR_CANCEL_FORCE_PHYSICAL_SIGNAL}, {}, 2).then(({valid, operate})=>{
+ commitOperate({operation: OperationEvent.Command.common.confirm2.operation,
+ cmdType: CMD.Station.CMD_STATION_SET_OR_CANCEL_FORCE_PHYSICAL_SIGNAL}, {}, 2).then(({valid, operate})=>{
if (valid) {
this.status = '发送 Second Confirm消息成功，请等待服务器！';
setTimeout(() => {
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/operateConfirm.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/operateConfirm.vue
index 2e799b7f8..5cfc1881e 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/operateConfirm.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/operateConfirm.vue
@@ -73,8 +73,10 @@ export default {
const title = this.$store.state.map.mapName;
const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
+ if (station) {
+ this.title = title + '-' + station.name;
+ }
- this.title = title + '-' + station.name;
this.$nextTick(function () {
setTimeout(e => {
this.$store.dispatch('training/emitTipFresh');
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue
index d877af19b..15353e35f 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue
@@ -9,216 +9,216 @@
+
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue
index d934116c0..a806a15ad 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue
@@ -1,151 +1,80 @@
-
@@ -53,25 +53,26 @@
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
// import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-import SignalGuide from './signalGuide';
+// import SignalGuide from './signalGuide';
import { mapGetters } from 'vuex';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
export default {
- name: 'StandDetain',
+ name: 'CancleSignalGuide',
components: {
- SignalGuide,
+ // SignalGuide,
NoticeInfo
},
data() {
return {
- status: false,
+ status: true,
standStatus: true,
allChecked: false,
dialogShow: false,
loading: false,
- operate: '',
- initEle: null,
- commandEleCode: null
+ operate: ''
+ // initEle: null,
+ // commandEleCode: null
};
},
computed: {
@@ -84,20 +85,20 @@ export default {
selected() {
return this.$store.state.menuOperation.selected;
},
- domIdChoose() {
- return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
+ domIdChoose() {
+ return this.dialogShow ? OperationEvent.Command.common.choose.domId : '';
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
- },
- domIdClose() {
+ },
+ domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
},
domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
- },
+ },
title() {
- return '初始化引导';
+ return '清除引导';
}
},
watch: {
@@ -105,12 +106,15 @@ export default {
if (this.show) {
this.commit();
}
+ },
+ 'selected': function(val) {
+ this.status = !val || val.callOn;
}
},
methods: {
doShow(operate) {
- this.initEle = null;
- this.commandEleCode = null;
+ // this.initEle = null;
+ // this.commandEleCode = null;
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
@@ -147,26 +151,32 @@ export default {
return '否';
}
},
- getProcess(code) {
- if (this.commandEleCode === code) {
- return '完成';
- } else if (this.initEle && this.initEle.code === code) {
- return '等待确认/取消';
- } else {
- return '';
- }
- },
+ // getProcess(code) {
+ // if (this.commandEleCode === code) {
+ // return '完成';
+ // } else if (this.initEle && this.initEle.code === code) {
+ // return '等待确认/取消';
+ // } else {
+ // return '';
+ // }
+ // },
commit(isClose = false) {
+ this.loading = true;
+ const val = this.selected || {};
const step = {
operation: isClose
- ? OperationEvent.Command.common.confirm.operation
- : OperationEvent.Command.common.apply.operation,
+ ? OperationEvent.Command.common.confirm.operation
+ : OperationEvent.Command.common.apply.operation,
+ over: true,
+ param: {signalCode:[val.code]}
};
+ step.cmdType = CMD.Signal.CMD_SIGNAL_CLOSE_GUIDE;
+
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.signalGuide.doShow(step, this.selected);
- this.initEle = this.selected;
+
+ this.loading = false;
isClose && this.doClose();
}
}).catch(() => {
@@ -176,15 +186,13 @@ export default {
},
handleCurrentChange(val) {
if (!val) { return; }
- this.initEle = null;
- this.commandEleCode = null;
const step = {
code: `${val.code}`,
operation: OperationEvent.Command.common.choose.operation,
- val: val.code,
+ val: val.code,
param: {
- signalCode: val.code
- }
+ signalCode: val.code
+ }
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
@@ -195,12 +203,12 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
- commandSuccess(code) {
- this.commandEleCode = code;
- },
- cancelCommand() {
- this.initEle = null;
- },
+ // commandSuccess(code) {
+ // this.commandEleCode = code;
+ // },
+ // cancelCommand() {
+ // this.initEle = null;
+ // },
cancel() {
const operate = {
operation: OperationEvent.Command.common.close.operation
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSectionLimitSpeed.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSectionLimitSpeed.vue
deleted file mode 100644
index 9fce8ae63..000000000
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSectionLimitSpeed.vue
+++ /dev/null
@@ -1,306 +0,0 @@
-
- 按钮
-
-
-
-
-
-
- {{ getStationName(scope.row) }}
-
-
-
-
- {{ getLimitSpeed(scope.row.code) }}
-
-
-
-
- {{ getIsLimit(scope.row.code) }}
-
-
-
-
- {{ getProcess(scope.row.code) }}
-
-
-
-
-
-
-
-
-
-
-
- 确定(O)
-
-
- 应用(A)
-
-
- 关闭(C)
-
-
- 帮助(H)
-
-
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSectionOpen.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSectionOpen.vue
deleted file mode 100644
index 7d953c992..000000000
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSectionOpen.vue
+++ /dev/null
@@ -1,233 +0,0 @@
-
-
-
-
-
-
-
- {{ getStationName(scope.row) }}
-
-
-
-
- {{ getSectionStatus(scope.row.code) }}
-
-
-
-
- {{ getProcess(scope.row.code) }}
-
-
-
-
-
-
- 确定(O)
-
-
- 应用(A)
-
-
- 关闭(C)
-
-
- 帮助(H)
-
-
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSignalBlock.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSignalBlock.vue
deleted file mode 100644
index d9a78d52d..000000000
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSignalBlock.vue
+++ /dev/null
@@ -1,233 +0,0 @@
-
-
-
-
-
-
-
- {{ getSignalStatus(scope.row.code) }}
-
-
-
-
- {{ getProcess(scope.row.code, 'lock') }}
-
-
-
-
- {{ getProcess(scope.row.code, 'unlock') }}
-
-
-
-
-
-
- 确定(O)
-
-
- 应用(A)
-
-
- 关闭(C)
-
-
- 帮助(H)
-
-
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSignalMode.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSignalMode.vue
deleted file mode 100644
index e40f64458..000000000
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSignalMode.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-
-
-
-
-
-
-
- {{ getSignalBlock(scope.row.code) }}
-
-
- 否
-
-
- {{ getProcess(scope.row.code) }}
-
-
-
-
-
-
- 确定(O)
-
-
- 应用(A)
-
-
- 关闭(C)
-
-
- 帮助(H)
-
-
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/initializeSwitchBlock.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/initializeSwitchBlock.vue
deleted file mode 100644
index dbcbaa1b0..000000000
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/initializeSwitchBlock.vue
+++ /dev/null
@@ -1,225 +0,0 @@
-
-
-
-
-
-
-
- {{ getSwitchStatus(scope.row.code) }}
-
-
-
-
- {{ getProcess(scope.row.code, 'block') }}
-
-
-
-
- {{ getProcess(scope.row.code, 'unblock') }}
-
-
-
-
-
-
- 确定(O)
-
-
- 应用(A)
-
-
- 关闭(C)
-
-
- 帮助(H)
-
-
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/remoteResetFunc.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/remoteResetFunc.vue
new file mode 100644
index 000000000..7d8067d86
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/remoteResetFunc.vue
@@ -0,0 +1,262 @@
+
+ 命令
命令
- 确认
- 取消
+ 确认
+ 取消
{{ $t('menu.menuDialog.purpose') }}
-
+
{{ $t('menu.menuDialog.terminalTwo') }}
@@ -157,3 +157,11 @@ export default {
}
};
+
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/viewTrainId.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/viewTrainId.vue
index e022b5ee3..eaa8ce076 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/viewTrainId.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/viewTrainId.vue
@@ -205,4 +205,11 @@ export default {
.elrow{
margin-top:4px;
}
+
+ .xian-01__systerm .el-dialog .base-label {
+ left: -10px;
+ top: -24px;
+ padding: 0 5px;
+ background-color: #F0F0F0;
+ }
diff --git a/src/jmapNew/theme/xian_01/menus/menuStation.vue b/src/jmapNew/theme/xian_01/menus/menuStation.vue
index da49659de..687e41913 100644
--- a/src/jmapNew/theme/xian_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuStation.vue
@@ -87,12 +87,12 @@ export default {
label: '所有进路交ATS自动控',
handler: this.atsAutoControlALL,
cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING
- },
- {
- label: '执行关键操作测试',
- handler: this.execKeyOperationTest,
- cmdType: CMD.Station.CMD_STATION_KEY_OPERATION_TEST
}
+ // {
+ // label: '执行关键操作测试',
+ // handler: this.execKeyOperationTest,
+ // cmdType: CMD.Station.CMD_STATION_KEY_OPERATION_TEST
+ // }
]
},
menuForce: [
diff --git a/src/jmapNew/theme/xian_01/operationConfig.js b/src/jmapNew/theme/xian_01/operationConfig.js
index b0716617c..6bf8a5f27 100644
--- a/src/jmapNew/theme/xian_01/operationConfig.js
+++ b/src/jmapNew/theme/xian_01/operationConfig.js
@@ -309,14 +309,14 @@ export default {
minDuration: 8,
operateType: 'Stand_Set_Reentry_Strategy',
skinCode: '02',
- trainingName: '人工折返策略设置({10}-{12}站台)',
- trainingRemark: '人工折返策略设置功能',
+ trainingName: '设置折返策略({10}-{12}站台)',
+ trainingRemark: '设置折返策略功能',
trainingType: 'Stand',
productTypes: ['02'],
stepVOList: [
- { deviceType: '06', orderNum: 1, operateCode: '511', tip: '鼠标右键菜单选择【人工折返策略设置】' },
+ { deviceType: '06', orderNum: 1, operateCode: '511', tip: '鼠标右键菜单选择【设置折返策略】' },
{ deviceType: '06', orderNum: 2, operateCode: '5111', tip: '鼠标左键点击，选择【无折返】', val: '01' },
- { deviceType: '06', orderNum: 3, operateCode: '511', tip: '鼠标左键点击【确定】按钮', val: '01' }
+ { deviceType: '06', orderNum: 3, operateCode: '511', tip: '鼠标左键点击【确定】按钮' }
]
},
@@ -485,28 +485,28 @@ export default {
{
maxDuration: 15,
minDuration: 8,
- operateType: 'Switch_Section_Block',
+ operateType: 'Switch_Block',
skinCode: '02',
- trainingName: '道岔区段封闭({7})',
- trainingRemark: '道岔区段封闭功能',
+ trainingName: '道岔封锁({7})',
+ trainingRemark: '道岔封锁功能',
trainingType: 'Switch',
productTypes: ['01', '02'],
stepVOList: [
- { deviceType: '02', orderNum: 1, operateCode: '105', tip: '鼠标右键菜单选择【道岔区段封闭】' },
+ { deviceType: '02', orderNum: 1, operateCode: '105', tip: '鼠标右键菜单选择【道岔封锁】' },
{ deviceType: '02', orderNum: 2, operateCode: '105', tip: '鼠标左键点击【确定】按钮' }
]
},
{
maxDuration: 15,
minDuration: 8,
- operateType: 'Switch_Section_Unblock',
+ operateType: 'Switch_Unblock',
skinCode: '02',
- trainingName: '道岔区段解封({7})',
- trainingRemark: '道岔区段解封功能',
+ trainingName: '道岔解封({7})',
+ trainingRemark: '道岔解封功能',
trainingType: 'Switch',
productTypes: ['01', '02'],
stepVOList: [
- { deviceType: '02', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【道岔区段解封】' },
+ { deviceType: '02', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【道岔解封】' },
{ deviceType: '02', orderNum: 2, operateCode: '1061', tip: '鼠标左键点击【下达】按钮' },
{ deviceType: '02', orderNum: 3, operateCode: '1063', tip: '鼠标左键点击【确认1】按钮' },
{ deviceType: '02', orderNum: 4, operateCode: '1064', tip: '鼠标左键点击【确认2】按钮' },
@@ -741,7 +741,7 @@ export default {
trainingName: '引导进路办理({3})',
trainingRemark: '进路办理信号引导',
trainingType: 'Signal',
- productTypes: ['01'],
+ productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【引导进路办理】' },
{ deviceType: '04', orderNum: 2, operateCode: '3081', tip: '鼠标左键点击【下达】按钮' },
@@ -758,7 +758,7 @@ export default {
trainingName: '进路交ATS自动控({3})',
trainingRemark: '进路交ATS自动控',
trainingType: 'Signal',
- productTypes: ['02'],
+ productTypes: ['02', '01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '315', tip: '鼠标右键菜单选择【进路交ATS自动控】' },
{ deviceType: '04', orderNum: 2, operateCode: '3151', tip: '鼠标左键选择进路({3})', val: '{4}' },
@@ -773,7 +773,7 @@ export default {
trainingName: '进路交人工控({3})',
trainingRemark: '进路交人工控',
trainingType: 'Signal',
- productTypes: ['02'],
+ productTypes: ['02', '01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '314', tip: '鼠标右键菜单选择【进路交人工控】' },
{ deviceType: '04', orderNum: 2, operateCode: '3141', tip: '鼠标左键选择进路({3})', val: '{4}' },
@@ -788,7 +788,7 @@ export default {
trainingName: '查询进路控制状态({5})',
trainingRemark: '查询进路控制状态',
trainingType: 'Signal',
- productTypes: ['02'],
+ productTypes: ['02', '01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '316', tip: '鼠标右键菜单选择【查询进路控制模式】' },
{ deviceType: '04', orderNum: 2, operateCode: '316', tip: '鼠标左键点击【确定】按钮' }
@@ -849,6 +849,93 @@ export default {
{ deviceType: '04', orderNum: 1, operateCode: '312', tip: '鼠标右键菜单选择【取消联锁自动触发】' },
{ deviceType: '04', orderNum: 2, operateCode: '312', tip: '鼠标左键点击【确定】按钮' }
]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Station_Set_CI_Auto_Trigger',
+ skinCode: '02',
+ trainingName: '全站设置联锁自动触发({26})',
+ trainingRemark: '全站设置联锁自动触发',
+ trainingType: 'Station',
+ productTypes: ['01'],
+ stepVOList: [
+ { deviceType: '04', orderNum: 1, operateCode: '601', tip: '鼠标右键菜单选择【全站设置联锁自动触发】' }
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Station_Cancel_CI_Auto_Trigger',
+ skinCode: '02',
+ trainingName: '全站取消联锁自动触发({26})',
+ trainingRemark: '全站取消联锁自动触发',
+ trainingType: 'Station',
+ productTypes: ['01'],
+ stepVOList: [
+ { deviceType: '04', orderNum: 1, operateCode: '602', tip: '鼠标右键菜单选择【全站取消联锁自动触发】' }
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Station_Close_Auto_Setting',
+ skinCode: '02',
+ trainingName: '所有进路交人工控({26})',
+ trainingRemark: '所有进路交人工控',
+ trainingType: 'Station',
+ productTypes: ['01', '02'],
+ stepVOList: [
+ { deviceType: '04', orderNum: 1, operateCode: '605', tip: '鼠标右键菜单选择【所有进路交人工控】' },
+ { deviceType: '04', orderNum: 2, operateCode: '605', tip: '鼠标左键点击【确定】按钮' }
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Station_Open_Auto_Setting',
+ skinCode: '02',
+ trainingName: '所有进路交ATS自动控({26})',
+ trainingRemark: '所有进路交ATS自动控',
+ trainingType: 'Station',
+ productTypes: ['01', '02'],
+ stepVOList: [
+ { deviceType: '04', orderNum: 1, operateCode: '606', tip: '鼠标右键菜单选择【所有进路交ATS自动控】' },
+ { deviceType: '04', orderNum: 2, operateCode: '606', tip: '鼠标左键点击【确定】按钮', val: 'true' }
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Station_Power_On_Unlock',
+ skinCode: '02',
+ trainingName: '上电解锁({26})',
+ trainingRemark: '上电解锁',
+ trainingType: 'Station',
+ productTypes: ['01'],
+ stepVOList:[
+ {deviceType: '05', orderNum: 1, operateCode: '603', tip: '鼠标右键菜单选择【上电解锁】'},
+ {deviceType: '05', orderNum: 2, operateCode: '6031', tip: '鼠标左键点击【下达】'},
+ {deviceType: '05', orderNum: 3, operateCode: '6033', tip: '鼠标左键点击【确认1】'},
+ {deviceType: '05', orderNum: 4, operateCode: '6034', tip: '鼠标左键点击【确认2】'},
+ {deviceType: '05', orderNum: 5, operateCode: '001', tip: '鼠标左键点击【关闭】按钮'}
+ ]
+ },
+ {
+ maxDuration: 15,
+ minDuration: 8,
+ operateType: 'Station_Set_Turn_Back_Strategy',
+ skinCode: '02',
+ trainingName: '设置折返策略({32})({31})',
+ trainingRemark: '设置折返策略',
+ trainingType: 'Station',
+ productTypes: ['01', '02'],
+ stepVOList: [
+ { deviceType: '05', orderNum: 1, operateCode: '610', tip: '鼠标右键菜单选择【设置折返策略】', codeType: 'BUTTON'},
+ { deviceType: '05', orderNum: 2, operateCode: '6101', tip: '选择折返策略【{31}】', val: '1' }, // 1为选项中的第一个，和后台默认保持一致
+ { deviceType: '05', orderNum: 3, operateCode: '610', tip: '鼠标左键点击【确定】' }
+ ],
+ config:{tbStrategyBT:true}
}
]
};
diff --git a/src/jmapNew/theme/xian_02/menus/menuRequest.vue b/src/jmapNew/theme/xian_02/menus/menuRequest.vue
index aff5f367f..8e2ab604c 100644
--- a/src/jmapNew/theme/xian_02/menus/menuRequest.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuRequest.vue
@@ -78,15 +78,20 @@ export default {
if (list && list.length) {
list.forEach(item => {
if (item.device && item.device.code) {
- let station;
+ let station, deviceName;
if (item.device._type == 'Station') {
station = item.device;
+ deviceName = item.device.name;
+ } else if (item.device._type == 'Train') {
+ station = {name:''};
+ deviceName = '列车' + item.device.serviceNumber + item.device.destinationCode;
} else {
station = this.$store.getters['map/getDeviceByCode'](item.device.stationCode);
+ deviceName = item.device.name;
}
const param = {
station: `CP ${station.name}`,
- operation: `${item.device.name} ${item.operation.name}`,
+ operation: `${deviceName} ${item.operation.name}`,
operateCode: item.operation.code,
deviceCode: item.device.code
};
diff --git a/src/jmapNew/theme/xian_02/menus/menuSignal.vue b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
index 5a4df05c1..dda3c4340 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSignal.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
@@ -209,7 +209,11 @@ export default {
handler: this.triggerFaultManagement,
cmdType: CMD.Fault.CMD_TRIGGER_FAULT
}
- ]
+ ],
+ prdType2ControlModeMap: {
+ '01': 'Local',
+ '02': 'Center'
+ }
};
},
computed: {
@@ -224,6 +228,9 @@ export default {
'routeList',
'routeData'
]),
+ prdType() {
+ return this.$store.state.training.prdType;
+ },
group() {
return this.$route.query.group;
}
@@ -239,7 +246,9 @@ export default {
}
},
'$store.state.menuOperation.leftClickCount': function (val) {
- if (this.selected._type === 'Signal') {
+ const control = MenuContextHandler.getStationControl(this.selected);
+ const controlMode = this.prdType2ControlModeMap[this.prdType];
+ if (this.selected._type === 'Signal' && control.controlMode == controlMode) {
this.arrangementRoute();
}
}
diff --git a/src/jmapNew/theme/xian_02/menus/menuStation.vue b/src/jmapNew/theme/xian_02/menus/menuStation.vue
index 8034efc9d..d73ae9697 100644
--- a/src/jmapNew/theme/xian_02/menus/menuStation.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuStation.vue
@@ -14,7 +14,6 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
import { mapGetters } from 'vuex';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
@@ -134,7 +133,7 @@ export default {
// label: '折返模式',
// children: [
// {
- // label: '优先折返',
+ // label: '侧线优先',
// handler: this.setPriorityStrategy
// },
// {
@@ -248,7 +247,7 @@ export default {
label: '折返模式',
children: [
{
- label: '优先折返',
+ label: '侧线优先',
handler: this.setPriorityStrategy
},
{
@@ -355,7 +354,7 @@ export default {
});
},
setPriorityStrategy() {
- this.getStrategyByStation('优先折返');
+ this.getStrategyByStation('侧线优先');
},
setLineStrategy() {
this.getStrategyByStation('直线折返');
diff --git a/src/jmapNew/theme/xian_02/menus/menuTrain.vue b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
index 2c48dba1f..e7f6d3209 100644
--- a/src/jmapNew/theme/xian_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
@@ -1,6 +1,6 @@
-
diff --git a/src/views/planMonitor/editTool/index.vue b/src/views/planMonitor/editTool/index.vue
index 9ef1bf2d0..1b82f5bc7 100644
--- a/src/views/planMonitor/editTool/index.vue
+++ b/src/views/planMonitor/editTool/index.vue
@@ -30,16 +30,12 @@
/>
-
-
- {{ $t('planMonitor.modifying.time') }}
-
-
-
-
-
-
-
- {{ $t('global.confirm') }}
- {{ $t('global.cancel') }}
-
-
-
-
-
- {{ $t('planMonitor.modifying.startStationTips') }}
-
-
- {{ $t('planMonitor.modifying.endStationTips') }}
-
-
-
-
-
-
-
-
diff --git a/src/views/planMonitor/editTool/schedule.vue b/src/views/planMonitor/editTool/schedule.vue
index b3f0e5b1c..b9b7f9ef5 100644
--- a/src/views/planMonitor/editTool/schedule.vue
+++ b/src/views/planMonitor/editTool/schedule.vue
@@ -23,14 +23,14 @@
+
diff --git a/src/views/planMonitor/editToolTJ/component/menuNav/menuItem.vue b/src/views/planMonitor/editToolTJ/component/menuNav/menuItem.vue
new file mode 100644
index 000000000..da813e93d
--- /dev/null
+++ b/src/views/planMonitor/editToolTJ/component/menuNav/menuItem.vue
@@ -0,0 +1,93 @@
+
+
+
+
+
+
diff --git a/src/views/planMonitor/editToolTJ/component/menuNav/menuList.vue b/src/views/planMonitor/editToolTJ/component/menuNav/menuList.vue
new file mode 100644
index 000000000..21023c888
--- /dev/null
+++ b/src/views/planMonitor/editToolTJ/component/menuNav/menuList.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
diff --git a/src/views/planMonitor/editToolTJ/index.vue b/src/views/planMonitor/editToolTJ/index.vue
new file mode 100644
index 000000000..2c74591e9
--- /dev/null
+++ b/src/views/planMonitor/editToolTJ/index.vue
@@ -0,0 +1,103 @@
+
+ 折返配置
-
-
-
-
- {{ formatName(scope.row.stationCode) }}
-
-
-
-
- {{ formatName(scope.row.sectionCode) }}
-
-
-
-
-
- {{ $t('map.remove') }}
-
-
-
-
-
- {{ $t('map.save') }}
-
-
-
-
- 区段:
-
-
- {{ $t('map.activate') }}
-
- {{ $t('map.add') }}
-
-
-
+
+
+
+
+
+
diff --git a/src/views/planMonitor/editToolTJ/navBar.vue b/src/views/planMonitor/editToolTJ/navBar.vue
new file mode 100644
index 000000000..63b1c2123
--- /dev/null
+++ b/src/views/planMonitor/editToolTJ/navBar.vue
@@ -0,0 +1,173 @@
+
+
+
+
+
+
diff --git a/src/views/planMonitor/editToolTJ/navSchedule.vue b/src/views/planMonitor/editToolTJ/navSchedule.vue
new file mode 100644
index 000000000..ebd25d7a2
--- /dev/null
+++ b/src/views/planMonitor/editToolTJ/navSchedule.vue
@@ -0,0 +1,30 @@
+
+
+ 运行图编辑工具
+
+
+
+
+
+ context
+
+
+
+
diff --git a/src/views/planMonitor/editToolTJ/navState.vue b/src/views/planMonitor/editToolTJ/navState.vue
new file mode 100644
index 000000000..a65e3b076
--- /dev/null
+++ b/src/views/planMonitor/editToolTJ/navState.vue
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/planMonitor/editToolTJ/navTool.vue b/src/views/planMonitor/editToolTJ/navTool.vue
new file mode 100644
index 000000000..3dfa0ba2b
--- /dev/null
+++ b/src/views/planMonitor/editToolTJ/navTool.vue
@@ -0,0 +1,155 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/planMonitor/newEditTool/index.vue b/src/views/planMonitor/newEditTool/index.vue
index d89113a81..1b82f5bc7 100644
--- a/src/views/planMonitor/newEditTool/index.vue
+++ b/src/views/planMonitor/newEditTool/index.vue
@@ -3,22 +3,20 @@
+
+
+
+
+
+ ![]()
+ {{ el.title }}
+
+