diff --git a/src/components/QueryListPage/QueryListPage.vue b/src/components/QueryListPage/QueryListPage.vue index f44bef52c..c33a4af53 100644 --- a/src/components/QueryListPage/QueryListPage.vue +++ b/src/components/QueryListPage/QueryListPage.vue @@ -191,6 +191,7 @@ + diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/modifyTrainNumber.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/modifyTrainNumber.vue new file mode 100644 index 000000000..27b7eec18 --- /dev/null +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/modifyTrainNumber.vue @@ -0,0 +1,159 @@ + + + + + + + + + + + + 列车描述号 + + 001-159:: + 计划列车 + 160-999:: + 临时目的地列车 + + + + + + + 确定(O) + + + 应用(A) + + + 关闭(C) + + + 帮助(H) + + + + + + + + diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/occupancyTrainCorrelation.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/occupancyTrainCorrelation.vue new file mode 100644 index 000000000..c30d0887d --- /dev/null +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/occupancyTrainCorrelation.vue @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + 关联 + + 在上行线尽头创建(U) + + 在下行线尽头创建(D) + + 删除(I) + + + + + + 确定(O) + + + 应用(A) + + + 关闭(C) + + + 帮助(H) + + + + + + + + diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainIdAssociated.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainIdAssociated.vue new file mode 100644 index 000000000..350832817 --- /dev/null +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainIdAssociated.vue @@ -0,0 +1,159 @@ + + + + + + + + + + + + 关联 + + 列车ID + + 车体号(R) + + 插入(I) + 删除(D) + + + + + + 确定(O) + + + 应用(A) + + + 关闭(C) + + + 帮助(H) + + + + + + + + diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainUpdateDeviation.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainUpdateDeviation.vue index a53b3dbd1..cf4d8d879 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainUpdateDeviation.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainUpdateDeviation.vue @@ -2,19 +2,19 @@ - + - - 跳停 + + 滑动时间(S) - 设置(S) - - 清除(R) + + 范围:-9999到9999秒 + 所有列车(L) @@ -56,7 +56,8 @@ export default { selected: null, activeName: 'first', operate: {}, - allCheck: false + allCheck: false, + slidingTime: 0 }; }, computed: { @@ -77,7 +78,7 @@ export default { return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : ''; }, title() { - return '设置/清除站台跳停'; + return '更新偏差'; } }, watch: { @@ -139,13 +140,12 @@ export default { } .set-status-box { position: relative; - top: 80px; border: 1px solid #AFAFAF; - padding: 10px 5px; + padding: 15px 5px 5px; } .set-status-title{ position: relative; - top: 95px; + top: 15px; background: #F0F0F0; width: 40px; text-align: center; diff --git a/src/views/publish/publishMap/index.vue b/src/views/publish/publishMap/index.vue index 1bdbd34aa..e3870c6d4 100644 --- a/src/views/publish/publishMap/index.vue +++ b/src/views/publish/publishMap/index.vue @@ -54,6 +54,13 @@ export default { config: { data: [] } + }, + lineCode: { + type: 'select', + label: '所属线路', + config: { + data: [] + } } } @@ -184,6 +191,9 @@ export default { this.lineCodeList = []; getLineCodeList().then(response => { this.lineCodeList = response.data; + this.lineCodeList.forEach(elem => { + this.queryForm.queryObject.lineCode.config.data.push({ value: elem.code, label: elem.name }); + }); }); }, handleSetProject(index, row) {