Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
Y
ybf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xulili
ybf
Commits
3304a556
Commit
3304a556
authored
Jan 08, 2020
by
xd
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://114.67.93.201/xulili/ybf
parents
da8847ef
21abda2c
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
66 additions
and
52 deletions
+66
-52
.eslintrc.js
ybf_admin/.eslintrc.js
+1
-1
App.vue
ybf_admin/src/App.vue
+17
-15
config.json
ybf_admin/src/assets/elementYbf02/config.json
+1
-0
element-icons.ttf
...min/src/assets/elementYbf02/theme/fonts/element-icons.ttf
+0
-0
element-icons.woff
...in/src/assets/elementYbf02/theme/fonts/element-icons.woff
+0
-0
index.css
ybf_admin/src/assets/elementYbf02/theme/index.css
+1
-0
theme-base.scss
ybf_admin/src/assets/style/theme/theme-base.scss
+2
-3
index.vue
...out/header-aside/components/header-alarm-notify/index.vue
+27
-0
layout.vue
ybf_admin/src/layout/header-aside/layout.vue
+15
-32
index.js
ybf_admin/src/plugin/d2admin/index.js
+2
-1
No files found.
ybf_admin/.eslintrc.js
View file @
3304a556
...
...
@@ -5,7 +5,7 @@ module.exports = {
},
'extends'
:
[
'plugin:vue/essential'
,
'@vue/standard'
//
'@vue/standard'
],
rules
:
{
'no-console'
:
process
.
env
.
NODE_ENV
===
'production'
?
'error'
:
'off'
,
...
...
ybf_admin/src/App.vue
View file @
3304a556
...
...
@@ -5,24 +5,26 @@
</
template
>
<
script
>
import
util
from
'@/libs/util'
export
default
{
import
util
from
'@/libs/util'
export
default
{
name
:
'app'
,
watch
:
{
'$i18n.locale'
:
'i18nHandle'
},
created
()
{
created
()
{
this
.
i18nHandle
(
this
.
$i18n
.
locale
)
},
methods
:
{
i18nHandle
(
val
,
oldVal
)
{
i18nHandle
(
val
,
oldVal
)
{
util
.
cookies
.
set
(
'lang'
,
val
)
document
.
querySelector
(
'html'
).
setAttribute
(
'lang'
,
val
)
}
}
}
}
</
script
>
<
style
lang=
"scss"
>
@import
'~@/assets/style/public-class.scss'
;
@import
'~@/assets/style/public-class.scss'
;
</
style
>
ybf_admin/src/assets/elementYbf02/config.json
0 → 100644
View file @
3304a556
{
"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
ybf_admin/src/assets/elementYbf02/theme/fonts/element-icons.ttf
0 → 100644
View file @
3304a556
File added
ybf_admin/src/assets/elementYbf02/theme/fonts/element-icons.woff
0 → 100644
View file @
3304a556
File added
ybf_admin/src/assets/elementYbf02/theme/index.css
0 → 100644
View file @
3304a556
This source diff could not be displayed because it is too large. You can
view the blob
instead.
ybf_admin/src/assets/style/theme/theme-base.scss
View file @
3304a556
...
...
@@ -85,13 +85,12 @@
padding
:
0px
;
position
:
relative
;
overflow
:
hidden
;
height
:
calc
(
100vh
-
92px
);
.d2-theme-container-main-layer
{
position
:
absolute
;
top
:
0px
;
bottom
:
0px
;
// left: 0px;
// Z-Style
left
:
20px
;
left
:
16px
;
right
:
0px
;
}
.d2-theme-container-main-body
{
...
...
ybf_admin/src/layout/header-aside/components/header-alarm-notify/index.vue
0 → 100644
View file @
3304a556
<
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
>
ybf_admin/src/layout/header-aside/layout.vue
View file @
3304a556
...
...
@@ -11,48 +11,27 @@
<!-- 顶栏 -->
<div
class=
"d2-theme-header"
:style=
"
{
opacity: this.searchActive ? 0.5 : 1
}"
:style=
"
{ opacity: this.searchActive ? 0.5 : 1 }"
flex-box="0"
flex
>
<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"
/>
<!-- 顶栏右侧 -->
<div
class=
"d2-header-right"
flex-box=
"0"
>
<!-- 如果你只想在开发环境显示这个按钮请添加 v-if="$env === 'development'" -->
<!--
<d2-header-search
@
click=
"handleSearchClick"
/
>
<
d2-header-log
/
>
<!--
<d2-header-search
@
click=
"handleSearchClick"
/>
--
>
<
!--
<d2-header-log
/>
--
>
<d2-header-fullscreen
/>
<
d2-header-theme
/
>
<
d2-header-size
/
>
<
d2-header-locales
/
>
<d2-header-color
/>
-->
<
!--
<d2-header-theme
/>
--
>
<
!--
<d2-header-size
/>
--
>
<
!--
<d2-header-locales
/>
--
>
<
!--
<
d2-header-color
/>
-->
<d2-header-user
/>
</div>
</div>
<!-- 下面 主体 -->
<div
class=
"d2-theme-container"
flex-box=
"1"
flex
>
<div
class=
"d2-theme-container"
flex-box=
"1"
flex
flex=
"dir:top"
>
<!-- 主体 侧边栏 -->
<!--
<div
flex-box=
"0"
...
...
@@ -64,8 +43,10 @@
}">
<d2-menu-side/>
</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"
>
<div
v-if=
"searchActive"
class=
"d2-theme-container-main-layer"
flex
>
...
...
@@ -83,7 +64,7 @@
<div
class=
"d2-theme-container-main-body"
flex-box=
"1"
style=
"
border:0px solid red;margin: 10px 0px 10
px 0px;"
style=
"
margin: 16px 0px 16
px 0px;"
>
<transition
:name=
"transitionActive ? 'fade-transverse' : ''"
>
<keep-alive
:include=
"keepAlive"
>
...
...
@@ -111,6 +92,7 @@ import d2HeaderTheme from './components/header-theme'
import
d2HeaderUser
from
'./components/header-user'
import
d2HeaderLog
from
'./components/header-log'
import
d2HeaderColor
from
'./components/header-color'
import
d2HeaderAlarmNotify
from
'./components/header-alarm-notify'
import
{
mapState
,
mapGetters
,
mapActions
}
from
'vuex'
import
mixinSearch
from
'./mixins/search'
export
default
{
...
...
@@ -127,7 +109,8 @@ export default {
d2HeaderTheme
,
d2HeaderUser
,
d2HeaderLog
,
d2HeaderColor
d2HeaderColor
,
d2HeaderAlarmNotify
},
data
()
{
return
{
...
...
ybf_admin/src/plugin/d2admin/index.js
View file @
3304a556
// Element
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 布局库
import
'flex.css'
// 组件
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment