Skip to content

T
template_vue
Commit 30e5dc30 authored by 高宇's avatar 高宇
Browse files
Options

model模式

parent fa1761a5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 102 deletions
src/components/Hamburger/index.vue
View file @ 30e5dc30
<template>
<div style="padding: 0 0 0 10px;" @click="toggleClick">
<svg
style="width: 16px; height: 16px;"
:class="{'is-active':isActive}"
class="hamburger"
viewBox="0 0 1024 1024"
xmlns="http://www.w3.org/2000/svg"
width="64"
height="64"
>
<path d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z" />
</svg>
......
src/layout/components/header.vue
View file @ 30e5dc30
......@@ -3,28 +3,33 @@
<div class="title-box">
<hamburger
:is-active="sidebar.opened"
class="hamburger-container"
style=" line-height: 46px;
height: 100%;
float: left;
cursor: pointer;
transition: background 0.3s;
-webkit-tap-highlight-color: transparent;"
@toggleClick="toggleSideBar"
/>
<!-- <el-dropdown-->
<!-- class="change-sys"-->
<!-- @command="handleCommand"-->
<!-- >-->
<!--&lt;!&ndash; <span class="el-dropdown-link">&ndash;&gt;-->
<!--&lt;!&ndash; 业务中台<i class="el-icon-arrow-down el-icon&#45;&#45;right" />&ndash;&gt;-->
<!--&lt;!&ndash; </span>&ndash;&gt;-->
<!-- <el-dropdown-menu-->
<!-- slot="dropdown"-->
<!-- >-->
<!-- <el-dropdown-item-->
<!-- v-for="(item) in appList"-->
<!-- :key="item.businessId"-->
<!-- :command="specialTag !== '1' ? item.pcUrl : ''"-->
<!-- >-->
<!-- {{ item.system }}-->
<!-- </el-dropdown-item>-->
<!-- </el-dropdown-menu>-->
<!-- </el-dropdown>-->
<!-- <el-dropdown-->
<!-- class="change-sys"-->
<!-- @command="handleCommand"-->
<!-- >-->
<!--&lt;!&ndash; <span class="el-dropdown-link">&ndash;&gt;-->
<!--&lt;!&ndash; 业务中台<i class="el-icon-arrow-down el-icon&#45;&#45;right" />&ndash;&gt;-->
<!--&lt;!&ndash; </span>&ndash;&gt;-->
<!-- <el-dropdown-menu-->
<!-- slot="dropdown"-->
<!-- >-->
<!-- <el-dropdown-item-->
<!-- v-for="(item) in appList"-->
<!-- :key="item.businessId"-->
<!-- :command="specialTag !== '1' ? item.pcUrl : ''"-->
<!-- >-->
<!-- {{ item.system }}-->
<!-- </el-dropdown-item>-->
<!-- </el-dropdown-menu>-->
<!-- </el-dropdown>-->
</div>
<div class="right-menu">
<!-- <i class="el-icon-info" />-->
......@@ -39,11 +44,11 @@
<el-dropdown class="avatar-container" trigger="click">
<div class="avatar-wrapper">
<span class="username-text">
<span STYLE="margin-right: 12px; font-size: 16px">
[您好，{{ userName }}]
</span>
<!-- <img :src="avatar" class="user-avatar">-->
<i class="el-icon-caret-bottom" />
<!-- <img :src="avatar" class="user-avatar">-->
<i class="el-icon-caret-bottom"/>
</div>
<el-dropdown-menu slot="dropdown" class="user-dropdown">
<el-dropdown-item>
......@@ -61,9 +66,10 @@
</template>
<script>
import { mapGetters } from 'vuex'
import { queryInAdhibitions } from '@/api/internal.js'
import {mapGetters} from 'vuex'
import {queryInAdhibitions} from '@/api/internal.js'
import Hamburger from '@/components/Hamburger'
export default {
data() {
return {
......@@ -122,9 +128,10 @@ export default {
overflow: hidden;
position: relative;
background: #fff;
box-shadow: 0 1px 4px rgba(0,21,41,.08);
box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
display: flex;
justify-content: space-between;
.hamburger-container {
line-height: 46px;
height: 100%;
......@@ -137,15 +144,17 @@ export default {
background: rgba(0, 0, 0, 0.025);
}
}
.title-box{
.title-box {
display: flex;
align-items: center;
.change-sys{
.change-sys {
margin-left: 20px;
}
}
.app-logo{
.app-logo {
width: 40px;
height: 40px;
border-radius: 10px;
......@@ -158,7 +167,7 @@ export default {
float: left;
cursor: pointer;
transition: background .3s;
-webkit-tap-highlight-color:transparent;
-webkit-tap-highlight-color: transparent;
&:hover {
background: rgba(0, 0, 0, .025)
......@@ -175,16 +184,20 @@ export default {
line-height: 50px;
display: flex;
align-items: center;
&:focus {
outline: none;
}
& > i {
margin-right: 50px;
font-size: 18px;
}
.username-text {
margin-right: 12px;
}
.right-menu-item {
display: inline-block;
padding: 0 8px;
......@@ -192,6 +205,7 @@ export default {
font-size: 18px;
color: #5a5e66;
vertical-align: text-bottom;
&.hover-effect {
cursor: pointer;
transition: background .3s;
......@@ -201,10 +215,11 @@ export default {
}
}
}
.avatar-container {
margin-right: 30px;
.avatar-wrapper :hover{
.avatar-wrapper :hover {
cursor: pointer;
}
......@@ -237,6 +252,7 @@ export default {
.el-badge {
margin-right: 50px;
font-size: 22px;
.el-badge__content.is-fixed {
top: 12px !important;
}
......
src/layoutLogin/components/logo.vue
View file @ 30e5dc30
......@@ -76,7 +76,7 @@ export default {
color: #fff;
font-weight: bold;
line-height: 70px;
font-size: 20px;
font-size: 20Px;
font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
vertical-align: middle;
}
......
src/styles/index.scss
View file @ 30e5dc30
......@@ -27,7 +27,7 @@ html {
#app {
height: 100%;
overflow-x: hidden;
min-width: 1440px;
//min-width: 1440px;
}
*,
......
src/utils/rem.js
View file @ 30e5dc30
......@@ -4,7 +4,8 @@ const baseSize = 16
function setRem() {
// 当前页面宽度相对于 1920 宽的缩放比例，可根据自己需要修改。
const scale = document.documentElement.clientWidth / 1920
const fontSize = (baseSize * Math.min(scale, 2)) > 7.2 ? (baseSize * Math.min(scale, 2)) : 7.2
const fontSize = (baseSize * Math.min(scale, 2)) > 14 ? (baseSize * Math.min(scale, 2)) : 14
// const fontSize = (baseSize * Math.min(scale, 2))
console.log('fontSize', (baseSize * Math.min(scale, 2)))
document.documentElement.style.fontSize = fontSize + 'px'
}
......
src/views/checkList.vue
View file @ 30e5dc30
This diff is collapsed.
src/views/inspectionSheet.vue
View file @ 30e5dc30
......@@ -390,7 +390,7 @@ export default {
padding-right: 13px;
}
.rightInput{
width: 300px;
//width: 300px;
}
.oneTableTest{
font-family: Microsoft YaHei, Microsoft YaHei-400;
......@@ -429,13 +429,13 @@ export default {
width: 60%;
height: 200px;
display: flex;
justify-content: center;
align-content: center;
border-left: 1px dashed #eeeeee;;
border-bottom: 1px dashed #eeeeee;;
background: #f4f4f4;
.rightForm {
margin-left: -196px;
margin-left: 20px;
//margin-left: -196px;
width: 90%;
padding-top: 2rem;
::v-deep .el-form-item__label{
font-family: Microsoft YaHei, Microsoft YaHei-400;
......@@ -661,7 +661,6 @@ export default {
justify-content: center;
align-items: center;
.twoTableInput{
width: 90%;
border: 1px solid #d9d9d9;
border-radius: 4px;
}
......@@ -691,7 +690,6 @@ export default {
justify-content: center;
align-items: center;
.twoTableInput{
width: 90%;
border: 1px solid #d9d9d9;
border-radius: 4px;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment