Commit 3304a556 authored by xd's avatar xd

Merge branch 'master' of http://114.67.93.201/xulili/ybf

parents da8847ef 21abda2c
...@@ -5,7 +5,7 @@ module.exports = { ...@@ -5,7 +5,7 @@ module.exports = {
}, },
'extends': [ 'extends': [
'plugin:vue/essential', 'plugin:vue/essential',
'@vue/standard' // '@vue/standard'
], ],
rules: { rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off', 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
......
...@@ -5,24 +5,26 @@ ...@@ -5,24 +5,26 @@
</template> </template>
<script> <script>
import util from '@/libs/util' import util from '@/libs/util'
export default {
name: 'app', export default {
watch: { name: 'app',
'$i18n.locale': 'i18nHandle' watch: {
}, '$i18n.locale': 'i18nHandle'
created () { },
this.i18nHandle(this.$i18n.locale) created() {
}, this.i18nHandle(this.$i18n.locale)
methods: { },
i18nHandle (val, oldVal) { methods: {
util.cookies.set('lang', val) i18nHandle(val, oldVal) {
document.querySelector('html').setAttribute('lang', val) util.cookies.set('lang', val)
document.querySelector('html').setAttribute('lang', val)
}
} }
} }
}
</script> </script>
<style lang="scss"> <style lang="scss">
@import '~@/assets/style/public-class.scss'; @import '~@/assets/style/public-class.scss';
</style> </style>
{"global":{"$--color-primary":"#4E59C7"},"local":{"$--button-default-background-color":"#E8E9FE","$--button-default-border-color":"#4E59C7","$--button-default-font-color":"#4E59C7"}}
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -85,13 +85,12 @@ ...@@ -85,13 +85,12 @@
padding: 0px; padding: 0px;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
height: calc(100vh - 92px);
.d2-theme-container-main-layer { .d2-theme-container-main-layer {
position: absolute; position: absolute;
top: 0px; top: 0px;
bottom: 0px; bottom: 0px;
// left: 0px; left: 16px;
// Z-Style
left: 20px;
right: 0px; right: 0px;
} }
.d2-theme-container-main-body { .d2-theme-container-main-body {
......
<template>
<div class="alarm-notify">
<p>温馨提示:此处为告警通知栏</p>
</div>
</template>
<script>
export default {
}
</script>
<style lang="scss">
.alarm-notify{
width: 100%;
height: 32px;
background-color: #fff;
height:32px;
box-shadow:0px 2px 4px 0px rgba(221,221,221,1);
p{
padding-left: 36px;
font-size:12px;
color:rgba(102,102,102,1);
line-height:12px;
}
}
</style>
...@@ -11,48 +11,27 @@ ...@@ -11,48 +11,27 @@
<!-- 顶栏 --> <!-- 顶栏 -->
<div <div
class="d2-theme-header" class="d2-theme-header"
:style="{ :style="{ opacity: this.searchActive ? 0.5 : 1 }"
opacity: this.searchActive ? 0.5 : 1
}"
flex-box="0" flex-box="0"
flex flex
> >
<img class="zlogos" :src="`/image/logo.png`" /> <img class="zlogos" :src="`/image/logo.png`" />
<!-- <img :src="`${$baseUrl}image/theme/${themeActiveSetting.name}/logo/all.png`" /> -->
<!-- <router-link
to="/index"
class="logo-group"
:style="{width: asideCollapse ? asideWidthCollapse : asideWidth}"
flex-box="0"
>
<img
v-if="asideCollapse"
:src="`${$baseUrl}image/theme/${themeActiveSetting.name}/logo/icon-only.png`"
/>
<img v-else :src="`${$baseUrl}image/theme/${themeActiveSetting.name}/logo/all.png`" />
<img class="zlogos" :src="`/image/logo.png`" />
<div>亿百分营销管理系统</div>
</router-link>-->
<!-- <div class="toggle-aside-btn" @click="handleToggleAside" flex-box="0">
<d2-icon name="bars" />
</div>-->
<d2-menu-header class="header-menus" flex-box="1" /> <d2-menu-header class="header-menus" flex-box="1" />
<!-- 顶栏右侧 --> <!-- 顶栏右侧 -->
<div class="d2-header-right" flex-box="0"> <div class="d2-header-right" flex-box="0">
<!-- 如果你只想在开发环境显示这个按钮请添加 v-if="$env === 'development'" --> <!-- 如果你只想在开发环境显示这个按钮请添加 v-if="$env === 'development'" -->
<!-- <d2-header-search @click="handleSearchClick" /> <!--<d2-header-search @click="handleSearchClick" />-->
<d2-header-log /> <!--<d2-header-log />-->
<d2-header-fullscreen /> <d2-header-fullscreen />
<d2-header-theme /> <!--<d2-header-theme />-->
<d2-header-size /> <!--<d2-header-size />-->
<d2-header-locales /> <!--<d2-header-locales />-->
<d2-header-color />--> <!--<d2-header-color />-->
<d2-header-user /> <d2-header-user />
</div> </div>
</div> </div>
<!-- 下面 主体 --> <!-- 下面 主体 -->
<div class="d2-theme-container" flex-box="1" flex> <div class="d2-theme-container" flex-box="1" flex flex="dir:top">
<!-- 主体 侧边栏 --> <!-- 主体 侧边栏 -->
<!-- <div <!-- <div
flex-box="0" flex-box="0"
...@@ -64,8 +43,10 @@ ...@@ -64,8 +43,10 @@
}"> }">
<d2-menu-side/> <d2-menu-side/>
</div>--> </div>-->
<!--通知栏-->
<d2-header-alarm-notify ></d2-header-alarm-notify>
<!-- 主体 --> <!-- 主体 -->
<div class="d2-theme-container-main" flex-box="1" flex> <div class="d2-theme-container-main">
<!-- 搜索 --> <!-- 搜索 -->
<!-- <transition name="fade-scale"> <!-- <transition name="fade-scale">
<div v-if="searchActive" class="d2-theme-container-main-layer" flex> <div v-if="searchActive" class="d2-theme-container-main-layer" flex>
...@@ -83,7 +64,7 @@ ...@@ -83,7 +64,7 @@
<div <div
class="d2-theme-container-main-body" class="d2-theme-container-main-body"
flex-box="1" flex-box="1"
style="border:0px solid red;margin: 10px 0px 10px 0px;" style="margin: 16px 0px 16px 0px;"
> >
<transition :name="transitionActive ? 'fade-transverse' : ''"> <transition :name="transitionActive ? 'fade-transverse' : ''">
<keep-alive :include="keepAlive"> <keep-alive :include="keepAlive">
...@@ -111,6 +92,7 @@ import d2HeaderTheme from './components/header-theme' ...@@ -111,6 +92,7 @@ import d2HeaderTheme from './components/header-theme'
import d2HeaderUser from './components/header-user' import d2HeaderUser from './components/header-user'
import d2HeaderLog from './components/header-log' import d2HeaderLog from './components/header-log'
import d2HeaderColor from './components/header-color' import d2HeaderColor from './components/header-color'
import d2HeaderAlarmNotify from './components/header-alarm-notify'
import { mapState, mapGetters, mapActions } from 'vuex' import { mapState, mapGetters, mapActions } from 'vuex'
import mixinSearch from './mixins/search' import mixinSearch from './mixins/search'
export default { export default {
...@@ -127,7 +109,8 @@ export default { ...@@ -127,7 +109,8 @@ export default {
d2HeaderTheme, d2HeaderTheme,
d2HeaderUser, d2HeaderUser,
d2HeaderLog, d2HeaderLog,
d2HeaderColor d2HeaderColor,
d2HeaderAlarmNotify
}, },
data () { data () {
return { return {
......
// Element // Element
import ElementUI from 'element-ui' import ElementUI from 'element-ui'
import 'element-ui/lib/theme-chalk/index.css' // import 'element-ui/lib/theme-chalk/index.css'
import '@/assets/elementYbf02/theme/index.css'
// flex 布局库 // flex 布局库
import 'flex.css' import 'flex.css'
// 组件 // 组件
......
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