joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
joylink_cuiweidong 2020-06-12 16:12:47 +08:00
commit a7ca270be0
25 changed files with 586 additions and 355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/PopMenu/item.vue
View File

@ -9,7 +9,7 @@
<i class="el-icon-arrow-right" /> <i class="el-icon-arrow-right" />
</div> </div>
<ul v-if="isPopup" ref="popup" class="menu" :style="{display: isShow? 'block': 'table', marginLeft: marginLeft+'px'}"> <ul v-if="isPopup" ref="popup" class="menu" :style="{display: isShow? 'block': 'table', marginLeft: marginLeft+'px'}">
<div class="menu-pop"> <div class="menu-pop pop-menu">
<div v-show="isShow" class="arrow el-icon-arrow-down" /> <div v-show="isShow" class="arrow el-icon-arrow-down" />
<pop-menu-item v-for="(el, i) in option.children" :key="i" :option="el" :pop-class="popClass" @close="close" /> <pop-menu-item v-for="(el, i) in option.children" :key="i" :option="el" :pop-class="popClass" @close="close" />
<div v-show="isShow" class="arrow el-icon-arrow-up" /> <div v-show="isShow" class="arrow el-icon-arrow-up" />
@ -56,7 +56,7 @@ export default {
data() { data() {
return { return {
active: -1, active: -1,
allowedColor: '#666', allowedColor: '#000',
disabledColor: '#ccc' disabledColor: '#ccc'
}; };
}, },
@ -162,11 +162,12 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
flex-direction: row;
padding-right: 3px; padding-right: 3px;
} }
.menu-item { .menu-item {
background: $bg; // background: $bg;
list-style: none; list-style: none;
} }

4
src/iscs/iscs.js
View File

@ -236,8 +236,10 @@ class Iscs {
} }
resize(opt) { resize(opt) {
// console.log(opt, 'resize');
// debugger;
this.$iscsZr.resize(opt); this.$iscsZr.resize(opt);
this.$painter.updateZrSize(opt); this.$painter.updateZrSize(opt); // 判断元素显示隐藏
} }
refresh() { refresh() {

2
src/iscs/transformHandle.js
View File

@ -1,4 +1,4 @@
import deviceType from './constant/deviceType'; // import deviceType from './constant/deviceType';
import {createTransform, createBoundingRect} from './utils/parser'; import {createTransform, createBoundingRect} from './utils/parser';
class TransformHandle { class TransformHandle {

32
src/jlmap3d/jl3ddevice/jl3ddeviceNew.js
View File

@ -148,13 +148,15 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
scope.modelmanager.loadpromise(Staticmodel, scope.mixers).then(function (data) { scope.modelmanager.loadpromise(Staticmodel, scope.mixers).then(function (data) {
moveanima.initlistnew(scope.modelmanager.switchmodel.mesh); moveanima.initlistnew(scope.modelmanager.switchmodel.mesh);
daochamodel = scope.modelmanager.switchmodel.mesh.getObjectByName("DAOCHA"); daochamodel = scope.modelmanager.switchmodel.mesh.getObjectByName("DAOCHA");
scope.modelmanager.standmodel.mesh.getObjectByName("zhantailiebiao").material.map =scope.stationtexture["stationlist"]; console.log(scope.stationtexture);
scope.modelmanager.standmodel.mesh.getObjectByName("zhantailiebiao").material.map.needsUpdate = true; if(scope.stationtexture["stationlist"]){
scope.modelmanager.standmodel.mesh.getObjectByName("zhantailiebiao").material.map =scope.stationtexture["stationlist"];
scope.modelmanager.standmodel.mesh.getObjectByName("pingbimen1").material.map =scope.stationtexture["pingbimen"]; scope.modelmanager.standmodel.mesh.getObjectByName("zhantailiebiao").material.map.needsUpdate = true;
scope.modelmanager.standmodel.mesh.getObjectByName("pingbimen1").material.map.needsUpdate = true; }
if(scope.stationtexture["pingbimen"]){
scope.modelmanager.standmodel.mesh.getObjectByName("pingbimen1").material.map =scope.stationtexture["pingbimen"];
scope.modelmanager.standmodel.mesh.getObjectByName("pingbimen1").material.map.needsUpdate = true;
}
animate(); animate();
}) })
}); });
@ -225,13 +227,14 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
} }
if (data._type == "Psd") { if (data._type == "Psd") {
console.log(data);
scope.modelmanager.standmodel.code = data.code; scope.modelmanager.standmodel.code = data.code;
scope.showmodel = scope.modelmanager.standmodel.mesh; scope.showmodel = scope.modelmanager.standmodel.mesh;
scope.scene.add(scope.showmodel); scope.scene.add(scope.showmodel);
if(scope.stationtexture[psdtexturemap[data.standCode]]){
scope.modelmanager.standmodel.mesh.getObjectByName("zhantaiming").material.map =scope.stationtexture[psdtexturemap[data.standCode]];
scope.modelmanager.standmodel.mesh.getObjectByName("zhantaiming").material.map.needsUpdate = true;
}
scope.modelmanager.standmodel.mesh.getObjectByName("zhantaiming").material.map =scope.stationtexture[psdtexturemap[data.standCode]];
scope.modelmanager.standmodel.mesh.getObjectByName("zhantaiming").material.map.needsUpdate = true;
} }
if(scope.showmodel){ if(scope.showmodel){
@ -272,12 +275,13 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
scope.scene.add(scope.showmodel); scope.scene.add(scope.showmodel);
} }
if (data._type == "Psd") {; if (data._type == "Psd") {
scope.showmodel = scope.modelmanager.standmodel.mesh; scope.showmodel = scope.modelmanager.standmodel.mesh;
scope.scene.add(scope.showmodel); scope.scene.add(scope.showmodel);
scope.modelmanager.standmodel.mesh.getObjectByName("zhantaiming").material.map =scope.stationtexture[psdtexturemap[data.standCode]]; if(scope.stationtexture[psdtexturemap[data.standCode]]){
scope.modelmanager.standmodel.mesh.getObjectByName("zhantaiming").material.map.needsUpdate = true; scope.modelmanager.standmodel.mesh.getObjectByName("zhantaiming").material.map =scope.stationtexture[psdtexturemap[data.standCode]];
scope.modelmanager.standmodel.mesh.getObjectByName("zhantaiming").material.map.needsUpdate = true;
}
} }
initstatus(data); initstatus(data);
} }

47
src/jmapNew/config/skinCode/bejing_01.js
View File

