From 50c206cad3d4990be23258c99a26f5b5dd0a9fa5 Mon Sep 17 00:00:00 2001 From: ival <610568032@qq.com> Date: Thu, 11 Mar 2021 18:30:43 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=81=E6=B3=A23?= =?UTF-8?q?=E9=81=93=E5=B2=94=E5=B0=81=E9=94=81=E5=AE=9E=E8=AE=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/ningbo_03/operationConfig.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/jmapNew/theme/ningbo_03/operationConfig.js b/src/jmapNew/theme/ningbo_03/operationConfig.js index afa8f6e8c..8947e03c4 100644 --- a/src/jmapNew/theme/ningbo_03/operationConfig.js +++ b/src/jmapNew/theme/ningbo_03/operationConfig.js @@ -234,9 +234,17 @@ export default { { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标左键选择【线路】' }, { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_switch.operation, tip: '鼠标左键选择【道岔】' }, { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_switch_block.operation, tip: '鼠标左键选择【封锁】' }, - { deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择道岔【{7}】', codeType:'SWITCH', val: '{17}' }, - { deviceType: '02', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' }, - { deviceType: '02', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' }, + { deviceType: 'bar', orderNum: 4, operateCode: OperationEvent.Command.commandNingBo3.line_switch_block_init.operation, tip: '鼠标左键选择【初始化】' }, + { deviceType: 'mbm', orderNum: 5, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择道岔【{7}】', codeType:'SWITCH', val: '{17}' }, + { deviceType: '02', orderNum: 6, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' }, + { deviceType: '02', orderNum: 7, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' }, + { deviceType: 'bar', orderNum: 8, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标左键选择【线路】' }, + { deviceType: 'bar', orderNum: 9, operateCode: OperationEvent.Command.commandNingBo3.line_switch.operation, tip: '鼠标左键选择【道岔】' }, + { deviceType: 'bar', orderNum: 10, operateCode: OperationEvent.Command.commandNingBo3.line_switch_block.operation, tip: '鼠标左键选择【封锁】' }, + { deviceType: 'bar', orderNum: 11, operateCode: OperationEvent.Command.commandNingBo3.line_switch_block_sure.operation, tip: '鼠标左键选择【确定/取消】' }, + { deviceType: 'mbm', orderNum: 12, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择道岔【{7}】', codeType:'SWITCH', val: '{17}' }, + { deviceType: '02', orderNum: 13, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' }, + { deviceType: '02', orderNum: 14, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' }, ] }, { From 6cac5cdf51e7b31bbe7acac0e6373958fbf3768d Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Fri, 12 Mar 2021 10:42:55 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E5=9B=BE=E7=BC=96?= =?UTF-8?q?=E5=88=B6=20=E5=AF=BC=E5=85=A5=E5=85=AC=E5=85=B1=E8=BF=9B?= =?UTF-8?q?=E8=B7=AF=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/jmap/mapdraft.js | 19 + .../QueryListPage/QueryListPage.vue | 35 +- .../routingoperate/importRouteOperate.vue | 267 ++++++++++++ .../components/routingoperate/routeConfig.vue | 379 ++++++++++-------- .../routingoperate/routeOperate.vue | 19 +- 5 files changed, 531 insertions(+), 188 deletions(-) create mode 100644 src/views/planMonitor/components/routingoperate/importRouteOperate.vue diff --git a/src/api/jmap/mapdraft.js b/src/api/jmap/mapdraft.js index 5f6529e7e..345f3a2dd 100644 --- a/src/api/jmap/mapdraft.js +++ b/src/api/jmap/mapdraft.js @@ -133,6 +133,25 @@ export function listRoutingData(mapId, params) { }); } +/** 分页查询公共的交路数据(新版)*/ +export function listPublicRoutingData(mapId, params) { + return request({ + // url: `/api/mapBuild/${mapId}/routingData`, + url: `/api/runPlan/userData/${mapId}/default/routing/page`, + method: 'get', + params: params + }); +} + +/** 用户拉取公共的交路数据(新版)*/ +export function pullPublicRoutingData(mapId, data) { + return request({ + url: `/api/runPlan/userData/${mapId}/default/routing/pull`, + method: 'put', + data: data + }); +} + /** 创建交路(新版)*/ export function addRoutingData(data) { return request({ diff --git a/src/components/QueryListPage/QueryListPage.vue b/src/components/QueryListPage/QueryListPage.vue index e25f33dae..b3938ca95 100644 --- a/src/components/QueryListPage/QueryListPage.vue +++ b/src/components/QueryListPage/QueryListPage.vue @@ -165,14 +165,6 @@ -
- {{ $t('global.selectAdd') }} -
+
+ {{ queryList.selectCheckText?queryList.selectCheckText:$t('global.selectAdd') }} +
@@ -517,12 +518,12 @@ export default { }, onRowClick(row) { this.choose = row; - }, - onReset() { - if (this.$refs.queryForm) { - this.$refs.queryForm.doClean(); - } - }, + }, + onReset() { + if (this.$refs.queryForm) { + this.$refs.queryForm.doClean(); + } + }, currentChoose() { return this.choose; }, @@ -568,7 +569,7 @@ export default { delete self.queryData[self.sortBy]; self.refresh(true); } - } + } } }; @@ -594,4 +595,8 @@ export default { z-index: 100; } } +.defaultCheckClass{ + margin-top: 8px; + margin-left: 8px; +} diff --git a/src/views/planMonitor/components/routingoperate/importRouteOperate.vue b/src/views/planMonitor/components/routingoperate/importRouteOperate.vue new file mode 100644 index 000000000..947a1ed24 --- /dev/null +++ b/src/views/planMonitor/components/routingoperate/importRouteOperate.vue @@ -0,0 +1,267 @@ + + + + diff --git a/src/views/planMonitor/components/routingoperate/routeConfig.vue b/src/views/planMonitor/components/routingoperate/routeConfig.vue index e2ba4b18c..5fa9ae3ca 100644 --- a/src/views/planMonitor/components/routingoperate/routeConfig.vue +++ b/src/views/planMonitor/components/routingoperate/routeConfig.vue @@ -1,169 +1,173 @@ From c3fec625e27c91de41f395b104642bf2bf2b1eb7 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Fri, 12 Mar 2021 16:16:51 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E5=9B=BE=E7=BC=96?= =?UTF-8?q?=E5=88=B6=20=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/menus/gernaratePlanTrain.vue | 98 ++++++++++++------- .../menus/populatingGenericData.vue | 41 +++----- 2 files changed, 73 insertions(+), 66 deletions(-) diff --git a/src/views/planMonitor/components/menus/gernaratePlanTrain.vue b/src/views/planMonitor/components/menus/gernaratePlanTrain.vue index 225dbe00a..c965b18b4 100644 --- a/src/views/planMonitor/components/menus/gernaratePlanTrain.vue +++ b/src/views/planMonitor/components/menus/gernaratePlanTrain.vue @@ -35,6 +35,7 @@ export default { dialogShow: false, routingList: [], loading: false, + runningRoutingMap:{}, runLevelList: [ { value: 1, label: '等级一' }, { value: 2, label: '等级二' }, @@ -49,11 +50,11 @@ export default { overTime: '', // 结束时间 runLevel:'', // 运行等级 departureInterval:180, // 发车间隔 - // reentryTime:120, // 折返时间 inboundRouting:'', // 回库交路code outboundRouting:'', // 出库交路code runningRouting1: '', // 环路code1 - runningRouting2: '' // 环路code2 + runningRouting2: '', // 环路code2 + runningRouting:'' }, rules: { @@ -74,23 +75,15 @@ export default { departureInterval:[ { required: true, message: '请填写发车间隔', trigger: 'blur' } ], - // reentryTime:[ - // { required: true, message: '请填写折返时间', trigger: 'blur' } - // ], inboundRouting: [ { required: true, message: '请选择回库交路', trigger: 'change' } ], + runningRouting: [ + { required: true, message: '请选择环路', trigger: 'blur' }, + { required: true, message: '请选择环路', trigger: 'change' } + ], outboundRouting: [ { required: true, message: '请选择出库交路', trigger: 'change' } - ], - runningRouting1: [ - // message: '请选择环路', - { required: true, validator: this.validateRunningRouting, trigger: 'change' }, - { required: true, validator: this.validateRunningRouting, trigger: 'blur' } - ], - runningRouting2: [ - { required: true, validator: this.validateRunningRouting, trigger: 'change' }, - { required: true, validator: this.validateRunningRouting, trigger: 'blur' } ] } }; @@ -113,10 +106,10 @@ export default { { prop: 'overTime', label: '结束时间', type: 'timePicker', selectableRange:'02:00:00-23:59:59'}, { prop: 'runLevel', label: '运行等级', type: 'select', options: this.runLevelList }, { prop: 'departureInterval', label: '发车间隔', type: 'number', show:this.formModel.gernarateType == '02', min:0, step:1, precisionFlag:true, precision:0, message:'s'}, - // { prop: 'reentryTime', label: '折返时间', type: 'number', min:120, step:1, precisionFlag:true, precision:0, message:'s' }, { prop: 'outboundRouting', label: '出库交路', type: 'select', options: this.covertRouting('OUTBOUND'), noDataText:'请先设置交路'}, - { prop: 'runningRouting1', label: '环路交路1', type: 'select', show:true, options: this.covertRouting('LOOP'), noDataText:'请先设置交路', change:true, onChange:this.changeRoute2 }, - { prop: 'runningRouting2', label: '环路交路2', type: 'select', show:true, options: this.covertRouting('LOOP'), noDataText:'请先设置交路', change:true, onChange:this.changeRoute1}, + { prop: 'runningRouting1', label: '环路交路1', type: 'select', show:false}, + { prop: 'runningRouting2', label: '环路交路2', type: 'select', show:false}, + {prop:'runningRouting', label:'环路', type: 'select', options:this.covertRoutingCircle(), noDataText:'请先设置交路', change:true, onChange:this.changeRoute}, { prop: 'inboundRouting', label: '入库交路', type: 'select', options: this.covertRouting('INBOUND'), noDataText:'请先设置交路'} ] }; @@ -127,8 +120,35 @@ export default { this.loading = false; const mapId = this.$route.query.mapId; if (mapId) { + const runningRoutingMap = {}; listUserRoutingData(mapId).then(response => { - this.routingList = response.data.map(elem => { return { value: elem.code, label: elem.name, routingType:elem.routingType }; }); + const list = response.data; + this.routingList = list.map(elem => { return { value: elem.code, label: elem.name, routingType:elem.routingType }; }); + list.forEach(elem=>{ + // this.routingList.push({value: elem.code, label: elem.name, routingType:elem.routingType}); + if (elem.routingType === 'LOOP') { + const name = elem.name; + let temp = ''; + if (elem.right) { + temp = name.split('-')[0]; + // const data = ; + const data = runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode]; + if (!data) { runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode] = {}; } + runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].label = elem.name + '-' + temp; + runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].value = elem.startSectionCode + '-' + elem.endSectionCode; + runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].runningRouting1 = elem.code; + } else { + temp = name.split('-')[1]; + // const data = ; + const data = runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode]; + if (!data) { runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode] = {}; } + runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode].label = temp + '-' + elem.name; + runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode].value = elem.endSectionCode + '-' + elem.startSectionCode; + runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode].runningRouting2 = elem.code; + } + } + }); + this.runningRoutingMap = runningRoutingMap; }).catch(() => { this.$messageBox(`获取交路列表失败`); }); @@ -171,34 +191,39 @@ export default { } } }, - validateRunningRouting(rule, value, callback) { - if (value.trim().length == 0) { - return callback(new Error('请选择环路')); - } else { - if (this.formModel.runningRouting1 == this.formModel.runningRouting2) { - return callback(new Error('环路交路1和环路交路2不能相同')); - } else { - return callback(); - } - } - }, - changeRoute2() { - this.changeRoute('runningRouting2'); - }, - changeRoute1() { - this.changeRoute('runningRouting1'); - }, + // changeRoute(runningRouting) { + // if (this.formModel[runningRouting]) { this.$refs.dataform.validateField([runningRouting]); } + // }, changeRoute(runningRouting) { - if (this.formModel[runningRouting]) { this.$refs.dataform.validateField([runningRouting]); } + const temp = this.runningRoutingMap[runningRouting]; + this.formModel.runningRouting1 = temp.runningRouting1; + this.formModel.runningRouting2 = temp.runningRouting2; }, doClose() { this.loading = false; this.$refs.dataform.resetForm(); + this.formModel = { + gernarateType:'01', + serviceNumber:'', // 服务号 + beginTime: '', // 开始时间 + overTime: '', // 结束时间 + runLevel:'', // 运行等级 + departureInterval:180, // 发车间隔 + inboundRouting:'', // 回库交路code + outboundRouting:'', // 出库交路code + runningRouting1: '', // 环路code1 + runningRouting2: '', // 环路code2 + runningRouting:'' + }; this.dialogShow = false; }, covertRouting(routingType) { return this.routingList.filter(route=>{ return route.routingType == routingType; }); }, + covertRoutingCircle() { + const list = Object.values(this.runningRoutingMap); + return list.filter(route=>{ return route.runningRouting1 && route.runningRouting2; }); + }, handleCommit() { this.$refs.dataform.validateForm(() => { if (this.formModel.overTime <= this.formModel.beginTime) { @@ -212,6 +237,7 @@ export default { delete formModel.serviceNumber; } delete formModel.gernarateType; + this.loading = true; generatePlanTrain(this.$route.query.planId || this.loadRunPlanId, formModel).then(res => { this.loading = false; diff --git a/src/views/planMonitor/components/menus/populatingGenericData.vue b/src/views/planMonitor/components/menus/populatingGenericData.vue index 5ca121b69..410a8f95c 100644 --- a/src/views/planMonitor/components/menus/populatingGenericData.vue +++ b/src/views/planMonitor/components/menus/populatingGenericData.vue @@ -62,6 +62,7 @@ export default { { required: true, message: '请填写发车间隔', trigger: 'blur' } ], runningRouting: [ + { required: true, message: '请选择环路', trigger: 'blur' }, { required: true, message: '请选择环路', trigger: 'change' } ] // parkedTime: [ @@ -96,20 +97,14 @@ export default { { prop: 'beginTime', label: '开始时间', type: 'timePicker', selectableRange:'02:00:00-23:59:59'}, { prop: 'overTime', label: '结束时间', type: 'timePicker', selectableRange:'02:00:00-23:59:59'}, { prop: 'departureTimeInterval', label: '发车间隔', type: 'number', min:0, step:1, precisionFlag:true, precision:0, message:'s'}, - // { prop: 'parkedTime', label: '停站时间', type: 'number', min:0, step:1, precisionFlag:true, precision:0}, - // { prop: 'reentryTime', label: '折返时间', type: 'number', min:120, step:1, precisionFlag:true, precision:0, message:'s'}, { prop: 'right', label: '发车类型', type: 'checkBox', children: [ { name: '上行发车', value: 1 }, { name: '下次发车', value: 2 }, { name: '同时发车', value: 3 } ] }, - // options: this.covertRouting('LOOP') - // options: this.covertRouting('LOOP') { prop: 'runningRouting1', label: '环路交路1', type: 'select', show:false}, { prop: 'runningRouting2', label: '环路交路2', type: 'select', show:false}, {prop:'runningRouting', label:'环路', type: 'select', options:this.covertRouting(), noDataText:'请先设置交路', change:true, onChange:this.changeRoute} - // noDataText:'请先设置交路', change:true, onChange:this.changeRoute1 - // noDataText:'请先设置交路', change:true, onChange:this.changeRoute2 // { prop: 'startStationCode', label: '起始站', type: 'select', options: this.stationList }, // { prop: 'endStationCode', label: '终止站', type: 'select', options: this.stationList } ] @@ -135,7 +130,6 @@ export default { listUserRoutingData(mapId).then(response => { const list = response.data; list.forEach(elem=>{ - // this.routingList.push({value: elem.code, label: elem.name, routingType:elem.routingType}); if (elem.routingType === 'LOOP') { const name = elem.name; let temp = ''; @@ -169,6 +163,16 @@ export default { doClose() { this.loading = false; this.$refs.dataform.resetForm(); + this.formModel = { + stationRunningTime: 60, // 站间运行时间 + right: 3, // 是否向右发车 不填未同时发车 + beginTime: '', + overTime: '', + departureTimeInterval: 180, // 发车间隔时间 + runningRouting1:'', // 环路code1 + runningRouting2:'', // 环路code2 + runningRouting:'' + }; this.dialogShow = false; }, handleCommit() { @@ -198,26 +202,6 @@ export default { } }); }, - // validateRunningRouting(rule, value, callback) { - // if (value.trim().length == 0) { - // return callback(new Error('请选择环路')); - // } else { - // if (this.formModel.runningRouting1 == this.formModel.runningRouting2) { - // return callback(new Error('环路交路1和环路交路2不能相同')); - // } else { - // return callback(); - // } - // } - // }, - // changeRoute2() { - // this.changeRoute('runningRouting2'); - // }, - // changeRoute1() { - // this.changeRoute('runningRouting1'); - // }, - // changeRoute(runningRouting) { - // if (this.formModel[runningRouting]) { this.$refs.dataform.validateField([runningRouting]); } - // }, changeRoute(runningRouting) { const temp = this.runningRoutingMap[runningRouting]; this.formModel.runningRouting1 = temp.runningRouting1; @@ -227,9 +211,6 @@ export default { const list = Object.values(this.runningRoutingMap); return list.filter(route=>{ return route.runningRouting1 && route.runningRouting2; }); } - // covertRouting(routingType) { - // return this.routingList.filter(route=>{ return route.routingType == routingType; }); - // } } }; From 40f6314b856dbffb7b598e99821bfb929f76214f Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Fri, 12 Mar 2021 16:37:32 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E5=9B=BE=E7=BC=96?= =?UTF-8?q?=E5=88=B6=20=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/menus/gernaratePlanTrain.vue | 18 +++++++++------- .../menus/populatingGenericData.vue | 21 +++++++++++-------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/views/planMonitor/components/menus/gernaratePlanTrain.vue b/src/views/planMonitor/components/menus/gernaratePlanTrain.vue index c965b18b4..d4a047efe 100644 --- a/src/views/planMonitor/components/menus/gernaratePlanTrain.vue +++ b/src/views/planMonitor/components/menus/gernaratePlanTrain.vue @@ -11,7 +11,7 @@ top="10vh" :close-on-click-modal="false" > - + {{ $t('global.cancel') }} {{ $t('global.confirm') }} @@ -33,6 +33,7 @@ export default { data() { return { dialogShow: false, + dataLoading:false, routingList: [], loading: false, runningRoutingMap:{}, @@ -121,35 +122,38 @@ export default { const mapId = this.$route.query.mapId; if (mapId) { const runningRoutingMap = {}; + this.dataLoading = true; listUserRoutingData(mapId).then(response => { const list = response.data; this.routingList = list.map(elem => { return { value: elem.code, label: elem.name, routingType:elem.routingType }; }); list.forEach(elem=>{ // this.routingList.push({value: elem.code, label: elem.name, routingType:elem.routingType}); if (elem.routingType === 'LOOP') { - const name = elem.name; - let temp = ''; + // const name = elem.name; + // let temp = ''; if (elem.right) { - temp = name.split('-')[0]; + // temp = name.split('-')[0]; // const data = ; const data = runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode]; if (!data) { runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode] = {}; } - runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].label = elem.name + '-' + temp; + runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].label = elem.name; runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].value = elem.startSectionCode + '-' + elem.endSectionCode; runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].runningRouting1 = elem.code; } else { - temp = name.split('-')[1]; + // temp = name.split('-')[1]; // const data = ; const data = runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode]; if (!data) { runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode] = {}; } - runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode].label = temp + '-' + elem.name; + runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode].label = elem.name; runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode].value = elem.endSectionCode + '-' + elem.startSectionCode; runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode].runningRouting2 = elem.code; } } }); this.runningRoutingMap = runningRoutingMap; + this.dataLoading = false; }).catch(() => { + this.dataLoading = false; this.$messageBox(`获取交路列表失败`); }); } diff --git a/src/views/planMonitor/components/menus/populatingGenericData.vue b/src/views/planMonitor/components/menus/populatingGenericData.vue index 410a8f95c..667ec9a4a 100644 --- a/src/views/planMonitor/components/menus/populatingGenericData.vue +++ b/src/views/planMonitor/components/menus/populatingGenericData.vue @@ -10,7 +10,7 @@ :modal="false" :close-on-click-modal="false" > - + {{ $t('global.cancel') }} {{ $t('global.confirm') }} @@ -35,6 +35,7 @@ export default { // stationList: [], // routingList: [], loading: false, + dataLoading:false, runningRoutingMap:{}, formModel: { stationRunningTime: 60, // 站间运行时间 @@ -127,37 +128,39 @@ export default { const mapId = this.$route.query.mapId; if (mapId) { const runningRoutingMap = {}; + this.dataLoading = true; listUserRoutingData(mapId).then(response => { const list = response.data; list.forEach(elem=>{ if (elem.routingType === 'LOOP') { - const name = elem.name; - let temp = ''; + // const name = elem.name; + // let temp = ''; if (elem.right) { - temp = name.split('-')[0]; + // temp = name.split('-')[0]; // const data = ; const data = runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode]; if (!data) { runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode] = {}; } - runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].label = elem.name + '-' + temp; + runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].label = elem.name; runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].value = elem.startSectionCode + '-' + elem.endSectionCode; runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].runningRouting1 = elem.code; } else { - temp = name.split('-')[1]; + // temp = name.split('-')[1]; // const data = ; const data = runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode]; if (!data) { runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode] = {}; } - runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode].label = temp + '-' + elem.name; + runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode].label = elem.name; runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode].value = elem.endSectionCode + '-' + elem.startSectionCode; runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode].runningRouting2 = elem.code; } } }); this.runningRoutingMap = runningRoutingMap; - this.dialogShow = true; + this.dataLoading = false; }).catch(() => { - this.dialogShow = true; + this.dataLoading = false; this.$messageBox(`获取交路列表失败`); }); + this.dialogShow = true; } }, doClose() { From 80b67e7f947b177d2f803bbf35b0ef881ca0e273 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Fri, 12 Mar 2021 17:18:02 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E5=9B=BE=20=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/planMonitor/newEditTool/menuBar.vue | 227 ++++++++++++------ 1 file changed, 147 insertions(+), 80 deletions(-) diff --git a/src/views/planMonitor/newEditTool/menuBar.vue b/src/views/planMonitor/newEditTool/menuBar.vue index f3ec2df08..9ae2cee82 100644 --- a/src/views/planMonitor/newEditTool/menuBar.vue +++ b/src/views/planMonitor/newEditTool/menuBar.vue @@ -37,9 +37,11 @@
{{ child.title }} + +
-
    +