Merge branch 'test'
1
.gitignore
vendored
@ -6,7 +6,6 @@ yarn-debug.log*
|
||||
yarn-error.log*
|
||||
package-lock.json
|
||||
tests/**/coverage/
|
||||
src/utils/baseUrl.js
|
||||
|
||||
# Editor directories and files
|
||||
.idea
|
||||
|
@ -85,8 +85,3 @@
|
||||
"not ie <= 8"
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
@ -902,7 +902,7 @@ export function SectionList() {
|
||||
|
||||
// console.log(sectiondata[i]);
|
||||
// console.log(testmesh2);
|
||||
console.log(newsection);
|
||||
// console.log(newsection);
|
||||
testmesh2.geometry = newrail;
|
||||
testmesh2.geometry.attributes.position.needsUpdate = true;
|
||||
testmesh2.geometry.attributes.uv.needsUpdate = true;
|
||||
|
@ -181,6 +181,7 @@ export function StationStandList() {
|
||||
if(jlmapstanddata[j].inside == true){
|
||||
newstationmesh = assetloader.modellist[num].mesh.clone(true);
|
||||
}else{
|
||||
console.log(jlmapstanddata[j]);
|
||||
newstationmesh = assetloader.modellist[num2].mesh.clone(true);
|
||||
}
|
||||
// console.log(jlmapstanddata[j]);
|
||||
@ -190,7 +191,6 @@ export function StationStandList() {
|
||||
newstationstand.direction1.name = standsdata[i].direction1.name;
|
||||
newstationstand.direction2.code = standsdata[i].direction2.code;
|
||||
newstationstand.direction2.name = standsdata[i].direction2.name;
|
||||
console.log(standsdata[i]);
|
||||
// console.log(standsdata[i]);
|
||||
newstationmesh.position.x = standsdata[i].position.x;
|
||||
newstationmesh.position.y = standsdata[i].position.y;
|
||||
|
@ -1,13 +1,13 @@
|
||||
export function Signallightload(lights) {
|
||||
|
||||
|
||||
settexture(lights, "red", 'https://test.joylink.club/oss/wx/signal/1.jpg');
|
||||
settexture(lights, "red", '../../static/model/device/signal/1.jpg');
|
||||
|
||||
settexture(lights, "yellow", 'https://test.joylink.club/oss/wx/signal/2.jpg');
|
||||
settexture(lights, "yellow", '../../static/model/device/signal/2.jpg');
|
||||
|
||||
settexture(lights, "green", 'https://test.joylink.club/oss/wx/signal/3.jpg');
|
||||
settexture(lights, "green", '../../static/model/device/signal/3.jpg');
|
||||
|
||||
settexture(lights, "black", 'https://test.joylink.club/oss/wx/signal/4.jpg');
|
||||
settexture(lights, "black", '../../static/model/device/signal/4.jpg');
|
||||
}
|
||||
|
||||
function settexture(lights, name, textureurl) {
|
||||
|
@ -5,7 +5,7 @@ var Staticmodel = {
|
||||
deviceType: "Switch",
|
||||
type: "fuzhou",
|
||||
picUrl: "",
|
||||
assetUrl: "https://joylink.club/oss/wx/switch/switch.FBX"
|
||||
assetUrl: "./../static/model/device/switch/switch.FBX"
|
||||
},//"https://joylink.club/oss/wx/switch/switch.FBX"
|
||||
//../../static/model/device/switch.FBX
|
||||
Signal: {
|
||||
@ -14,7 +14,7 @@ var Staticmodel = {
|
||||
deviceType: "Signal",
|
||||
type: "low",
|
||||
picUrl: "",
|
||||
assetUrl: "https://joylink.club/oss/wx/signal/signal.FBX"
|
||||
assetUrl: "../../static/model/device/signal/signal.FBX"
|
||||
},
|
||||
stationstand: {
|
||||
id: "3",
|
||||
@ -22,7 +22,7 @@ var Staticmodel = {
|
||||
deviceType: "stationstand",
|
||||
type: "low",
|
||||
picUrl: "",
|
||||
assetUrl: "../../static/model/device/stationstand.FBX"
|
||||
assetUrl: "../../static/model/device/stationstand/stationstand.FBX"
|
||||
//https://joylink.club/oss/wx/stationstand/stationstand.FBX
|
||||
//../../static/model/device/stationstand.FBX
|
||||
|
||||
|
@ -178,6 +178,7 @@ export function Jl3ddeviceNew(dom,group,token) {
|
||||
} else if (data.normalPosition == "1") {
|
||||
scope.modelmanager.switchmodel.normalPosition = "1";
|
||||
scope.modelmanager.switchmodel.action.reset();
|
||||
|
||||
scope.modelmanager.switchmodel.action.time = scope.modelmanager.switchmodel.action._clip.duration;
|
||||
scope.modelmanager.switchmodel.action.timeScale = 1;
|
||||
scope.modelmanager.switchmodel.action.play();
|
||||
@ -201,20 +202,19 @@ export function Jl3ddeviceNew(dom,group,token) {
|
||||
}
|
||||
|
||||
this.updateaction = function (data) {
|
||||
|
||||
if (data.type == "SWITCH") {
|
||||
if (data.normal == "0") {
|
||||
scope.modelmanager.switchmodel.normalPosition = "0";
|
||||
scope.modelmanager.switchmodel.action.reset();
|
||||
scope.modelmanager.switchmodel.action.time = 0;
|
||||
scope.modelmanager.switchmodel.action.timeScale = -1;
|
||||
scope.modelmanager.switchmodel.action.timeScale = 1;
|
||||
scope.modelmanager.switchmodel.action.play();
|
||||
|
||||
} else if (data.normal == "1") {
|
||||
scope.modelmanager.switchmodel.normalPosition = "1";
|
||||
scope.modelmanager.switchmodel.action.reset();
|
||||
scope.modelmanager.switchmodel.action.time = scope.modelmanager.switchmodel.action._clip.duration;
|
||||
scope.modelmanager.switchmodel.action.timeScale = 1;
|
||||
scope.modelmanager.switchmodel.action.timeScale = -1;
|
||||
scope.modelmanager.switchmodel.action.play();
|
||||
|
||||
}
|
||||
@ -271,19 +271,19 @@ export function Jl3ddeviceNew(dom,group,token) {
|
||||
}
|
||||
|
||||
function initstatus(data) {
|
||||
|
||||
if (data._type == "Switch") {
|
||||
if (data.normalPosition == "0") {
|
||||
scope.modelmanager.switchmodel.normalPosition = "0";
|
||||
scope.modelmanager.switchmodel.action.reset();
|
||||
scope.modelmanager.switchmodel.action.time = 0;
|
||||
scope.modelmanager.switchmodel.action.timeScale = -1;
|
||||
scope.modelmanager.switchmodel.action.time = scope.modelmanager.switchmodel.action._clip.duration;
|
||||
scope.modelmanager.switchmodel.action.timeScale = 1;
|
||||
|
||||
scope.modelmanager.switchmodel.action.play();
|
||||
} else if (data.normalPosition == "1") {
|
||||
scope.modelmanager.switchmodel.normalPosition = "1";
|
||||
scope.modelmanager.switchmodel.action.reset();
|
||||
scope.modelmanager.switchmodel.action.time = scope.modelmanager.switchmodel.action._clip.duration;
|
||||
scope.modelmanager.switchmodel.action.timeScale = 1;
|
||||
scope.modelmanager.switchmodel.action.time = 0;
|
||||
scope.modelmanager.switchmodel.action.timeScale = -1;
|
||||
scope.modelmanager.switchmodel.action.play();
|
||||
}
|
||||
}
|
||||
|
@ -102,7 +102,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta
|
||||
return;
|
||||
}
|
||||
if(data.type == "Train_Hmi_3D"){
|
||||
console.log(data.body);
|
||||
// console.log(data.body);
|
||||
trainhmi(data.body);
|
||||
return;
|
||||
}
|
||||
|
@ -90,7 +90,7 @@ var views = [
|
||||
width: 0.5,
|
||||
height: 0.5,
|
||||
background: new THREE.Color( 0.5, 0.5, 0.7 ),
|
||||
eye: [ 3.7, 17, 26 ],
|
||||
eye: [ 3.7, 16, 26 ],
|
||||
up: [3.7, 10 ,16 ],
|
||||
fov: 30
|
||||
},
|
||||
@ -100,7 +100,7 @@ var views = [
|
||||
width: 0.5,
|
||||
height: 0.5,
|
||||
background: new THREE.Color( 0.5, 0.5, 0.7 ),
|
||||
eye: [ 3.7,30,-4 ],
|
||||
eye: [ 3.7,17,-4 ],
|
||||
up: [ 3.7, 10 ,16],
|
||||
fov: 30
|
||||
},
|
||||
@ -120,8 +120,8 @@ var views = [
|
||||
width: 0.5,
|
||||
height: 0.5,
|
||||
background: new THREE.Color( 0.5, 0.7, 0.7 ),
|
||||
eye: [ -1,12,0],
|
||||
up: [-1, 11, 8],
|
||||
eye: [ -7,17,2],
|
||||
up: [-7, 10, 8],
|
||||
fov: 60
|
||||
}
|
||||
];
|
||||
@ -229,6 +229,9 @@ export function Jl3dpassflow(dom) {
|
||||
originhuman1.remove(originhuman1.children[2]);
|
||||
scene.add(rungroup);
|
||||
loadingInstance.close();
|
||||
|
||||
scope.switchrender(false);
|
||||
|
||||
animate();
|
||||
})
|
||||
|
||||
|
@ -77,7 +77,7 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
|
||||
// }
|
||||
if (event.data.type== 'SIGNAL' && signallist) {
|
||||
signalupdate(event.data);
|
||||
console.log(event.data);
|
||||
// console.log(event.data);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -125,7 +125,7 @@ export function DriverLoadNew(data,scope,netdata,mapdata,sectionlist,signallist,
|
||||
backdata.loaderdata(sectionlist,linklist,signallist,stationstandlist,trainlisttest,realsectionlist,rails);
|
||||
scope.Subscribe.updatamap(sectionlist,linklist,signallist,stationstandlist,trainlisttest,realsectionlist,rails,scope.materiallist,scope.actions,scope.sceneload);
|
||||
scope.webwork.postMessage("on");
|
||||
// console.log(stationstandlist);
|
||||
console.log(scene);
|
||||
// updatemenulist(stationstandlist.list,trainlisttest.list);
|
||||
loadingInstance.close();
|
||||
});
|
||||
|
@ -276,6 +276,7 @@ class SkinCode extends defaultStyle {
|
||||
},
|
||||
reentry: {}, // 站台折返策略
|
||||
detainCar: { // 扣车
|
||||
position: -1, // 扣车标识在站台上显示方向
|
||||
text: 'H', // 扣车显示内容
|
||||
offset: { x: -8, y: 13 }, // 扣车偏移量
|
||||
centerTrainColor: '#FFFFFF', // 中心扣车颜色
|
||||
@ -285,7 +286,8 @@ class SkinCode extends defaultStyle {
|
||||
fontWeight: 'normal'
|
||||
},
|
||||
stopTime: { // 停站时间
|
||||
offset: { x: -40, y: 10 }, // 运行时间偏移量
|
||||
position: 1, // 停站时间方向
|
||||
offset: { x: -8, y: 25 }, // 运行时间偏移量
|
||||
textColor: '#FFFFFF', // 停站时间字体颜色
|
||||
textFontSize: 8
|
||||
},
|
||||
|
@ -225,6 +225,7 @@ class SkinCode extends defaultStyle {
|
||||
},
|
||||
reentry: {}, // 站台折返策略
|
||||
detainCar: { // 扣车
|
||||
position: -1, // 扣车标识在站台上显示方向
|
||||
text: 'H', // 扣车显示内容
|
||||
offset: {x: -8, y: 13}, // 扣车偏移量
|
||||
centerTrainColor: 'white', // 中心扣车颜色
|
||||
@ -234,11 +235,13 @@ class SkinCode extends defaultStyle {
|
||||
fontWeight: 'normal'
|
||||
},
|
||||
stopTime: { // 停站时间
|
||||
position: 1, // 停站时间方向
|
||||
offset: {x: -8, y: -4}, // 运行时间偏移量
|
||||
textColor: 'white', // 停站时间字体颜色
|
||||
textFontSize: 12
|
||||
},
|
||||
jump: {
|
||||
position: 1, // 停跳方向
|
||||
text: '跳', // 停跳显示内容
|
||||
offset: {x: -8, y: 10},
|
||||
textColor: '#00ffcc', // 停跳文字颜色
|
||||
|
@ -231,8 +231,9 @@ class SkinCode extends defaultStyle {
|
||||
},
|
||||
reentry: {}, // 站台折返策略
|
||||
detainCar: { // 扣车
|
||||
position: -1, // 扣车标识在站台上显示方向
|
||||
text: '扣', // 扣车显示内容
|
||||
offset: {x: -8, y: 13}, // 扣车偏移量
|
||||
offset: {x: -8, y: 20}, // 扣车偏移量
|
||||
centerTrainColor: '#C0C0C0', // 中心扣车颜色
|
||||
andCenterTrainColor: '#C0C0C0', // 车站+中心扣车颜色
|
||||
detainTrainTextColor: '#E4EF50', // 车站扣除文字颜色
|
||||
@ -240,11 +241,13 @@ class SkinCode extends defaultStyle {
|
||||
fontWeight: 'normal'
|
||||
},
|
||||
stopTime: { // 停站时间
|
||||
offset: {x: -50, y: 10}, // 运行时间偏移量
|
||||
position: -1, // 停站时间方向
|
||||
offset: {x: -8, y: 10}, // 运行时间偏移量
|
||||
textColor: '#FFFFFF', // 停站时间字体颜色
|
||||
textFontSize: 10
|
||||
},
|
||||
jump: {
|
||||
position: 1, // 停跳方向
|
||||
text: '跳', // 停跳显示内容
|
||||
offset: {x: -8, y: 10},
|
||||
textColor: '#00ffcc', // 停跳文字颜色
|
||||
|
@ -220,6 +220,7 @@ class SkinCode extends defaultStyle {
|
||||
},
|
||||
reentry: {}, // 站台折返策略
|
||||
detainCar: { // 扣车
|
||||
position: 1, // 扣车标识在站台上显示方向
|
||||
text: 'H', // 扣车显示内容
|
||||
offset: {x: -8, y: 13}, // 扣车偏移量
|
||||
centerTrainColor: '#FFFFFF', // 中心扣车颜色
|
||||
@ -229,11 +230,13 @@ class SkinCode extends defaultStyle {
|
||||
fontWeight: 'normal'
|
||||
},
|
||||
stopTime: { // 停站时间
|
||||
offset: {x: 37, y: 5}, // 停站时间偏移量
|
||||
position: 1, // 停站时间方向
|
||||
offset: {x: -8, y: 5}, // 停站时间偏移量
|
||||
textColor: '#C0C0C0', // 停站时间字体颜色
|
||||
textFontSize: 11
|
||||
},
|
||||
jump: {
|
||||
position: 1, // 停跳方向
|
||||
text: 'S', // 停跳显示内容
|
||||
offset: {x: -8, y: -5},
|
||||
textColor: '#5376B3', // 停跳文字颜色
|
||||
|
@ -211,7 +211,8 @@ class SkinCode extends defaultStyle {
|
||||
},
|
||||
standEmergent: { // 紧急关闭
|
||||
mergentR: 4, // 站台紧急关闭半径
|
||||
offset: {x: 0, y: 40}, // 站台紧急关闭偏移量
|
||||
insideOffset: { x: 0, y: 25 }, // 内站台紧急关闭偏移量
|
||||
outsideOffset: { x: 0, y: -25 }, // 外站台紧急关闭偏移量
|
||||
closeColor: '#F61107' // 站台紧急关闭颜色
|
||||
},
|
||||
reentry: { // 站台折返策略
|
||||
@ -222,7 +223,7 @@ class SkinCode extends defaultStyle {
|
||||
},
|
||||
detainCar: { // 扣车
|
||||
text: 'H', // 扣车显示内容
|
||||
position: -1, // 扣车方向
|
||||
position: 1, // 扣车方向
|
||||
offset: {x: -8, y: -6}, // 扣车偏移量
|
||||
trainColor: '#E4EF50', // 车站扣车颜色
|
||||
centerTrainColor: '#FFFFFF', // 中心扣车颜色
|
||||
@ -239,6 +240,8 @@ class SkinCode extends defaultStyle {
|
||||
offset: {x: -8, y: 6}, // 运行等级偏移量
|
||||
textColor: '#FFFFFF' // 停站等级字体颜色
|
||||
},
|
||||
trainStop: {}, // 停车标志
|
||||
trainDepart: {}, // 停车计时
|
||||
text: {
|
||||
fontSize: 11, // 字体大小
|
||||
fontWeight: 'normal', // 字体粗细
|
||||
@ -394,8 +397,12 @@ class SkinCode extends defaultStyle {
|
||||
core: {
|
||||
length: 6 // 道岔单边长度
|
||||
},
|
||||
block: { // 道岔封锁配置
|
||||
blockName: 'default' // 默认道岔封锁类型
|
||||
jointImg: { // 道岔 A B C D四元素属性配置
|
||||
trapezoidLength: 8, // 直角梯形元素默认长度
|
||||
block: false, // 联合图形封锁状态
|
||||
flashingColors: '#D600D5', // 联合图形封锁闪烁显示颜色
|
||||
fork: false, // 挤岔专用(如有挤岔操作 变为true)
|
||||
forKColor: 'red' // 挤岔颜色 配合挤岔专用
|
||||
},
|
||||
arcBlcok: { // 圆形封锁图形
|
||||
show: false, // 显示
|
||||
|
@ -227,6 +227,7 @@ class SkinCode extends defaultStyle {
|
||||
},
|
||||
reentry: {}, // 站台折返策略
|
||||
detainCar: { // 扣车
|
||||
position: 1, // 扣车标识在站台上显示方向
|
||||
text: 'H', // 扣车显示内容
|
||||
fontSize: 18, // 扣车字体大小
|
||||
offset: { x: 60, y: -20 }, // 扣车偏移量
|
||||
|
@ -329,8 +329,9 @@ class SkinCode extends defaultStyle {
|
||||
},
|
||||
reentry: {}, // 站台折返策略
|
||||
detainCar: { // 扣车
|
||||
text: 'H', // 扣车显示内容
|
||||
offset: { x: -8, y: 0 }, // 扣车偏移量
|
||||
position: 1, // 扣车标识在站台上显示方向
|
||||
text: 'H', // 扣车显示内容
|
||||
offset: { x: -8, y: 10 }, // 扣车偏移量
|
||||
centerTrainColor: 'white', // 中心扣车颜色
|
||||
andCenterTrainColor: 'red', // 车站+中心扣车颜色
|
||||
detainTrainTextColor: '#E4EF50', // 车站扣除文字颜色
|
||||
@ -338,7 +339,7 @@ class SkinCode extends defaultStyle {
|
||||
fontWeight: 'normal'
|
||||
},
|
||||
stopTime: { // 停站时间
|
||||
offset: { x: -40, y: -5 }, // 运行时间偏移量
|
||||
offset: { x: -8, y: 4 }, // 运行时间偏移量
|
||||
textColor: 'white', // 停站时间字体颜色
|
||||
textFontSize: 10 // 停站时间字体大小
|
||||
},
|
||||
|
@ -133,8 +133,8 @@ class StationStand extends Group {
|
||||
|
||||
/** 站台扣车*/
|
||||
const detainD = model.right ? 1 : -1;
|
||||
const detainX = model.position.x - (detainD) * (style.StationStand.detainCar.offset.x - model.width / 2);
|
||||
const detainY = model.position.y + (detainD) * (style.StationStand.detainCar.offset.y - model.height / 2);
|
||||
const detainX = model.position.x - style.StationStand.detainCar.position * detainD * (style.StationStand.detainCar.offset.x - model.width / 2);
|
||||
const detainY = model.position.y + detainD * (style.StationStand.detainCar.offset.y - model.height / 2);
|
||||
this.detain = new EDetain({
|
||||
zlevel: this.zlevel,
|
||||
z: this.z,
|
||||
@ -150,8 +150,8 @@ class StationStand extends Group {
|
||||
/** 停站时间*/
|
||||
if (style.StationStand.stopTime.offset) {
|
||||
const timeDrict = model.right ? 1 : -1;
|
||||
const timeX = model.position.x + timeDrict * style.StationStand.stopTime.offset.x;
|
||||
const timeY = model.position.y + timeDrict * style.StationStand.stopTime.offset.y;
|
||||
const timeX = model.position.x + style.StationStand.stopTime.position * timeDrict * (style.StationStand.stopTime.offset.x - model.width / 2);
|
||||
const timeY = model.position.y + timeDrict * (style.StationStand.stopTime.offset.y - model.height / 2);
|
||||
this.time = new ETime({
|
||||
zlevel: this.zlevel,
|
||||
z: this.z + 1,
|
||||
@ -180,9 +180,9 @@ class StationStand extends Group {
|
||||
/** 列车停跳 */
|
||||
if (style.StationStand.common.haveJumpShow) {
|
||||
const jumpDirct = model.right ? -1 : 1;
|
||||
const jumpX = model.position.x - jumpDirct * (style.StationStand.jump.offset.x - model.width / 2);
|
||||
const jumpX = model.position.x - jumpDirct * style.StationStand.jump.position * (style.StationStand.jump.offset.x - model.width / 2);
|
||||
const jumpY = model.position.y + jumpDirct * style.StationStand.jump.offset.y;
|
||||
const jumpCX = model.position.x - jumpDirct * (style.StationStand.jump.offset.x - model.width / 2);
|
||||
const jumpCX = model.position.x - jumpDirct * style.StationStand.jump.position * (style.StationStand.jump.offset.x - model.width / 2);
|
||||
const jumpCY = model.position.y + jumpDirct * style.StationStand.jump.offset.y;
|
||||
this.jump = new EJump({
|
||||
zlevel: this.zlevel,
|
||||
|
@ -107,7 +107,6 @@ export default {
|
||||
loading: false,
|
||||
type: 'text',
|
||||
timeout: 1000,
|
||||
timenum: 30,
|
||||
stepNum: 0,
|
||||
task: null,
|
||||
model: {
|
||||
@ -189,18 +188,6 @@ export default {
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
'model.stationCode': function(code) {
|
||||
this.randomSectionList = [];
|
||||
this.sectionList.forEach(section => {
|
||||
if (section.stationCode == this.model.stationCode) {
|
||||
let name = section.name;
|
||||
if (section.type == '02') {
|
||||
name = section.name;
|
||||
}
|
||||
this.randomSectionList.push({ name: `${name}(${section.code})`, code: section.code });
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.$nextTick(() => {
|
||||
@ -231,30 +218,24 @@ export default {
|
||||
this.model.sectionName = '';
|
||||
this.model.confirmStationCode = '';
|
||||
this.model.confirmSectionCode = '';
|
||||
this.model.sectionCode = '';
|
||||
this.model.stationCode = '';
|
||||
if (selected) {
|
||||
this.model.sectionCode = selected.code;
|
||||
if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
|
||||
if (selected.isSwitchSection) {
|
||||
const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
|
||||
if (section) {
|
||||
this.model.sectionName = section.name;
|
||||
}
|
||||
const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
|
||||
if (section) {
|
||||
this.model.sectionName = `${section.name}-${selected.name}(${selected.code})`;
|
||||
} else {
|
||||
const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
|
||||
if (section) {
|
||||
this.model.sectionName = section.name;
|
||||
this.model.sectionName = `${section.name}-${selected.name}`;
|
||||
} else {
|
||||
this.model.sectionName = `${selected.name}`;
|
||||
}
|
||||
this.model.sectionName = `${selected.name}(${selected.code})`;
|
||||
}
|
||||
} else if (selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
|
||||
const section = this.$store.getters['map/getDeviceByCode'](selected.switchSectionCode);
|
||||
const section = this.$store.getters['map/getDeviceByCode'](selected.sectionParentCode);
|
||||
if (section) {
|
||||
this.model.sectionName = section.name;
|
||||
this.model.sectionName = `${section.name}(${section.code})`;
|
||||
this.model.sectionCode = section.code;
|
||||
}
|
||||
}
|
||||
|
||||
const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
|
||||
if (station) {
|
||||
this.model.stationName = station.name;
|
||||
@ -275,6 +256,19 @@ export default {
|
||||
this.$store.dispatch('training/emitTipFresh');
|
||||
this.mouseCancelState(this.selected);
|
||||
},
|
||||
getSectionList(code) {
|
||||
this.randomSectionList = [];
|
||||
this.sectionList.forEach(section => {
|
||||
if (section.stationCode == code) {
|
||||
let name = `${section.name}(${section.code})`;
|
||||
if (section.type == '02') {
|
||||
const sectionParent = this.$store.getters['map/getDeviceByCode'](section.parentCode);
|
||||
name = `${sectionParent.name}-${section.name}(${section.code})`;
|
||||
}
|
||||
this.randomSectionList.push({ name: `${name}`, code: section.code });
|
||||
}
|
||||
});
|
||||
},
|
||||
waitSelectEvent() {
|
||||
if (!this.$store.state.menuOperation.break) {
|
||||
this.model.time -= 1;
|
||||
@ -299,22 +293,17 @@ export default {
|
||||
if (valid) {
|
||||
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
||||
this.type = 'password';
|
||||
this.model.time = this.timenum;
|
||||
this.model.time = 60;
|
||||
this.task = setInterval(this.waitSelectEvent, this.timeout);
|
||||
}
|
||||
});
|
||||
},
|
||||
stationSelectChange(code) {
|
||||
if (this.model.confirmStationCode === this.model.sectionCode) {
|
||||
this.stepNum = 2;
|
||||
} else {
|
||||
this.model.time = 0;
|
||||
}
|
||||
console.log(code, 'code');
|
||||
const operate = {
|
||||
operation: '',
|
||||
val: code
|
||||
};
|
||||
this.getSectionList(code);
|
||||
|
||||
if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
|
||||
operate.operation = OperationEvent.Section.alxeEffective.choose1.operation;
|
||||
@ -327,12 +316,6 @@ export default {
|
||||
});
|
||||
},
|
||||
sectionSelectChange(code) {
|
||||
if (this.model.confirmSectionCode === this.model.sectionCode) {
|
||||
this.stepNum = 2;
|
||||
} else {
|
||||
this.model.time = 0;
|
||||
}
|
||||
console.log(code, 'code');
|
||||
const operate = {
|
||||
operation: '',
|
||||
val: code
|
||||
@ -345,9 +328,7 @@ export default {
|
||||
}
|
||||
|
||||
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
|
||||
this.$store.dispatch('menuOperation/handleBreakFlag', {
|
||||
break: true
|
||||
});
|
||||
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
||||
});
|
||||
},
|
||||
/** 确认计轴恢复工作*/
|
||||
@ -375,13 +356,14 @@ export default {
|
||||
if (valid) {
|
||||
this.type = 'text';
|
||||
this.stopTask();
|
||||
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
||||
this.$refs.popupAlarm.doShow(
|
||||
Object.assign(this.operate, {val: operate.val}), [`集中站 ${this.model.stationName} 区段 ${this.model.sectionName}报告恢复计轴有效`]
|
||||
);
|
||||
// this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
||||
// this.$refs.popupAlarm.doShow(
|
||||
// Object.assign(this.operate, {val: operate.val}), [`集中站 ${this.model.stationName} 区段 ${this.model.sectionName}报告恢复计轴有效`]
|
||||
// );
|
||||
}
|
||||
}).catch((error) => {
|
||||
this.loading = false;
|
||||
this.doClose();
|
||||
this.$refs.noticeInfo.doShow(operate, error.message);
|
||||
});
|
||||
} else {
|
||||
|
@ -1,84 +1,93 @@
|
||||
<template>
|
||||
<el-dialog class="ningbo-01__systerm popup-alarm" :title="title" :visible.sync="show" width="500px"
|
||||
:before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
|
||||
<el-row>
|
||||
<el-col :offset="2">
|
||||
<span v-for="(message, index) in messages" :key="index">{{message}}</span><br>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row justify="center" class="button-group">
|
||||
<el-col :span="10" :offset="8">
|
||||
<el-button :id="domIdSure" type="primary" @click="commit">确定</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-dialog>
|
||||
<el-dialog
|
||||
v-dialogDrag
|
||||
class="ningbo-01__systerm popup-alarm"
|
||||
:title="title"
|
||||
:visible.sync="show"
|
||||
width="500px"
|
||||
:before-close="doClose"
|
||||
:z-index="2000"
|
||||
:modal="false"
|
||||
:close-on-click-modal="false"
|
||||
append-to-body
|
||||
>
|
||||
<el-row>
|
||||
<el-col :offset="2">
|
||||
<span v-for="(message, index) in messages" :key="index">{{ message }}</span><br>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row justify="center" class="button-group">
|
||||
<el-col :span="10" :offset="8">
|
||||
<el-button :id="domIdSure" type="primary" @click="commit">确定</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
|
||||
import { OperationEvent } from '@/scripts/ConstDic';
|
||||
|
||||
export default {
|
||||
name: 'Popup-Alarm',
|
||||
data() {
|
||||
return {
|
||||
dialogShow: false,
|
||||
messages: [],
|
||||
operate: null,
|
||||
operation: '',
|
||||
}
|
||||
export default {
|
||||
name: 'PopupAlarm',
|
||||
data() {
|
||||
return {
|
||||
dialogShow: false,
|
||||
messages: [],
|
||||
operate: null,
|
||||
operation: ''
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
show() {
|
||||
return this.dialogShow && !this.$store.state.menuOperation.break;
|
||||
},
|
||||
computed: {
|
||||
show() {
|
||||
return this.dialogShow && !this.$store.state.menuOperation.break;
|
||||
},
|
||||
title() {
|
||||
return '弹出式告警';
|
||||
},
|
||||
domIdSure() {
|
||||
return this.dialogShow ? OperationEvent.Command.close.alarm.domId : '';
|
||||
}
|
||||
title() {
|
||||
return '弹出式告警';
|
||||
},
|
||||
mounted() {
|
||||
this.$nextTick(() => {
|
||||
this.$store.dispatch('training/tipReload');
|
||||
})
|
||||
},
|
||||
methods: {
|
||||
doShow(operate, messages) {
|
||||
this.operate = operate || {};
|
||||
this.operation = operate.operation;
|
||||
this.dialogShow = true;
|
||||
this.messages = messages || [];
|
||||
this.$nextTick(function () {
|
||||
this.$store.dispatch('training/emitTipFresh');
|
||||
});
|
||||
},
|
||||
doClose() {
|
||||
this.dialogShow = false;
|
||||
domIdSure() {
|
||||
return this.dialogShow ? OperationEvent.Command.close.alarm.domId : '';
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.$nextTick(() => {
|
||||
this.$store.dispatch('training/tipReload');
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
doShow(operate, messages) {
|
||||
this.operate = operate || {};
|
||||
this.operation = operate.operation;
|
||||
this.dialogShow = true;
|
||||
this.messages = messages || [];
|
||||
this.$nextTick(function () {
|
||||
this.$store.dispatch('training/emitTipFresh');
|
||||
},
|
||||
commit() {
|
||||
if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
|
||||
// 确认计轴有效
|
||||
this.alxeEffective();
|
||||
}
|
||||
|
||||
},
|
||||
alxeEffective() {
|
||||
let operate = {
|
||||
type: this.operate.type,
|
||||
operation: OperationEvent.Command.close.alarm.operation,
|
||||
}
|
||||
|
||||
this.$store.dispatch('training/next', operate).then(({ valid }) => {
|
||||
if (valid) {
|
||||
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
||||
this.doClose();
|
||||
}
|
||||
})
|
||||
});
|
||||
},
|
||||
doClose() {
|
||||
this.dialogShow = false;
|
||||
this.$store.dispatch('training/emitTipFresh');
|
||||
},
|
||||
commit() {
|
||||
if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
|
||||
// 确认计轴有效
|
||||
this.alxeEffective();
|
||||
}
|
||||
|
||||
},
|
||||
alxeEffective() {
|
||||
const operate = {
|
||||
operation: OperationEvent.Command.close.alarm.operation
|
||||
};
|
||||
|
||||
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
|
||||
if (valid) {
|
||||
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
||||
this.doClose();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
</script>
|
||||
<style>
|
||||
@ -86,4 +95,4 @@
|
||||
padding-bottom: 40px !important;
|
||||
border: 1px solid lightgray;
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
@ -39,7 +39,7 @@
|
||||
v-model="changeList[scope.$index]"
|
||||
style="text-align: center; display: block;"
|
||||
:disabled="scope.row.disabled"
|
||||
@change="changeCheck(changeList[scope.$index],scope.row.code)"
|
||||
@change="changeCheck(changeList[scope.$index], scope.row.code)"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@ -116,13 +116,12 @@ export default {
|
||||
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
|
||||
},
|
||||
domIdChoose() {
|
||||
if (this.dialogShow) {
|
||||
if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
|
||||
return OperationEvent.Signal.humanControl.choose.domId;
|
||||
} else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
|
||||
return OperationEvent.Signal.atsAutoControl.choose.domId;
|
||||
}
|
||||
if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
|
||||
return OperationEvent.Signal.humanControl.choose.domId;
|
||||
} else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
|
||||
return OperationEvent.Signal.atsAutoControl.choose.domId;
|
||||
}
|
||||
return '';
|
||||
},
|
||||
domIdConfirm() {
|
||||
return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
|
||||
@ -133,6 +132,7 @@ export default {
|
||||
} else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
|
||||
return '进路交自动控';
|
||||
}
|
||||
return '';
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
@ -205,6 +205,7 @@ export default {
|
||||
}
|
||||
if (this.selection.length > 0) {
|
||||
this.commitDisabled = false;
|
||||
this.handleChooseChange();
|
||||
} else {
|
||||
this.commitDisabled = true;
|
||||
}
|
||||
@ -237,43 +238,27 @@ export default {
|
||||
this.commitDisabled = true;
|
||||
}
|
||||
},
|
||||
// serializeCodeListWithSeparator(sep) {
|
||||
// const codeList = [];
|
||||
// if (this.selection && this.selection.length) {
|
||||
// this.selection.forEach(elem => {
|
||||
// codeList.push(elem.code);
|
||||
// });
|
||||
// }
|
||||
// return codeList.join(sep);
|
||||
// },
|
||||
// handleChooseChange(selection) {
|
||||
// this.selection = selection;
|
||||
// if (selection && selection.length) {
|
||||
// const operate = {
|
||||
// repeat: true,
|
||||
// type: MapDeviceType.Signal.type,
|
||||
// operation: '',
|
||||
// val: this.serializeCodeListWithSeparator('::'),
|
||||
// selection: selection
|
||||
// };
|
||||
handleChooseChange() {
|
||||
const codeList = this.selection.map(elem => { return elem; });
|
||||
const operate = {
|
||||
operation: '',
|
||||
val: codeList.join('::')
|
||||
};
|
||||
|
||||
// if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
|
||||
// /** 进路交人工控*/
|
||||
// operate.operation = OperationEvent.Signal.humanControl.choose.operation;
|
||||
// } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
|
||||
// /** 进路交自动控*/
|
||||
// operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation;
|
||||
// }
|
||||
if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
|
||||
/** 进路交人工控*/
|
||||
operate.operation = OperationEvent.Signal.humanControl.choose.operation;
|
||||
} else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
|
||||
/** 进路交自动控*/
|
||||
operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation;
|
||||
}
|
||||
|
||||
// this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
|
||||
// if (valid) {
|
||||
// this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
||||
// }
|
||||
// });
|
||||
// } else if (!selection) {
|
||||
// this.$messageBox(`请选择一条数据`);
|
||||
// }
|
||||
// },
|
||||
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
|
||||
if (valid) {
|
||||
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
||||
}
|
||||
});
|
||||
},
|
||||
commit() {
|
||||
if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
|
||||
/** 进路交人工控*/
|
||||
|
@ -166,7 +166,8 @@ export default {
|
||||
|
||||
// 设置选中指令
|
||||
const operate = {
|
||||
operation: OperationEvent.Signal.arrangementRoute.choose.operation
|
||||
operation: OperationEvent.Signal.arrangementRoute.choose.operation,
|
||||
val: row.code
|
||||
};
|
||||
|
||||
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
|
||||
|
@ -15,11 +15,11 @@
|
||||
<div style="overflow: hidden;">
|
||||
<div>操作设备</div>
|
||||
<el-col :span="11">
|
||||
<el-input :value="messageText1" placeholder="" size="mini" disabled />
|
||||
<el-input :value="messageText1" placeholder="" size="mini" disabled />
|
||||
</el-col>
|
||||
<el-col :span="8" :offset="1">
|
||||
<el-button :id="confirmId1" class="status_btn" :disabled="disabledConfirm1" @click="confirm1">确认
|
||||
</el-button>
|
||||
<el-button :id="confirmId1" class="status_btn" :disabled="disabledConfirm1" @click="confirm1">确认
|
||||
</el-button>
|
||||
</el-col>
|
||||
</div>
|
||||
</div>
|
||||
@ -28,13 +28,13 @@
|
||||
<div style="overflow: hidden;">
|
||||
<div>操作设备</div>
|
||||
<el-col :span="11">
|
||||
<el-select :id="domIdChoose" v-model="messageText2" filterable size="mini" :disabled="disabledConfirm2" @change="SelectChange">
|
||||
<el-option v-for="option in signalList" :key="option.code" :label="option.name" :value="option.name" />
|
||||
</el-select>
|
||||
<el-select :id="domIdChoose" v-model="messageText2" filterable size="mini" :disabled="disabledConfirm2" @change="SelectChange">
|
||||
<el-option v-for="option in signalList" :key="option.code" :label="option.name" :value="option.code" />
|
||||
</el-select>
|
||||
</el-col>
|
||||
<el-col :span="8" :offset="1">
|
||||
<el-button :id="confirmId2" class="status_btn" :disabled="disabledConfirm2" @click="confirm2">确认
|
||||
</el-button>
|
||||
<el-button :id="confirmId2" class="status_btn" :disabled="disabledConfirm2" @click="confirm2">确认
|
||||
</el-button>
|
||||
</el-col>
|
||||
</div>
|
||||
</div>
|
||||
@ -49,7 +49,9 @@
|
||||
</div>
|
||||
<div class="body_cont">
|
||||
<div class="status_text">状态</div>
|
||||
<div class="textarea_content" />
|
||||
<div class="textarea_content">
|
||||
{{ message }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-button :id="domIdConfirm" class="close_btn" type="primary" @click="commit">关闭</el-button>
|
||||
@ -73,8 +75,10 @@ export default {
|
||||
dialogShow: false,
|
||||
selected: null,
|
||||
operation: null,
|
||||
message: '',
|
||||
|
||||
messageText1: '',
|
||||
signalCode: '',
|
||||
messageText2: '',
|
||||
timeCountConfirm: -1,
|
||||
disabledConfirm1: false,
|
||||
@ -120,8 +124,10 @@ export default {
|
||||
methods: {
|
||||
doShow(operate, selected) {
|
||||
this.selected = selected;
|
||||
this.message = '';
|
||||
if (!this.dialogShow) {
|
||||
this.messageText1 = selected.name;
|
||||
this.signalCode = selected.code;
|
||||
|
||||
this.operation = operate.operation;
|
||||
}
|
||||
@ -132,6 +138,13 @@ export default {
|
||||
},
|
||||
doClose() {
|
||||
this.dialogShow = false;
|
||||
this.messageText1 = '';
|
||||
this.messageText2 = '';
|
||||
this.message = '';
|
||||
this.signalCode = '';
|
||||
this.timeCountConfirm = -1;
|
||||
this.disabledConfirm1 = false;
|
||||
this.disabledConfirm2 = true;
|
||||
this.$store.dispatch('training/emitTipFresh');
|
||||
this.mouseCancelState(this.selected);
|
||||
},
|
||||
@ -170,30 +183,34 @@ export default {
|
||||
});
|
||||
},
|
||||
confirm2() {
|
||||
const operate = {
|
||||
operation: OperationEvent.Signal.unlock.confirm2.operation,
|
||||
cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
|
||||
};
|
||||
if (this.messageText2 == this.signalCode) {
|
||||
const operate = {
|
||||
operation: OperationEvent.Signal.unlock.confirm2.operation,
|
||||
cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
|
||||
};
|
||||
|
||||
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
|
||||
if (valid) {
|
||||
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
||||
this.messageText2 = '*****';
|
||||
this.disabledConfirm2 = true;
|
||||
this.timeCountConfirm = -1;
|
||||
}
|
||||
}).catch((error) => {
|
||||
this.$refs.noticeInfo.doShow(operate, error.message);
|
||||
});
|
||||
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
|
||||
if (valid) {
|
||||
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
||||
this.messageText2 = '*****';
|
||||
this.disabledConfirm2 = true;
|
||||
this.timeCountConfirm = -1;
|
||||
}
|
||||
}).catch((error) => {
|
||||
this.$refs.noticeInfo.doShow(operate, error.message);
|
||||
});
|
||||
} else {
|
||||
this.message = '选择信号机错误';
|
||||
}
|
||||
},
|
||||
commit() {
|
||||
const operate = {
|
||||
over: true,
|
||||
operation: OperationEvent.Signal.unlock.confirm.operation,
|
||||
operation: OperationEvent.Signal.unlock.confirm.operation
|
||||
};
|
||||
|
||||
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
|
||||
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
||||
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
||||
this.doClose();
|
||||
}).catch((error) => {
|
||||
this.doClose();
|
||||
|
@ -29,7 +29,7 @@
|
||||
<div>操作设备</div>
|
||||
<el-col :span="11">
|
||||
<el-select :id="domIdChoose" v-model="messageText2" filterable size="mini" :disabled="disabledConfirm2" @change="SelectChange">
|
||||
<el-option v-for="option in sectionList" :key="option.code" :label="option.name + '(' + option.code + ')'" :value="option.name" />
|
||||
<el-option v-for="option in sectionLists" :key="option.code" :label="option.name" :value="option.code" />
|
||||
</el-select>
|
||||
</el-col>
|
||||
<el-col :span="8" :offset="1">
|
||||
@ -49,7 +49,9 @@
|
||||
</div>
|
||||
<div class="body_cont">
|
||||
<div class="status_text">状态</div>
|
||||
<div class="textarea_content" />
|
||||
<div class="textarea_content">
|
||||
{{ message }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-button :id="domIdConfirm" class="close_btn" type="primary" @click="commit">关闭</el-button>
|
||||
@ -73,8 +75,10 @@ export default {
|
||||
dialogShow: false,
|
||||
selected: null,
|
||||
operation: null,
|
||||
message: '',
|
||||
|
||||
messageText1: '',
|
||||
sectionCode: '',
|
||||
messageText2: '',
|
||||
timeCountConfirm: -1,
|
||||
disabledConfirm1: false,
|
||||
@ -107,6 +111,18 @@ export default {
|
||||
return '区故解';
|
||||
}
|
||||
return '';
|
||||
},
|
||||
sectionLists() {
|
||||
const list = [];
|
||||
this.sectionList.forEach(section => {
|
||||
let name = section.name;
|
||||
if (section.type == '02') {
|
||||
const sectionParent = this.$store.getters['map/getDeviceByCode'](section.parentCode);
|
||||
name = `${sectionParent.name}-${section.name}`;
|
||||
}
|
||||
list.push({ name: name, code: section.code });
|
||||
});
|
||||
return list;
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
@ -125,12 +141,14 @@ export default {
|
||||
methods: {
|
||||
doShow(operate, selected) {
|
||||
this.selected = selected;
|
||||
this.message = '';
|
||||
if (!this.dialogShow) {
|
||||
this.messageText1 = `${selected.name}(${selected.code})`;
|
||||
// if (selected.parentCode) {
|
||||
// const parentSection = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
|
||||
// this.messageText1 = `${parentSection.name}${selected.name}`;
|
||||
// }
|
||||
this.messageText1 = selected.name;
|
||||
this.sectionCode = selected.code;
|
||||
if (selected.type == '02') {
|
||||
const sectionParent = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
|
||||
this.messageText1 = `${sectionParent.name}-${selected.name}`;
|
||||
}
|
||||
|
||||
this.operation = operate.operation;
|
||||
}
|
||||
@ -145,6 +163,8 @@ export default {
|
||||
this.disabledConfirm2 = true;
|
||||
this.timeCountConfirm = -1;
|
||||
this.messageText1 = '';
|
||||
this.message = '';
|
||||
this.sectionCode = '';
|
||||
this.messageText2 = '';
|
||||
this.$store.dispatch('training/emitTipFresh');
|
||||
this.mouseCancelState(this.selected);
|
||||
@ -196,29 +216,33 @@ export default {
|
||||
});
|
||||
},
|
||||
confirm2() {
|
||||
const operate = {
|
||||
operation: '',
|
||||
cmdType: ''
|
||||
};
|
||||
if (this.messageText2 == this.sectionCode) {
|
||||
const operate = {
|
||||
operation: '',
|
||||
cmdType: ''
|
||||
};
|
||||
|
||||
if (this.operation == OperationEvent.Section.unlock.menu.operation) {
|
||||
operate.operation = OperationEvent.Section.unlock.confirm2.operation;
|
||||
operate.cmdType = CMD.Section.CMD_SECTION_UNBLOCK;
|
||||
} else if (this.operation == OperationEvent.Section.fault.menu.operation) {
|
||||
operate.operation = OperationEvent.Section.fault.confirm2.operation;
|
||||
operate.cmdType = CMD.Section.CMD_SECTION_FAULT_UNLOCK;
|
||||
}
|
||||
|
||||
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
|
||||
if (valid) {
|
||||
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
||||
this.messageText2 = '*****';
|
||||
this.disabledConfirm2 = true;
|
||||
this.timeCountConfirm = -1;
|
||||
if (this.operation == OperationEvent.Section.unlock.menu.operation) {
|
||||
operate.operation = OperationEvent.Section.unlock.confirm2.operation;
|
||||
operate.cmdType = CMD.Section.CMD_SECTION_UNBLOCK;
|
||||
} else if (this.operation == OperationEvent.Section.fault.menu.operation) {
|
||||
operate.operation = OperationEvent.Section.fault.confirm2.operation;
|
||||
operate.cmdType = CMD.Section.CMD_SECTION_FAULT_UNLOCK;
|
||||
}
|
||||
}).catch((error) => {
|
||||
this.$refs.noticeInfo.doShow(operate, error.message);
|
||||
});
|
||||
|
||||
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
|
||||
if (valid) {
|
||||
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
||||
this.messageText2 = '*****';
|
||||
this.disabledConfirm2 = true;
|
||||
this.timeCountConfirm = -1;
|
||||
}
|
||||
}).catch((error) => {
|
||||
this.$refs.noticeInfo.doShow(operate, error.message);
|
||||
});
|
||||
} else {
|
||||
this.message = '选择区段错误';
|
||||
}
|
||||
},
|
||||
commit() {
|
||||
const operate = {
|
||||
|
@ -378,18 +378,24 @@ export default {
|
||||
/** 区段设置限速*/
|
||||
operate.operation = OperationEvent.Section.setSpeed.order.operation;
|
||||
operate.message = `在【${this.name}】区段,区段设置限速${this.speed}km/h,确认下达吗?`;
|
||||
if (this.speed == 0) {
|
||||
operate.message = `在【${this.name}】区段,区段取消限速,确认下达吗?`;
|
||||
}
|
||||
} else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
|
||||
/** 区段取消限速*/
|
||||
operate.operation = OperationEvent.Section.cancelSpeed.order.operation;
|
||||
operate.message = `在【${this.name}】区段,区段取消限速${this.speed}km/h,确认下达吗?`;
|
||||
operate.message = `在【${this.name}】区段,区段取消限速,确认下达吗?`;
|
||||
} else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
|
||||
/** 道岔设置限速*/
|
||||
operate.operation = OperationEvent.Switch.setSpeed.order.operation;
|
||||
operate.message = `在【${this.name}】区段,道岔设置限速${this.speed}km/h,确认下达吗?`;
|
||||
if (this.speed == 0) {
|
||||
operate.message = `在【${this.name}】区段,道岔区段取消限速,确认下达吗?`;
|
||||
}
|
||||
} else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
|
||||
/** 区段取消限速*/
|
||||
operate.operation = OperationEvent.Switch.cancelSpeed.order.operation;
|
||||
operate.message = `在【${this.name}】区段,道岔取消限速${this.speed}km/h,确认下达吗?`;
|
||||
operate.message = `在【${this.name}】区段,道岔区段取消限速,确认下达吗?`;
|
||||
}
|
||||
|
||||
this.setMessage('请点击“确认1”按钮,确认命令!');
|
||||
|
@ -29,7 +29,7 @@
|
||||
<div>道岔</div>
|
||||
<el-col :span="11">
|
||||
<el-select :id="domIdChoose" v-model="messageText2" filterable size="mini" :disabled="disabledConfirm2" @change="SelectChange">
|
||||
<el-option v-for="option in switchList" :key="option.code" :label="option.name" :value="option.name" />
|
||||
<el-option v-for="option in switchList" :key="option.code" :label="option.name" :value="option.code" />
|
||||
</el-select>
|
||||
</el-col>
|
||||
<el-col :span="8" :offset="1">
|
||||
@ -49,7 +49,9 @@
|
||||
</div>
|
||||
<div class="body_cont">
|
||||
<div class="status_text">状态</div>
|
||||
<div class="textarea_content" />
|
||||
<div class="textarea_content">
|
||||
{{ message }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-button :id="domIdConfirm" class="close_btn" type="primary" @click="commit">关闭</el-button>
|
||||
@ -73,8 +75,10 @@ export default {
|
||||
dialogShow: false,
|
||||
selected: null,
|
||||
operation: null,
|
||||
message: '',
|
||||
|
||||
messageText1: '',
|
||||
switchCode: '',
|
||||
messageText2: '',
|
||||
timeCountConfirm: -1,
|
||||
disabledConfirm1: false,
|
||||
@ -125,8 +129,10 @@ export default {
|
||||
methods: {
|
||||
doShow(operate, selected) {
|
||||
this.selected = selected;
|
||||
this.message = '';
|
||||
if (!this.dialogShow) {
|
||||
this.messageText1 = selected.name;
|
||||
this.switchCode = selected.code;
|
||||
|
||||
this.operation = operate.operation;
|
||||
}
|
||||
@ -139,6 +145,8 @@ export default {
|
||||
this.dialogShow = false;
|
||||
this.messageText1 = '';
|
||||
this.messageText2 = '';
|
||||
this.message = '';
|
||||
this.switchCode = '';
|
||||
this.timeCountConfirm = -1;
|
||||
this.disabledConfirm1 = false;
|
||||
this.disabledConfirm2 = true;
|
||||
@ -192,28 +200,32 @@ export default {
|
||||
});
|
||||
},
|
||||
confirm2() {
|
||||
const operate = {
|
||||
operation: '',
|
||||
cmdType: ''
|
||||
};
|
||||
if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
|
||||
operate.operation = OperationEvent.Switch.unlock.confirm2.operation;
|
||||
operate.cmdType = CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK;
|
||||
} else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
|
||||
operate.operation = OperationEvent.Switch.unblock.confirm2.operation;
|
||||
operate.cmdType = CMD.Switch.CMD_SWITCH_UNBLOCK;
|
||||
}
|
||||
|
||||
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
|
||||
if (valid) {
|
||||
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
||||
this.messageText2 = '*****';
|
||||
this.disabledConfirm2 = true;
|
||||
this.timeCountConfirm = -1;
|
||||
if (this.messageText2 == this.switchCode) {
|
||||
const operate = {
|
||||
operation: '',
|
||||
cmdType: ''
|
||||
};
|
||||
if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
|
||||
operate.operation = OperationEvent.Switch.unlock.confirm2.operation;
|
||||
operate.cmdType = CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK;
|
||||
} else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
|
||||
operate.operation = OperationEvent.Switch.unblock.confirm2.operation;
|
||||
operate.cmdType = CMD.Switch.CMD_SWITCH_UNBLOCK;
|
||||
}
|
||||
}).catch((error) => {
|
||||
this.$refs.noticeInfo.doShow(operate, error.message);
|
||||
});
|
||||
|
||||
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
|
||||
if (valid) {
|
||||
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
||||
this.messageText2 = '*****';
|
||||
this.disabledConfirm2 = true;
|
||||
this.timeCountConfirm = -1;
|
||||
}
|
||||
}).catch((error) => {
|
||||
this.$refs.noticeInfo.doShow(operate, error.message);
|
||||
});
|
||||
} else {
|
||||
this.message = '选择道岔错误';
|
||||
}
|
||||
},
|
||||
commit() {
|
||||
const operate = {
|
||||
|
@ -51,12 +51,12 @@ export default {
|
||||
cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
|
||||
},
|
||||
{
|
||||
label: '区段激活跟踪',
|
||||
label: '区段跟踪激活',
|
||||
handler: this.active,
|
||||
cmdType: CMD.Section.CMD_SECTION_ACTIVE
|
||||
},
|
||||
{
|
||||
label: '区段切除跟踪',
|
||||
label: '区段跟踪切除',
|
||||
handler: this.split,
|
||||
cmdType: CMD.Section.CMD_SECTION_CUT_OFF
|
||||
},
|
||||
|
@ -124,7 +124,7 @@ export default {
|
||||
cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
|
||||
},
|
||||
{
|
||||
label: '取消列车进路',
|
||||
label: '取消进路',
|
||||
handler: this.cancelTrainRoute,
|
||||
cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
|
||||
},
|
||||
|
@ -387,7 +387,7 @@ export const asyncRouter = [
|
||||
meta: {
|
||||
}
|
||||
},
|
||||
{ // 地图绘制
|
||||
{ // 地图 绘制
|
||||
path: 'map/draw/:mapId/:view',
|
||||
component: Mapedit,
|
||||
hidden: true
|
||||
|
@ -3462,7 +3462,7 @@ export const OperationList = {
|
||||
trainingName: '扣车({10}-{12} 站台)',
|
||||
trainingRemark: '设置扣车功能',
|
||||
trainingType: '05',
|
||||
productTypes: ['02'], // 产品类型 01 现地 02 行调
|
||||
productTypes: ['01', '02'], // 产品类型 01 现地 02 行调
|
||||
stepVOList: [
|
||||
{ deviceType: '06', orderNum: 1, operateCode: '504', tip: '鼠标右键菜单选择【扣车】' },
|
||||
{ deviceType: '06', orderNum: 2, operateCode: '504', tip: '鼠标左键点击【确定】按钮' }
|
||||
@ -3476,7 +3476,7 @@ export const OperationList = {
|
||||
trainingName: '取消扣车({10}-{12} 站台)',
|
||||
trainingRemark: '取消扣车功能',
|
||||
trainingType: '05',
|
||||
productTypes: ['02'], // 产品类型 01 现地 02 行调
|
||||
productTypes: ['01', '02'], // 产品类型 01 现地 02 行调
|
||||
stepVOList: [
|
||||
{ deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】' },
|
||||
{ deviceType: '06', orderNum: 2, operateCode: '505', tip: '鼠标左键点击【确定】按钮' }
|
||||
@ -3518,7 +3518,7 @@ export const OperationList = {
|
||||
trainingName: '提前发车({10}-{12}站台)',
|
||||
trainingRemark: '提前发车功能',
|
||||
trainingType: '05',
|
||||
productTypes: ['02'],
|
||||
productTypes: ['01', '02'],
|
||||
stepVOList: [
|
||||
{ deviceType: '06', orderNum: 1, operateCode: '501', tip: '鼠标右键菜单选择【提前发车】' },
|
||||
{ deviceType: '06', orderNum: 2, operateCode: '501', tip: '鼠标左键点击【确定】按钮' }
|
||||
@ -3669,13 +3669,30 @@ export const OperationList = {
|
||||
trainingName: '查看站台信息({10}-{12}站台)',
|
||||
trainingRemark: '查看站台信息功能',
|
||||
trainingType: '05',
|
||||
productTypes: ['02'],
|
||||
productTypes: ['01', '02'],
|
||||
stepVOList: [
|
||||
{ deviceType: '06', orderNum: 1, operateCode: '507', tip: '鼠标右键菜单选择【查看站台信息】' },
|
||||
{ deviceType: '06', orderNum: 2, operateCode: '0012', tip: '鼠标左键点击【确定】按钮' }
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
operateType: '0402',
|
||||
skinCode: '06',
|
||||
trainingName: '区段故障解锁({8}{9})',
|
||||
trainingRemark: '区段故障解锁',
|
||||
trainingType: '04',
|
||||
productTypes: ['02'],
|
||||
stepVOList: [
|
||||
{ deviceType: '03', orderNum: 1, operateCode: '402', tip: '鼠标右键菜单选择【区段故障解锁】' },
|
||||
{ deviceType: '03', orderNum: 2, operateCode: '4024', tip: '鼠标左键点击【确定】按钮' },
|
||||
{ deviceType: '03', orderNum: 3, operateCode: '4028', tip: '鼠标左键选择({8}{9})区段', val: '' },
|
||||
{ deviceType: '03', orderNum: 4, operateCode: '4025', tip: '鼠标左键点击【确定】按钮' },
|
||||
{ deviceType: '03', orderNum: 5, operateCode: '402', tip: '鼠标左键点击【关闭】按钮' }
|
||||
]
|
||||
},
|
||||
{
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
@ -3684,7 +3701,7 @@ export const OperationList = {
|
||||
trainingName: '区段跟踪切除({8}{9})',
|
||||
trainingRemark: '区段跟踪切除',
|
||||
trainingType: '04',
|
||||
productTypes: ['02'],
|
||||
productTypes: ['01', '02'],
|
||||
stepVOList: [
|
||||
{ deviceType: '03', orderNum: 1, operateCode: '405', tip: '鼠标右键菜单选择【区段跟踪切除】' },
|
||||
{ deviceType: '03', orderNum: 2, operateCode: '405', tip: '鼠标左键点击【确定】按钮' }
|
||||
@ -3698,7 +3715,7 @@ export const OperationList = {
|
||||
trainingName: '区段跟踪激活({8}{9})',
|
||||
trainingRemark: '区段跟踪激活功能',
|
||||
trainingType: '04',
|
||||
productTypes: ['02'],
|
||||
productTypes: ['01', '02'],
|
||||
stepVOList: [
|
||||
{ deviceType: '03', orderNum: 1, operateCode: '406', tip: '鼠标右键菜单选择【区段跟踪激活】' },
|
||||
{ deviceType: '03', orderNum: 2, operateCode: '406', tip: '鼠标左键点击【确定】按钮' }
|
||||
@ -3708,7 +3725,7 @@ export const OperationList = {
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
operateType: '0407',
|
||||
skinCode: '02',
|
||||
skinCode: '06',
|
||||
trainingName: '设置临时限速({8}{9})',
|
||||
trainingRemark: '设置临时限速功能(限速值:5)',
|
||||
trainingType: '04',
|
||||
@ -3727,7 +3744,7 @@ export const OperationList = {
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
operateType: '0407',
|
||||
skinCode: '02',
|
||||
skinCode: '06',
|
||||
trainingName: '设置临时限速({8}{9})',
|
||||
trainingRemark: '设置临时限速功能(限速值:自动)',
|
||||
trainingType: '04',
|
||||
@ -3741,7 +3758,38 @@ export const OperationList = {
|
||||
{ deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮' },
|
||||
{ deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
operateType: '0405',
|
||||
skinCode: '06',
|
||||
trainingName: '区段封锁({8}{9})',
|
||||
trainingRemark: '区段封锁功能',
|
||||
trainingType: '04',
|
||||
productTypes: ['01'],
|
||||
stepVOList: [
|
||||
{ deviceType: '03', orderNum: 1, operateCode: '403', tip: '鼠标右键菜单选择【区段封锁】' },
|
||||
{ deviceType: '03', orderNum: 2, operateCode: '403', tip: '鼠标左键点击【确定】按钮' }
|
||||
]
|
||||
},
|
||||
// {
|
||||
// maxDuration: 15,
|
||||
// minDuration: 8,
|
||||
// operateType: '0406',
|
||||
// skinCode: '06',
|
||||
// trainingName: '区段解封({8}{9})',
|
||||
// trainingRemark: '区段解封功能',
|
||||
// trainingType: '04',
|
||||
// productTypes: ['01'],
|
||||
// stepVOList: [
|
||||
// { deviceType: '03', orderNum: 1, operateCode: '404', tip: '鼠标右键菜单选择【区段解封】' },
|
||||
// { deviceType: '03', orderNum: 2, operateCode: '4043', tip: '鼠标左键点击【确定】按钮' },
|
||||
// { deviceType: '03', orderNum: 3, operateCode: '4046', tip: '鼠标左键选择({8}{9})区段', val: '' },
|
||||
// { deviceType: '03', orderNum: 4, operateCode: '4044', tip: '鼠标左键点击【确定】按钮' },
|
||||
// { deviceType: '03', orderNum: 5, operateCode: '404', tip: '鼠标左键点击【关闭】按钮' }
|
||||
// ]
|
||||
// },
|
||||
// {
|
||||
// maxDuration: 15,
|
||||
// minDuration: 8,
|
||||
@ -3757,9 +3805,416 @@ export const OperationList = {
|
||||
// { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{10}', val: '' },
|
||||
// { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({8}{9})', val: '' },
|
||||
// { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' },
|
||||
// { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【关闭】按钮' }
|
||||
// { deviceType: '03', orderNum: 6, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' }
|
||||
// ]
|
||||
// }
|
||||
|
||||
{
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
operateType: '0313',
|
||||
skinCode: '06',
|
||||
trainingName: '定操({7})',
|
||||
trainingRemark: '定操({7})',
|
||||
trainingType: '03',
|
||||
productTypes: ['01', '02'],
|
||||
stepVOList: [
|
||||
{ deviceType: '02', orderNum: 1, operateCode: '1010', tip: '鼠标左键菜单选择【定操】' },
|
||||
{ deviceType: '02', orderNum: 2, operateCode: '1010', tip: '鼠标左键点击【{7}】按钮' }
|
||||
]
|
||||
},
|
||||
{
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
operateType: '0313', // 0313 新增定位字典
|
||||
skinCode: '06',
|
||||
trainingName: '反操({7})',
|
||||
trainingRemark: '反操({7})',
|
||||
trainingType: '03',
|
||||
productTypes: ['01', '02'],
|
||||
stepVOList: [
|
||||
{ deviceType: '02', orderNum: 1, operateCode: '102', tip: '鼠标右键菜单选择【反操】' },
|
||||
{ deviceType: '02', orderNum: 2, operateCode: '102', tip: '鼠标左键点击【确定】按钮' }
|
||||
]
|
||||
},
|
||||
{
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
operateType: '0308',
|
||||
skinCode: '06',
|
||||
trainingName: '区段切除({7})',
|
||||
trainingRemark: '区段切除',
|
||||
trainingType: '03',
|
||||
productTypes: ['02'],
|
||||
stepVOList: [
|
||||
{ deviceType: '02', orderNum: 1, operateCode: '111', tip: '鼠标右键菜单选择【区段切除】' },
|
||||
{ deviceType: '02', orderNum: 2, operateCode: '111', tip: '鼠标左键点击【确定】按钮' }
|
||||
]
|
||||
},
|
||||
{
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
operateType: '0309',
|
||||
skinCode: '06',
|
||||
trainingName: '区段激活({7})',
|
||||
trainingRemark: '区段激活功能',
|
||||
trainingType: '03',
|
||||
productTypes: ['02'],
|
||||
stepVOList: [
|
||||
{ deviceType: '02', orderNum: 1, operateCode: '112', tip: '鼠标右键菜单选择【区段激活】' },
|
||||
{ deviceType: '02', orderNum: 2, operateCode: '112', tip: '鼠标左键点击【确定】按钮' }
|
||||
]
|
||||
},
|
||||
// {
|
||||
// maxDuration: 15,
|
||||
// minDuration: 8,
|
||||
// operateType: '0314',
|
||||
// skinCode: '02',
|
||||
// trainingName: '确认计轴有效({8}{9})',
|
||||
// trainingRemark: '确认计轴有效功能',
|
||||
// trainingType: '04',
|
||||
// productTypes: ['02'],
|
||||
// stepVOList: [
|
||||
// { deviceType: '03', orderNum: 1, operateCode: '412', tip: '鼠标右键菜单选择【确认计轴有效】' },
|
||||
// { deviceType: '03', orderNum: 2, operateCode: '4123', tip: '鼠标左键选择【确认】' },
|
||||
// { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{10}', val: '' },
|
||||
// { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({8}{9})', val: '' },
|
||||
// { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' },
|
||||
// { deviceType: '03', orderNum: 6, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' }
|
||||
// ]
|
||||
// }
|
||||
{
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
operateType: '0301',
|
||||
skinCode: '06',
|
||||
trainingName: '道岔单锁({7})',
|
||||
trainingRemark: '道岔单锁功能',
|
||||
trainingType: '03',
|
||||
productTypes: ['01'],
|
||||
stepVOList: [
|
||||
{ deviceType: '02', orderNum: 1, operateCode: '103', tip: '鼠标右键菜单选择【道岔单锁】' },
|
||||
{ deviceType: '02', orderNum: 2, operateCode: '103', tip: '鼠标左键点击【确定】按钮' }
|
||||
]
|
||||
},
|
||||
// {
|
||||
// maxDuration: 15,
|
||||
// minDuration: 8,
|
||||
// operateType: '0302',
|
||||
// skinCode: '06',
|
||||
// trainingName: '道岔单解({7})',
|
||||
// trainingRemark: '道岔单解功能',
|
||||
// trainingType: '03',
|
||||
// productTypes: ['01'],
|
||||
// stepVOList: [
|
||||
// { deviceType: '03', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【区段解封】' },
|
||||
// { deviceType: '03', orderNum: 2, operateCode: '1043', tip: '鼠标左键点击【确定】按钮' },
|
||||
// { deviceType: '03', orderNum: 3, operateCode: '1046', tip: '鼠标左键选择({8}{9})区段', val: '' },
|
||||
// { deviceType: '03', orderNum: 4, operateCode: '1044', tip: '鼠标左键点击【确定】按钮' },
|
||||
// { deviceType: '03', orderNum: 5, operateCode: '104', tip: '鼠标左键点击【关闭】按钮' }
|
||||
// ]
|
||||
// },
|
||||
{
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
operateType: '0303',
|
||||
skinCode: '06',
|
||||
trainingName: '道岔封锁({7})',
|
||||
trainingRemark: '道岔封锁功能',
|
||||
trainingType: '03',
|
||||
productTypes: ['01'],
|
||||
stepVOList: [
|
||||
{ deviceType: '02', orderNum: 1, operateCode: '105', tip: '鼠标右键菜单选择【道岔封锁】' },
|
||||
{ deviceType: '02', orderNum: 2, operateCode: '105', tip: '鼠标左键点击【确定】按钮' }
|
||||
]
|
||||
},
|
||||
// {
|
||||
// maxDuration: 15,
|
||||
// minDuration: 8,
|
||||
// operateType: '0304',
|
||||
// skinCode: '06',
|
||||
// trainingName: '道岔解封({7})',
|
||||
// trainingRemark: '道岔解封功能',
|
||||
// trainingType: '03',
|
||||
// productTypes: ['01'],
|
||||
// stepVOList: [
|
||||
// { deviceType: '03', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【区段解封】' },
|
||||
// { deviceType: '03', orderNum: 2, operateCode: '1063', tip: '鼠标左键点击【确定】按钮' },
|
||||
// { deviceType: '03', orderNum: 3, operateCode: '1066', tip: '鼠标左键选择({8}{9})区段', val: '' },
|
||||
// { deviceType: '03', orderNum: 4, operateCode: '1064', tip: '鼠标左键点击【确定】按钮' },
|
||||
// { deviceType: '03', orderNum: 5, operateCode: '106', tip: '鼠标左键点击【关闭】按钮' }
|
||||
// ]
|
||||
// },
|
||||
{
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
operateType: '0310',
|
||||
skinCode: '06',
|
||||
trainingName: '道岔区段设置限速({7})',
|
||||
trainingRemark: '道岔区段设置限速功能(限速值:10)',
|
||||
trainingType: '03',
|
||||
productTypes: ['01', '02'],
|
||||
stepVOList: [
|
||||
{ deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【道岔区段设置限速】' },
|
||||
{ deviceType: '02', orderNum: 2, operateCode: '1136', tip: '鼠标左键选择【限速值5】', val: '10' },
|
||||
{ deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' },
|
||||
{ deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' },
|
||||
{ deviceType: '02', orderNum: 5, operateCode: '1133', tip: '鼠标左键点击【确认1】按钮' },
|
||||
{ deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮' },
|
||||
{ deviceType: '02', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
|
||||
]
|
||||
},
|
||||
{
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
operateType: '0310',
|
||||
skinCode: '06',
|
||||
trainingName: '道岔区段设置限速({7})',
|
||||
trainingRemark: '道岔区段设置限速功能(限速值:不限)',
|
||||
trainingType: '03',
|
||||
productTypes: ['01', '02'],
|
||||
stepVOList: [
|
||||
{ deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【道岔区段设置限速】' },
|
||||
{ deviceType: '02', orderNum: 2, operateCode: '1136', tip: '鼠标左键选择【限速值: 不限】', val: '0' },
|
||||
{ deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' },
|
||||
{ deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' },
|
||||
{ deviceType: '02', orderNum: 5, operateCode: '1133', tip: '鼠标左键点击【确认1】按钮' },
|
||||
{ deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮' },
|
||||
{ deviceType: '02', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
operateType: '0201',
|
||||
skinCode: '06',
|
||||
trainingName: '排列进路({3})',
|
||||
trainingRemark: '排列进路',
|
||||
trainingType: '02',
|
||||
productTypes: ['01', '02'],
|
||||
stepVOList: [
|
||||
{ deviceType: '04', orderNum: 1, operateCode: '301', tip: '鼠标右键菜单选择【排列进路】' },
|
||||
{ deviceType: '04', orderNum: 2, operateCode: '3011', tip: '鼠标左键选择进路名称【{3}】', val: '{4}' },
|
||||
{ deviceType: '04', orderNum: 3, operateCode: '301', tip: '鼠标左键点击【确定】按钮' }
|
||||
]
|
||||
},
|
||||
{
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
operateType: '0202',
|
||||
skinCode: '06',
|
||||
trainingName: '取消进路({3})',
|
||||
trainingRemark: '取消进路',
|
||||
trainingType: '02',
|
||||
productTypes: ['01', '02'],
|
||||
stepVOList: [
|
||||
{ deviceType: '04', orderNum: 1, operateCode: '303', tip: '鼠标右键菜单选择【取消进路】' },
|
||||
{ deviceType: '04', orderNum: 2, operateCode: '303', tip: '鼠标左键点击【确定】按钮' }
|
||||
]
|
||||
},
|
||||
{
|
||||
maxDuration: 8,
|
||||
minDuration: 5,
|
||||
operateType: '0206',
|
||||
skinCode: '06',
|
||||
trainingName: '信号重开({3} 进路)',
|
||||
trainingRemark: '信号重开功能',
|
||||
trainingType: '02',
|
||||
productTypes: ['01', '02'],
|
||||
stepVOList: [
|
||||
{ deviceType: '04', orderNum: 1, operateCode: '304', tip: '鼠标右键菜单选择【信号重开】' },
|
||||
{ deviceType: '04', orderNum: 2, operateCode: '304', tip: '鼠标左键点击【确定】按钮' }
|
||||
]
|
||||
},
|
||||
{
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
operateType: '0208',
|
||||
skinCode: '06',
|
||||
trainingName: '进路交自动控({5})',
|
||||
trainingRemark: '进路交自动控',
|
||||
trainingType: '02',
|
||||
productTypes: ['01', '02'],
|
||||
stepVOList: [
|
||||
{ deviceType: '04', orderNum: 1, operateCode: '315', tip: '鼠标右键菜单选择【进路交自动控】' },
|
||||
{ deviceType: '04', orderNum: 2, operateCode: '3151', tip: '鼠标左键选择【{3}】进路', val: '{4}' },
|
||||
{ deviceType: '04', orderNum: 3, operateCode: '315', tip: '鼠标左键点击【确定】按钮' }
|
||||
]
|
||||
},
|
||||
{
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
operateType: '0209',
|
||||
skinCode: '06',
|
||||
trainingName: '进路交人工控({5})',
|
||||
trainingRemark: '进路交人工控',
|
||||
trainingType: '02',
|
||||
productTypes: ['01', '02'],
|
||||
stepVOList: [
|
||||
{ deviceType: '04', orderNum: 1, operateCode: '314', tip: '鼠标右键菜单选择【进路交人工控】' },
|
||||
{ deviceType: '04', orderNum: 2, operateCode: '3141', tip: '鼠标左键选择【{3}】进路', val: '{4}' },
|
||||
{ deviceType: '04', orderNum: 3, operateCode: '314', tip: '鼠标左键点击【确定】按钮' }
|
||||
]
|
||||
},
|
||||
{
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
operateType: '0211',
|
||||
skinCode: '06',
|
||||
trainingName: '设置通过模式({5})',
|
||||
trainingRemark: '设置通过模式',
|
||||
trainingType: '02',
|
||||
productTypes: ['02'],
|
||||
stepVOList: [
|
||||
{ deviceType: '04', orderNum: 1, operateCode: '309', tip: '鼠标右键菜单选择【设置通过模式】' },
|
||||
{ deviceType: '04', orderNum: 2, operateCode: '309', tip: '鼠标左键点击【确定】按钮' }
|
||||
]
|
||||
},
|
||||
{
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
operateType: '0211',
|
||||
skinCode: '06',
|
||||
trainingName: 'Fleet进路办理({5})',
|
||||
trainingRemark: 'Fleet进路办理',
|
||||
trainingType: '02',
|
||||
productTypes: ['01'],
|
||||
stepVOList: [
|
||||
{ deviceType: '04', orderNum: 1, operateCode: '309', tip: '鼠标右键菜单选择【Fleet进路办理】' },
|
||||
{ deviceType: '04', orderNum: 2, operateCode: '309', tip: '鼠标左键点击【确定】按钮' }
|
||||
]
|
||||
},
|
||||
{
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
operateType: '0212',
|
||||
skinCode: '06',
|
||||
trainingName: '取消通过模式({5})',
|
||||
trainingRemark: '取消通过模式',
|
||||
trainingType: '02',
|
||||
productTypes: ['02'],
|
||||
stepVOList: [
|
||||
{ deviceType: '04', orderNum: 1, operateCode: '310', tip: '鼠标右键菜单选择【取消通过模式】' },
|
||||
{ deviceType: '04', orderNum: 2, operateCode: '310', tip: '鼠标左键点击【确定】按钮' }
|
||||
]
|
||||
},
|
||||
{
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
operateType: '0212',
|
||||
skinCode: '06',
|
||||
trainingName: 'Fleet进路取消({5})',
|
||||
trainingRemark: 'Fleet进路取消',
|
||||
trainingType: '02',
|
||||
productTypes: ['01'],
|
||||
stepVOList: [
|
||||
{ deviceType: '04', orderNum: 1, operateCode: '310', tip: '鼠标右键菜单选择【Fleet进路取消】' },
|
||||
{ deviceType: '04', orderNum: 2, operateCode: '310', tip: '鼠标左键点击【确定】按钮' }
|
||||
]
|
||||
},
|
||||
{
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
operateType: '0215',
|
||||
skinCode: '06',
|
||||
trainingName: '人工解锁进路({5})',
|
||||
trainingRemark: '人工解锁进路',
|
||||
trainingType: '02',
|
||||
productTypes: ['01', '02'],
|
||||
stepVOList: [
|
||||
{ deviceType: '04', orderNum: 1, operateCode: '318', tip: '鼠标右键菜单选择【人工解锁进路】' },
|
||||
{ deviceType: '04', orderNum: 2, operateCode: '318', tip: '鼠标左键点击【确定】按钮' }
|
||||
]
|
||||
},
|
||||
{
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
operateType: '0216',
|
||||
skinCode: '06',
|
||||
trainingName: '信号机引导办理({5})',
|
||||
trainingRemark: '信号机引导办理',
|
||||
trainingType: '02',
|
||||
productTypes: ['01'],
|
||||
stepVOList: [
|
||||
{ deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【信号机引导办理】' },
|
||||
{ deviceType: '04', orderNum: 2, operateCode: '308', tip: '鼠标左键点击【确定】按钮' }
|
||||
]
|
||||
},
|
||||
{
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
operateType: '0203',
|
||||
skinCode: '06',
|
||||
trainingName: '信号封锁({5})',
|
||||
trainingRemark: '信号封闭',
|
||||
trainingType: '02',
|
||||
productTypes: ['02'],
|
||||
stepVOList: [
|
||||
{ deviceType: '04', orderNum: 1, operateCode: '306', tip: '鼠标右键菜单选择【信号封闭】' },
|
||||
{ deviceType: '04', orderNum: 2, operateCode: '306', tip: '鼠标左键点击【确定】按钮' }
|
||||
]
|
||||
},
|
||||
// {
|
||||
// maxDuration: 15,
|
||||
// minDuration: 8,
|
||||
// operateType: '0204',
|
||||
// skinCode: '06',
|
||||
// trainingName: '信号解封({5})',
|
||||
// trainingRemark: '信号解封功能',
|
||||
// trainingType: '02',
|
||||
// productTypes: ['01'],
|
||||
// stepVOList: [
|
||||
// { deviceType: '03', orderNum: 1, operateCode: '307', tip: '鼠标右键菜单选择【信号解封】' },
|
||||
// { deviceType: '03', orderNum: 2, operateCode: '3073', tip: '鼠标左键点击【确定】按钮' },
|
||||
// { deviceType: '03', orderNum: 3, operateCode: '3076', tip: '鼠标左键选择({8}{9})区段', val: '' },
|
||||
// { deviceType: '03', orderNum: 4, operateCode: '3074', tip: '鼠标左键点击【确定】按钮' },
|
||||
// { deviceType: '03', orderNum: 5, operateCode: '307', tip: '鼠标左键点击【关闭】按钮' }
|
||||
// ]
|
||||
// },
|
||||
{
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
operateType: '0210',
|
||||
skinCode: '06',
|
||||
trainingName: '查询进路控制状态({5})',
|
||||
trainingRemark: '查询进路控制状态',
|
||||
trainingType: '02',
|
||||
productTypes: ['01', '02'],
|
||||
stepVOList: [
|
||||
{ deviceType: '04', orderNum: 1, operateCode: '316', tip: '鼠标右键菜单选择【查询进路控制模式】' },
|
||||
{ deviceType: '04', orderNum: 2, operateCode: '316', tip: '鼠标左键点击【确定】按钮' }
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
maxDuration: 20,
|
||||
minDuration: 15,
|
||||
operateType: '0103',
|
||||
skinCode: '06',
|
||||
trainingName: '请求遥控({1})',
|
||||
trainingRemark: '控制权限转换,站控转中控',
|
||||
trainingType: '01',
|
||||
productTypes: ['02'], // 行调请求中控
|
||||
stepVOList: [
|
||||
{ deviceType: '05', orderNum: 1, operateCode: '202', tip: '鼠标左键点击顶部菜单栏【请求遥控】' },
|
||||
{ deviceType: '05', orderNum: 2, operateCode: '202', tip: '鼠标左键点击【应用】' }
|
||||
]
|
||||
},
|
||||
{
|
||||
maxDuration: 15,
|
||||
minDuration: 8,
|
||||
operateType: '0101',
|
||||
skinCode: '06',
|
||||
trainingName: '请求站控({1})',
|
||||
trainingRemark: '控制权限转换,中控转站控',
|
||||
trainingType: '01',
|
||||
productTypes: ['01'], // 现地请求站控
|
||||
stepVOList: [
|
||||
{ deviceType: '05', orderNum: 1, operateCode: '204', tip: '鼠标左键点击顶部菜单栏【请求站控】' },
|
||||
{ deviceType: '05', orderNum: 2, operateCode: '204', tip: '鼠标左键点击【应用】' }
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
};
|
||||
|
@ -52,6 +52,7 @@ class ValidateHandler {
|
||||
const order = Handler.getOrder();
|
||||
|
||||
let valid = false;
|
||||
debugger;
|
||||
if (operate.over && steps.length == 1) { // 右键菜单直接发送校验
|
||||
if (operate && steps[0] &&
|
||||
operate.code == steps[0].code &&
|
||||
|
@ -1,4 +1,3 @@
|
||||
|
||||
export function getBaseUrl() {
|
||||
let BASE_API;
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
|
@ -1,17 +1,20 @@
|
||||
<template>
|
||||
<div class="jl3dpassflow">
|
||||
<div id="jl3d" class="jl3ddraw" />
|
||||
<div class="menutop">
|
||||
<el-button-group>
|
||||
<el-button type="primary" @click="switchrender">{{ rendermode }}</el-button>
|
||||
</el-button-group>
|
||||
</div>
|
||||
<div class="menudown">
|
||||
<el-button-group>
|
||||
<el-button type="primary" @click="back">退出</el-button>
|
||||
</el-button-group>
|
||||
</div>
|
||||
</div>
|
||||
<div class="jl3dpassflow">
|
||||
<div id="jl3d" class="jl3ddraw">
|
||||
|
||||
</div>
|
||||
<!-- <div class="menutop">
|
||||
<el-button-group>
|
||||
<el-button type="primary" @click="switchrender">{{rendermode}}</el-button>
|
||||
</el-button-group>
|
||||
</div> -->
|
||||
<div class="menudown">
|
||||
<el-button-group>
|
||||
<el-button type="primary" @click="back">退出</el-button>
|
||||
</el-button-group>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</template>
|
||||
<script>
|
||||
import Vue from 'vue';
|
||||
|
@ -126,7 +126,7 @@ export default {
|
||||
methods:{
|
||||
deviceChange(code) {
|
||||
this.$emit('setCenter', code);
|
||||
this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
|
||||
this.setModel(this.$store.getters['map/getDeviceByCode'](code));
|
||||
},
|
||||
setModel(data) {
|
||||
this.$refs.dataform.resetFields();
|
||||
|
BIN
static/model/device/signal/1.jpg
Normal file
After Width: | Height: | Size: 26 KiB |
BIN
static/model/device/signal/2.jpg
Normal file
After Width: | Height: | Size: 27 KiB |
BIN
static/model/device/signal/3.jpg
Normal file
After Width: | Height: | Size: 24 KiB |
BIN
static/model/device/signal/4.jpg
Normal file
After Width: | Height: | Size: 8.3 KiB |
BIN
static/model/device/signal/5.jpg
Normal file
After Width: | Height: | Size: 17 KiB |
BIN
static/model/device/signal/signal.FBX
Normal file
BIN
static/model/device/stationstand/stationstand.bak.FBX
Normal file
BIN
static/model/device/stationstand/zt001.png
Normal file
After Width: | Height: | Size: 21 KiB |
BIN
static/model/device/stationstand/zt005.png
Normal file
After Width: | Height: | Size: 375 KiB |
BIN
static/model/device/stationstand/zt007.png
Normal file
After Width: | Height: | Size: 5.4 KiB |
BIN
static/model/device/stationstand/zt008.png
Normal file
After Width: | Height: | Size: 19 KiB |
BIN
static/model/device/switch/011.jpg
Normal file
After Width: | Height: | Size: 17 KiB |
BIN
static/model/device/switch/012.jpg
Normal file
After Width: | Height: | Size: 16 KiB |
BIN
static/model/device/switch/013.jpg
Normal file
After Width: | Height: | Size: 13 KiB |
BIN
static/model/device/switch/014.jpg
Normal file
After Width: | Height: | Size: 21 KiB |
BIN
static/model/device/switch/015.jpg
Normal file
After Width: | Height: | Size: 21 KiB |
BIN
static/model/device/switch/016.jpg
Normal file
After Width: | Height: | Size: 22 KiB |
BIN
static/model/device/switch/017.jpg
Normal file
After Width: | Height: | Size: 9.2 KiB |
BIN
static/model/device/switch/020.jpg
Normal file
After Width: | Height: | Size: 19 KiB |
BIN
static/model/device/switch/021.jpg
Normal file
After Width: | Height: | Size: 17 KiB |
BIN
static/model/device/switch/022.jpg
Normal file
After Width: | Height: | Size: 9.3 KiB |
BIN
static/model/device/switch/024.jpg
Normal file
After Width: | Height: | Size: 13 KiB |
BIN
static/model/device/switch/switch.bak.FBX
Normal file
BIN
static/model/device/switch/z025.jpg
Normal file
After Width: | Height: | Size: 24 KiB |