@ -365,31 +365,46 @@ class SkinCode extends defaultStyle {
fontColor: '#ffffff', // 控制模式字体颜色 fontColor: '#ffffff', // 控制模式字体颜色
fontWeight: 'normal', // 控制模式字体粗细 fontWeight: 'normal', // 控制模式字体粗细
textAlign: 'middle', // 控制模式水平对齐 textAlign: 'middle', // 控制模式水平对齐
textVerticalAlign: 'top', // 控制模式垂直对齐 textVerticalAlign: 'top' // 控制模式垂直对齐
centerControlText: '中控', // 中控文字内容
substationControlText: '站控', // 站控文字内容
emergencyControlText: '紧急站控', // 紧急站控文字内容
interconnectedControlText: '连锁控' // 连锁控文字内容
// stationCenterControlText: '站中控', // 站中控文字内容
// generalAlarmControlText: '总报警' // 总报警文字内容
}, },
lamp: { lamp: {
count: 3, // 控制模式灯个数 count: 3, // 控制模式灯个数
offset: { x: 20, y: 0 }, // 偏移量 offset: { x: 0, y: 0 }, // 偏移量
radiusR: 6, // 控制模式灯的半径 radiusR: 6, // 控制模式灯的半径
distance: 46, // 控制模式之间灯之间的距离 distance: 46, // 控制模式之间灯之间的距离
grayColor: '#7F7F7F', // 控制模式灰色 grayColor: '#7F7F7F', // 控制模式灰色
greenColor: '#00FF00', // 控制模式绿色 greenColor: '#00FF00', // 控制模式绿色
redColor: '#FF0000', // 控制模式红色 redColor: '#FF0000', // 控制模式红色
yellowColor: '#FFFF00', // 控制模式黄色 yellowColor: '#FFFF00' // 控制模式黄色
emergencyControlShow: true, // 紧急站控显示
centerControlShow: true, // 中控显示
substationControlShow: true, // 站控按钮显示
interconnectedControlShow: false, // 联锁控显示
centerControlButtonShow: false // 中控显示
}, },
arrow: { emergencyControl: { // 紧急站控
show: false // 控制模式箭头显隐 show: true,
offset: { x: 0, y: 0 },
text: '紧急站控',
arrowShow: false,
grayColor: '#7F7F7F'
},
centerControl: { // 中控
show: true,
offset: { x: 0, y: 0 },
text: '中控',
buttonShow: false,
arrowShow: false,
grayColor: '#7F7F7F'
},
substationControl: { // 站控按钮
show: true,
offset: { x: 0, y: 0 },
text: '站控',
arrowShow: false,
grayColor: '#7F7F7F'
},
interconnectedControl: { // 联锁控
show: false,
offset: { x: 0, y: 0 },
text: '联锁控',
arrowShow: false,
grayColor: '#7F7F7F'
}, },
mouseOverStyle: { // 鼠标悬浮样式 mouseOverStyle: { // 鼠标悬浮样式
fontSize: 10, fontSize: 10,

48
src/jmapNew/config/skinCode/chengdu_01.js
View File

@ -334,31 +334,47 @@ class SkinCode extends defaultStyle {
fontColor: '#ffffff', // 字体颜色 fontColor: '#ffffff', // 字体颜色
fontWeight: 'normal', // 字体粗细 fontWeight: 'normal', // 字体粗细
textAlign: 'middle', // 字体水平对齐 textAlign: 'middle', // 字体水平对齐
textVerticalAlign: 'top', // 字体垂直对齐 textVerticalAlign: 'top' // 字体垂直对齐
centerControlText: '中控', // 中控文字内容
substationControlText: '站控', // 站控文字内容
emergencyControlText:'紧急站控', // 紧急站控文字内容
interconnectedControlText:'连锁控' // 连锁控文字内容
// stationCenterControlText: '站中控', // 站中控文字内容
// generalAlarmControlText: '总报警' // 总报警文字内容
}, },
lamp: { lamp: {
count: 4, // 控制模式的个数 count: 4, // 控制模式的个数
offset: {x: 20, y: 0}, // 偏移量 offset: {x: 0, y: 0}, // 偏移量
emergencyOffset: {x: 0, y: 0},
radiusR: 4, // 控制模式灯的半径 radiusR: 4, // 控制模式灯的半径
distance: 46, // 控制模式之间灯之间的距离 distance: 46, // 控制模式之间灯之间的距离
grayColor: '#C0C0C0', // 控制模式灰色 grayColor: '#C0C0C0', // 控制模式灰色
greenColor: 'green', // 控制模式绿色 greenColor: 'green', // 控制模式绿色
redColor: 'red', // 控制模式红色 redColor: 'red', // 控制模式红色
yellowColor: 'yellow', // 控制模式黄色 yellowColor: 'yellow' // 控制模式黄色
emergencyControlShow: true, // 紧急站控显示
centerControlShow: true, // 中控显示
substationControlShow: true, // 站控按钮显示
interconnectedControlShow: false, // 联锁控显示
centerControlButtonShow: false // 中控显示
}, },
arrow: { emergencyControl: { // 紧急站控
show: false // 控制模式箭头显隐 show: true,
offset: { x: 0, y: 0 },
text: '紧急站控',
arrowShow: false,
grayColor: '#7F7F7F'
},
centerControl: { // 中控
show: true,
offset: { x: 0, y: 0 },
text: '中控',
buttonShow: false,
arrowShow: false,
grayColor: '#7F7F7F'
},
substationControl: { // 站控按钮
show: true,
offset: { x: 0, y: 0 },
text: '站控',
arrowShow: false,
grayColor: '#7F7F7F'
},
interconnectedControl: { // 联锁控
show: false,
offset: { x: 0, y: 0 },
text: '联锁控',
arrowShow: false,
grayColor: '#7F7F7F'
} }
} }
}; };

45
src/jmapNew/config/skinCode/chengdu_03.js
View File

@ -324,13 +324,7 @@ class SkinCode extends defaultStyle {
fontColor: '#ffffff', // 字体颜色 fontColor: '#ffffff', // 字体颜色
fontWeight: 'normal', // 字体粗细 fontWeight: 'normal', // 字体粗细
textAlign: 'middle', // 字体水平对齐 textAlign: 'middle', // 字体水平对齐
textVerticalAlign: 'top', // 字体垂直对齐 textVerticalAlign: 'top' // 字体垂直对齐
centerControlText: '中控', // 中控文字内容
substationControlText: '站控', // 站控文字内容
emergencyControlText:'紧急站控', // 紧急站控文字内容
interconnectedControlText:'连锁控' // 连锁控文字内容
// stationCenterControlText: '站中控', // 站中控文字内容
// generalAlarmControlText: '总报警' // 总报警文字内容
}, },
lamp: { lamp: {
count: 4, // 控制模式的个数 count: 4, // 控制模式的个数
@ -340,15 +334,36 @@ class SkinCode extends defaultStyle {
grayColor: '#7F7F7F', // 控制模式灰色 grayColor: '#7F7F7F', // 控制模式灰色
greenColor: '#00FF00', // 控制模式绿色 greenColor: '#00FF00', // 控制模式绿色
redColor: '#FF0000', // 控制模式红色 redColor: '#FF0000', // 控制模式红色
yellowColor: '#FFFF00', // 控制模式黄色 yellowColor: '#FFFF00' // 控制模式黄色
emergencyControlShow: true, // 紧急站控显示
centerControlShow: true, // 中控显示
substationControlShow: true, // 站控按钮显示
interconnectedControlShow: true, // 联锁控显示
centerControlButtonShow: false // 中控显示
}, },
arrow: { emergencyControl: { // 紧急站控
show: false // 控制模式箭头显隐 show: true,
offset: { x: 0, y: 0 },
text: '紧急站控',
arrowShow: false,
grayColor: '#7F7F7F'
},
centerControl: { // 中控
show: true,
offset: { x: 0, y: 0 },
text: '中控',
buttonShow: false,
arrowShow: false,
grayColor: '#7F7F7F'
},
substationControl: { // 站控按钮
show: true,
offset: { x: 0, y: 0 },
text: '站控',
arrowShow: false,
grayColor: '#7F7F7F'
},
interconnectedControl: { // 联锁控
show: true,
offset: { x: 0, y: 0 },
text: '联锁控',
arrowShow: false,
grayColor: '#7F7F7F'
} }
} }
}; };

44
src/jmapNew/config/skinCode/foshan_01.js
View File

