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

代码调整

Browse Source
This commit is contained in:
fan 2022-11-29 17:09:04 +08:00
parent a1e852fed3
commit a274f4ef3b
4 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jmapNew/theme/datie_02/menus/menuButton.vue
View File

@ -82,7 +82,7 @@
<center><b>灭灯</b></center>
</span>
</button>
<button :id="Station.stationMasterLock.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor: sGuideMasterLock? guideColorDown: guideColorUp}" @click="guideLockLeftButtonDown()">
<button :id="Station.stationMasterLock.leftButton.domId" class="button_box" :style="{width: width+'px', backgroundColor: sGuideMasterLock? guideColorDown: guideColorUp}" @click="guideLockLeftButtonDown()">
<span style="color: #800000">
<center><b>S引导总锁</b></center>
</span>

2
src/scripts/cmdPlugin/OperationHandler.js
View File

@ -134,7 +134,7 @@ export const OperationEvent = {
/** 控制模式菜单 */
remoteControl: {
operation: '0024',
domId: '_Tips-Mbar-0-StationControl'
domId: '_Tips-Mbar-0-StationControl{RIGHT}'
},
/** 请求区域 */
requestZone: {

28
src/views/newMap/display/trainingList/poptip.vue
View File

@ -3,7 +3,8 @@
<div ref="tipRef" class="pop-content" :style="{ width: width + 'px',textAlign: textAlign }">
<p style="color: black;" v-html="tip" />
<div v-show="tPosition.align === 'top'" x-arrow class="popper__arraw_top" :style="{left: arrawLeft+'px'}" />
<div v-show="tPosition.align === 'bottom'" x-arrow class=" popper__arraw_bottom" :style="{left: arrawLeft+'px'}" />
<div v-show="tPosition.align === 'bottom'" x-arrow class="popper__arraw_bottom" :style="{left: arrawLeft+'px'}" />
<div v-show="tPosition.align === 'right'" x-arrow class="popper__arraw_right" />
</div>
</div>
</template>
@ -86,6 +87,8 @@ export default {
} else if (this.tPosition.align == 'bottom') {
const distance = 5;
this.tPosition.y = this.position.y - (height + distance);
} else if (this.tPosition.align == 'right') {
this.tPosition.x = this.position.x + (this.width / 2) + 5;
}
if (this.tPosition.x < 0) this.tPosition.x = 0;
if (this.tPosition.y < 0) this.tPosition.y = 0;
@ -129,13 +132,24 @@ export default {
height: 14px;
width: 14px;
top: -7px;
background: $bg;
-moz-transform: rotate(45deg);
-webkit-transform: rotate(45deg);
-o-transform: rotate(45deg);
transform: rotate(45deg);
background: $bg;
-moz-transform: rotate(45deg);
-webkit-transform: rotate(45deg);
-o-transform: rotate(45deg);
transform: rotate(45deg);
}
.popper__arraw_right {
position: absolute;
height: 14px;
width: 14px;
left: -8px;
top: 10px;
background: $bg;
-moz-transform: rotate(45deg);
-webkit-transform: rotate(45deg);
-o-transform: rotate(45deg);
transform: rotate(45deg);
}
.popper__arraw_left {
position: absolute;
height: 14px;

7
src/views/newMap/display/trainingList/trainingPositionTip.vue
View File

@ -145,6 +145,7 @@ export default {
// 获取地图菜单按钮和对话框按钮提示显示位置
getOtherTipPoint(tipPosition) {
const domId = OperationHandler.getDomIdByOperation(tipPosition.domId);
console.log(domId, '-------------');
if (!domId) { return null; }
return new Promise(async(resolve, reject) => {
try {
@ -159,10 +160,12 @@ export default {
}
let align = 'bottom';
if (this.tipAlignIsTop(tipPosition, domId)) {
if (/{RIGHT}/.test(domId)) {
align = 'right';
} else if (this.tipAlignIsTop(tipPosition, domId)) {
align = 'top';
}
console.log(align, '*******', domId);
resolve({
align: align,
x: offset.x + btnDom.clientWidth / 2,