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 
# Conflicts:
#	src/jmapNew/theme/xian_02/menus/menuSignal.vue
This commit is contained in:
zyy 2020-04-28 15:44:35 +08:00
commit 4a1c36bfd0
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/PopMenu/popTip.vue
View File

@ -241,8 +241,8 @@ export default {
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
$bg: #508F86;
$hoverBg: #508F86;
$bg: #78e2ad;
$hoverBg: #78e2ad;
.pop-menu {
background-color: $bg;

10
src/jmapNew/theme/xian_02/menus/index.vue
View File

@ -108,11 +108,11 @@ export default {
<style>
.xian-02__menus .pop-menu {
background: #508F86;
background: #78e2ad;
padding: 0;
}
.xian-02__menus .pop-menu .el-popover{
background: #508F86;
background: #78e2ad;
}
.xian-02__menus .pop-menu span {
color: #000;
@ -129,15 +129,15 @@ export default {
.xian-02__pop_tip_station{
padding: 0 !important;
margin-left: 1px !important;
background: #508F86;
background: #78e2ad;
border: 1px solid #6B736A;
border-radius: 0;
}
.xian-02__system .el-dialog {
background: #AEB2C3;
background: #9da5ff;
box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
border: 1px solid #AEB2C3;
border: 1px solid #9da5ff;
border-radius: 6px;
font-size: 13px !important;
color: #000;

2
src/jmapNew/theme/xian_02/menus/menuSignal.vue
View File

@ -1,6 +1,6 @@
<template>
<div>
<pop-menu ref="popMenu" :menu="menu" pop-class="xian-02__pop_tip_station" :tip-msg="topTip" :tip-subhead="tipSubhead" />
<pop-menu ref="popMenu" :menu="menu" :tip-msg="topTip" :tip-subhead="tipSubhead" pop-class="xian-02__pop_tip_station" />
<route-selection ref="routeSelection" />
<route-lock ref="routeLock" />
<route-un-lock ref="routeUnLock" />