mt-fe-group/11-mes-new
13
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update

Browse Source
This commit is contained in:
lb
2022-11-11 14:05:56 +08:00
parent c88648e8d2
commit ec12c84830
12 changed files with 338 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/layout/components/Navbar.vue
View File

@@ -23,7 +23,7 @@
<svg-icon
class="item-icon"
:icon-class="showTitle ? 'home' : 'homeb'"
style="height: 24px; width: 24px; vertical-align: -6px; margin-right: 2px;"
style="height: calc(24px * var(--beilv)); width: calc(24px * var(--beilv)); vertical-align: calc(-7px * var(--beilv)); margin-right: 2px;"
/>
<span v-if="showhome">
{{ 'navbar.homepage' | i18nFilter }}
@@ -38,10 +38,14 @@
:hidden="alarmNum > 0 ? false : true"
:value="alarmNum"
class="item"
style="line-height: 0; margin: 0 10px; vertical-align: -3px"
style=" margin: 0 10px; "
@click.native="handleAlarm"
>
<svg-icon style="width: 24px; height: 24px" class="item-icon" :icon-class="showTitle ? 'alarm' : 'alarmb'" />
<svg-icon
style="width: calc(24px * var(--beilv)); height: calc(24px * var(--beilv)); vertical-align: calc(-4px * var(--beilv))"
class="item-icon"
:icon-class="showTitle ? 'alarm' : 'alarmb'"
/>
</el-badge>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item>暂无数据</el-dropdown-item>
@@ -49,7 +53,7 @@
</el-dropdown>
<div :style="showTitle ? 'color: #fff' : ''" class="right-menu-back">
<svg-icon
style="width: 24px; height: 24px; vertical-align: -7px"
style="width: calc(24px * var(--beilv)); height: calc(24px * var(--beilv)); vertical-align: calc(-7px * var(--beilv))"
:icon-class="showTitle ? 'countdown' : 'countdown2'"
/>
{{ formatTime }}
@@ -65,7 +69,7 @@
<a href="Lodap.zip">
<svg-icon
:style="showTitle ? 'color: #fff' : ''"
style="width: 24px; height: 24px; vertical-align: -7px"
style="width: calc(24px * var(--beilv)); height: calc(24px * var(--beilv)); vertical-align: calc(-7px * var(--beilv))"
icon-class="download"
/>
</a>
@@ -74,7 +78,7 @@
<a href="google.exe">
<svg-icon
:style="showTitle ? 'color: #fff' : ''"
style="width: 24px; height: 24px; vertical-align: -7px"
style="width: calc(24px * var(--beilv)); height: calc(24px * var(--beilv)); vertical-align: calc(-7px * var(--beilv))"
:icon-class="showTitle ? 'chrome' : 'chromeb'"
/>
</a>
@@ -371,7 +375,7 @@ export default {
}
.hamburger-container {
line-height: calc(48px * var(--beilv));
// line-height: calc(48px * var(--beilv));
height: 100%;
float: left;
cursor: pointer;

27
src/layout/components/Sidebar/Logo.vue
View File

@@ -6,15 +6,15 @@
* @Description: file content
-->
<template>
<div class="sidebar-logo-container" :class="{'collapse':collapse}">
<div class="sidebar-logo-container" :class="{ collapse: collapse }">
<transition name="sidebarLogoFade">
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
<img v-if="logo" :src="logo" class="sidebar-logo">
<h1 v-else :style="{fontSize}" class="sidebar-title">{{ title }} </h1>
<img v-if="logo" :src="logo" class="sidebar-logo" />
<h1 v-else :style="{ fontSize }" class="sidebar-title">{{ title }}</h1>
</router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
<img v-if="logo" :src="logo" class="sidebar-logo">
<h1 :style="{fontSize}" class="sidebar-title">{{ title }} </h1>
<img v-if="logo" :src="logo" class="sidebar-logo" />
<h1 :style="{ fontSize }" class="sidebar-title">{{ title }}</h1>
</router-link>
</transition>
</div>
@@ -58,10 +58,10 @@ export default {
.sidebar-logo-container {
position: relative;
width: 100%;
height: 48px;
line-height: 48px;
height: calc(48px * var(--beilv));
line-height: calc(48px * var(--beilv));
background: #001529;
padding-left: 10px;
padding-left: calc(10px * var(--beilv));
overflow: hidden;
& .sidebar-logo-link {
@@ -71,21 +71,24 @@ export default {
& .sidebar-logo {
width: 26px;
height: 26px;
vertical-align: middle;
margin-right: 12px;
// width: calc(26px * var(--beilv));
// height: calc(26px * var(--beilv));
// margin-right: calc(12px * var(--beilv));
vertical-align: middle;
}
& .sidebar-title {
display: inline-block;
margin: 0;
color: #fff;
width: 189px;
width: calc(189px * var(--beilv));
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-weight: 500;
line-height: 50px;
font-size: 14px;
line-height: calc(50px * var(--beilv));
font-size: calc(14px * var(--beilv));
font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
vertical-align: middle;
}