From 92219adba0a186036e265b9ce9274fbe4dbca61e Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 27 Aug 2020 13:12:36 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E5=BD=95=E5=88=B6?= =?UTF-8?q?=E9=A2=84=E8=A7=88=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 --- .../component/covertOperation.js | 84 +++++++++++++++---- .../scriptPreview/scriptButtonGroup.vue | 5 +- src/views/scriptManage/allScriptRole.vue | 2 +- 3 files changed, 70 insertions(+), 21 deletions(-) diff --git a/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js b/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js index 939350f66..152ffc464 100644 --- a/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js +++ b/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js @@ -21,13 +21,15 @@ export const operateEnum = { code:'routeCodeList', isDevice:true, isList:true, - name:'进路列表' + name:'进路列表', + function:getRouteNameById }, Signal_Close_Auto_Setting:{ code:'routeCodeList', isDevice:true, isList:true, - name:'进路列表' + name:'进路列表', + function:getRouteNameById } }, Switch:{ @@ -54,6 +56,15 @@ export const operateEnum = { name:'限速值为' } }, + ControlConvertMenu:{ + CM_Apply_For_Station_Control:{ + code:'stationCodes', + isList:true, + isDevice:true, + name:'车站列表', + function:getStationNameById + } + }, Stand:{ code:'standCode', type:'站台', @@ -116,11 +127,17 @@ export function covertOperate(operationType, operationParamMap) { if (operationType == 'Set_Fault' || operationType == 'Cancel_Fault') { // covertOperation(operationType); } else { - const device = operationType.split('_')[0]; + let device = operationType.split('_')[0]; + if (device == 'CM') { + device = 'ControlConvertMenu'; + } const operateName = Object.values(CMD[device]).find(res=>{ return res.value == operationType; }); const deviceInfo = covertOperation(device, operationParamMap, operationType); - let tip = '请找到' + deviceInfo.deviceName + '，'; - tip += ' 执行【' + operateName.label + '】操作'; + let tip = '请'; + if (deviceInfo.deviceName) { + tip += '找到' + deviceInfo.deviceName + '，'; + } + tip += '执行【' + operateName.label + '】操作'; if (deviceInfo.paramName) { tip += ',参数为:' + deviceInfo.paramName; } @@ -131,24 +148,42 @@ export function covertOperate(operationType, operationParamMap) { function covertOperation(deviceType, operationParamMap, operationType) { let deviceName = ''; let paramName = ''; - const device = store.getters['map/getDeviceByCode'](operationParamMap[operateEnum[deviceType].code]); - if (device._type == 'StationStand') { - const station = store.getters['map/getDeviceByCode'](device.stationCode); - deviceName += '【车站-' + station.name + '】/'; - } - if (device._type == 'Section') { - if (device.parentCode) { - const parentSection = store.getters['map/getDeviceByCode'](device.parentCode); - deviceName += '【' + operateEnum[deviceType].type + ' ' + parentSection.name + '-' + device.name + '】'; + if (operateEnum[deviceType].code) { + const device = store.getters['map/getDeviceByCode'](operationParamMap[operateEnum[deviceType].code]); + if (device._type == 'StationStand') { + const station = store.getters['map/getDeviceByCode'](device.stationCode); + deviceName += '【车站-' + station.name + '】/'; + } + if (device._type == 'Section') { + if (device.parentCode) { + const parentSection = store.getters['map/getDeviceByCode'](device.parentCode); + deviceName += '【' + operateEnum[deviceType].type + ' ' + parentSection.name + '-' + device.name + '】'; + } + } else { + deviceName += '【' + operateEnum[deviceType].type + ' ' + device.name + '】'; } - } else { - deviceName += '【' + operateEnum[deviceType].type + ' ' + device.name + '】'; } const paramInfo = operateEnum[deviceType][operationType]; if (paramInfo) { if (paramInfo.isDevice) { if (paramInfo.isList) { paramName += '【' + paramInfo.name + ' '; + const deviceList = operationParamMap[paramInfo.code]; + deviceList.forEach((device, index)=>{ + paramName += covertFunction(paramInfo.function, device); + if (index != deviceList.length - 1) { + paramName += '，'; + } + }); + paramName += '】'; + // const routeList = operationParamMap[paramInfo.code]; + // routeList.forEach((route, index)=>{ + // paramName += getRouteNameById(route); + // if (index != routeList.length - 1) { + // paramName += '，'; + // } + // }); + // paramName += '】'; } else { paramName += '【' + paramInfo.name + ' '; paramName += getRouteNameById(operationParamMap[paramInfo.code]) + '】'; @@ -158,7 +193,7 @@ function covertOperation(deviceType, operationParamMap, operationType) { const params = paramInfo.params; if (params && params.length > 0) { paramName += '【'; - params.forEach(param=>{ + params.forEach((param, index)=>{ paramName += ' ' + param.name; const data = operationParamMap[param.code]; param.result.forEach(result=>{ @@ -182,16 +217,24 @@ function covertOperation(deviceType, operationParamMap, operationType) { } } }); - paramName += ','; + if (index != params.length - 1) { + paramName += ','; + } }); paramName += '】'; } + } else { + paramName += '【' + paramInfo.name + operationParamMap[paramInfo.code] + '】'; } } } return {deviceName:deviceName, paramName:paramName}; } +function covertFunction(func, device) { + return func(device); +} + function getRouteNameById(routeId) { const routeList = store.state.map.routeList; const route = routeList.find(route=>{ @@ -200,3 +243,8 @@ function getRouteNameById(routeId) { if (route) { return route.name; } else { return ''; } } +function getStationNameById(stationId) { + const station = store.getters['map/getDeviceByCode'](stationId); + return station.name; +} + diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue index 45f900215..5f175fa9c 100644 --- a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue +++ b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue @@ -73,6 +73,7 @@ export default { dataError: false, faultMode: false, viewDisabled: true, + firstLoad:true, isscriptRun:false // 剧本是否正在加载 }; }, @@ -104,15 +105,15 @@ export default { this.setWindowSize(); }, '$store.state.training.switchcount': async function () { - if (this.group) { + if (this.group && this.firstLoad) { await this.loadRunData(); // if (this.$store.state.training.started && !this.firstLoad) { // } else if (this.firstLoad) { // await this.loadRunData(this.$route.query); // } - // this.firstLoad = false; } + this.firstLoad = false; } }, async mounted() { diff --git a/src/views/scriptManage/allScriptRole.vue b/src/views/scriptManage/allScriptRole.vue index 186405cdc..c5335c2c2 100644 --- a/src/views/scriptManage/allScriptRole.vue +++ b/src/views/scriptManage/allScriptRole.vue @@ -197,7 +197,7 @@ export default { name:this.$store.state.user.nickname } ); - // this.oldMemberId = role.id; + this.oldMemberId = role.id; this.$store.dispatch('training/setPrdType', prdType); ConstConfig.ConstSelect.roleTypeNew.forEach(each=>{ if (each.label == role.type) { From 8a3287ca22afa8c0b8fb250cc09672a0a1ee236a Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Thu, 27 Aug 2020 13:13:15 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/factory.js | 1 - src/jmapNew/theme/ningbo_03/planConvert.js | 176 +++++++++--------- src/views/ibp/home.vue | 3 +- .../editTool/menus/createEmptyPlan.vue | 1 - .../newEditTool/menus/createEmptyPlan.vue | 16 +- 5 files changed, 93 insertions(+), 104 deletions(-) diff --git a/src/jmapNew/theme/factory.js b/src/jmapNew/theme/factory.js index 1dc7346e6..9ae66e4de 100644 --- a/src/jmapNew/theme/factory.js +++ b/src/jmapNew/theme/factory.js @@ -3,7 +3,6 @@ class Theme { this._code = '02'; this._mapMenu = { '01': 'chengdu_01', - // '01': 'ningbo_03', '02': 'fuzhou_01', '03': 'beijing_01', '04': 'chengdu_03', diff --git a/src/jmapNew/theme/ningbo_03/planConvert.js b/src/jmapNew/theme/ningbo_03/planConvert.js index d844d0136..8251b95aa 100644 --- a/src/jmapNew/theme/ningbo_03/planConvert.js +++ b/src/jmapNew/theme/ningbo_03/planConvert.js @@ -14,114 +14,101 @@ export default { ExcelConfig: { beginRow: 1, beginCol: 0, - fieldNum: 10, - sepField: '行车间隔', - trainId: 'TrainID', - columns: ['折返线', 'TrainID', '行车间隔'] + fieldNum: 6, + sepField: '车次号', + columns: { + '停车站名称': { key: 'stationName', formatter: (val) => { return val; } }, + '到达时间': { key: 'arriveTime', formatter: (val) => { return val; } }, + '出发时间': { key: 'departureTime', formatter: (val) => { return val; } } + } }, /** 解析exal数据转换为Json后台数据*/ importData(Sheet, JsonData) { - var dataList = convertSheetToList(Sheet, true); - if (dataList && dataList.length) { - if (dataList && dataList.length && dataList[1] && dataList[0]) { - // const tIndex = dataList.findIndex(it => { return it[0]; }); // 设置不用过滤行数 - const tIndex = 9; // 设置不用过滤行数 + const dataList = convertSheetToList(Sheet, true); + const needList = Object.keys(this.ExcelConfig.columns); + debugger; - /** 解析二维数组为json对象*/ - const reg3 = /^(\d+:\d+:\d+|)/; // 06:12:00 - dataList.forEach((elem, i) => { - var begin = -1; - /** 跳过名称所在的行*/ - if (i != tIndex && elem && elem.length > 0) { - let flag = false; - let count = 0; - let param = { begTime: '', endTime: '' }; - if (i > tIndex) { elem.reverse(); } - elem.forEach((item, j) => { - /** 过滤空值*/ - if (item) { - let title = ''; - var value = `${item}`.trim(); - if (i > tIndex) { // 上行线 - title = `${dataList[tIndex][dataList[tIndex].length - j - 1]}`.replace(/\s*/g, ''); - if (title == 'undefined') { - title = `${dataList[tIndex][dataList[tIndex].length - j - 2]}`.replace(/\s*/g, ''); - } - } else { // 下行线 - title = `${dataList[tIndex][j]}`.replace(/\s*/g, ''); - if (title == 'undefined') { - title = `${dataList[tIndex][j - 1]}`.replace(/\s*/g, ''); + if (dataList && dataList.length) { + for (let colIndex = this.ExcelConfig.beginCol; colIndex < dataList.length; colIndex += this.ExcelConfig.fieldNum + 1) { + let isContinue = true; + let tripObj = { code: '', directionCode: '', arrivalList: [] }; + for (let rowIndex = this.ExcelConfig.beginRow; isContinue; rowIndex += 1) { + isContinue = false; + + const stationObj = {}; + for (let index = 0; index < this.ExcelConfig.fieldNum; index += 1) { + if (dataList[colIndex + index]) { + const title = dataList[colIndex + index][0]; + const value = dataList[colIndex + index][rowIndex]; + + if (title && value) { + // 数据列解析 + isContinue = true; + const titleStr = `${title}`.trim(); + let valueStr = `${value}`.trim(); + + if (titleStr == this.ExcelConfig.sepField) { + valueStr = `${dataList[colIndex + index - 1][rowIndex]}${valueStr}`; + if (tripObj.code) { + const length = tripObj.arrivalList.length; + if (length == 1) { + tripObj.arrivalList[0]['flag'] = true; + } + if (valueStr != tripObj.code) { + JsonData.push(tripObj); + const strVal = `${value}`.trim(); + tripObj = { code: valueStr, directionCode: strVal[0], arrivalList: [] }; + } + } else { + const strVal = `${value}`.trim(); + tripObj.code = valueStr; + tripObj.directionCode = strVal[0]; } } - /** 匹配到开始位置或者结束位置*/ - if (title == this.ExcelConfig.trainId) { - if (begin == -1) { - flag = true; - begin = value; // 设置初始索引 - JsonData.push({ - code: value, - destinationCode: '', - arrivalList: [] - }); - } else if (flag) { - begin = -1; // 清空初始索引 - JsonData[JsonData.length - 1].destinationCode = value; - flag = false; - } - } else if (begin !== -1) { - /** 匹配到中间位置*/ - var stationName = title.replace(/\s/, ''); - if (this.ExcelConfig.columns.indexOf(stationName) == -1 && reg3.test(value)) { - let need = false; - if (value.split(':')[0] == '24') { // 24:XX:XX 类似这种数据 变24为00 - const arr = value.split(':'); - arr[0] = '00'; - value = arr.join(':'); - } - if (count == 1) { - count = 0; - param.endTime = value; - } - if (count == 0) { - count = 1; - param.begTime = param.begTime || value; - } - - if (param.begTime && param.endTime) { - need = true; - } - - /** 添加json数据*/ - if (need) { // 储存非空 数据 - var stationObj = { - stationName: stationName - }; - stationObj['arriveTime'] = prefixTime(param.begTime); - stationObj['departureTime'] = prefixTime(param.endTime); - JsonData[JsonData.length - 1].arrivalList.push(stationObj); - param = { begTime: '', endTime: '' }; - count = 0; - } + // 取需要的字段 + if (needList.findIndex(elem => { return elem == titleStr; }) >= 0) { + stationObj[this.ExcelConfig.columns[titleStr].key] = this.ExcelConfig.columns[titleStr].formatter(valueStr); + if (this.ExcelConfig.columns[titleStr].key == 'arriveTime' || this.ExcelConfig.columns[titleStr].key == 'departureTime') { + stationObj[this.ExcelConfig.columns[titleStr].key] = this.ExcelConfig.columns[titleStr].formatter(prefixTime(valueStr)); } } } - }); + } } - }); + + // 添加字段值 + if (Object.keys(stationObj).length) { + if (stationObj.arriveTime) { + tripObj.arrivalList.push(stationObj); + } + } + } + + // 添加最后那条没有车次的记录 + if (tripObj.code) { + const length = tripObj.arrivalList.length; + if (length) { + tripObj.arrivalList[length - 1]['flag'] = true; + } + JsonData.push(tripObj); + } } } + return JsonData; }, /** 将后台数据解析成图表*/ convertDataToModels(data, stations, kmRangeCoordMap, lineStyle) { var models = []; + if (data && data.serviceNumberDataList && data.serviceNumberDataList.length) { /** 按服务遍历数据*/ data.serviceNumberDataList.forEach((service) => { /** 按车次遍历数据*/ + var isBackup = true; var opt = { name: '', markPointData: [], data: [] }; if (service.tripNumberDataList && service.tripNumberDataList.length) { service.tripNumberDataList.forEach((train, j) => { @@ -134,7 +121,8 @@ export default { /** 如果车次号为空，不显示名称*/ if (train.tripNumber) { /** 创建标记点名称和坐标*/ - pointdata.name = `${service.serviceNumber}${train.tripNumber}${train.destinationCode || ''}`; + // pointdata.name = `${service.serviceNumber}${train.directionCode}${train.tripNumber}`; + pointdata.name = `${service.serviceNumber}${train.tripNumber}`; pointdata.color = '#000' || lineStyle.color; pointdata.directionCode = train.directionCode; pointdata.coord = [train.stationTimeList[1].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[1], train.directionCode, false)]; @@ -152,7 +140,7 @@ export default { index == train.stationTimeList.length - 2 && train.stationTimeList[index].secondTime != train.stationTimeList[index + 1].secondTime || index > 0 && index < train.stationTimeList.length - 1) { const aa = `${train.directionCode}${train.tripNumber}`; - opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa, `${service.serviceNumber}${train.tripNumber}${train.destinationCode || ''}`]); + opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa]); } }); @@ -161,8 +149,9 @@ export default { lastPoint = train.stationTimeList[idx - 1]; nextPoint = service.tripNumberDataList[j + 1].stationTimeList[1]; num = this.computedReentryNumber(train.tripNumber); - opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true, num), lastPoint.stationCode, `${service.serviceNumber}${train.tripNumber}${train.destinationCode || ''}`]); - opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, train.directionCode, true, num), nextPoint.stationCode, `${service.serviceNumber}${train.tripNumber}${train.destinationCode || ''}`]); + const aa = `${train.directionCode}${train.tripNumber}`; + opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true, num), lastPoint.stationCode, aa]); + opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, train.directionCode, true, num), nextPoint.stationCode, aa]); } /** 如果是备用车，按车次添加线*/ @@ -175,10 +164,12 @@ export default { opt = { name: '', markPointData: [], data: [] }; } } + + isBackup = train.backup; }); // 不是备用车，按服务添加线 - if (!service.backup) { + if (!isBackup) { /** 创建一条完成的服务数据*/ var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle)); if (model) { @@ -201,6 +192,7 @@ export default { if (!runPlanData[elem.serviceNumber]) { /** 创建一个新服务号标记*/ runPlanData[elem.serviceNumber] = {}; + /** 不存在此服务号，则需要创建一条新的line*/ series.push(createSeriesModel({ zlevel: 1, @@ -229,17 +221,17 @@ export default { serie.markPoint.data.push(createMartPoint({ directionCode: elem.directionCode, coord: [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false)], - name: `(${elem.groupNumber})${elem.serviceNumber}${elem.tripNumber}${elem.destinationCode || ''}`, + name: `(${elem.groupNumber})${elem.serviceNumber}${elem.tripNumber}`, color: lineStyle.color || '#000' })); } /** 计算折返点*/ - var nextPoint = [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false), elem.directionCode]; + var num = this.computedReentryNumber(elem.tripNumber); + var nextPoint = [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false, num), elem.directionCode]; if (serie.data.length > 0) { var lastPoint = serie.data[serie.data.length - 1]; if (lastPoint[2] !== nextPoint[2]) { - var num = this.computedReentryNumber(elem.tripNumber); serie.data.push([lastPoint[0], this.getYvalueByDirectionCode(lastPoint[1], lastPoint[2], num), lastPoint[2]]); serie.data.push([nextPoint[0], this.getYvalueByDirectionCode(nextPoint[1], lastPoint[2], num), lastPoint[2]]); } diff --git a/src/views/ibp/home.vue b/src/views/ibp/home.vue index 5d88e60a9..35a9ef08b 100644 --- a/src/views/ibp/home.vue +++ b/src/views/ibp/home.vue @@ -73,7 +73,8 @@ export default { { name: '发布', handleClick: this.publishScript, - type: 'primary' + type: 'primary', + showControl: (row) => { return !row.publish; } } ] } diff --git a/src/views/planMonitor/editTool/menus/createEmptyPlan.vue b/src/views/planMonitor/editTool/menus/createEmptyPlan.vue index 3700316eb..a89d2047f 100644 --- a/src/views/planMonitor/editTool/menus/createEmptyPlan.vue +++ b/src/views/planMonitor/editTool/menus/createEmptyPlan.vue @@ -219,7 +219,6 @@ export default { for (const index in wb.Sheets) { jsonData = that.planConvert.importData(wb.Sheets[index], jsonData); } - console.log(jsonData, '解析后数据'); if (that.$route.query.lineCode == '02' && !jsonData[0].downTrack && !jsonData[0].upTrack) { that.loadingDig.close(); diff --git a/src/views/planMonitor/newEditTool/menus/createEmptyPlan.vue b/src/views/planMonitor/newEditTool/menus/createEmptyPlan.vue index 979f8269d..14e933719 100644 --- a/src/views/planMonitor/newEditTool/menus/createEmptyPlan.vue +++ b/src/views/planMonitor/newEditTool/menus/createEmptyPlan.vue @@ -214,13 +214,11 @@ export default { }); } if (wb) { - try { - let jsonData = []; - for (const index in wb.Sheets) { - jsonData = that.planConvert.importData(wb.Sheets[index], jsonData); - } - console.log(jsonData, '解析后数据'); - + let jsonData = []; + for (const index in wb.Sheets) { + jsonData = that.planConvert.importData(wb.Sheets[index], jsonData); + } + if (jsonData.length) { if (that.$route.query.lineCode == '02' && !jsonData[0].downTrack && !jsonData[0].upTrack) { that.loadingDig.close(); that.$message.warning(`运行图暂无默认上行折返轨或默认下行折返轨，请输入`); @@ -237,9 +235,9 @@ export default { that.$message.warning(`${that.$t('tip.importRunGraphFailed')} ${error.message}`); }); } - } catch (error) { + } else { that.loadingDig.close(); - that.$message.warning(`${that.$t('tip.parseRunGraphFailed')} ${error.message}`); + that.$message.warning(that.$t('tip.parseRunGraphFailed')); } } }; From 1e844407c0d45d7fb3adac23c4989068fd2ed897 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 27 Aug 2020 14:02:27 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BB=BF=E7=9C=9F=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/displayNew/demonMenu.vue | 2 +- .../displayNew/{ => dispatherContest}/changeMap.vue | 0 .../index.vue} | 8 ++++---- src/views/newMap/displayNew/index.vue | 9 +++++++-- .../scriptDisplay/component/covertOperation.js | 8 -------- .../scriptRecord/index.vue} | 4 ++-- .../{ => scriptDisplay/scriptRecord}/scriptChat.vue | 2 +- 7 files changed, 15 insertions(+), 18 deletions(-) rename src/views/newMap/displayNew/{ => dispatherContest}/changeMap.vue (100%) rename src/views/newMap/displayNew/{menuDispatherContest.vue => dispatherContest/index.vue} (99%) rename src/views/newMap/displayNew/{menuScript.vue => scriptDisplay/scriptRecord/index.vue} (98%) rename src/views/newMap/displayNew/{ => scriptDisplay/scriptRecord}/scriptChat.vue (99%) diff --git a/src/views/newMap/displayNew/demonMenu.vue b/src/views/newMap/displayNew/demonMenu.vue index 8786bd63f..4515f42e6 100644 --- a/src/views/newMap/displayNew/demonMenu.vue +++ b/src/views/newMap/displayNew/demonMenu.vue @@ -38,7 +38,7 @@ import Jl3dDevice from '@/views/jlmap3d/device/jl3ddevice'; import Jl3dDrive from '@/views/jlmap3d/drive/jl3ddrive'; import { getToken } from '@/utils/auth'; -import ChangeMap from './changeMap'; +import ChangeMap from './dispatherContest/changeMap'; import { getSessionStorage } from '@/utils/auth'; import Scheduling from '@/views/newMap/displayNew/demon/scheduling'; import SchedulingView from '@/views/newMap/displayNew/demon/schedulingView'; diff --git a/src/views/newMap/displayNew/changeMap.vue b/src/views/newMap/displayNew/dispatherContest/changeMap.vue similarity index 100% rename from src/views/newMap/displayNew/changeMap.vue rename to src/views/newMap/displayNew/dispatherContest/changeMap.vue diff --git a/src/views/newMap/displayNew/menuDispatherContest.vue b/src/views/newMap/displayNew/dispatherContest/index.vue similarity index 99% rename from src/views/newMap/displayNew/menuDispatherContest.vue rename to src/views/newMap/displayNew/dispatherContest/index.vue index 35b194b10..755aa4e55 100644 --- a/src/views/newMap/displayNew/menuDispatherContest.vue +++ b/src/views/newMap/displayNew/dispatherContest/index.vue @@ -54,9 +54,9 @@