diff --git a/.env.development b/.env.development index 73489ea25..8527b4390 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,6 @@ # just a flag NODE_ENV = 'development' -#VUE_APP_PRO = 'local' +# VUE_APP_PRO = 'local' # base api # VUE_APP_BASE_API = 'https://joylink.club/jlcloud' diff --git a/package.json b/package.json index 65b10342d..9d86044e8 100644 --- a/package.json +++ b/package.json @@ -17,11 +17,14 @@ }, "dependencies": { "axios": "0.18.0", + "echarts": "^4.7.0", + "element-ui": "^2.12.0", "file-saver": "^1.3.3", "js-cookie": "2.2.0", "js-md5": "^0.7.3", "lodash": "^4.17.11", "normalize.css": "7.0.0", + "nprogress": "^0.2.0", "path-to-regexp": "2.4.0", "qrcode.vue": "^1.6.2", "script-loader": "^0.7.2", @@ -30,8 +33,11 @@ "stompjs": "^2.3.3", "storejs": "^1.0.25", "three": "^0.107.0", + "vue": "^2.6.10", "vue-i18n": "^8.12.0", + "vue-router": "^3.1.6", "vuedraggable": "^2.23.2", + "vuex": "^3.1.0", "xlsx": "^0.14.2", "zrender": "^4.0.4" }, @@ -51,10 +57,9 @@ "babel-preset-env": "1.6.1", "babel-preset-stage-2": "6.24.1", "chalk": "2.4.2", - "compression-webpack-plugin": "^3.0.0", + "compression-webpack-plugin": "^3.1.0", "connect": "3.6.6", "copy-webpack-plugin": "^4.5.2", - "eslint": "5.15.3", "eslint-plugin-vue": "5.2.2", "file-loader": "^3.0.1", @@ -68,7 +73,7 @@ "serve-static": "^1.13.2", "svg-sprite-loader": "4.1.3", "svgo": "1.2.2", - "vue-template-compiler": "2.6.10" + "vue-template-compiler": "2.6.11" }, "engines": { "node": ">=8.9", diff --git a/public/index.html b/public/index.html index 29a987a35..2f384b84c 100644 --- a/public/index.html +++ b/public/index.html @@ -6,24 +6,25 @@ - - + <%= webpackConfig.name %> - - - - - - - - - - - + <% if (process.env.VUE_APP_PRO !== 'local') { %> + + + + + + + + + + + <% } %> + - + diff --git a/src/directive/dialogDrag/dialogDrag.js b/src/directive/dialogDrag/dialogDrag.js index a0652b16c..2e1b1ec67 100644 --- a/src/directive/dialogDrag/dialogDrag.js +++ b/src/directive/dialogDrag/dialogDrag.js @@ -1,4 +1,4 @@ -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; export default { bind(el) { diff --git a/src/i18n/index.js b/src/i18n/index.js index 3b11fe883..ff63ffa44 100644 --- a/src/i18n/index.js +++ b/src/i18n/index.js @@ -1,7 +1,7 @@ -import en from './langs/en/index'; -import zh from './langs/zh/index'; +import en from './langs/en/index_APP_TARGET'; +import zh from './langs/zh/index_APP_TARGET'; export default { - en, - zh + en, + zh }; diff --git a/src/i18n/langs/en/global.js b/src/i18n/langs/en/global.js index 949386fa2..fa6b46629 100644 --- a/src/i18n/langs/en/global.js +++ b/src/i18n/langs/en/global.js @@ -204,5 +204,6 @@ export default { perpetual: 'perpetual', buyingTips: 'Function upgrade, stay tuned!', permissionAllNum:'Total permissions', - set: 'Set' + set: 'Set', + joinNewRoom: 'Join new room' }; diff --git a/src/i18n/langs/en/index.js b/src/i18n/langs/en/index_Common.js similarity index 96% rename from src/i18n/langs/en/index.js rename to src/i18n/langs/en/index_Common.js index edfbe50bb..a9afb2e9d 100644 --- a/src/i18n/langs/en/index.js +++ b/src/i18n/langs/en/index_Common.js @@ -1,4 +1,3 @@ -// import enLocale from 'element-ui/lib/locale/lang/en'; import ELEMENT from 'element-ui'; import map from './map'; import global from './global'; diff --git a/src/i18n/langs/en/index_HYD.js b/src/i18n/langs/en/index_HYD.js new file mode 100644 index 000000000..6b247f001 --- /dev/null +++ b/src/i18n/langs/en/index_HYD.js @@ -0,0 +1,63 @@ +import enLocale from 'element-ui/lib/locale/lang/en'; +import map from './map'; +import global from './global'; +import router from './router'; +import lesson from './lesson'; +import error from './error'; +import rules from './rules'; +import scriptRecord from './scriptRecord'; +import tip from './tip'; +import system from './system'; +import orderAuthor from './orderAuthor'; +import teach from './teach'; +import publish from './publish'; +import permission from './permission'; +import replay from './replay'; +import planMonitor from './planMonitor'; +import screenMonitor from './screenMonitor'; +import demonstration from './demonstration'; +import exam from './exam'; +import dashboard from './dashboard'; +import jlmap3d from './jlmap3d'; +import display from './display'; +import joinTraining from './joinTraining'; +import trainRoom from './trainRoom'; +import menu from './menu'; +import ibp from './ibp'; +import approval from './approval'; +import systemGenerate from './systemGenerate'; +import login from './login'; +import designPlatform from './designPlatform'; + +export default { + enLocale, + map, + global, + router, + lesson, + teach, + error, + rules, + scriptRecord, + tip, + system, + orderAuthor, + publish, + permission, + replay, + planMonitor, + screenMonitor, + demonstration, + exam, + dashboard, + jlmap3d, + display, + joinTraining, + trainRoom, + menu, + ibp, + approval, + systemGenerate, + login, + designPlatform +}; diff --git a/src/i18n/langs/en/jlmap3d.js b/src/i18n/langs/en/jlmap3d.js index 910ec9a23..e7449cf95 100644 --- a/src/i18n/langs/en/jlmap3d.js +++ b/src/i18n/langs/en/jlmap3d.js @@ -19,5 +19,69 @@ export default { stationInfoDisplay: 'Station information — display', stationInfoHidden: 'Station information — hidden', trainInfoDisplay: 'Train information — display', - trainInfoHidden: 'Train information — hidden' + trainInfoHidden: 'Train information — hidden', + + drive: 'Driving a car', + train: 'Train', + driver: 'Driver', + newInformation: 'A new message', + driving: 'Driving in', + unselectedVehicle: 'Unselected vehicle', + returnDriving: 'Return to driving', + accordingChat: 'According to the chat', + displayControl: 'Display controller', + haveBus: 'Have got on the bus', + busUnrideable: 'The bus is unrideable', + + highSpeedCircuitBreaker: 'High speed circuit breaker', + washCarModel: 'Wash', + forcedAirCompressor: 'Compressor Forced Start', + ATBStart: 'ATB', + forcedRelieve: 'Forced Relief', + closeLeftDoor: 'L Door Close', + openLeftDoor: 'L Door Open', + ATOStart: 'ATO', + electricHornButton: 'Whistle', + roomLightingControl: 'Compartment light', + sivsControl: 'SIV', + driverRoomLights: 'Cab light', + passingBeam: 'Low', + headLamp: 'Headlight', + distanceLight: 'High', + leftDoorOpen: 'Left door open', + leftDoorClose: 'Port door closed', + openRightDoor: 'R Door Open', + closeRightDoor: 'R Door Close', + sprayWater: 'Open', + waterSwitch: 'Water Spray', + slow: 'Slow', + highSpeed: 'Fast', + wiperSwitch: 'Wiper', + emergencyBraking: 'Emergency Braking', + leftSide: 'Left', + location0: '0', + rightSide: 'Right', + doorSideChoose: 'Door Selection', + doorModel: 'Door Model', + rightDoorOpen: 'Right side door open', + rightDoorClose: 'Door on right', + + close: 'Close', + shut: 'Close', + open: 'Open', + front: 'front', + later: 'back', + electricGongSheng: 'The electric GongSheng', + pantographFall: 'Pantograph fall', + lampButton: 'Try the lamp button', + removalATP: 'ATP Removal of', + infliction: 'applying', + mesoPosition: 'The median', + remission: 'ease', + parkingBrakeMode: 'Parking brake mode', + traction: 'Traction', + braking: 'Braking', + quick: 'Quick Braking', + noComponent: 'No session', + }; diff --git a/src/i18n/langs/en/tip.js b/src/i18n/langs/en/tip.js index 2a9a6daac..91c39c666 100644 --- a/src/i18n/langs/en/tip.js +++ b/src/i18n/langs/en/tip.js @@ -233,5 +233,6 @@ export default { stopPointOffsetTip: 'Set block stop offset in bulk successfully!', mapSortSuccessfully: 'Map sort successfully！', mapSortFailed: 'Map sort failed', - enterTrainingRoomFailed: 'Failed to enter the comprehensive drill, please consult the administrator is still in the room!' + enterTrainingRoomFailed: 'Failed to enter the comprehensive drill, please consult the administrator is still in the room!', + failedToAddNewRoom: 'Failed to add new room' }; diff --git a/src/i18n/langs/en/trainRoom.js b/src/i18n/langs/en/trainRoom.js index c27daee2c..238099021 100644 --- a/src/i18n/langs/en/trainRoom.js +++ b/src/i18n/langs/en/trainRoom.js @@ -33,5 +33,7 @@ export default { plcGatewayOffline: '[PLC gateway offline]', uplinkPlatform: 'Uplink platform', downlinkPlatform: 'Downlink platform', - ibp:'IBP' + ibp:'IBP', + getGroupId: 'Get group Id', + groupId: 'Group id' }; diff --git a/src/i18n/langs/zh/global.js b/src/i18n/langs/zh/global.js index 893759f07..42635d258 100644 --- a/src/i18n/langs/zh/global.js +++ b/src/i18n/langs/zh/global.js @@ -204,5 +204,6 @@ export default { perpetual: '永久', buyingTips: '功能升级中, 敬请期待!', permissionAllNum:'权限总数', - set: '设 置' + set: '设 置', + joinNewRoom: '加入新房间' }; diff --git a/src/i18n/langs/zh/index.js b/src/i18n/langs/zh/index_Common.js similarity index 96% rename from src/i18n/langs/zh/index.js rename to src/i18n/langs/zh/index_Common.js index 14bb3e3ad..48ee88d10 100644 --- a/src/i18n/langs/zh/index.js +++ b/src/i18n/langs/zh/index_Common.js @@ -1,4 +1,3 @@ -// import cnLocale from 'element-ui/lib/locale/lang/zh-CN'; import ELEMENT from 'element-ui'; import map from './map'; import global from './global'; diff --git a/src/i18n/langs/zh/index_HYD.js b/src/i18n/langs/zh/index_HYD.js new file mode 100644 index 000000000..3974061e3 --- /dev/null +++ b/src/i18n/langs/zh/index_HYD.js @@ -0,0 +1,63 @@ +import cnLocale from 'element-ui/lib/locale/lang/zh-CN'; +import map from './map'; +import global from './global'; +import router from './router'; +import lesson from './lesson'; +import error from './error'; +import rules from './rules'; +import scriptRecord from './scriptRecord'; +import tip from './tip'; +import system from './system'; +import orderAuthor from './orderAuthor'; +import teach from './teach'; +import publish from './publish'; +import permission from './permission'; +import replay from './replay'; +import planMonitor from './planMonitor'; +import screenMonitor from './screenMonitor'; +import demonstration from './demonstration'; +import exam from './exam'; +import dashboard from './dashboard'; +import jlmap3d from './jlmap3d'; +import display from './display'; +import joinTraining from './joinTraining'; +import trainRoom from './trainRoom'; +import menu from './menu'; +import ibp from './ibp'; +import approval from './approval'; +import systemGenerate from './systemGenerate'; +import login from './login'; +import designPlatform from './designPlatform'; + +export default { + cnLocale, + map, + global, + router, + lesson, + error, + teach, + rules, + scriptRecord, + tip, + system, + orderAuthor, + publish, + permission, + replay, + planMonitor, + screenMonitor, + demonstration, + exam, + dashboard, + jlmap3d, + display, + joinTraining, + trainRoom, + menu, + ibp, + approval, + systemGenerate, + login, + designPlatform +}; diff --git a/src/i18n/langs/zh/jlmap3d.js b/src/i18n/langs/zh/jlmap3d.js index eb8a1e316..152835a6f 100644 --- a/src/i18n/langs/zh/jlmap3d.js +++ b/src/i18n/langs/zh/jlmap3d.js @@ -19,5 +19,69 @@ export default { stationInfoDisplay: '站台信息——显示', stationInfoHidden: '站台信息——隐藏', trainInfoDisplay: '列车信息——显示', - trainInfoHidden: '列车信息——隐藏' + trainInfoHidden: '列车信息——隐藏', + + drive: '开车', + train: '列车', + driver: '司机', + newInformation: '新的消息', + driving: '驾驶中', + unselectedVehicle: '未选择车辆', + returnDriving: '返回驾驶', + accordingChat: '显示聊天', + displayControl: '显示控制器', + haveBus: '已上车', + busUnrideable: '该车无法搭乘', + + highSpeedCircuitBreaker: '高速断路器分', + washCarModel: '洗车模式', + forcedAirCompressor: '空压机强迫启动', + ATBStart: 'ATB启动', + forcedRelieve: '强迫缓解', + closeLeftDoor: '关左门', + openLeftDoor: '开左门', + ATOStart: 'ATO启动', + electricHornButton: '电笛按钮', + roomLightingControl: '客室照明控制', + sivsControl: 'SIV', + driverRoomLights: '司机室灯', + passingBeam: '近光', + distanceLight: '远光', + headLamp: '头灯', + leftDoorOpen: '左侧车门开', + leftDoorClose: '左侧车门关', + openRightDoor: '开右门', + closeRightDoor: '关右门', + sprayWater: '喷水', + waterSwitch: '喷水开关', + slow: '低速', + highSpeed: '高速', + wiperSwitch: '刮雨器开关', + emergencyBraking: '紧急制动', + leftSide: '左侧', + location0: '0位', + rightSide: '右侧', + doorSideChoose: '门侧选择', + doorModel: '门模式', + rightDoorOpen: '右侧车门开', + rightDoorClose: '右侧车门关', + + close: '关', + shut: '关闭', + open: '开', + front: '前', + later: '后', + electricGongSheng: '受电弓升', + pantographFall: '受电弓降', + lampButton: '试灯按钮', + removalATP: 'ATP切除', + infliction: '施加', + mesoPosition: '中位', + remission: '缓解', + parkingBrakeMode: '停放制动模式', + + traction: '牵引', + braking: '制动', + quick: '快制', + noComponent: '暂无会话', }; diff --git a/src/i18n/langs/zh/tip.js b/src/i18n/langs/zh/tip.js index d33ed76a3..373531735 100644 --- a/src/i18n/langs/zh/tip.js +++ b/src/i18n/langs/zh/tip.js @@ -233,5 +233,6 @@ export default { stopPointOffsetTip: '批量设置区段停车点偏移量成功！', mapSortSuccessfully: '地图排序成功！', mapSortFailed: '地图排序失败！', - enterTrainingRoomFailed: '进入综合演练失败，请咨询管理员是否还在房间内！' + enterTrainingRoomFailed: '进入综合演练失败，请咨询管理员是否还在房间内！', + failedToAddNewRoom: '加入新房间失败' }; diff --git a/src/i18n/langs/zh/trainRoom.js b/src/i18n/langs/zh/trainRoom.js index 3987dd786..9c607e361 100644 --- a/src/i18n/langs/zh/trainRoom.js +++ b/src/i18n/langs/zh/trainRoom.js @@ -33,5 +33,7 @@ export default { plcGatewayOffline: '[PLC网关离线]', uplinkPlatform: '上行站台', downlinkPlatform: '下行站台', - ibp:'IBP' + ibp:'IBP', + getGroupId: '获取房间号', + groupId: '房间号' }; diff --git a/src/ibp/mouseController.js b/src/ibp/mouseController.js index 24b63cd21..26af6ceff 100644 --- a/src/ibp/mouseController.js +++ b/src/ibp/mouseController.js @@ -1,7 +1,7 @@ import deviceType from './constant/deviceType'; import Eventful from 'zrender/src/mixin/Eventful'; import * as eventTool from 'zrender/src/core/event'; -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; class EventModel { constructor(e) { diff --git a/src/ibp/utils/parser.js b/src/ibp/utils/parser.js index 1ee536314..397e4092d 100644 --- a/src/ibp/utils/parser.js +++ b/src/ibp/utils/parser.js @@ -2,7 +2,7 @@ import * as zrUtil from 'zrender/src/core/util'; import * as matrix from 'zrender/src/core/matrix'; import deviceType from '../constant/deviceType'; import deviceRender from '../constant/deviceRender'; -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; export function createTransform(opts) { let transform = matrix.create(); diff --git a/src/iscs/iscs.js b/src/iscs/iscs.js index f257c1973..26ac62398 100644 --- a/src/iscs/iscs.js +++ b/src/iscs/iscs.js @@ -6,7 +6,7 @@ import Painter from './painter'; import deviceType from './constant/deviceType'; import {calculateDCenter, createBoundingRect, deviceFactory} from './utils/parser'; import { updateIscsData } from './utils/parser'; -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; const renderer = 'canvas'; const devicePixelRatio = 1; diff --git a/src/iscs/mouseController.js b/src/iscs/mouseController.js index cb5eab76d..9ea858b75 100644 --- a/src/iscs/mouseController.js +++ b/src/iscs/mouseController.js @@ -1,7 +1,7 @@ import deviceType from './constant/deviceType'; import Eventful from 'zrender/src/mixin/Eventful'; import * as eventTool from 'zrender/src/core/event'; -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; class EventModel { constructor(e) { diff --git a/src/iscs/utils/parser.js b/src/iscs/utils/parser.js index 45216f7a9..c303abfff 100644 --- a/src/iscs/utils/parser.js +++ b/src/iscs/utils/parser.js @@ -2,7 +2,7 @@ import * as zrUtil from 'zrender/src/core/util'; import * as matrix from 'zrender/src/core/matrix'; import deviceType from '../constant/deviceType'; import deviceRender from '../constant/deviceRender'; -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; import { deepClone } from '@/utils/index'; export function createTransform(opts) { diff --git a/src/jlmap3d/edit/jlmap3dedit.js b/src/jlmap3d/edit/jlmap3dedit.js index dd6aa403c..3921d3586 100644 --- a/src/jlmap3d/edit/jlmap3dedit.js +++ b/src/jlmap3d/edit/jlmap3dedit.js @@ -53,7 +53,7 @@ export function JLmap3dEdit(dom, data, mapid) { dom.appendChild(this.renderer.domElement); //定义相机 - this.camera = new THREE.PerspectiveCamera(70, dom.clientWidth/dom.clientHeight, 1, 20000); + this.camera = new THREE.PerspectiveCamera(70, dom.clientWidth/dom.clientHeight, 1, 1000); this.camera.aspect = window.innerWidth / window.innerHeight; this.camera.updateProjectionMatrix(); this.camera.position.set(0,0,1800); @@ -163,7 +163,7 @@ export function JLmap3dEdit(dom, data, mapid) { this.export = function(){ let exporter = new THREE.OBJExporter(); console.log(scope.mapdata); - let exportmodels = scope.mapdata.linklist.linksgroup; + let exportmodels = scope.mapdata.stationstandlist.group; // let exportmodels = scope.mapdata.sectionlist.switchgroup; // let exportmodels = scope.mapdata.stationstandlist.group; let result = exporter.parse( exportmodels ); diff --git a/src/jlmap3d/jl3ddrive/drivecontrol/simulation.js b/src/jlmap3d/jl3ddrive/drivecontrol/simulation.js new file mode 100644 index 000000000..9be9c30b9 --- /dev/null +++ b/src/jlmap3d/jl3ddrive/drivecontrol/simulation.js @@ -0,0 +1,99 @@ +import request from '@/utils/request'; + + +// 获取仿真成员列表（新版地图） +export function getSimulationMembersNew(group) { + return request({ + url: `/simulation/${group}/members`, + method: 'get' + }) +} + +// 获取仿真成员（新版地图） +export function getSimulationMemberNew(group) { + return request({ + url: `/simulation/${group}/member`, + method: 'get' + }); +} + +// 获取仿真会话列表（新版地图） +export function getSimulationConversationListNew(group) { + return request({ + url: `/simulation/${group}/conversations`, + method: 'get' + }); +} + +// 获取仿真会话消息列表（新版地图） +export function getSimulationContextListNew(group, conversationId) { + return request({ + url: `/simulation/${group}/conversation/${conversationId}`, + method: 'get' + }); +} + +// 获取客户端已经进入仿真的用户仿真所在group(新版地图) +export function getSimulationRunningNew(params) { + return request({ + url: `/simulation/running`, + method: 'get', + params + }) +} + +// 根据group获取仿真对象（新版地图） +export function getSimulationByGroupNew(group) { + return request({ + url: `/simulation/${group}`, + method: 'get' + }) +} + +// 获取/创建仿真会话（新版地图） +export function getSimulationConversationIdNew(params, group) { + return request({ + url: `/simulation/${group}/wx/conversation`, + method: 'get', + params: params + }); +} + +// 仿真驾驶车辆列表（新版地图） +export function getSimulationTrainlistNew(group) { + return request({ + url: `/simulation/driving/${group}/trainList`, + method: 'get', + params: '' + }) +} + +//新版仿真驾驶发送命令 +export function bindSimulationTrain(group,groupNumber) { + return request({ + url: `/simulation/driving/${group}/bindTrain/${groupNumber}`, + method: 'post', + params: '' + }) +} +export function trainSimulationEb(group,groupNumber) { + return request({ + url: `/simulation/driving/${group}/train/${groupNumber}/eb`, + method: 'put', + params: '' + }) +} +export function trainSimulationForce(group,groupNumber,percent) { + return request({ + url: `/simulation/driving/${group}/train/${groupNumber}/force/${percent}`, + method: 'put', + params: '' + }) +} +export function trainSimulationGear(group,groupNumber,gear) { + return request({ + url: `/simulation/driving/${group}/train/${groupNumber}/gear/${gear}`, + method: 'put', + params: '' + }) +} diff --git a/src/jlmap3d/jl3ddrive/jl3ddrive.js b/src/jlmap3d/jl3ddrive/jl3ddrive.js index bab7f38c1..fd08263e4 100644 --- a/src/jlmap3d/jl3ddrive/jl3ddrive.js +++ b/src/jlmap3d/jl3ddrive/jl3ddrive.js @@ -134,7 +134,7 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj // }); let controls3 = new MouseControls(camera, 1.6); - controls3.enabled = true; + controls3.enabled = false; // controls3.getObject().rotation.x = Math.PI/2; scene.add(controls3.getObject()); @@ -202,7 +202,7 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj scope.datatype = "new"; scope.Subscribe = new Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,stats); - + datanew(); // scope.jsonwebworknew = new Worker("../../static/workertest/jsonworkernew.js"); // scope.Subscribe = new Jlmap3dSubscribeNew(scope,routegroup,scope.jsonwebworknew); // scope.Subscribe.socketon(scope.Subscribe.topic); @@ -229,8 +229,9 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj // getPublish3dMapDetail(mapId).then(netdata => { // DriverLoad(data, scope, netdata.data, sectionlist,linklist,signallist,stationstandlist,trainlisttest,realsectionlist,rails, camera, controls3, scene,mixers,storemod); // }); - let stats = new Stats(); - dom.appendChild( stats.dom ); + let stats =null; + // let stats = new Stats(); + // dom.appendChild( stats.dom ); // 开启渲染 animate(); startWorker(); @@ -314,7 +315,7 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj }; updatemmi.updatedrivingcode = function(code) { - console.log(trainlisttest); + // console.log(trainlisttest); drivingcode = code; trainlisttest.group.children[0].children[0].add(controls3.getObject()); controls3.getObject().position.x = 10; diff --git a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js index 9e7a4dfb9..0b6e8544a 100644 --- a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js +++ b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js @@ -4,585 +4,591 @@ import { getTrainingCbtcDemon, runDiagramStart, runDiagramOver, setTrainingCbtcI import { creatSubscribe, clearSubscribe, displayTopic, screenTopic } from '@/utils/stomp'; import { getToken } from '@/utils/auth'; -import router from '@/router/index_APP_TARGET'; // 定于仿真socket接口 -export function Jl3dDrivingNew(mixers, updatemmi, sound, translation, routegroup, stats) { +export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,stats) { - const scope = this; - this.map = null; - const toppic = '/app/topic/simulation/client/' + routegroup + '/drive'; - var trainlisttest = null; - var sectionlist = null; - var signallist = null; - var stationstandlist = null; - var sectionlist = null; - var materials = null; - var actions = null; - var rails = null; - var links = null; + let scope = this; + this.map = null; + let toppic = '/app/topic/simulation/client/'+routegroup+'/drive'; + var trainlisttest = null; + var sectionlist = null; + var signallist = null; + var stationstandlist = null; + var sectionlist = null; + var materials = null; + var actions = null; + var rails = null; + var links = null; - let trainmodel = null; - var scenes = null; + let trainmodel = null; + var scenes = null; - var code = null; + var code = null; - var drivingcode = null; - var drivingspeed = null; - var drivingaptspeed = null; + var drivingcode = null; + var drivingspeed = null; + var drivingaptspeed = null; - const driverswitch = false; + let driverswitch = false; - const stoptimer = null; - const num = 30; - const pointstand = null; - // run as plane = 01; - // reset = 02; - var datatype = '00'; - this.teststomp = new StompClient(); - this.topic = '/user/queue/simulation/drive/' + routegroup; - const header = {'X-Token': getToken() }; + let stoptimer = null; + let num = 30; + let pointstand = null; + // run as plane = 01; + // reset = 02; + var datatype = '00'; + this.teststomp = new StompClient(); + this.topic = '/user/queue/simulation/drive/'+routegroup; + let header = {'X-Token': getToken() }; - this.updatamap = function(newsectionlist, newlinklist, newsignallist, newstationstandlist, newtrainlisttest, newrealsectionlist, newrails, materiallist, nowaction, scene) { - // console.log(mapdata); - // console.log(newtrainlisttest); - trainmodel = newtrainlisttest.group.children[0]; - trainlisttest = newtrainlisttest; - sectionlist = newsectionlist; - signallist = newsignallist; - stationstandlist = newstationstandlist; - materials = materiallist; - scenes = scene; - actions = nowaction; - links = newlinklist; - rails = newrails; - }; + this.updatamap = function(newsectionlist,newlinklist,newsignallist,newstationstandlist,newtrainlisttest,newrealsectionlist,newrails, materiallist, nowaction, scene) { + // console.log(mapdata); + // console.log(newtrainlisttest); + trainmodel = newtrainlisttest.group.children[0]; + trainlisttest = newtrainlisttest; + sectionlist = newsectionlist; + signallist = newsignallist; + stationstandlist = newstationstandlist; + materials = materiallist; + scenes = scene; + actions = nowaction; + links = newlinklist; + rails = newrails; + }; - this.initdrivercode = function(code) { - drivingcode = code; - }; + this.initdrivercode = function(code) { + drivingcode = code; + }; - this.socketon = function(topic) { - try { - // console.log("teststomp"); - scope.teststomp.subscribe(topic, callback, header); - } catch (error) { - console.error('websocket订阅失败'); - } + this.socketon = function(topic) { + try { + // console.log("teststomp"); + scope.teststomp.subscribe(topic, callback, header); + } catch (error) { + console.error('websocket订阅失败'); + } - }; + }; - this.socketoff = function(topic) { - scope.teststomp.unsubscribe(topic); - for (let i = 0; i < trainlisttest.group.children.length; i++) { - if (trainlisttest.group.children[i].dispose == false) { - code = trainlisttest.group.children[i].name; - trainmodel.rotation.y = 0; - trainmodel.doorStatus = '01'; - trainmodel.speed = 0; - trainlisttest.group.children[i].dispose = true; - trainlisttest.group.children[i].position.x = -50000; - trainlisttest.group.children[i].position.y = -50000; - trainlisttest.group.remove(trainlisttest.group.children[i]); - i--; - } - } - }; + this.socketoff = function(topic) { + scope.teststomp.unsubscribe(topic); + for (let i=0; i 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0 || trainmodel.children[5].rotalist.length > 0) { + } + if(trainmodel.children[1].rotalist.length > 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){ - for (let rs = 1; rs < 6; rs++) { - // console.log(rs); - if (trainmodel.children[rs].rotalist[0]) { + for(let rs = 1;rs<6;rs++){ + //console.log(rs); + if(trainmodel.children[rs].rotalist[0]){ - const offsetz = parseFloat(trainmodel.children[rs].rotalist[0].posr.z) + parseFloat(trainmodel.children[rs].position.z); - trainmodel.children[rs].position.z -= offsetz; + let offsetz = parseFloat(trainmodel.children[rs].rotalist[0].posr.z) + parseFloat(trainmodel.children[rs].position.z); + trainmodel.children[rs].position.z -= offsetz; - for (let xh = 0; xh < trainmodel.children[rs].rotalist.length; xh++) { - if ((trainmodel.children[rs].matrixWorld.elements[12] + 10) >= trainmodel.children[rs].rotalist[0].posr.x) { + for(let xh=0;xh=trainmodel.children[rs].rotalist[0].posr.x){ - if (rs != 5) { - const asd = trainmodel.children[rs].rotalist[0]; - trainmodel.children[rs + 1].rotalist.push(asd); + if(rs != 5){ + let asd = trainmodel.children[rs].rotalist[0]; + trainmodel.children[rs+1].rotalist.push(asd); - } - // let offsetx = trainmodel.children[1].matrixWorld.elements[12]-trainmodel.children[0].children[3].matrixWorld.elements[12]; + } + //let offsetx = trainmodel.children[1].matrixWorld.elements[12]-trainmodel.children[0].children[3].matrixWorld.elements[12]; - trainmodel.children[rs].rotation.z = trainmodel.children[rs].rotalist[0].rota; - trainmodel.children[rs].rotalist.splice(0, 1); - xh--; - } else { - xh = trainmodel.children[rs].rotalist.length; - } - } - // console.log(trainmodel.children[rs].rotalist.length); + trainmodel.children[rs].rotation.z = trainmodel.children[rs].rotalist[0].rota; + trainmodel.children[rs].rotalist.splice(0,1) + xh--; + }else{ + xh = trainmodel.children[rs].rotalist.length; + } + } + //console.log(trainmodel.children[rs].rotalist.length); - } + } - } - // console.log(trainmodel.rotalist); - } - } else { - if (trainmodel.children[0].position.z != pos.z) { - trainmodel.children[0].up = new THREE.Vector3(-1, 0, 0); - const tangent = trainmodel.curve.getTangentAt(data.offset).normalize(); - trainmodel.children[0].axis.crossVectors(trainmodel.children[0].up, tangent).normalize(); - const radians = Math.acos(trainmodel.children[0].up.dot(tangent)); - trainmodel.children[0].quaternion.setFromAxisAngle(trainmodel.children[0].axis, radians); - trainmodel.children[0].rotation.x = -Math.PI / 2; - trainmodel.children[0].rotation.z = trainmodel.children[0].rotation.y; - trainmodel.children[0].rotation.y = 0; - const rotas = { - posr:pos, - rota:trainmodel.children[0].rotation.z - }; - trainmodel.children[1].rotalist.push(rotas); + } + // console.log(trainmodel.rotalist); + } - const offsetz = parseFloat(pos.z) - parseFloat(trainmodel.children[0].position.z); - trainmodel.children[0].position.z += offsetz; - } - if (trainmodel.children[1].rotalist.length > 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0 || trainmodel.children[5].rotalist.length > 0) { - for (let rs = 1; rs < 6; rs++) { - // console.log(rs); - if (trainmodel.children[rs].rotalist[0]) { - const offsetz = parseFloat(trainmodel.children[rs].rotalist[0].posr.z) - parseFloat(trainmodel.children[rs].matrixWorld.elements[14]); + }else{ + if(trainmodel.children[0].position.z != pos.z){ + trainmodel.children[0].up = new THREE.Vector3(-1,0,0); + let tangent = trainmodel.curve.getTangentAt(data.offset).normalize(); + trainmodel.children[0].axis.crossVectors(trainmodel.children[0].up, tangent).normalize(); + let radians = Math.acos(trainmodel.children[0].up.dot(tangent)); + trainmodel.children[0].quaternion.setFromAxisAngle(trainmodel.children[0].axis, radians); + trainmodel.children[0].rotation.x = -Math.PI/2; + trainmodel.children[0].rotation.z = trainmodel.children[0].rotation.y; + trainmodel.children[0].rotation.y = 0; + let rotas = { + posr:pos, + rota:trainmodel.children[0].rotation.z + } + trainmodel.children[1].rotalist.push(rotas); - trainmodel.children[rs].position.z += offsetz; - for (let xh = 0; xh < trainmodel.children[rs].rotalist.length; xh++) { - if ((trainmodel.children[rs].matrixWorld.elements[12] - 10) <= trainmodel.children[rs].rotalist[0].posr.x) { + let offsetz = parseFloat(pos.z) - parseFloat(trainmodel.children[0].position.z); + trainmodel.children[0].position.z += offsetz; + } + if(trainmodel.children[1].rotalist.length > 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){ + for(let rs = 1;rs<6;rs++){ + //console.log(rs); + if(trainmodel.children[rs].rotalist[0]){ + let offsetz = parseFloat(trainmodel.children[rs].rotalist[0].posr.z) - parseFloat(trainmodel.children[rs].matrixWorld.elements[14]); - if (rs != 5) { - const asd = trainmodel.children[rs].rotalist[0]; - trainmodel.children[rs + 1].rotalist.push(asd); + trainmodel.children[rs].position.z += offsetz; - } + for(let xh=0;xh= 0; an--) { - actions['traindoor'].down[an].reset(); - actions['traindoor'].down[an].time = actions['traindoor'].top[an]._clip.duration; - actions['traindoor'].down[an].timeScale = -1; - actions['traindoor'].down[an].play(); - } - } else if (trainmodel.open != data.open && data.open == '1') { - trainmodel.open = '1'; - for (let an = actions['traindoor'].down.length - 1; an >= 0; an--) { - actions['traindoor'].down[an].reset(); - actions['traindoor'].down[an].time = 0; - actions['traindoor'].down[an].timeScale = 1; - actions['traindoor'].down[an].play(); - } - } - } else { + return; + } + } + } - if (trainmodel.open != data.open && data.open == '0') { - trainmodel.open = '0'; - for (let an = actions['traindoor'].top.length - 1; an >= 0; an--) { - actions['traindoor'].top[an].reset(); - actions['traindoor'].top[an].time = actions['traindoor'].top[an]._clip.duration; - actions['traindoor'].top[an].timeScale = -1; - actions['traindoor'].top[an].play(); - } - } else if (trainmodel.open != data.open && data.open == '1') { - trainmodel.open = '1'; - for (let an = actions['traindoor'].top.length - 1; an >= 0; an--) { - actions['traindoor'].top[an].reset(); - actions['traindoor'].top[an].time = 0; - actions['traindoor'].top[an].timeScale = 1; - actions['traindoor'].top[an].play(); - } - } + function traindoorupdate(data){ - } + if(trainmodel.code == data.code){ - } + if(data.doorCode == "0"){ - } + if(trainmodel.open != data.open && data.open == "0"){ + trainmodel.open = "0"; + for(let an=actions["traindoor"].down.length-1;an>=0;an--){ + actions["traindoor"].down[an].reset(); + actions["traindoor"].down[an].time = actions["traindoor"].top[an]._clip.duration; + actions["traindoor"].down[an].timeScale = -1; + actions["traindoor"].down[an].play(); + } + }else if(trainmodel.open != data.open && data.open == "1"){ + trainmodel.open = "1"; + for(let an=actions["traindoor"].down.length-1;an>=0;an--){ + actions["traindoor"].down[an].reset(); + actions["traindoor"].down[an].time = 0; + actions["traindoor"].down[an].timeScale = 1; + actions["traindoor"].down[an].play(); + } + } + }else{ - function trainstatus(data) { - // 遍历列车对象组 - if (trainlisttest) { - code = data.code; - // 剔除不显示的车 - // 找到对应列车 - if ( trainmodel) { + if (trainmodel.open != data.open && data.open == '0') { + trainmodel.open = '0'; + for (let an=actions["traindoor"].top.length-1; an>=0; an--) { + actions["traindoor"].top[an].reset(); + actions["traindoor"].top[an].time = actions["traindoor"].top[an]._clip.duration; + actions["traindoor"].top[an].timeScale = -1; + actions["traindoor"].top[an].play(); + } + } else if (trainmodel.open != data.open && data.open == '1') { + trainmodel.open = "1"; + for(let an=actions["traindoor"].top.length-1;an>=0;an--){ + actions["traindoor"].top[an].reset(); + actions["traindoor"].top[an].time = 0; + actions["traindoor"].top[an].timeScale = 1; + actions["traindoor"].top[an].play(); + } + } - trainmodel.driveMode = data.driveMode; - trainmodel.status = data.right; - // 车门开关验证 + } - // 遍历获取所在轨道 - if (trainmodel.dispose != data.dispose && data.dispose == '0') { - if (rails.sectionrail[data.sectionCode]) { + } - trainlisttest.group.add(trainmodel); - trainmodel.position.y = 0; - // trainmodel.progress = 0; - trainmodel.dispose = '0'; - trainmodel.nowcode = data.sectionCode; - trainmodel.nextcode = null; - trainmodel.curve = null; + } + + function trainstatus(data){ + // 遍历列车对象组 + if (trainlisttest) { + + code = data.code; + // 剔除不显示的车 + // 找到对应列车 + if ( trainmodel) { + + trainmodel.driveMode = data.driveMode; + trainmodel.status = data.right; + // 车门开关验证 + + + // 遍历获取所在轨道 + if (trainmodel.dispose != data.dispose && data.dispose == "0") { + if (rails.sectionrail[data.sectionCode]) { + + trainlisttest.group.add(trainmodel); + trainmodel.position.y = 0; + // trainmodel.progress = 0; + trainmodel.dispose = "0"; + trainmodel.nowcode = data.sectionCode; + trainmodel.nextcode = null; + trainmodel.curve = null; trainmodel.nextcurve = null; - trainmodel.pc = 1; + trainmodel.pc = 1; - if (trainmodel.mixerpush == false) { - for (let mi = 0, lenmi = trainmodel.mixer.length; mi < lenmi; mi++) { - jlmap3d.mixers.push(trainmodel.mixer[mi]); - } - trainmodel.mixerpush = true; - } - } - } else if (trainmodel.dispose != data.dispose && data.dispose == '1') { - trainmodel.status = 1; - trainlisttest.group.remove(trainmodel); - trainmodel.progress = null; - trainmodel.dispose = '1'; - code = trainlisttest.group.children[i].name; - trainmodel.rotation.y = 0; - trainmodel.open = '1'; - trainmodel.curve = null; + if(trainmodel.mixerpush == false){ + for(let mi=0,lenmi=trainmodel.mixer.length;mi { - ////console.log(result); + resolve("loaderassets"); //['成功了', 'success'] }).catch((error) => { //console.log(error); diff --git a/src/jmap/mouseController.js b/src/jmap/mouseController.js index 7cfa6e7ce..f73ee90d0 100644 --- a/src/jmap/mouseController.js +++ b/src/jmap/mouseController.js @@ -1,7 +1,7 @@ import deviceType from './constant/deviceType'; import Eventful from 'zrender/src/mixin/Eventful'; import * as eventTool from 'zrender/src/core/event'; -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; class EventModel { constructor(e) { diff --git a/src/jmap/shape/Section/EMouse.js b/src/jmap/shape/Section/EMouse.js index 850274745..17a26e812 100644 --- a/src/jmap/shape/Section/EMouse.js +++ b/src/jmap/shape/Section/EMouse.js @@ -2,7 +2,7 @@ import Group from 'zrender/src/container/Group'; import Text from 'zrender/src/graphic/Text'; import Rect from 'zrender/src/graphic/shape/Rect'; // import Vue from 'vue'; -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; class EMouse extends Group { constructor(device, code) { super(); diff --git a/src/jmap/shape/Switch/EMouse.js b/src/jmap/shape/Switch/EMouse.js index 5ae837984..0645e4f5d 100644 --- a/src/jmap/shape/Switch/EMouse.js +++ b/src/jmap/shape/Switch/EMouse.js @@ -1,6 +1,6 @@ import Group from 'zrender/src/container/Group'; import Rect from 'zrender/src/graphic/shape/Rect'; -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; class EMouse extends Group { constructor(device) { super(); diff --git a/src/jmap/shape/Train/TrainBody.js b/src/jmap/shape/Train/TrainBody.js index 58596d45f..1d339a3c9 100644 --- a/src/jmap/shape/Train/TrainBody.js +++ b/src/jmap/shape/Train/TrainBody.js @@ -3,7 +3,7 @@ import TrainBodyBox from './TrainBodyBox'; import '../StationStand/EDetain'; import ETextName from '../element/ETextName'; // 名称文字 (共有) import EMouse from './EMouse'; -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; /** 车身*/ export default class TrainBody extends Group { diff --git a/src/jmap/shape/TrainWindow/index.js b/src/jmap/shape/TrainWindow/index.js index e432ffdcb..3403d39df 100644 --- a/src/jmap/shape/TrainWindow/index.js +++ b/src/jmap/shape/TrainWindow/index.js @@ -2,7 +2,7 @@ import Polygon from 'zrender/src/graphic/shape/Polygon'; import Group from 'zrender/src/container/Group'; import EMouse from './EMouse'; -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; class TrainWindow extends Group { constructor(model, style) { diff --git a/src/jmap/theme/batong_01/menus/utils/menuItemStatus.js b/src/jmap/theme/batong_01/menus/utils/menuItemStatus.js index f5f5a3ad1..dd467c4e8 100644 --- a/src/jmap/theme/batong_01/menus/utils/menuItemStatus.js +++ b/src/jmap/theme/batong_01/menus/utils/menuItemStatus.js @@ -1,4 +1,4 @@ -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; import deviceState from '@/jmap/constant/deviceState'; import { OperateMode } from '@/scripts/ConstDic'; diff --git a/src/jmap/theme/beijing_01/menus/utils/menuItemStatus.js b/src/jmap/theme/beijing_01/menus/utils/menuItemStatus.js index dada7aa32..9778d96b3 100644 --- a/src/jmap/theme/beijing_01/menus/utils/menuItemStatus.js +++ b/src/jmap/theme/beijing_01/menus/utils/menuItemStatus.js @@ -1,5 +1,5 @@ import Vue from 'vue'; -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; import deviceState from '@/jmap/constant/deviceState'; import { OperateMode } from '@/scripts/ConstDic'; diff --git a/src/jmap/theme/chengdu_03/menus/utils/menuItemStatus.js b/src/jmap/theme/chengdu_03/menus/utils/menuItemStatus.js index c1f62d7f4..3b5e29d01 100644 --- a/src/jmap/theme/chengdu_03/menus/utils/menuItemStatus.js +++ b/src/jmap/theme/chengdu_03/menus/utils/menuItemStatus.js @@ -1,4 +1,4 @@ -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; import deviceState from '@/jmap/constant/deviceState'; import { OperateMode } from '@/scripts/ConstDic'; diff --git a/src/jmap/theme/chengdu_04/menus/utils/menuItemStatus.js b/src/jmap/theme/chengdu_04/menus/utils/menuItemStatus.js index 44d3cbb9a..cf14bd2b0 100644 --- a/src/jmap/theme/chengdu_04/menus/utils/menuItemStatus.js +++ b/src/jmap/theme/chengdu_04/menus/utils/menuItemStatus.js @@ -1,4 +1,4 @@ -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; import deviceState from '@/jmap/constant/deviceState'; import { OperateMode } from '@/scripts/ConstDic'; diff --git a/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js b/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js index 230fc7be0..c41559f8c 100644 --- a/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js +++ b/src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js @@ -1,4 +1,4 @@ -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; import deviceState from '@/jmap/constant/deviceState'; import { OperateMode } from '@/scripts/ConstDic'; diff --git a/src/jmapNew/config/skinCode/bejing_01.js b/src/jmapNew/config/skinCode/bejing_01.js index c7672c88e..7ba21df8a 100644 --- a/src/jmapNew/config/skinCode/bejing_01.js +++ b/src/jmapNew/config/skinCode/bejing_01.js @@ -285,7 +285,7 @@ class SkinCode extends defaultStyle { fontWeight: 'normal' }, stopTime: { // 停站时间 - offset: { x: -8, y: 3 }, // 运行时间偏移量 + offset: { x: -40, y: 10 }, // 运行时间偏移量 textColor: '#FFFFFF', // 停站时间字体颜色 textFontSize: 8 }, diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js index 64d5aefae..c1bec15a9 100644 --- a/src/jmapNew/config/skinCode/chengdu_03.js +++ b/src/jmapNew/config/skinCode/chengdu_03.js @@ -240,8 +240,8 @@ class SkinCode extends defaultStyle { fontWeight: 'normal' }, stopTime: { // 停站时间 - offset: {x: -8, y: -4}, // 运行时间偏移量 - textColor: '#C0C0C0', // 停站时间字体颜色 + offset: {x: -50, y: 10}, // 运行时间偏移量 + textColor: '#FFFFFF', // 停站时间字体颜色 textFontSize: 10 }, jump: { diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js index 9f3106465..d05a0e75c 100644 --- a/src/jmapNew/config/skinCode/ningbo_01.js +++ b/src/jmapNew/config/skinCode/ningbo_01.js @@ -338,7 +338,7 @@ class SkinCode extends defaultStyle { fontWeight: 'normal' }, stopTime: { // 停站时间 - offset: { x: -8, y: -4 }, // 运行时间偏移量 + offset: { x: -40, y: -5 }, // 运行时间偏移量 textColor: 'white', // 停站时间字体颜色 textFontSize: 10 // 停站时间字体大小 }, diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js index 738a66aa2..aad226366 100644 --- a/src/jmapNew/map.js +++ b/src/jmapNew/map.js @@ -10,7 +10,7 @@ import deviceType from './constant/deviceType'; import { selectLineCode } from './config/deviceStyle'; import { deviceFactory, createBoundingRect, calculateDCenter } from './utils/parser'; import { deepAssign } from '@/utils/index'; -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; const renderer = 'canvas'; const devicePixelRatio = 1; @@ -371,6 +371,10 @@ class Jlmap { this.$painter.update(oDevice); } } else { + if (elem.deviceType === 'TRAIN') { + store.dispatch('map/updateTrainState', elem); + store.dispatch('map/setTrainListUpdate', elem); + } const oDevice = this.mapDevice[code] || deviceFactory(type, elem, this.showConfig); if (elem.dispose) { this.$painter.delete(oDevice); diff --git a/src/jmapNew/mouseController.js b/src/jmapNew/mouseController.js index e9e12645c..de4a2928d 100644 --- a/src/jmapNew/mouseController.js +++ b/src/jmapNew/mouseController.js @@ -1,7 +1,7 @@ import deviceType from './constant/deviceType'; import Eventful from 'zrender/src/mixin/Eventful'; import * as eventTool from 'zrender/src/core/event'; -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; class EventModel { constructor(e) { diff --git a/src/jmapNew/shape/Section/EMouse.js b/src/jmapNew/shape/Section/EMouse.js index 77ae6aa67..c3f8c6ae7 100644 --- a/src/jmapNew/shape/Section/EMouse.js +++ b/src/jmapNew/shape/Section/EMouse.js @@ -1,7 +1,7 @@ import Group from 'zrender/src/container/Group'; import Text from 'zrender/src/graphic/Text'; import Rect from 'zrender/src/graphic/shape/Rect'; -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; class EMouse extends Group { constructor(device, code) { super(); diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js index 8438efdf9..945584221 100644 --- a/src/jmapNew/shape/Section/index.js +++ b/src/jmapNew/shape/Section/index.js @@ -11,7 +11,7 @@ import { EBackArrow, EBackArrowTriangle } from './EBackArrow'; // 折返进路 import ELimitName from './ELimitName'; // 成都三号线 限速名称 import JTriangle from '../../utils/JTriangle'; import { drawSectionStyle } from '../../config/defaultStyle'; -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; import Vue from 'vue'; /** 区段*/ diff --git a/src/jmapNew/shape/Switch/EMouse.js b/src/jmapNew/shape/Switch/EMouse.js index 5185dd030..e49fad194 100644 --- a/src/jmapNew/shape/Switch/EMouse.js +++ b/src/jmapNew/shape/Switch/EMouse.js @@ -1,6 +1,6 @@ import Group from 'zrender/src/container/Group'; import Rect from 'zrender/src/graphic/shape/Rect'; -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; class EMouse extends Group { constructor(device) { super(); diff --git a/src/jmapNew/shape/Switch/index.js b/src/jmapNew/shape/Switch/index.js index df3ebe68e..760cdda04 100644 --- a/src/jmapNew/shape/Switch/index.js +++ b/src/jmapNew/shape/Switch/index.js @@ -13,7 +13,7 @@ import EMouse from './EMouse'; import EHighlight from '../element/EHighlight'; import ERhomboid from './ERhomboid'; import ETriangle from './ETriangle'; -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; import Vue from 'vue'; export default class Switch extends Group { diff --git a/src/jmapNew/shape/Train/EDirection.js b/src/jmapNew/shape/Train/EDirection.js index aee22e8f5..0cb36290e 100644 --- a/src/jmapNew/shape/Train/EDirection.js +++ b/src/jmapNew/shape/Train/EDirection.js @@ -36,18 +36,6 @@ class EDirection extends Group { this.create(); this.arrow.setStyle('fill', color); } - - // 隐藏 - hide() { - this.create(); - this.arrow.hide(); - } - - // 显示 - show() { - this.create(); - this.arrow.show(); - } } export default EDirection; diff --git a/src/jmapNew/shape/Train/TrainBody.js b/src/jmapNew/shape/Train/TrainBody.js index b24973c8c..4c504a250 100644 --- a/src/jmapNew/shape/Train/TrainBody.js +++ b/src/jmapNew/shape/Train/TrainBody.js @@ -3,7 +3,7 @@ import TrainBodyBox from './TrainBodyBox'; import '../StationStand/EDetain'; import ETextName from '../element/ETextName'; // 名称文字 (共有) import EMouse from './EMouse'; -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; import Circle from 'zrender/src/graphic/shape/Circle'; import BoundingRect from 'zrender/src/core/BoundingRect'; diff --git a/src/jmapNew/shape/Train/index.js b/src/jmapNew/shape/Train/index.js index 600c6a838..891a6cd3d 100644 --- a/src/jmapNew/shape/Train/index.js +++ b/src/jmapNew/shape/Train/index.js @@ -4,7 +4,7 @@ import TrainBody from './TrainBody'; import BoundingRect from 'zrender/src/core/BoundingRect'; import Rect from 'zrender/src/graphic/shape/Rect'; import ETriangle from '../Train/ETriangle'; -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; import EDirection from './EDirection'; /** 列车 */ diff --git a/src/jmapNew/shape/TrainWindow/index.js b/src/jmapNew/shape/TrainWindow/index.js index 860844258..e8209aeea 100644 --- a/src/jmapNew/shape/TrainWindow/index.js +++ b/src/jmapNew/shape/TrainWindow/index.js @@ -2,7 +2,7 @@ import Polygon from 'zrender/src/graphic/shape/Polygon'; import Group from 'zrender/src/container/Group'; import EMouse from './EMouse'; -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; class TrainWindow extends Group { constructor(model, style) { diff --git a/src/jmapNew/theme/beijing_01/menus/menuButton.vue b/src/jmapNew/theme/beijing_01/menus/menuButton.vue index 548fedefb..6cd39b79d 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuButton.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuButton.vue @@ -444,33 +444,6 @@ export default { Handler.clear(); this.$store.dispatch('menuOperation/setButtonOperation', null); } - - // 按钮按下时 - // if (this.$store.state.menuOperation.buttonOperation) { - // const model = this.$store.state.menuOperation.selected; - // if (model && model._type) { - // // const deviceType = MapDeviceType[model._type]; - // const operate = { - // send: true, - // model: model, - // code: model.code, - // // type: deviceType.type, - // operation: this.$store.state.menuOperation.buttonOperation, - // tempData: this.tempData - // }; - - // this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => { - // if (valid) { - // if (response) { - // this.tempData = response.data; - // } - // } - // }); - // } else { - // Handler.clear(); - // this.$store.dispatch('menuOperation/setButtonOperation', null); - // } - // } } } }; diff --git a/src/jmapNew/theme/beijing_01/menus/utils/menuItemStatus.js b/src/jmapNew/theme/beijing_01/menus/utils/menuItemStatus.js index dada7aa32..9778d96b3 100644 --- a/src/jmapNew/theme/beijing_01/menus/utils/menuItemStatus.js +++ b/src/jmapNew/theme/beijing_01/menus/utils/menuItemStatus.js @@ -1,5 +1,5 @@ import Vue from 'vue'; -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; import deviceState from '@/jmap/constant/deviceState'; import { OperateMode } from '@/scripts/ConstDic'; diff --git a/src/jmapNew/theme/beijing_01/menus/utils/menuOperate.js b/src/jmapNew/theme/beijing_01/menus/utils/menuOperate.js index a4f519a67..c8a60f23d 100644 --- a/src/jmapNew/theme/beijing_01/menus/utils/menuOperate.js +++ b/src/jmapNew/theme/beijing_01/menus/utils/menuOperate.js @@ -1,4 +1,4 @@ -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; diff --git a/src/jmapNew/theme/chengdu_01/menus/utils/menuItemStatus.js b/src/jmapNew/theme/chengdu_01/menus/utils/menuItemStatus.js index bb63524dd..d4170dc30 100644 --- a/src/jmapNew/theme/chengdu_01/menus/utils/menuItemStatus.js +++ b/src/jmapNew/theme/chengdu_01/menus/utils/menuItemStatus.js @@ -1,4 +1,4 @@ -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; import deviceState from '@/jmap/constant/deviceState'; import { OperateMode } from '@/scripts/ConstDic'; diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue index 89a553807..0d2540d23 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue @@ -32,32 +32,32 @@ :height="140" > - + - + - + - + @@ -93,7 +93,8 @@ export default { selected: null, tempData: [], stationName: '', - signalName: '' + signalName: '', + domIdChoose: '' }; }, computed: { diff --git a/src/jmapNew/theme/chengdu_03/menus/utils/menuItemStatus.js b/src/jmapNew/theme/chengdu_03/menus/utils/menuItemStatus.js index bb63524dd..d4170dc30 100644 --- a/src/jmapNew/theme/chengdu_03/menus/utils/menuItemStatus.js +++ b/src/jmapNew/theme/chengdu_03/menus/utils/menuItemStatus.js @@ -1,4 +1,4 @@ -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; import deviceState from '@/jmap/constant/deviceState'; import { OperateMode } from '@/scripts/ConstDic'; diff --git a/src/jmapNew/theme/chengdu_03/planSchedule/index.vue b/src/jmapNew/theme/chengdu_03/planSchedule/index.vue index 696eed1e0..83cd8f1e3 100644 --- a/src/jmapNew/theme/chengdu_03/planSchedule/index.vue +++ b/src/jmapNew/theme/chengdu_03/planSchedule/index.vue @@ -51,6 +51,7 @@ export default { }, data() { return { + lineCode: '' }; }, computed: { diff --git a/src/jmapNew/theme/foshan_01/menus/menuSection.vue b/src/jmapNew/theme/foshan_01/menus/menuSection.vue index 1da696f0f..9982b12aa 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuSection.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuSection.vue @@ -16,7 +16,6 @@ import SpeedLimitControl from './dialog/speedLimitControl'; import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'; import { mapGetters } from 'vuex'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; -import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; import {menuOperate, commitOperate} from './utils/menuOperate'; diff --git a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue index 360080e9a..830957023 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue @@ -29,7 +29,6 @@ import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import {menuOperate, commitOperate} from './utils/menuOperate'; -// import { querySignalStatus } from '@/api/simulation'; export default { name: 'SignalMenu', diff --git a/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue b/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue index f0e819add..a9b8bfbec 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue @@ -22,7 +22,6 @@ import StandRunLevel from './dialog/standRunLevel'; import StandStopTime from './dialog/standStopTime'; import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'; import StandDetainTrainAll from './dialog/standDetainTrainAll'; -// import Handler from '@/scripts/cmdPlugin/Handler'; import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; diff --git a/src/jmapNew/theme/foshan_01/menus/utils/menuItemStatus.js b/src/jmapNew/theme/foshan_01/menus/utils/menuItemStatus.js index dada7aa32..9778d96b3 100644 --- a/src/jmapNew/theme/foshan_01/menus/utils/menuItemStatus.js +++ b/src/jmapNew/theme/foshan_01/menus/utils/menuItemStatus.js @@ -1,5 +1,5 @@ import Vue from 'vue'; -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; import deviceState from '@/jmap/constant/deviceState'; import { OperateMode } from '@/scripts/ConstDic'; diff --git a/src/jmapNew/theme/foshan_01/menus/utils/menuOperate.js b/src/jmapNew/theme/foshan_01/menus/utils/menuOperate.js index 030a78876..abaeb2ea0 100644 --- a/src/jmapNew/theme/foshan_01/menus/utils/menuOperate.js +++ b/src/jmapNew/theme/foshan_01/menus/utils/menuOperate.js @@ -1,4 +1,4 @@ -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; diff --git a/src/jmapNew/theme/fuzhou_01/menus/utils/menuItemStatus.js b/src/jmapNew/theme/fuzhou_01/menus/utils/menuItemStatus.js index bd43672d1..6263f872b 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/utils/menuItemStatus.js +++ b/src/jmapNew/theme/fuzhou_01/menus/utils/menuItemStatus.js @@ -1,4 +1,4 @@ -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; import deviceState from '@/jmap/constant/deviceState'; import { OperateMode } from '@/scripts/ConstDic'; diff --git a/src/jmapNew/theme/haerbin_01/menus/utils/menuItemStatus.js b/src/jmapNew/theme/haerbin_01/menus/utils/menuItemStatus.js index bd43672d1..6263f872b 100644 --- a/src/jmapNew/theme/haerbin_01/menus/utils/menuItemStatus.js +++ b/src/jmapNew/theme/haerbin_01/menus/utils/menuItemStatus.js @@ -1,4 +1,4 @@ -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; import deviceState from '@/jmap/constant/deviceState'; import { OperateMode } from '@/scripts/ConstDic'; diff --git a/src/jmapNew/theme/ningbo_01/menus/utils/menuItemStatus.js b/src/jmapNew/theme/ningbo_01/menus/utils/menuItemStatus.js index dada7aa32..9778d96b3 100644 --- a/src/jmapNew/theme/ningbo_01/menus/utils/menuItemStatus.js +++ b/src/jmapNew/theme/ningbo_01/menus/utils/menuItemStatus.js @@ -1,5 +1,5 @@ import Vue from 'vue'; -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; import deviceState from '@/jmap/constant/deviceState'; import { OperateMode } from '@/scripts/ConstDic'; diff --git a/src/jmapNew/theme/ningbo_01/menus/utils/menuOperate.js b/src/jmapNew/theme/ningbo_01/menus/utils/menuOperate.js index 10e10f8f1..5dcae4248 100644 --- a/src/jmapNew/theme/ningbo_01/menus/utils/menuOperate.js +++ b/src/jmapNew/theme/ningbo_01/menus/utils/menuOperate.js @@ -1,4 +1,4 @@ -import store from '@/store'; +import store from '@/store/index_APP_TARGET'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; diff --git a/src/layout/components/Entry.vue b/src/layout/components/Entry.vue index 8aef0b114..885311959 100644 --- a/src/layout/components/Entry.vue +++ b/src/layout/components/Entry.vue @@ -23,14 +23,14 @@ {{ $t(item.name) }} - + + + diff --git a/src/views/jlmap3d/drive/drivecontrol/centerpane.vue b/src/views/jlmap3d/drive/drivecontrol/centerpane.vue new file mode 100644 index 000000000..7487fc01c --- /dev/null +++ b/src/views/jlmap3d/drive/drivecontrol/centerpane.vue @@ -0,0 +1,411 @@ + + + + + diff --git a/src/views/jlmap3d/drive/drivecontrol/dirvespee.js b/src/views/jlmap3d/drive/drivecontrol/dirvespee.js new file mode 100644 index 000000000..e69de29bb diff --git a/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue b/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue new file mode 100644 index 000000000..f83538e48 --- /dev/null +++ b/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue @@ -0,0 +1,230 @@ + + + + + diff --git a/src/views/jlmap3d/drive/drivecontrol/leftpane.vue b/src/views/jlmap3d/drive/drivecontrol/leftpane.vue new file mode 100644 index 000000000..651e8c777 --- /dev/null +++ b/src/views/jlmap3d/drive/drivecontrol/leftpane.vue @@ -0,0 +1,425 @@ + + + + + diff --git a/src/views/jlmap3d/drive/drivecontrol/rightpane.vue b/src/views/jlmap3d/drive/drivecontrol/rightpane.vue new file mode 100644 index 000000000..192c6cb7f --- /dev/null +++ b/src/views/jlmap3d/drive/drivecontrol/rightpane.vue @@ -0,0 +1,338 @@ + + + + + diff --git a/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue b/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue new file mode 100644 index 000000000..96484fbee --- /dev/null +++ b/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue @@ -0,0 +1,225 @@ + + + + + diff --git a/src/views/jlmap3d/drive/jl3ddrive.vue b/src/views/jlmap3d/drive/jl3ddrive.vue index b5472aaf6..04bfbaeab 100644 --- a/src/views/jlmap3d/drive/jl3ddrive.vue +++ b/src/views/jlmap3d/drive/jl3ddrive.vue @@ -27,7 +27,7 @@ - + @@ -51,13 +51,14 @@ import { JLmapDriving } from '@/jlmap3d/jl3ddrive/jl3ddrive'; import DriveMmi from '@/views/jlmap3d/drive/sceneview/mmiview'; import DriveTms from '@/views/jlmap3d/drive/sceneview/tmsview'; - +import DriveControl from '@/views/jlmap3d/drive/drivecontrol/drivecontrol'; var train; export default { name: 'Jl3dDrive', components: { DriveMmi, - DriveTms + DriveTms, + DriveControl }, data() { return { @@ -77,7 +78,8 @@ export default { mmishow: false, showbuttonmsg: this.$t('jlmap3d.trainInstrumentationDisplay'), trainnum: '', - stoptimes: '' + stoptimes: '', + dcontrolshow: false, }; }, watch: { @@ -154,7 +156,7 @@ export default { mounted() { this.mmishow = true; - + window.datanew = this.datanew; // this.$refs.mmiui.init(); }, methods: { @@ -236,6 +238,9 @@ export default { } }, + datanew(){ + this.dcontrolshow = true; + }, cctvplane() { if (this.cctvshow == true) { this.cctvbuttonmsg = this.$t('jlmap3d.surveillanceHidden'); diff --git a/src/views/jlmap3d/drive/sceneview/mmiview.vue b/src/views/jlmap3d/drive/sceneview/mmiview.vue index 7fa5801ce..814a6417b 100644 --- a/src/views/jlmap3d/drive/sceneview/mmiview.vue +++ b/src/views/jlmap3d/drive/sceneview/mmiview.vue @@ -341,7 +341,7 @@ export default { height:333px; background: black; position:absolute; - bottom:0; + bottom:160px; } .meter{ width:60%; diff --git a/src/views/jlmap3d/drive/sceneview/tmsview.vue b/src/views/jlmap3d/drive/sceneview/tmsview.vue index 24c305d47..cd2382218 100644 --- a/src/views/jlmap3d/drive/sceneview/tmsview.vue +++ b/src/views/jlmap3d/drive/sceneview/tmsview.vue @@ -47,7 +47,7 @@ export default { background-size:100% 100%; background-image:url('/static/jl3d/tms.png'); position:absolute; - bottom:0; + bottom:160px; right:0; } diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue index efcf66ac5..63a4e78c9 100644 --- a/src/views/newMap/displayNew/index.vue +++ b/src/views/newMap/displayNew/index.vue @@ -25,6 +25,8 @@ + + 现地 @@ -326,6 +330,9 @@ export default { } }); }, + setCenter(code) { + this.$refs.mapCanvas.setCenter(code); + }, // 结束加载状态 endViewLoading(isSuccess) { if (!isSuccess) { @@ -507,14 +514,14 @@ export default { window.open(routeData.href, '_blank', 'noopener noreferrer'); } }, - passflow(){ - const routeData = this.$router.resolve({ - path:'/jlmap3d/passengerflow', - query:{ - mapid:this.mapId, - } - }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + passflow() { + const routeData = this.$router.resolve({ + path:'/jlmap3d/passengerflow', + query:{ + mapid:this.mapId + } + }); + window.open(routeData.href, '_blank', 'noopener noreferrer'); }, devicemodel() { if (this.deviceShow == false) { diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue index 528c4b06a..dc9862965 100644 --- a/src/views/newMap/displayNew/menuDemon.vue +++ b/src/views/newMap/displayNew/menuDemon.vue @@ -162,6 +162,7 @@ export default { } ranAsPlan(data, this.group).then(res => { this.$store.dispatch('training/simulationStart').then(() => { + this.$store.dispatch('map/setRunPlanStatus', true); this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${model.initTime}`)); }); }).catch(error => { @@ -194,6 +195,7 @@ export default { exitRunPlan(this.group).then(() => { this.$store.dispatch('training/over').then(() => { this.$store.dispatch('training/setMapDefaultState').then(() => { + this.$store.dispatch('map/setRunPlanStatus', false); this.$store.dispatch('map/clearJlmapTrainView'); this.$store.dispatch('map/setTrainWindowShow', false); }); @@ -218,7 +220,7 @@ export default { Notification.closeAll(); }); }, - jumpjl3dpassflow(){ + jumpjl3dpassflow() { this.$emit('passflow'); }, jumpjlmap3d() { diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue index 4ee53e07e..db1df16b0 100644 --- a/src/views/newMap/displayNew/menuSchema.vue +++ b/src/views/newMap/displayNew/menuSchema.vue @@ -64,7 +64,7 @@ export default { } }, stationList: { - type: Object, + type: Array, default() { return []; } diff --git a/src/views/newMap/displayNew/menuTrainList.vue b/src/views/newMap/displayNew/menuTrainList.vue new file mode 100644 index 000000000..30c5769a9 --- /dev/null +++ b/src/views/newMap/displayNew/menuTrainList.vue @@ -0,0 +1,136 @@ + + + diff --git a/src/views/newMap/jlmapNew/pendant/switchStation.vue b/src/views/newMap/jlmapNew/pendant/switchStation.vue index 7924a4084..99fa14001 100644 --- a/src/views/newMap/jlmapNew/pendant/switchStation.vue +++ b/src/views/newMap/jlmapNew/pendant/switchStation.vue @@ -10,7 +10,7 @@ export default { name: 'SwitchStation', props: { concentrationStationList: { - type: String, + type: Array, default() { return []; } diff --git a/src/views/newMap/mapsystemNew/common/index.vue b/src/views/newMap/mapsystemNew/common/index.vue index b261d2f3f..5666aade2 100644 --- a/src/views/newMap/mapsystemNew/common/index.vue +++ b/src/views/newMap/mapsystemNew/common/index.vue @@ -167,6 +167,9 @@ export default { }, setShowStation(stationCode) { this.$refs.jlmapVisual && this.$refs.jlmapVisual.setShowStation(stationCode); + }, + setCenter(code) { + this.$refs.jlmapVisual && this.$refs.jlmapVisual.setCenter(code); } } }; diff --git a/src/views/newMap/mapsystemNew/index.vue b/src/views/newMap/mapsystemNew/index.vue index 1485f929f..05572f187 100644 --- a/src/views/newMap/mapsystemNew/index.vue +++ b/src/views/newMap/mapsystemNew/index.vue @@ -114,6 +114,9 @@ export default { setShowStation(stationCode) { this.$refs.mapCommon && this.$refs.mapCommon.setShowStation(stationCode); }, + setCenter(code) { + this.$refs.mapCommon && this.$refs.mapCommon.setCenter(code); + }, sendDeviceChangeEvent(data, header) { // 发送设备操作事件到服务器 sendCommand('', data).then(response => { diff --git a/src/views/trainRoom/e-roles.vue b/src/views/trainRoom/e-roles.vue index 29ff52ca7..546079d8b 100644 --- a/src/views/trainRoom/e-roles.vue +++ b/src/views/trainRoom/e-roles.vue @@ -92,7 +92,8 @@
{{ $t('trainRoom.destroyRoom') }} - {{ $t('trainRoom.generatingQRCode') }} + {{ $t('trainRoom.generatingQRCode') }} + {{ $t('trainRoom.getGroupId') }} @@ -169,6 +170,9 @@ export default { isXtyProject() { return getSessionStorage('project').endsWith('xty'); }, + isLocal() { + return process.env.VUE_APP_PRO === 'local'; + }, group() { return this.$route.query.group; }, @@ -436,6 +440,9 @@ export default { this.disabled = false; }); }, + handleGetGroup() { + this.$messageBox(this.group, this.$t('trainRoom.groupId'), 'success'); + }, async handleBack() { try { this.disabled = true; diff --git a/static/jl3d/control/aircom.png b/static/jl3d/control/aircom.png new file mode 100644 index 000000000..2a5579e22 Binary files /dev/null and b/static/jl3d/control/aircom.png differ diff --git a/static/jl3d/control/atp.png b/static/jl3d/control/atp.png new file mode 100644 index 000000000..5c0ff75f0 Binary files /dev/null and b/static/jl3d/control/atp.png differ diff --git a/static/jl3d/control/direct.png b/static/jl3d/control/direct.png new file mode 100644 index 000000000..3072ee398 Binary files /dev/null and b/static/jl3d/control/direct.png differ diff --git a/static/jl3d/control/directoff.png b/static/jl3d/control/directoff.png new file mode 100644 index 000000000..b2a2d9f19 Binary files /dev/null and b/static/jl3d/control/directoff.png differ diff --git a/static/jl3d/control/gray.png b/static/jl3d/control/gray.png new file mode 100644 index 000000000..c3761a5b8 Binary files /dev/null and b/static/jl3d/control/gray.png differ diff --git a/static/jl3d/control/green.png b/static/jl3d/control/green.png new file mode 100644 index 000000000..f8cf00d99 Binary files /dev/null and b/static/jl3d/control/green.png differ diff --git a/static/jl3d/control/greenl.png b/static/jl3d/control/greenl.png new file mode 100644 index 000000000..e5230a421 Binary files /dev/null and b/static/jl3d/control/greenl.png differ diff --git a/static/jl3d/control/greenz.png b/static/jl3d/control/greenz.png new file mode 100644 index 000000000..b16f53d4f Binary files /dev/null and b/static/jl3d/control/greenz.png differ diff --git a/static/jl3d/control/jiantou.png b/static/jl3d/control/jiantou.png new file mode 100644 index 000000000..4fdc340b7 Binary files /dev/null and b/static/jl3d/control/jiantou.png differ diff --git a/static/jl3d/control/lg.png b/static/jl3d/control/lg.png new file mode 100644 index 000000000..6d92db4c2 Binary files /dev/null and b/static/jl3d/control/lg.png differ diff --git a/static/jl3d/control/niu.png b/static/jl3d/control/niu.png new file mode 100644 index 000000000..f0e6aee28 Binary files /dev/null and b/static/jl3d/control/niu.png differ diff --git a/static/jl3d/control/pane.png b/static/jl3d/control/pane.png new file mode 100644 index 000000000..08db01723 Binary files /dev/null and b/static/jl3d/control/pane.png differ diff --git a/static/jl3d/control/red.png b/static/jl3d/control/red.png new file mode 100644 index 000000000..d60e21827 Binary files /dev/null and b/static/jl3d/control/red.png differ diff --git a/static/jl3d/control/redl.png b/static/jl3d/control/redl.png new file mode 100644 index 000000000..d5a6170c4 Binary files /dev/null and b/static/jl3d/control/redl.png differ diff --git a/static/jl3d/control/redz.png b/static/jl3d/control/redz.png new file mode 100644 index 000000000..5061302bd Binary files /dev/null and b/static/jl3d/control/redz.png differ diff --git a/static/jl3d/control/scene.png b/static/jl3d/control/scene.png new file mode 100644 index 000000000..0c7779fd3 Binary files /dev/null and b/static/jl3d/control/scene.png differ diff --git a/static/jl3d/control/start.png b/static/jl3d/control/start.png new file mode 100644 index 000000000..f00217497 Binary files /dev/null and b/static/jl3d/control/start.png differ diff --git a/static/jl3d/control/urgestop.png b/static/jl3d/control/urgestop.png new file mode 100644 index 000000000..4979d61bf Binary files /dev/null and b/static/jl3d/control/urgestop.png differ diff --git a/static/jl3d/control/zuo.png b/static/jl3d/control/zuo.png new file mode 100644 index 000000000..78853e438 Binary files /dev/null and b/static/jl3d/control/zuo.png differ diff --git a/static/jl3d/tms.png b/static/jl3d/tms.png index daa679003..7f748e6c8 100644 Binary files a/static/jl3d/tms.png and b/static/jl3d/tms.png differ diff --git a/static/model/station/fuzhou.FBX b/static/model/station/fuzhou.FBX index d1d35f975..cc261796d 100644 Binary files a/static/model/station/fuzhou.FBX and b/static/model/station/fuzhou.FBX differ diff --git a/static/model/station/fuzhoufuzhou.FBX b/static/model/station/fuzhoufuzhou.FBX deleted file mode 100644 index c66b39de0..000000000 Binary files a/static/model/station/fuzhoufuzhou.FBX and /dev/null differ diff --git a/static/model/station/fuzhouold.FBX b/static/model/station/fuzhouold.FBX new file mode 100644 index 000000000..d1d35f975 Binary files /dev/null and b/static/model/station/fuzhouold.FBX differ diff --git a/static/model/station/waicestation.FBX b/static/model/station/waicestation.FBX index b3a10aff6..1e9b07944 100644 Binary files a/static/model/station/waicestation.FBX and b/static/model/station/waicestation.FBX differ diff --git a/vue.config.js b/vue.config.js index 561d92480..2fe40badc 100644 --- a/vue.config.js +++ b/vue.config.js @@ -86,6 +86,16 @@ module.exports = { // // 为开发环境修改配置... // config.mode = 'development'; // } + // if (process.env.NODE_ENV !== 'development') { + // config.plugins.push(new CompressionPlugin({ + // filename: '[path].gz[query]', + // algorithm: 'gzip', + // test:/\.js$|\.html$|.\css/, // 匹配文件名 + // threshold: 10240, // 对超过10k的数据压缩 + // minRatio: 0.8, // 只有压缩好这个比率的资产才能被处理 + // deleteOriginalAssets: true + // })); + // } config.name = name; config.resolve = { extensions: ['.js', '.vue', '.json'], @@ -93,9 +103,7 @@ module.exports = { '@': path.resolve('src') } }; - // var appTarget = 'Common'; - // var appTarget = 'HYD';// 哈尔滨项目打包 - var appTarget = process.env.NODE_ENV === 'Local' ? 'HYD' : 'Common'; + const appTarget = process.env.NODE_ENV === 'Local' || process.env.VUE_APP_PRO === 'local' ? 'HYD' : 'Common'; config.plugins.push(new webpack.NormalModuleReplacementPlugin(/(.*)_APP_TARGET(\.*)/, function (resourse) { resourse.request = resourse.request.replace(/APP_TARGET/, `${appTarget}`); @@ -108,8 +116,7 @@ module.exports = { ignore: ['.*'] } ])); - - config.externals = { // 配置使用CDN + const externalsConfig = { 'vue': 'Vue', 'vuex': 'Vuex', 'vue-router': 'VueRouter', @@ -117,7 +124,7 @@ module.exports = { 'echarts': 'echarts', 'element-ui': 'ELEMENT' }; - + config.externals = process.env.NODE_ENV === 'Local' || process.env.VUE_APP_PRO === 'local' ? {} : externalsConfig; // 配置CDN使用 }, // webpack配置 chainWebpack(config) {