@ -346,13 +346,7 @@ class SkinCode extends defaultStyle {
fontColor: '#ffffff', // 字体颜色 fontColor: '#ffffff', // 字体颜色
fontWeight: 'normal', // 字体粗细 fontWeight: 'normal', // 字体粗细
textAlign: 'middle', // 字体水平对齐 textAlign: 'middle', // 字体水平对齐
textVerticalAlign: 'top', // 字体垂直对齐 textVerticalAlign: 'top' // 字体垂直对齐
centerControlText: '中控', // 中控文字内容
substationControlText: '站控', // 站控文字内容
emergencyControlText:'紧急站控', // 紧急站控文字内容
interconnectedControlText:'连锁控' // 连锁控文字内容
// stationCenterControlText: '站中控', // 站中控文字内容
// generalAlarmControlText: '总报警' // 总报警文字内容
}, },
lamp: { lamp: {
count: 2, // 控制模式灯个数 count: 2, // 控制模式灯个数
@ -362,12 +356,36 @@ class SkinCode extends defaultStyle {
grayColor: '#7F7F7F', // 控制模式灰色 grayColor: '#7F7F7F', // 控制模式灰色
greenColor: '#00FF00', // 控制模式绿色 greenColor: '#00FF00', // 控制模式绿色
redColor: '#FF0000', // 控制模式红色 redColor: '#FF0000', // 控制模式红色
yellowColor: '#FFFF00', // 控制模式黄色 yellowColor: '#FFFF00' // 控制模式黄色
emergencyControlShow: false, // 紧急站控显示 },
centerControlShow: true, // 中控显示 emergencyControl: { // 紧急站控
substationControlShow: true, // 站控按钮显示 show: true,
interconnectedControlShow: false, // 联锁控显示 offset: { x: 110, y: 0 },
centerControlButtonShow: false // 中控显示 text: '紧急',
arrowShow: true,
grayColor: '#7F7F7F'
},
centerControl: { // 中控
show: true,
offset: { x: 0, y: 0 },
text: '中控',
buttonShow: false,
arrowShow: false,
grayColor: '#7F7F7F'
},
substationControl: { // 站控按钮
show: true,
offset: { x: 0, y: 0 },
text: '站控',
arrowShow: true,
grayColor: '#7F7F7F'
},
interconnectedControl: { // 联锁控
show: false,
offset: { x: 0, y: 0 },
text: '联锁控',
arrowShow: false,
grayColor: '#7F7F7F'
}, },
arrow: { arrow: {
show: true // 控制模式箭头显隐 show: true // 控制模式箭头显隐

45
src/jmapNew/config/skinCode/fuzhou_01.js
View File

@ -335,13 +335,7 @@ class SkinCode extends defaultStyle {
fontColor: '#ffffff', // 字体颜色 fontColor: '#ffffff', // 字体颜色
fontWeight: 'normal', // 字体粗细 fontWeight: 'normal', // 字体粗细
textAlign: 'middle', // 字体水平对齐 textAlign: 'middle', // 字体水平对齐
textVerticalAlign: 'top', // 字体垂直对齐 textVerticalAlign: 'top' // 字体垂直对齐
centerControlText: '中控', // 中控文字内容
substationControlText: '站控', // 站控文字内容
emergencyControlText:'紧急站控', // 紧急站控文字内容
interconnectedControlText:'连锁控' // 连锁控文字内容
// stationCenterControlText: '站中控', // 站中控文字内容
// generalAlarmControlText: '总报警' // 总报警文字内容
}, },
lamp: { lamp: {
count: 2, // 控制模式灯个数 count: 2, // 控制模式灯个数
@ -351,15 +345,36 @@ class SkinCode extends defaultStyle {
grayColor: '#7F7F7F', // 控制模式灰色 grayColor: '#7F7F7F', // 控制模式灰色
greenColor: '#00FF00', // 控制模式绿色 greenColor: '#00FF00', // 控制模式绿色
redColor: '#FF0000', // 控制模式红色 redColor: '#FF0000', // 控制模式红色
yellowColor: '#FFFF00', // 控制模式黄色 yellowColor: '#FFFF00' // 控制模式黄色
emergencyControlShow: false, // 紧急站控显示
centerControlShow: true, // 中控显示
substationControlShow: true, // 站控按钮显示
interconnectedControlShow: false, // 联锁控显示
centerControlButtonShow: false // 中控显示
}, },
arrow: { emergencyControl: { // 紧急站控
show: true // 控制模式箭头显隐 show: false,
offset: { x: 0, y: 0 },
text: '紧急',
arrowShow: false,
grayColor: '#7F7F7F'
},
centerControl: { // 中控
show: true,
offset: { x: 0, y: 0 },
text: '中控',
buttonShow: false,
arrowShow: false,
grayColor: '#7F7F7F'
},
substationControl: { // 站控按钮
show: true,
offset: { x: 0, y: 0 },
text: '站控',
arrowShow: true,
grayColor: '#7F7F7F'
},
interconnectedControl: { // 联锁控
show: false,
offset: { x: 0, y: 0 },
text: '联锁控',
arrowShow: false,
grayColor: '#7F7F7F'
}, },
mouseOverStyle: { // 鼠标悬浮样式 mouseOverStyle: { // 鼠标悬浮样式
fontSize: null, fontSize: null,

46
src/jmapNew/config/skinCode/haerbin_01.js
View File

@ -355,31 +355,47 @@ class SkinCode extends defaultStyle {
fontColor: '#ffffff', // 字体颜色 fontColor: '#ffffff', // 字体颜色
fontWeight: 'normal', // 字体粗细 fontWeight: 'normal', // 字体粗细
textAlign: 'middle', // 字体水平对齐 textAlign: 'middle', // 字体水平对齐
textVerticalAlign: 'top', // 字体垂直对齐 textVerticalAlign: 'top' // 字体垂直对齐
centerControlText: '中控', // 中控文字内容
substationControlText: '站控', // 站控文字内容
emergencyControlText: '紧急站控', // 紧急站控文字内容
interconnectedControlText: '连锁控' // 连锁控文字内容
// stationCenterControlText: '站中控', // 站中控文字内容
// generalAlarmControlText: '总报警' // 总报警文字内容
}, },
lamp: { lamp: {
count: 2, // 控制模式灯个数 count: 2, // 控制模式灯个数
offset: { x: 0, y: 0 }, // 控制模式灯偏移量 offset: { x: 0, y: 0 }, // 控制模式灯偏移量
emergencyOffset: {x: 0, y: 0},
radiusR: 4, // 控制模式灯的半径 radiusR: 4, // 控制模式灯的半径
distance: 36, // 控制模式之间灯之间的距离 distance: 36, // 控制模式之间灯之间的距离
grayColor: '#7F7F7F', // 控制模式灰色 grayColor: '#7F7F7F', // 控制模式灰色
greenColor: '#00FF00', // 控制模式绿色 greenColor: '#00FF00', // 控制模式绿色
redColor: '#FF0000', // 控制模式红色 redColor: '#FF0000', // 控制模式红色
yellowColor: '#FFFF00', // 控制模式黄色 yellowColor: '#FFFF00' // 控制模式黄色
emergencyControlShow: false, // 紧急站控显示
centerControlShow: true, // 中控显示
substationControlShow: true, // 站控按钮显示
interconnectedControlShow: false, // 联锁控显示
centerControlButtonShow: false // 中控显示
}, },
arrow: { emergencyControl: { // 紧急站控
show: true // 控制模式箭头显隐 show: false,
offset: { x: 0, y: 0 },
text: '紧急',
arrowShow: false,
grayColor: '#7F7F7F'
},
centerControl: { // 中控
show: true,
offset: { x: 0, y: 0 },
text: '中控',
buttonShow: false,
arrowShow: false,
grayColor: '#7F7F7F'
},
substationControl: { // 站控按钮
show: true,
offset: { x: 0, y: 0 },
text: '站控',
arrowShow: true,
grayColor: '#7F7F7F'
},
interconnectedControl: { // 联锁控
show: false,
offset: { x: 0, y: 0 },
text: '联锁控',
arrowShow: false,
grayColor: '#7F7F7F'
}, },
mouseOverStyle: { // 鼠标悬浮样式 mouseOverStyle: { // 鼠标悬浮样式
fontSize: null, fontSize: null,

58
src/jmapNew/config/skinCode/ningbo_01.js
View File

@ -223,34 +223,50 @@ class SkinCode extends defaultStyle {
fontColor: '#ffffff', // 字体颜色 fontColor: '#ffffff', // 字体颜色
fontWeight: 'normal', // 字体粗细 fontWeight: 'normal', // 字体粗细
textAlign: 'middle', // 字体水平对齐 textAlign: 'middle', // 字体水平对齐
textVerticalAlign: 'top', // 字体垂直对齐 textVerticalAlign: 'top' // 字体垂直对齐
centerControlButton: '站遥控按钮', // 中控文字内容
centerControlText: '遥控', // 中控文字内容
substationControlText: '站控', // 站控文字内容
emergencyControlText: '紧急站控', // 紧急站控文字内容
interconnectedControlText: '连锁控' // 连锁控文字内容
// stationCenterControlText: '站中控', // 站中控文字内容
// generalAlarmControlText: '总报警' // 总报警文字内容
}, },
lamp: { lamp: {
count: 4, // 控制模式的个数 count: 4, // 控制模式的个数
offset: { x: 20, y: 0 }, // 偏移量 offset: { x: 20, y: 0 }, // 偏移量
emergencyOffset: {x: 0, y: 0},
radiusR: 6, // 控制模式灯的半径 radiusR: 6, // 控制模式灯的半径
distance: 46, // 控制模式之间灯之间的距离 distance: 46, // 控制模式之间灯之间的距离
grayColor: '#C0C0C0', // 控制模式灰色 grayColor: '#C0C0C0', // 控制模式灰色
greenColor: 'green', // 控制模式绿色 greenColor: 'green', // 控制模式绿色
redColor: 'red', // 控制模式红色 redColor: 'red', // 控制模式红色
yellowColor: 'yellow', // 控制模式黄色 yellowColor: 'yellow', // 控制模式黄色
emergencyControlShow: true, // 紧急站控显示
centerControlShow: true, // 中控显示
substationControlShow: true, // 站控按钮显示
interconnectedControlShow: false, // 联锁控显示
centerControlButtonShow: true, // 中控显示
stroke: '#FFFFFF', // 框的颜色 stroke: '#FFFFFF', // 框的颜色
fill: 'rgba(0,0,0,0)' // 填充色 fill: 'rgba(0,0,0,0)' // 填充色
}, },
arrow: { emergencyControl: { // 紧急站控
show: false // 控制模式箭头显隐 show: true,
offset: { x: 0, y: 0 },
text: '紧急站控',
arrowShow: false,
grayColor: '#7F7F7F'
},
centerControl: { // 中控
show: true,
offset: { x: 0, y: 0 },
text: '遥控',
buttonText: '站遥控按钮',
buttonShow: true,
arrowShow: false,
grayColor: '#7F7F7F'
},
substationControl: { // 站控按钮
show: true,
offset: { x: 0, y: 0 },
text: '站控',
arrowShow: false,
grayColor: '#7F7F7F'
},
interconnectedControl: { // 联锁控
show: false,
offset: { x: 0, y: 0 },
text: '联锁控',
arrowShow: false,
grayColor: '#7F7F7F'
} }
} }
}; };
@ -534,7 +550,17 @@ class SkinCode extends defaultStyle {
fontFamily: 'consolas', fontFamily: 'consolas',
trainBodyLineWidth: 1, // 车身line宽 trainBodyLineWidth: 1, // 车身line宽
changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度 changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
specialTrainType: [], // 特殊列车类型需设置显示格式 specialTrainType: [
{
type: 'MANUAL',
serviceNumber: '',
nameFormat: 'groupNumber:targetCode'
},
{
type: 'HEAD',
nameFormat: 'groupNumber:targetCode'
}
], // 特殊列车类型需设置显示格式
lrPadding: 4, // 两边间隔 lrPadding: 4, // 两边间隔
upPadding: 4, // 上边距离 upPadding: 4, // 上边距离
trainSidelineColor: '#ABFE9B', trainSidelineColor: '#ABFE9B',

