From 96ad7becf293953be422417e9181b5f6fe2c3771 Mon Sep 17 00:00:00 2001 From: ival <610568032@qq.com> Date: Fri, 5 Mar 2021 15:39:08 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../planMonitor/editTool/menus/addTask.vue | 182 ++++++------------ 1 file changed, 60 insertions(+), 122 deletions(-) diff --git a/src/views/planMonitor/editTool/menus/addTask.vue b/src/views/planMonitor/editTool/menus/addTask.vue index a5be4561a..503bd63ee 100644 --- a/src/views/planMonitor/editTool/menus/addTask.vue +++ b/src/views/planMonitor/editTool/menus/addTask.vue @@ -171,6 +171,7 @@ diff --git a/src/views/planMonitor/newEditTool/index.vue b/src/views/planMonitor/newEditTool/index.vue index d89113a81..9ef1bf2d0 100644 --- a/src/views/planMonitor/newEditTool/index.vue +++ b/src/views/planMonitor/newEditTool/index.vue @@ -3,22 +3,20 @@ @@ -26,31 +24,27 @@ - - - + - - + + + - - @@ -64,7 +58,6 @@ 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'; @@ -72,18 +65,13 @@ 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 GernaratePlan from './menus/gernaratePlanTrain'; +import MovePlaningTrain from './menus/movePlaningTrain'; +import ModifyingStationIntervalTime from './menus/modifyingStationIntervalTime'; +import ModifyingStationStopTime from './menus/modifyingStationStopTime'; +import PopulatingGenericData from './menus/populatingGenericData'; import { deletePlanService } from '@/api/runplan'; import { checkLoginLine } from '@/api/login'; -import { getRpListByMapId } from '@/api/runplan'; import { loadMapDataById } from '@/utils/loaddata'; export default { @@ -105,13 +93,12 @@ export default { ModifyingRouting, ModifyingBeginTime, EditStationBetweenTime, - AddSmoothRunTime, - EditSmoothRunTime, + // AddSmoothRunTime, + // EditSmoothRunTime, ModifyingStationIntervalTime, - CreateEmptyPlan, + ModifyingStationStopTime, EditPlanName, GernaratePlan, - ModifyingStationStopTime, MovePlaningTrain }, data() { @@ -120,18 +107,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 +129,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 +155,11 @@ export default { } }); }, + async loadMap() { + this.runplanLoading = true; + // 加载地图数据 + loadMapDataById(this.$route.query.mapId, 'parse'); + }, handleConfirm(params) { if (params.operate == 'AddPlanningTrain') { // 添加计划 @@ -173,13 +167,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 +188,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 +210,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 +251,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..d2b438fa9 100644 --- a/src/views/planMonitor/newEditTool/menuBar.vue +++ b/src/views/planMonitor/newEditTool/menuBar.vue @@ -37,11 +37,9 @@
{{ child.title }} - -
-
    +
      diff --git a/src/views/planMonitor/newEditTool/menus/modifyService.vue b/src/views/planMonitor/newEditTool/menus/modifyService.vue index 4a933c1a6..c3a040a33 100644 --- a/src/views/planMonitor/newEditTool/menus/modifyService.vue +++ b/src/views/planMonitor/newEditTool/menus/modifyService.vue @@ -33,14 +33,6 @@ import { updateTripNumber, updateServiceNumber } from '@/api/runplan'; export default { name:'ModifyService', - props: { - loadRunPlanId: { - type: String, - default() { - return ''; - } - } - }, data() { return { dialogShow:false, @@ -75,7 +67,7 @@ export default { if (this.isModifyServiceNumber) { const result = /^\d{2,}$/.test(this.serviceNumber); if (this.serviceNumber && result) { - updateServiceNumber(this.loadRunPlanId, this.oldServiceNumber, this.serviceNumber).then(res=>{ + updateServiceNumber(this.$route.query.planId, this.oldServiceNumber, this.serviceNumber).then(res=>{ this.$message.success('修改计划号成功'); // this.$emit('refresh'); this.dialogShow = false; @@ -91,7 +83,7 @@ export default { const result = /^\d{2,}$/.test(this.tripNumber); if (this.tripNumber && result) { const SDTNumber = this.oldServiceNumber + this.oldTripNumber; - updateTripNumber(this.loadRunPlanId, SDTNumber, this.tripNumber).then(res=>{ + updateTripNumber(this.$route.query.planId, SDTNumber, this.tripNumber).then(res=>{ this.$message.success('修改车次号成功'); // this.$emit('refresh'); this.dialogShow = false; diff --git a/src/views/planMonitor/newEditTool/menus/modifyingStationIntervalTime.vue b/src/views/planMonitor/newEditTool/menus/modifyingStationIntervalTime.vue index 5b0b8d420..32d09f9ec 100644 --- a/src/views/planMonitor/newEditTool/menus/modifyingStationIntervalTime.vue +++ b/src/views/planMonitor/newEditTool/menus/modifyingStationIntervalTime.vue @@ -10,6 +10,38 @@ :modal="false" :close-on-click-modal="false" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      速度单位: (Km/h)
      +       +       +       @@ -17,7 +49,7 @@ {{ formatName(scope.row.startStationCode) }} - + @@ -27,72 +59,61 @@ {{ formatName(scope.row.endStationCode) }} - + - + - + - - - - - - - - - - - - - - - +
      + + + + + + + + + + + + + + + +
      - - {{ $t('planMonitor.modifying.cancelAndQuit') }} + 更新距离 + 关闭 + 更新
      diff --git a/src/views/planMonitor/newEditTool/menus/modifyingStationStopTime.vue b/src/views/planMonitor/newEditTool/menus/modifyingStationStopTime.vue new file mode 100644 index 000000000..68a42e18f --- /dev/null +++ b/src/views/planMonitor/newEditTool/menus/modifyingStationStopTime.vue @@ -0,0 +1,134 @@ + + + diff --git a/src/views/planMonitor/newEditTool/menus/modifyingTask.vue b/src/views/planMonitor/newEditTool/menus/modifyingTask.vue index 0585702a6..d1e48f54e 100644 --- a/src/views/planMonitor/newEditTool/menus/modifyingTask.vue +++ b/src/views/planMonitor/newEditTool/menus/modifyingTask.vue @@ -145,8 +145,8 @@ :placeholder="$t('planMonitor.modifying.selectTime')" value-format="HH:mm:ss" size="mini" - :clearable="false" :picker-options="{selectableRange:'02:00:00-23:59:59'}" + :clearable="false" /> @@ -194,8 +194,17 @@ {{ formatName(scope.row.endSectionCode) }} - - + + + + + + + @@ -252,6 +261,7 @@ + + diff --git a/src/views/planMonitor/newEditTool/menus/parameter/baseParameter.vue b/src/views/planMonitor/newEditTool/menus/parameter/baseParameter.vue index d8e2aec7d..314358a35 100644 --- a/src/views/planMonitor/newEditTool/menus/parameter/baseParameter.vue +++ b/src/views/planMonitor/newEditTool/menus/parameter/baseParameter.vue @@ -21,50 +21,50 @@ - {{$t('global.second')}} + {{ $t('global.second') }} - {{$t('global.second')}} + {{ $t('global.second') }} - {{$t('global.second')}} + {{ $t('global.second') }} diff --git a/src/views/planMonitor/newEditTool/routingoperate/preview.vue b/src/views/planMonitor/newEditTool/routingoperate/preview.vue new file mode 100644 index 000000000..6e4a5d0e3 --- /dev/null +++ b/src/views/planMonitor/newEditTool/routingoperate/preview.vue @@ -0,0 +1,62 @@ + + + diff --git a/src/views/planMonitor/newEditTool/routingoperate/routeConfig.vue b/src/views/planMonitor/newEditTool/routingoperate/routeConfig.vue new file mode 100644 index 000000000..3c944fcfc --- /dev/null +++ b/src/views/planMonitor/newEditTool/routingoperate/routeConfig.vue @@ -0,0 +1,700 @@ + + + diff --git a/src/views/planMonitor/newEditTool/routingoperate/routeMap.vue b/src/views/planMonitor/newEditTool/routingoperate/routeMap.vue new file mode 100644 index 000000000..9f16b5fff --- /dev/null +++ b/src/views/planMonitor/newEditTool/routingoperate/routeMap.vue @@ -0,0 +1,180 @@ + + + + + + diff --git a/src/views/planMonitor/newEditTool/routingoperate/routeOperate.vue b/src/views/planMonitor/newEditTool/routingoperate/routeOperate.vue new file mode 100644 index 000000000..f375fcb6c --- /dev/null +++ b/src/views/planMonitor/newEditTool/routingoperate/routeOperate.vue @@ -0,0 +1,289 @@ + + + diff --git a/src/views/planMonitor/newEditTool/routingoperate/runplanConfig.vue b/src/views/planMonitor/newEditTool/routingoperate/runplanConfig.vue new file mode 100644 index 000000000..8e638934e --- /dev/null +++ b/src/views/planMonitor/newEditTool/routingoperate/runplanConfig.vue @@ -0,0 +1,192 @@ + + + diff --git a/src/views/planMonitor/newEditTool/schedule.vue b/src/views/planMonitor/newEditTool/schedule.vue index b1063fe49..b3f0e5b1c 100644 --- a/src/views/planMonitor/newEditTool/schedule.vue +++ b/src/views/planMonitor/newEditTool/schedule.vue @@ -1,5 +1,5 @@ @@ -26,6 +27,9 @@ import ModifyService from './menus/modifyService'; import { mapGetters } from 'vuex'; import { timeFormat } from '@/utils/date'; import { getStationList, queryRunPlan } from '@/api/runplan'; +import {getRpDetailByUserMapId, getUserMapDetailByMapId} from '@/api/designPlatform'; +import { getPublishMapInfo } from '@/api/jmap/map'; +import {getMapDetail} from '@/api/jmap/mapdraft'; import DataTable from './menus/components/dataTable'; import echarts from 'echarts'; @@ -40,14 +44,6 @@ export default { type: Object, required: true }, - maxWidth: { - type: Number, - required: true - }, - maxHeight: { - type: Number, - required: true - }, loadRunPlanId: { type: String, default() { @@ -65,9 +61,11 @@ export default { return { top: 0, height: 0, + mapName: '', runPlanId: 'plan-tool', myChart: null, showTrain: false, + runplanLoading:false, serviceNumberConfig: { data: [], title: this.$t('planMonitor.serviceNumber'), @@ -100,8 +98,8 @@ export default { } ] }, - realData: {}, - kmRangeCoordMap: {}, + // realData: {}, + // kmRangeCoordMap: {}, option: { title: { // 标题 text: '', @@ -221,41 +219,50 @@ export default { } ] }, - absoluteTime: 2 * 3600, - indexKmRangeMap: {}, + // absoluteTime: 2 * 3600, + // indexKmRangeMap: {}, stationsObj: {} }; }, computed: { ...mapGetters('runPlan', [ - 'draftStations' - ]) - }, - watch: { + 'stations' + ]), + planId() { + return this.$route.query.planId; + }, maxWidth() { - this.setPosition(); + return this.$store.state.app.width; }, maxHeight() { - this.setPosition(); - }, + return this.$store.state.app.height; + } + }, + watch: { '$store.state.runPlan.planSizeCount': function () { this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height }); }, '$store.state.runPlan.refreshCount': function() { this.loadChartPage(); }, - $route() { - this.$nextTick(() => { - this.loadChartPage(); - }); - }, + // $route() { + // this.$nextTick(() => { + // this.loadChartPage(); + // }); + // }, loadRunPlanId() { this.loadChartPage(); + }, + 'maxWidth':function () { + this.setPosition(); + }, + 'maxHeight':function () { + this.setPosition(); } }, mounted() { this.setPosition(); - this.loadChartPage(); + // this.loadChartPage(); }, beforeDestroy() { this.destroy(); @@ -264,19 +271,31 @@ export default { displayTrain() { this.showTrain = !this.showTrain; }, + serviceNumberModify(row) { + if (row) { + this.$refs.modifyService.doShow({serviceNumber:row.serviceNumber}); + } + }, + tripNumberModify(row) { + if (row) { + this.$refs.modifyService.doShow({serviceNumber:this.$store.state.runPlan.selected.serviceNumber, tripNumber:row.tripNumber}); + } + }, serviceNumberChange(row) { let serviceNumber = null; let serviceObj = {}; if (row) { serviceNumber = row.serviceNumber; - serviceObj = this.$store.state.runPlan.draftEditData[row.serviceNumber] || {}; + serviceObj = this.$store.state.runPlan.editData[row.serviceNumber] || {}; const op = this.myChart.getOption(); op.series.forEach((item, index) => { item.lineStyle.color = '#000'; + item.lineStyle.width = 0.5; switch (item.name) { case serviceNumber: { item.lineStyle.color = 'red'; + item.lineStyle.width = 1; break; } case 'trainLabel': { @@ -287,11 +306,11 @@ export default { }); this.myChart.setOption(op, true); } - this.$store.dispatch('runPlan/setDraftSelected', { serviceNumber: serviceNumber, tripNumber: null }); + this.$store.dispatch('runPlan/setSelected', { serviceNumber: serviceNumber, tripNumber: null }); this.analyticalTripNumber(serviceObj.trainMap || {}); }, tripNumberChange(row) { - const serviceNumber = this.$store.state.runPlan.draftSelected.serviceNumber; + const serviceNumber = this.$store.state.runPlan.selected.serviceNumber; let tripNumber = null; if (row) { const data = []; @@ -308,6 +327,8 @@ export default { data.push(nor); } }); + // item.lineStyle.color = '#000'; + item.lineStyle.width = 0.5; break; } case 'trainLabel': { @@ -320,7 +341,8 @@ export default { op.series.push({ name: 'trainLabel', lineStyle: { - color: 'green' + color: 'green', + width:2 }, type: 'line', data: data @@ -330,14 +352,17 @@ export default { }, 50); } - this.$store.dispatch('runPlan/setDraftSelected', { serviceNumber: serviceNumber, tripNumber: tripNumber }); + this.$store.dispatch('runPlan/setSelected', { serviceNumber: serviceNumber, tripNumber: tripNumber }); }, async analyticalServiceNumber(data) { this.serviceNumberConfig.data = Object.keys(data || {}) - .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; }) + .sort((a, b) => { return parseInt(data[a].serviceNumber) - parseInt(data[b].serviceNumber); }) .map(serviceNumber => { return { serviceNumber }; }); }, async analyticalTripNumber(data) { + // this.tripNumberConfig.data = Object.keys(data || {}) + // .sort((a, b) => { return data[a].tripNumber - data[b].tripNumber; }) + // .map(tripNumber => { return { tripNumber }; }); this.tripNumberConfig.data = Object.keys(data || {}) .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; }) .map(tripNumber => { return { tripNumber }; }); @@ -345,7 +370,6 @@ export default { async setPosition() { this.$nextTick(() => { let top = 3; - const width = this.maxWidth; let height = this.maxHeight; const titleBar = document.getElementById('PlanTitleBar'); @@ -370,8 +394,7 @@ export default { } height = height - top; - this.$store.dispatch('runPlan/resize', { width, height:height - 20 }); - + this.$store.dispatch('runPlan/resize', { width:this.maxWidth, height }); if (this.top != top) { this.top = top; } @@ -381,51 +404,106 @@ export default { } }); }, - serviceNumberModify(row) { - if (row) { - this.$refs.modifyService.doShow({serviceNumber:row.serviceNumber}); - } - }, - tripNumberModify(row) { - if (row) { - this.$refs.modifyService.doShow({serviceNumber:this.$store.state.runPlan.draftSelected.serviceNumber, tripNumber:row.tripNumber}); - } - }, async loadChartPage() { try { - this.$store.dispatch('runPlan/draftClear').then(() => { - // this.loadInitChart().then(() => { + if (/^\/plan\/usertool/.test(this.$route.fullPath)) { + getUserMapDetailByMapId(this.$route.query.mapId).then(resp => { + this.mapName = `${resp.data.name} (${this.$route.query.planName || this.loadRunPlanName || ''})`; + }); + } else { + getPublishMapInfo(this.$route.query.mapId).then(resp => { + this.mapName = `${resp.data.name} (${this.$route.query.planName || this.loadRunPlanName || ''})`; + }); + } + + this.$store.dispatch('runPlan/clear').then(() => { if (this.$route.query.mapId) { - getStationList(this.$route.query.mapId).then(resp => { - this.$store.dispatch('runPlan/setDraftStations', resp.data).then(() => { - this.loadInitData(); - if (this.loadRunPlanId) { - this.myChart && this.myChart.showLoading(); - queryRunPlan(this.loadRunPlanId).then(rest => { - this.$store.dispatch('runPlan/setDraftPlanData', rest.data).then(() => { - this.analyticalServiceNumber(this.$store.state.runPlan.draftEditData); - this.loadChartData(); - this.myChart && this.myChart.hideLoading(); + if (/^\/plan\/usertool/.test(this.$route.fullPath)) { + this.runplanLoading = true; + getMapDetail(this.$route.query.mapId).then(response => { + const res = response.data; + const stationList = res.stationList.sort((a, b)=>{ return a.kmRange - b.kmRange; }); + this.$store.dispatch('runPlan/setStations', stationList).then(() => { + this.loadInitData(); + if (this.planId || this.loadRunPlanId) { + getRpDetailByUserMapId(this.planId || this.loadRunPlanId).then(rest => { + this.$store.dispatch('runPlan/setPlanData', rest.data).then(() => { + this.analyticalServiceNumber(this.$store.state.runPlan.editData); + this.loadChartData(); + this.runplanLoading = false; + }); + }).catch(() => { + this.runplanLoading = false; + this.$messageBox(this.$t('error.obtainOperationGraphFailed')); }); - }).catch(() => { - this.myChart && this.myChart.hideLoading(); - this.$messageBox(this.$t('error.obtainOperationGraphFailed')); - }); - } else { - // this.clearCanvas(); - this.$store.dispatch('runPlan/setDraftPlanData', {serviceNumberDataList: []}).then(()=> { - this.analyticalServiceNumber(this.$store.state.runPlan.draftEditData); - this.loadChartData(); - this.myChart && this.myChart.hideLoading(); - }); - } + } + }); + // }); }); - }).catch(() => { - this.$messageBox(this.$t('tip.requestingStationDataFailed')); - this.$store.dispatch('runPlan/setDraftStations', []); - }); + } else { + this.runplanLoading = true; + getStationList(this.$route.query.mapId).then(resp => { + this.$store.dispatch('runPlan/setStations', resp.data).then(() => { + this.loadInitData(); + if (this.planId || this.loadRunPlanId) { + queryRunPlan(this.planId || this.loadRunPlanId).then(rest => { + this.$store.dispatch('runPlan/setPlanData', rest.data).then(() => { + this.analyticalServiceNumber(this.$store.state.runPlan.editData); + this.loadChartData(); + this.runplanLoading = false; + }); + }).catch(() => { + this.runplanLoading = false; + this.$messageBox(this.$t('error.obtainOperationGraphFailed')); + }); + + } else { + this.clearCanvas(); + } + }); + }).catch(() => { + this.$messageBox(this.$t('tip.requestingStationDataFailed')); + this.$store.dispatch('runPlan/setStations', []); + }); + } + // getStationList(this.$route.query.mapId).then(resp => { + // this.$store.dispatch('runPlan/setStations', resp.data).then(() => { + // this.loadInitData(); + // if (this.planId) { + // this.myChart && this.myChart.showLoading(); + // if (/^\/plan\/usertool/.test(this.$route.fullPath)) { + // getRpDetailByUserMapId(this.planId).then(rest => { + // this.$store.dispatch('runPlan/setPlanData', rest.data).then(() => { + // this.analyticalServiceNumber(this.$store.state.runPlan.editData); + // this.loadChartData(); + // this.myChart && this.myChart.hideLoading(); + // }); + // }).catch(() => { + // this.myChart && this.myChart.hideLoading(); + // this.$messageBox(this.$t('error.obtainOperationGraphFailed')); + // }); + // } else { + // queryRunPlan(this.planId).then(rest => { + // this.$store.dispatch('runPlan/setPlanData', rest.data).then(() => { + // this.analyticalServiceNumber(this.$store.state.runPlan.editData); + // this.loadChartData(); + // this.myChart && this.myChart.hideLoading(); + // }); + // }).catch(() => { + // this.myChart && this.myChart.hideLoading(); + // this.$messageBox(this.$t('error.obtainOperationGraphFailed')); + // }); + // } + + // } else { + // this.clearCanvas(); + // } + // }); + // }).catch(() => { + // this.$messageBox(this.$t('tip.requestingStationDataFailed')); + // this.$store.dispatch('runPlan/setStations', []); + // }); } - // }); }); } catch (error) { this.$messageBox(this.$t('error.loadingOperationGraphFailed')); @@ -433,8 +511,9 @@ export default { }, async loadChartData() { try { - const stations = this.$store.state.runPlan.draftStations; - const planData = this.$store.state.runPlan.draftPlanData; + // let option={}; + const stations = this.$store.state.runPlan.stations; + const planData = this.$store.state.runPlan.planData; this.stationsObj = {}; stations.forEach(item => { this.stationsObj[Math.floor(item.kmRange)] = item; @@ -443,9 +522,9 @@ export default { this.viewDisabled = true; this.option.series = []; - this.kmRangeCoordMap = this.planConvert.convertStationsToMap(stations); - this.pushModels(this.option.series, [this.planConvert.initializeYaxis(this.draftStations)]); - this.pushModels(this.option.series, this.planConvert.convertDataToModels(planData, stations, this.kmRangeCoordMap, { width: 0.5, color: '#000' })); + const kmRangeCoordMap = this.planConvert.convertStationsToMap(stations); + this.pushModels(this.option.series, [this.planConvert.initializeYaxis(this.stations)]); + this.pushModels(this.option.series, this.planConvert.convertDataToModels(planData, stations, kmRangeCoordMap, { width: 0.5, color: '#000' })); await this.loadInitChart(); this.viewDisabled = false; @@ -467,7 +546,6 @@ export default { } }); } - return series; }, popModels(series, models) { @@ -479,7 +557,6 @@ export default { } }); } - return series; }, loadInitChart() { @@ -488,8 +565,11 @@ export default { if (this.myChart && this.myChart.isDisposed) { this.myChart.clear(); } - this.option.title.text = this.loadRunPlanName; + if (this.$route.query.planName || this.$route.query.prdType === '05') { + this.option.title.text = this.mapName; + } this.myChart = echarts.init(document.getElementById(this.runPlanId)); + // this.option; this.myChart.setOption(this.option); this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height }); resolve(true); @@ -498,19 +578,31 @@ export default { } }); }, + refreshRunPlanName(name) { + getPublishMapInfo(this.$route.query.mapId).then(resp => { + this.mapName = `${resp.data.name} (${name})`; + this.myChart.setOption({ + title: { + text: this.mapName, + left: 'center', // 居中对齐 + top: '10px' + } + }); + }); + }, clearCanvas() { this.option.series = []; this.option.title.text = ''; if (this.myChart) { this.myChart.clear(); } - this.myChart && this.myChart.setOption(this.option); + this.myChart.setOption(this.option); }, xAxisPointFormat(params) { return timeFormat(params.value); }, yAxisPointFormat(params) { - return this.planConvert.computedFormatYAxis(this.draftStations, params); + return this.planConvert.computedFormatYAxis(this.stations, params); }, xAxisLableFormat(value, index) { if (value % 60 === 0) { @@ -540,16 +632,16 @@ export default { }, yAxisInit() { if (Object.keys(this.planConvert).length) { - this.pushModels(this.option.series, [this.planConvert.initializeYaxis(this.draftStations)]); - this.option.yAxis.min = this.planConvert.computedYaxisMinValue(this.draftStations); - this.option.yAxis.max = this.planConvert.computedYaxisMaxValue(this.draftStations); + this.pushModels(this.option.series, [this.planConvert.initializeYaxis(this.stations)]); + this.option.yAxis.min = this.planConvert.computedYaxisMinValue(this.stations); + this.option.yAxis.max = this.planConvert.computedYaxisMaxValue(this.stations); } }, axisTooltip(param) { let data = ''; const arr = []; param.forEach(item => { - const station = this.$store.getters['map/getDeviceByCode'](item.data[2]); + const station = this.stationsObj[Math.floor((item.data[1] - this.planConvert.EdgeHeight) / this.planConvert.CoordMultiple)] || { name: '', kmRange: '' }; if (!arr.includes(`${item.data[0]}${item.data[1]}`)) { arr.push(`${item.data[0]}${item.data[1]}`); if (this.$route.query.lineCode == '06' || this.$route.query.lineCode == '08') { @@ -591,7 +683,7 @@ export default { // } // }); // this.myChart.setOption(op); - // this.$store.dispatch('runPlan/setDraftSelected', model); + // this.$store.dispatch('runPlan/setSelected', model); // }, reSize(opt) { if (this.myChart) { @@ -607,13 +699,13 @@ export default { this.myChart.dispose(); this.myChart = null; } - }, - scheduleTouch() { - - }, - trainNumTouch() { - } + // scheduleTouch() { + + // }, + // trainNumTouch() { + + // } } }; diff --git a/src/views/planMonitor/newEditTool/statusBar.vue b/src/views/planMonitor/newEditTool/statusBar.vue index ae6d359fb..962230572 100644 --- a/src/views/planMonitor/newEditTool/statusBar.vue +++ b/src/views/planMonitor/newEditTool/statusBar.vue @@ -1,11 +1,9 @@ From 07eaf3d8d442019bf65ffd44f3854f5439f494ef Mon Sep 17 00:00:00 2001 From: ival <610568032@qq.com> Date: Fri, 5 Mar 2021 17:47:30 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=BC=B9=E7=AA=97=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/components/menus/eachChildMenu.vue | 56 ++++++++------ .../theme/components/menus/menuBar.vue | 76 ++++++------------- 2 files changed, 57 insertions(+), 75 deletions(-) diff --git a/src/jmapNew/theme/components/menus/eachChildMenu.vue b/src/jmapNew/theme/components/menus/eachChildMenu.vue index 8ace80f66..99519d357 100644 --- a/src/jmapNew/theme/components/menus/eachChildMenu.vue +++ b/src/jmapNew/theme/components/menus/eachChildMenu.vue @@ -4,29 +4,34 @@ {{ item.computedTitle?item.computedTitle(item): item.title }} - -
        +
        -
          +
        @@ -46,11 +51,17 @@ export default { } }, id:{ - type:String, + type: Number, default() { return -1; } }, + index: { + type: Number, + default() { + return -1; + } + }, className:{ type:String, default() { @@ -66,8 +77,7 @@ export default { }, data() { return { - classA:'-1', - tempClassA: -1 + active: -1 }; }, computed: { @@ -88,44 +98,44 @@ 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'); + } } }; diff --git a/src/jmapNew/theme/components/menus/menuBar.vue b/src/jmapNew/theme/components/menus/menuBar.vue index 0aa87813c..d6e9226b6 100644 --- a/src/jmapNew/theme/components/menus/menuBar.vue +++ b/src/jmapNew/theme/components/menus/menuBar.vue @@ -1,13 +1,16 @@