46
src/jmapNew/config/skinCode/xian_01.js
View File

@ -350,31 +350,47 @@ class SkinCode extends defaultStyle {
fontColor: '#ffffff', // 字体颜色 fontColor: '#ffffff', // 字体颜色
fontWeight: 'normal', // 字体粗细 fontWeight: 'normal', // 字体粗细
textAlign: 'middle', // 字体水平对齐 textAlign: 'middle', // 字体水平对齐
textVerticalAlign: 'top', // 字体垂直对齐 textVerticalAlign: 'top' // 字体垂直对齐
centerControlText: '中控', // 中控文字内容
substationControlText: '站控', // 站控文字内容
emergencyControlText:'紧急站控', // 紧急站控文字内容
interconnectedControlText:'连锁控' // 连锁控文字内容
// stationCenterControlText: '站中控', // 站中控文字内容
// generalAlarmControlText: '总报警' // 总报警文字内容
}, },
lamp: { lamp: {
count: 2, // 控制模式灯个数 count: 2, // 控制模式灯个数
offset: {x: 0, y: 0}, // 控制模式灯偏移量 offset: {x: 0, y: 0}, // 控制模式灯偏移量
emergencyOffset: {x: 0, y: 0},
radiusR: 4, // 控制模式灯的半径 radiusR: 4, // 控制模式灯的半径
distance: 36, // 控制模式之间灯之间的距离 distance: 36, // 控制模式之间灯之间的距离
grayColor: '#7F7F7F', // 控制模式灰色 grayColor: '#7F7F7F', // 控制模式灰色
greenColor: '#00FF00', // 控制模式绿色 greenColor: '#00FF00', // 控制模式绿色
redColor: '#FF0000', // 控制模式红色 redColor: '#FF0000', // 控制模式红色
yellowColor: '#FFFF00', // 控制模式黄色 yellowColor: '#FFFF00' // 控制模式黄色
emergencyControlShow: false, // 紧急站控显示
centerControlShow: true, // 中控显示
substationControlShow: true, // 站控按钮显示
interconnectedControlShow: false, // 联锁控显示
centerControlButtonShow: false // 中控显示
}, },
arrow: { emergencyControl: { // 紧急站控
show: true // 控制模式箭头显隐 show: false,
offset: { x: 0, y: 0 },
text: '紧急',
arrowShow: false,
grayColor: '#7F7F7F'
},
centerControl: { // 中控
show: true,
offset: { x: 0, y: 0 },
text: '中控',
buttonShow: false,
arrowShow: false,
grayColor: '#7F7F7F'
},
substationControl: { // 站控按钮
show: true,
offset: { x: 0, y: 0 },
text: '站控',
arrowShow: true,
grayColor: '#7F7F7F'
},
interconnectedControl: { // 联锁控
show: false,
offset: { x: 0, y: 0 },
text: '联锁控',
arrowShow: false,
grayColor: '#7F7F7F'
}, },
mouseOverStyle: { // 鼠标悬浮样式 mouseOverStyle: { // 鼠标悬浮样式
fontSize: null, fontSize: null,

46
src/jmapNew/config/skinCode/xian_02.js
View File

@ -394,31 +394,47 @@ class SkinCode extends defaultStyle {
fontColor: '#ffffff', // 字体颜色 fontColor: '#ffffff', // 字体颜色
fontWeight: 'normal', // 字体粗细 fontWeight: 'normal', // 字体粗细
textAlign: 'middle', // 字体水平对齐 textAlign: 'middle', // 字体水平对齐
textVerticalAlign: 'top', // 字体垂直对齐 textVerticalAlign: 'top' // 字体垂直对齐
centerControlText: '中控', // 中控文字内容
substationControlText: '站控', // 站控文字内容
emergencyControlText:'紧急站控', // 紧急站控文字内容
interconnectedControlText:'连锁控' // 连锁控文字内容
// stationCenterControlText: '站中控', // 站中控文字内容
// generalAlarmControlText: '总报警' // 总报警文字内容
}, },
lamp: { lamp: {
count: 4, // 控制模式的个数 count: 4, // 控制模式的个数
offset: {x: 20, y: 0}, // 偏移量 offset: {x: 20, y: 0}, // 偏移量
emergencyOffset: {x: 0, y: 0},
radiusR: 4, // 控制模式灯的半径 radiusR: 4, // 控制模式灯的半径
distance: 46, // 控制模式之间灯之间的距离 distance: 46, // 控制模式之间灯之间的距离
grayColor: '#C0C0C0', // 控制模式灰色 grayColor: '#C0C0C0', // 控制模式灰色
greenColor: 'green', // 控制模式绿色 greenColor: 'green', // 控制模式绿色
redColor: 'red', // 控制模式红色 redColor: 'red', // 控制模式红色
yellowColor: 'yellow', // 控制模式黄色 yellowColor: 'yellow' // 控制模式黄色
emergencyControlShow: true, // 紧急站控显示
centerControlShow: true, // 中控显示
substationControlShow: true, // 站控按钮显示
interconnectedControlShow: false, // 联锁控显示
centerControlButtonShow: false // 中控显示
}, },
arrow: { emergencyControl: { // 紧急站控
show: false // 控制模式箭头显隐 show: true,
offset: { x: 0, y: 0 },
text: '紧急',
arrowShow: false,
grayColor: '#7F7F7F'
},
centerControl: { // 中控
show: true,
offset: { x: 0, y: 0 },
text: '中控',
buttonShow: false,
arrowShow: false,
grayColor: '#7F7F7F'
},
substationControl: { // 站控按钮
show: true,
offset: { x: 0, y: 0 },
text: '站控',
arrowShow: false,
grayColor: '#7F7F7F'
},
interconnectedControl: { // 联锁控
show: false,
offset: { x: 0, y: 0 },
text: '联锁控',
arrowShow: false,
grayColor: '#7F7F7F'
} }
} }
}; };

262
src/jmapNew/shape/Station/index.js
View File

@ -174,73 +174,41 @@ export default class Station extends Group {
const model = this.model; const model = this.model;
if (model.visible && model.createControlMode) { if (model.visible && model.createControlMode) {
// 紧急站控 // 紧急站控
if (this.style.Station.StationControl.lamp.emergencyControlShow) { this.createEmergencyControl();
this.emergencyControl = new ESingleControl({
_subType: 'emergency',
style: this.style,
zlevel: this.zlevel,
z: this.z,
point: {
x: model.controlModePoint.x - this.style.Station.StationControl.lamp.distance * 3 / 2 + this.style.Station.StationControl.lamp.offset.x,
y: model.controlModePoint.y + this.style.Station.StationControl.lamp.offset.y
},
context: this.style.Station.StationControl.text.emergencyControlText,
pop: false
});
this.add(this.emergencyControl);
}
// 中控按钮 // 中控按钮
if (this.style.Station.StationControl.lamp.centerControlShow) { this.createCenterControl();
this.centerControl = new ESingleControl({
_subType: 'center',
style: this.style,
zlevel: this.zlevel,
z: this.z,
point: {
x: model.controlModePoint.x - this.style.Station.StationControl.lamp.distance / 2 + this.style.Station.StationControl.lamp.offset.x,
y: model.controlModePoint.y + this.style.Station.StationControl.lamp.offset.y
},
context: this.style.Station.StationControl.text.centerControlText,
pop: false
});
this.add(this.centerControl);
}
// 站控按钮 // 站控按钮
if (this.style.Station.StationControl.lamp.substationControlShow) { this.createSubstationControl();
this.substationControl = new ESingleControl({
_subType: 'substation',
style: this.style,
zlevel: this.zlevel,
z: this.z,
point: {
x: model.controlModePoint.x + this.style.Station.StationControl.lamp.distance / 2 + this.style.Station.StationControl.lamp.offset.x,
y: model.controlModePoint.y + this.style.Station.StationControl.lamp.offset.y
},
context: this.style.Station.StationControl.text.substationControlText,
pop: false
});
this.add(this.substationControl);
}
// 联锁控 // 联锁控
if (this.style.Station.StationControl.lamp.interconnectedControlShow) { this.createInterconnectedControl();
this.interconnectedControl = new ESingleControl({ }
_subType: 'interconnected', this.setState(model);
style: this.style, }
zlevel: this.zlevel,
z: this.z, createEmergencyControl() { // 紧急站控
point: { const model = this.model;
x: model.controlModePoint.x + this.style.Station.StationControl.lamp.distance * 3 / 2 + this.style.Station.StationControl.lamp.offset.x, if (this.style.Station.StationControl.emergencyControl.show) {
y: model.controlModePoint.y + this.style.Station.StationControl.lamp.offset.y this.emergencyControl = new ESingleControl({
}, _subType: 'emergency',
context: this.style.Station.StationControl.text.interconnectedControlText || '联锁控', style: this.style,
pop: false zlevel: this.zlevel,
}); z: this.z,
this.add(this.interconnectedControl); point: {
} x: model.controlModePoint.x - this.style.Station.StationControl.lamp.distance * 3 / 2 + this.style.Station.StationControl.emergencyControl.offset.x,
// 箭头 y: model.controlModePoint.y + this.style.Station.StationControl.emergencyControl.offset.y
if (this.style.Station.StationControl.arrow.show) { },
const point = arrow(this.model.controlModePoint.x, this.model.controlModePoint.y + this.style.Station.StationControl.lamp.radiusR / 2, this.style.Station.StationControl.lamp.distance / 6, this.style.Station.StationControl.lamp.radiusR * 0.8); context: this.style.Station.StationControl.emergencyControl.text,
this.arrowsControl = new EArrow({ pop: false
});
this.add(this.emergencyControl);
if (this.style.Station.StationControl.emergencyControl.arrowShow) {
const x = model.controlModePoint.x - this.style.Station.StationControl.lamp.distance * 2 + this.style.Station.StationControl.emergencyControl.offset.x;
const y = model.controlModePoint.y + this.style.Station.StationControl.emergencyControl.offset.y;
const point = arrow(x, y + this.style.Station.StationControl.lamp.radiusR / 2, this.style.Station.StationControl.lamp.distance / 6, this.style.Station.StationControl.lamp.radiusR * 0.8);
this.emergencyArrowsControl = new EArrow({
zlevel: this.zlevel, zlevel: this.zlevel,
z: this.z, z: this.z,
style: this.style, style: this.style,
@ -249,44 +217,137 @@ export default class Station extends Group {
point: point, point: point,
x: model.controlModePoint.x + this.style.Station.StationControl.lamp.offset.x, x: model.controlModePoint.x + this.style.Station.StationControl.lamp.offset.x,
y: model.controlModePoint.y + this.style.Station.StationControl.lamp.radiusR / 2 + this.style.Station.StationControl.lamp.offset.y, y: model.controlModePoint.y + this.style.Station.StationControl.lamp.radiusR / 2 + this.style.Station.StationControl.lamp.offset.y,
fill: this.style.Station.StationControl.lamp.grayColor, fill: this.style.Station.StationControl.emergencyControl.grayColor,
lineWidth: 1, lineWidth: 1,
stroke: this.style.sidelineColor stroke: this.style.sidelineColor
}); });
this.add(this.arrowsControl); this.add(this.emergencyArrowsControl);
} }
// 中控按钮
if (this.style.Station.StationControl.lamp.centerControlButtonShow) {
this.centerControlButton = new ESingleControl({
_subType: 'button',
style: this.style,
zlevel: this.zlevel,
z: this.z,
point: {
x: model.controlModePoint.x - this.style.Station.StationControl.lamp.distance * 3 / -2 + this.style.Station.StationControl.lamp.offset.x,
y: model.controlModePoint.y + this.style.Station.StationControl.lamp.offset.y
},
context: this.style.Station.StationControl.text.centerControlButton,
pop: false
});
this.add(this.centerControlButton);
const arcRect = this.centerControlButton.getArcBoundingRect();
this.arcBorder = new Rect({
zlevel: this.zlevel,
z: this.z,
silent: true,
shape: arcRect,
style: {
lineDash: null,
stroke: this.style.Station.StationControl.lamp.stroke,
fill: this.style.Station.StationControl.lamp.fill
}
});
this.add(this.arcBorder);
}
} }
this.setState(model); }
createCenterControl() { // 中控按钮
const model = this.model;
if (this.style.Station.StationControl.centerControl.show) {
this.centerControl = new ESingleControl({
_subType: 'center',
style: this.style,
zlevel: this.zlevel,
z: this.z,
point: {
x: model.controlModePoint.x - this.style.Station.StationControl.lamp.distance / 2 + this.style.Station.StationControl.centerControl.offset.x,
y: model.controlModePoint.y + this.style.Station.StationControl.centerControl.offset.y
},
context: this.style.Station.StationControl.centerControl.text,
pop: false
});
this.add(this.centerControl);
if (this.style.Station.StationControl.centerControl.arrowShow) {
const x = model.controlModePoint.x - this.style.Station.StationControl.lamp.distance * 3 / 2 + this.style.Station.StationControl.emergencyControl.offset.x;
const y = model.controlModePoint.y + this.style.Station.StationControl.emergencyControl.offset.y;
const point = arrow(x, y + this.style.Station.StationControl.lamp.radiusR / 2, this.style.Station.StationControl.lamp.distance / 6, this.style.Station.StationControl.lamp.radiusR * 0.8);
this.centerArrowsControl = new EArrow({
zlevel: this.zlevel,
z: this.z,
style: this.style,
count: this.count,
drict: 1,
point: point,
x: model.controlModePoint.x + this.style.Station.StationControl.lamp.offset.x,
y: model.controlModePoint.y + this.style.Station.StationControl.lamp.radiusR / 2 + this.style.Station.StationControl.lamp.offset.y,
fill: this.style.Station.StationControl.centerControl.grayColor,
lineWidth: 1,
stroke: this.style.sidelineColor
});
this.add(this.centerArrowsControl);
}
}
// 中控按钮
if (this.style.Station.StationControl.centerControl.buttonShow) { // 宁波一 显示
this.centerControlButton = new ESingleControl({
_subType: 'button',
style: this.style,
zlevel: this.zlevel,
z: this.z,
point: {
x: model.controlModePoint.x - this.style.Station.StationControl.lamp.distance * 3 / -2 + this.style.Station.StationControl.lamp.offset.x,
y: model.controlModePoint.y + this.style.Station.StationControl.lamp.offset.y
},
context: this.style.Station.StationControl.centerControl.buttonText,
pop: false
});
this.add(this.centerControlButton);
const arcRect = this.centerControlButton.getArcBoundingRect();
this.arcBorder = new Rect({
zlevel: this.zlevel,
z: this.z,
silent: true,
shape: arcRect,
style: {
lineDash: null,
stroke: this.style.Station.StationControl.lamp.stroke,
fill: this.style.Station.StationControl.lamp.fill
}
});
this.add(this.arcBorder);
}
}
createSubstationControl() { // 站控按钮
const model = this.model;
if (this.style.Station.StationControl.substationControl.show) {
this.substationControl = new ESingleControl({
_subType: 'substation',
style: this.style,
zlevel: this.zlevel,
z: this.z,
point: {
x: model.controlModePoint.x + this.style.Station.StationControl.lamp.distance / 2 + this.style.Station.StationControl.substationControl.offset.x,
y: model.controlModePoint.y + this.style.Station.StationControl.substationControl.offset.y
},
context: this.style.Station.StationControl.substationControl.text,
pop: false
});
this.add(this.substationControl);
if (this.style.Station.StationControl.substationControl.arrowShow) {
const x = this.model.controlModePoint.x + this.style.Station.StationControl.substationControl.offset.x;
const y = this.model.controlModePoint.y + this.style.Station.StationControl.substationControl.offset.y;
const point = arrow(x, y + this.style.Station.StationControl.lamp.radiusR / 2, this.style.Station.StationControl.lamp.distance / 6, this.style.Station.StationControl.lamp.radiusR * 0.8);
this.substationArrowsControl = new EArrow({
zlevel: this.zlevel,
z: this.z,
style: this.style,
count: this.count,
drict: 1,
point: point,
x: model.controlModePoint.x + this.style.Station.StationControl.lamp.offset.x,
y: model.controlModePoint.y + this.style.Station.StationControl.lamp.radiusR / 2 + this.style.Station.StationControl.lamp.offset.y,
fill: this.style.Station.StationControl.substationControl.grayColor,
lineWidth: 1,
stroke: this.style.sidelineColor
});
this.add(this.substationArrowsControl);
}
}
}
createInterconnectedControl() { // 联锁控
const model = this.model;
if (this.style.Station.StationControl.interconnectedControl.show) { // 成都三会显示
this.interconnectedControl = new ESingleControl({
_subType: 'interconnected',
style: this.style,
zlevel: this.zlevel,
z: this.z,
point: {
x: model.controlModePoint.x + this.style.Station.StationControl.lamp.distance * 3 / 2 + this.style.Station.StationControl.interconnectedControl.offset.x,
y: model.controlModePoint.y + this.style.Station.StationControl.interconnectedControl.offset.y
},
context: this.style.Station.StationControl.interconnectedControl.text || '联锁控',
pop: false
});
this.add(this.interconnectedControl);
}
} }
handleCenter() { // 中控 handleCenter() { // 中控
@ -301,13 +362,15 @@ export default class Station extends Group {
this.substationControl && this.substationControl.setColor(this.style.Station.StationControl.lamp.yellowColor); this.substationControl && this.substationControl.setColor(this.style.Station.StationControl.lamp.yellowColor);
this.substationControl && this.substationControl.setTextColor(this.style.Station.StationControl.lamp.yellowColor); // 文字颜色 this.substationControl && this.substationControl.setTextColor(this.style.Station.StationControl.lamp.yellowColor); // 文字颜色
this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.grayColor); this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.grayColor);
this.arrowsControl && this.arrowsControl.setColor(this.style.Station.StationControl.lamp.greenColor); this.substationArrowsControl && this.substationArrowsControl.setColor(this.style.Station.StationControl.lamp.greenColor);
} }
handleEmergency() { // 紧急站控 handleEmergency() { // 紧急站控
this.emergencyControl && this.emergencyControl.setColor(this.style.Station.StationControl.lamp.redColor); this.emergencyControl && this.emergencyControl.setColor(this.style.Station.StationControl.lamp.redColor);
this.emergencyControl && this.emergencyControl.setTextColor(this.style.Station.StationControl.lamp.redColor); // 紧急 颜色
this.substationControl && this.substationControl.setColor(this.style.Station.StationControl.lamp.grayColor); this.substationControl && this.substationControl.setColor(this.style.Station.StationControl.lamp.grayColor);
this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.grayColor); this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.grayColor);
this.emergencyArrowsControl && this.emergencyArrowsControl.setColor(this.style.Station.StationControl.lamp.greenColor);
} }
recover() { recover() {
@ -317,6 +380,9 @@ export default class Station extends Group {
this.substationControl && this.substationControl.setTextColor(this.style.Station.StationControl.text.fontColor); this.substationControl && this.substationControl.setTextColor(this.style.Station.StationControl.text.fontColor);
this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.grayColor); this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.grayColor);
this.centerControl && this.centerControl.setTextColor(this.style.Station.StationControl.text.fontColor); this.centerControl && this.centerControl.setTextColor(this.style.Station.StationControl.text.fontColor);
this.substationArrowsControl && this.substationArrowsControl.setColor(this.style.Station.StationControl.lamp.grayColor);
this.emergencyArrowsControl && this.emergencyArrowsControl.setColor(this.style.Station.StationControl.lamp.grayColor);
} }
// 设置状态 // 设置状态

32
src/jmapNew/theme/components/menus/dialog/standControl.vue
View File

@ -130,6 +130,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import OperationHandler from '@/scripts/cmdPlugin/OperationHandler'; import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
import NoticeInfo from '../../menus/childDialog/childDialog/noticeInfo'; import NoticeInfo from '../../menus/childDialog/childDialog/noticeInfo';
import {menuOperate, commitOperate} from '../../utils/menuOperate'; import {menuOperate, commitOperate} from '../../utils/menuOperate';
import { mapGetters } from 'vuex';
export default { export default {
name: 'StandDetainTrain', name: 'StandDetainTrain',
@ -161,6 +162,9 @@ export default {
}; };
}, },
computed: { computed: {
...mapGetters('map', [
'mapConfig'
]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
@ -213,7 +217,7 @@ export default {
} }
} }
this.radio = '2'; this.radio = '2';
if (this.selected.right) { // 判断站台行驶方向 if ((this.selected.right && this.mapConfig.upDirection === 'right') || (!this.selected.right && this.mapConfig.upDirection === 'left')) { // 判断站台行驶方向
this.radio = '1'; this.radio = '1';
} }
@ -237,7 +241,7 @@ export default {
this.radio1 = '2'; this.radio1 = '2';
} else if (this.operation == OperationEvent.StationStand.earlyDeparture.menu.operation) { } else if (this.operation == OperationEvent.StationStand.earlyDeparture.menu.operation) {
this.earlyDepar = true; this.earlyDepar = true;
if (!this.selected.right) { if ((!this.selected.right && this.mapConfig.upDirection === 'right') || (this.selected.right && this.mapConfig.upDirection === 'left')) {
this.radio2 = '2'; this.radio2 = '2';
} else { } else {
this.radio2 = '1'; this.radio2 = '1';
@ -246,14 +250,14 @@ export default {
this.AutomaticBuckle = true; this.AutomaticBuckle = true;
this.autoRadio1 = '1'; this.autoRadio1 = '1';
this.autoRadio = '1'; this.autoRadio = '1';
if (!this.selected.right) { if ((!this.selected.right && this.mapConfig.upDirection === 'right') || (this.selected.right && this.mapConfig.upDirection === 'left')) {
this.autoRadio = '2'; this.autoRadio = '2';
} }
} else if (this.operation == OperationEvent.StationStand.cancelDetainTrainAuto.menu.operation) { } else if (this.operation == OperationEvent.StationStand.cancelDetainTrainAuto.menu.operation) {
this.AutomaticBuckle = true; this.AutomaticBuckle = true;
this.autoRadio1 = '2'; this.autoRadio1 = '2';
this.autoRadio = '1'; this.autoRadio = '1';
if (!this.selected.right) { if ((!this.selected.right && this.mapConfig.upDirection === 'right') || (this.selected.right && this.mapConfig.upDirection === 'left')) {
this.autoRadio = '2'; this.autoRadio = '2';
} }
} }
@ -303,30 +307,18 @@ export default {
} }
}, },
setDetainTrainAuto() { // 区间自动扣车 setDetainTrainAuto() { // 区间自动扣车
this.sendCommand(menuOperate.StationStand.setDetainTrainAuto, { this.sendCommand(menuOperate.StationStand.setDetainTrainAuto);
leftDirection: this.autoRadio == '2', // 1 上行 2 下行
rightDirection: this.autoRadio == '1'
});
}, },
cancelDetainTrainAuto() { // 取消区间自动扣车 cancelDetainTrainAuto() { // 取消区间自动扣车
this.sendCommand(menuOperate.StationStand.cancelDetainTrainAuto, { this.sendCommand(menuOperate.StationStand.cancelDetainTrainAuto);
leftDirection: this.autoRadio == '2', // 1 上行 2 下行
rightDirection: this.autoRadio == '1'
});
}, },
// 设置扣车 // 设置扣车
setDetainTrain() { setDetainTrain() {
this.sendCommand(menuOperate.StationStand.setDetainTrain, { this.sendCommand(menuOperate.StationStand.setDetainTrain);
leftDirection: this.radio == '2', // 1 上行 2 下行
rightDirection: this.radio == '1'
});
}, },
// 取消扣车 // 取消扣车
cancelDetainTrain() { cancelDetainTrain() {
this.sendCommand(menuOperate.StationStand.cancelDetainTrain, { this.sendCommand(menuOperate.StationStand.cancelDetainTrain);
leftDirection: this.radio == '2', // 1 上行 2 下行
rightDirection: this.radio == '1'
});
}, },
// 提前发车 // 提前发车
earlyDeparture() { earlyDeparture() {

138
src/jmapNew/theme/foshan_01/menus/menuBar.vue
View File

@ -356,35 +356,36 @@ export default {
} }
] ]
}, },
{ // {
title: '批处理命令', // title: '批处理命令',
operate: OperationEvent.Command.mBar.detainControl, // operate: OperationEvent.Command.mBar.detainControl,
children: [ // click: this.undeveloped,
{ // children: [
title: '全线扣车', // {
operate: OperationEvent.StationStand.setDetainTrainAll.mbar, // title: '全线扣车',
click: this.setDetainTrainAll // operate: OperationEvent.StationStand.setDetainTrainAll.mbar,
}, // click: this.setDetainTrainAll
{ // },
title: '取消全线扣车', // {
operate: OperationEvent.StationStand.cancelDetainTrainAll.mbar, // title: '取消全线扣车',
click: this.cancelDetainTrainAll // operate: OperationEvent.StationStand.cancelDetainTrainAll.mbar,
}, // click: this.cancelDetainTrainAll
{ // },
title: '取消上行全线扣车', // {
operate: OperationEvent.StationStand.cancelUpDetainTrainAll.mbar, // title: '取消上行全线扣车',
click: this.cancelUpDetainTrainAll // operate: OperationEvent.StationStand.cancelUpDetainTrainAll.mbar,
}, // click: this.cancelUpDetainTrainAll
{ // },
title: '取消下行全线扣车', // {
operate: OperationEvent.StationStand.cancelDownDetainTrainAll.mbar, // title: '取消下行全线扣车',
click: this.cancelDownDetainTrainAll // operate: OperationEvent.StationStand.cancelDownDetainTrainAll.mbar,
} // click: this.cancelDownDetainTrainAll
] // }
}, // ]
// },
{ {
title: '信息管理', title: '信息管理',
operate: '', operate: OperationEvent.Command.mBar.detainControl,
children: [ children: [
{ {
title: '调度日志', title: '调度日志',
@ -402,6 +403,7 @@ export default {
}, },
{ {
title: '帮助', title: '帮助',
operate: OperationEvent.Command.mBar.detainControl,
children: [ children: [
{ {
title: '关于ITS GPC 工作站', title: '关于ITS GPC 工作站',
@ -622,35 +624,36 @@ export default {
} }
] ]
}, },
{ // {
title: '批处理命令', // title: '批处理命令',
operate: OperationEvent.Command.mBar.detainControl, // operate: OperationEvent.Command.mBar.detainControl,
children: [ // click: this.undeveloped,
{ // children: [
title: '全线扣车', // {
operate: OperationEvent.StationStand.setDetainTrainAll.mbar, // title: '全线扣车',
click: this.setDetainTrainAll // operate: OperationEvent.StationStand.setDetainTrainAll.mbar,
}, // click: this.setDetainTrainAll
{ // },
title: '取消全线扣车', // {
operate: OperationEvent.StationStand.cancelDetainTrainAll.mbar, // title: '取消全线扣车',
click: this.cancelDetainTrainAll // operate: OperationEvent.StationStand.cancelDetainTrainAll.mbar,
}, // click: this.cancelDetainTrainAll
{ // },
title: '取消上行全线扣车', // {
operate: OperationEvent.StationStand.cancelUpDetainTrainAll.mbar, // title: '取消上行全线扣车',
click: this.cancelUpDetainTrainAll // operate: OperationEvent.StationStand.cancelUpDetainTrainAll.mbar,
}, // click: this.cancelUpDetainTrainAll
{ // },
title: '取消下行全线扣车', // {
operate: OperationEvent.StationStand.cancelDownDetainTrainAll.mbar, // title: '取消下行全线扣车',
click: this.cancelDownDetainTrainAll // operate: OperationEvent.StationStand.cancelDownDetainTrainAll.mbar,
} // click: this.cancelDownDetainTrainAll
] // }
}, // ]
// },
{ {
title: '信息管理', title: '信息管理',
operate: '', operate: OperationEvent.Command.mBar.detainControl,
children: [ children: [
{ {
title: '调度日志', title: '调度日志',
@ -668,6 +671,7 @@ export default {
}, },
{ {
title: '帮助', title: '帮助',
operate: OperationEvent.Command.mBar.detainControl,
children: [ children: [
{ {
title: '关于ITS GPC 工作站', title: '关于ITS GPC 工作站',
@ -808,7 +812,7 @@ export default {
}; };
this.tempClassA = index; this.tempClassA = index;
this.tempClassB = -1; this.tempClassB = -1;
this.$store.dispatch('training/next', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
} }
@ -829,7 +833,7 @@ export default {
operation: item.operate.operation operation: item.operate.operation
}; };
this.tempClassB = index; this.tempClassB = index;
this.$store.dispatch('training/next', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
} }
@ -847,7 +851,7 @@ export default {
const operate = { const operate = {
operation: order.operation operation: order.operation
}; };
this.$store.dispatch('training/next', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.closeMenu(true); this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@ -862,7 +866,7 @@ export default {
operation: order.operation operation: order.operation
}; };
this.$store.dispatch('training/next', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.closeMenu(true); this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@ -876,7 +880,7 @@ export default {
type: 'bar', type: 'bar',
operation: order.operation operation: order.operation
}; };
this.$store.dispatch('training/next', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.closeMenu(true); this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@ -891,7 +895,7 @@ export default {
operation: order.operation operation: order.operation
}; };
this.$store.dispatch('training/next', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.closeMenu(true); this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@ -906,7 +910,7 @@ export default {
operation: order.operation operation: order.operation
}; };
this.$store.dispatch('training/next', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.closeMenu(true); this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@ -921,7 +925,7 @@ export default {
operation: order.operation operation: order.operation
}; };
this.$store.dispatch('training/next', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.closeMenu(true); this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@ -935,7 +939,7 @@ export default {
type: 'bar', type: 'bar',
operation: order.operation operation: order.operation
}; };
this.$store.dispatch('training/next', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.closeMenu(true); this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@ -949,7 +953,7 @@ export default {
type: 'bar', type: 'bar',
operation: order.operation operation: order.operation
}; };
this.$store.dispatch('training/next', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.closeMenu(true); this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@ -963,7 +967,7 @@ export default {
type: 'bar', type: 'bar',
operation: order.operation operation: order.operation
}; };
this.$store.dispatch('training/next', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.closeMenu(true); this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@ -977,7 +981,7 @@ export default {
type: 'bar', type: 'bar',
operation: order.operation operation: order.operation
}; };
this.$store.dispatch('training/next', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.closeMenu(true); this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@ -991,7 +995,7 @@ export default {
type: 'bar', type: 'bar',
operation: order.operation operation: order.operation
}; };
this.$store.dispatch('training/next', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.closeMenu(true); this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });

17
src/jmapNew/theme/fuzhou_01/menus/menuSection.vue
View File

@ -230,18 +230,9 @@ export default {
}, },
// 故障解锁 // 故障解锁
fault() { fault() {
const step = { commitOperate(menuOperate.Section.fault, {sectionCode: this.selected.code}, 0).then(({valid, operate}) => {
start: true,
code: `${this.selected.code}`,
operation: OperationEvent.Section.fault.menu.operation,
param: {
Section_Code: `${this.selected.code}`
}
};
this.$store.dispatch('training/next', step).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$refs.sectionCmdControl.doShow(operate, this.selected);
this.$refs.sectionCmdControl.doShow(step, this.selected);
} }
}); });
}, },
@ -252,7 +243,7 @@ export default {
code: `${this.selected.code}`, code: `${this.selected.code}`,
operation: OperationEvent.Section.split.menu.operation, operation: OperationEvent.Section.split.menu.operation,
param: { param: {
Section_Code: `${this.selected.code}` sectionCode: `${this.selected.code}`
} }
}; };
this.$store.dispatch('training/next', step).then(({ valid }) => { this.$store.dispatch('training/next', step).then(({ valid }) => {
@ -269,7 +260,7 @@ export default {
code: `${this.selected.code}`, code: `${this.selected.code}`,
operation: OperationEvent.Section.active.menu.operation, operation: OperationEvent.Section.active.menu.operation,
param: { param: {
Section_Code: `${this.selected.code}` sectionCode: `${this.selected.code}`
} }
}; };
this.$store.dispatch('training/next', step).then(({ valid }) => { this.$store.dispatch('training/next', step).then(({ valid }) => {

3
src/jmapNew/theme/xian_01/menus/index.vue
View File

@ -96,6 +96,9 @@ export default {
padding: 0; padding: 0;
padding-left: 20px; padding-left: 20px;
} }
.xian-01__systerm.pop-menu .container{
border-left: 1px solid #ccc;
}
.xian-01__systerm.pop-menu .dsp-block { .xian-01__systerm.pop-menu .dsp-block {
display: block; display: block;
text-align: left; text-align: left;

16
src/views/iscs/iscsSystem/config/bas/tunnelVentilation.vue
View File

@ -2,7 +2,7 @@
<div class="bigSystemBox"> <div class="bigSystemBox">
<div class="title-name">{{ $route.query.stationName }}机电隧道通风</div> <div class="title-name">{{ $route.query.stationName }}机电隧道通风</div>
<div class=""> <div class="">
<iscsSystem ref="iscsPlate" :width-canvas="1300" :canvas-height="700" /> <iscsSystem ref="iscsPlate" :width-canvas="width" :canvas-height="700" />
</div> </div>
</div> </div>
</template> </template>
@ -14,8 +14,22 @@ export default {
}, },
data() { data() {
return { return {
width: 1300
}; };
}, },
watch: {
'$store.state.iscs.selectedCount': function() {
const device = this.$store.state.iscs.selected;
if (device && device._type === 'IscsButton' && device.function === 'OperatingButton') {
this.width = 1300;
this.$refs.iscsPlate.show('29');
} else if (device && device._type === 'IscsButton' && device.function === 'GoBack') {
this.width = 1300;
this.$refs.iscsPlate.show('28');
}
// console.log(this.width, '宽度');
}
},
mounted() { mounted() {
this.$refs.iscsPlate.show('28'); this.$refs.iscsPlate.show('28');
}, },

3
src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue
View File

@ -153,8 +153,9 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
// this.width = this.$store.state.config.width; // this.width = this.$store.state.config.width;
// this.height = this.$store.state.config.height; // this.height = this.$store.state.config.height;
this.$iscs && this.$iscs.resize({ width: this.widthCanvas, height: this.canvasHeight }); // this.$iscs && this.$iscs.resize({ width: this.widthCanvas, height: this.canvasHeight });
}); });
this.$iscs && this.$iscs.resize({ width: this.widthCanvas, height: this.canvasHeight });
}, },
iscsDestroy() { iscsDestroy() {
if (this.$iscs) { if (this.$iscs) {

BIN
static/model/station/fuzhou s.FBX
View File

Binary file not shown.

BIN
static/model/station/station333.FBX
View File

Binary file not shown.

BIN
static/model/station/topstation.FBX
View File

Binary file not shown.

BIN
static/model/station/waicestation s.FBX
View File

Binary file not shown.

BIN
static/texture/xian3/xian3listtest.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 112 KiB