Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-operate-sys-cscec
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
fulixin
dsk-operate-sys-cscec
Commits
0d952d0e
Commit
0d952d0e
authored
Dec 05, 2023
by
tianhongyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🎈
perf(根据ui图 重置导航宽度 样式):
parent
e5068e0c
Changes
7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
98 additions
and
54 deletions
+98
-54
supplier-management-siderbar.svg
...-ui/src/assets/icons/svg/supplier-management-siderbar.svg
+1
-0
zjyj-logo.svg
dsk-operate-ui/src/assets/images/logo/zjyj-logo.svg
+1
-0
sidebar.scss
dsk-operate-ui/src/assets/styles/sidebar.scss
+77
-36
variables.scss
dsk-operate-ui/src/assets/styles/variables.scss
+2
-2
index.vue
dsk-operate-ui/src/components/SvgIcon/index.vue
+2
-2
Logo.vue
dsk-operate-ui/src/layout/components/Sidebar/Logo.vue
+14
-13
index.vue
dsk-operate-ui/src/views/tool/build/index.vue
+1
-1
No files found.
dsk-operate-ui/src/assets/icons/svg/supplier-management-siderbar.svg
0 → 100644
View file @
0d952d0e
This diff is collapsed.
Click to expand it.
dsk-operate-ui/src/assets/images/logo/zjyj-logo.svg
0 → 100644
View file @
0d952d0e
This diff is collapsed.
Click to expand it.
dsk-operate-ui/src/assets/styles/sidebar.scss
View file @
0d952d0e
...
@@ -66,9 +66,16 @@
...
@@ -66,9 +66,16 @@
height
:
100%
;
height
:
100%
;
}
}
.el-scrollbar
{
.scrollbar-wrapper
{
padding-top
:
20px
;
box-sizing
:
border-box
;
}
}
&
.has-logo
{
&
.has-logo
{
.el-scrollbar
{
.el-scrollbar
{
height
:
calc
(
100%
-
5
0
px
);
height
:
calc
(
100%
-
5
6
px
);
}
}
}
}
...
@@ -82,8 +89,14 @@
...
@@ -82,8 +89,14 @@
overflow
:
hidden
;
overflow
:
hidden
;
}
}
.sidebar-logo-link
{
display
:
flex
;
align-items
:
center
;
overflow
:
hidden
;
}
.svg-icon
{
.svg-icon
{
margin-right
:
6
px
;
margin-right
:
8
px
;
}
}
.el-submenu__icon-arrow
{
.el-submenu__icon-arrow
{
top
:
54%
;
top
:
54%
;
...
@@ -94,19 +107,21 @@
...
@@ -94,19 +107,21 @@
.el-menu
{
.el-menu
{
border
:
none
;
border
:
none
;
height
:
100%
;
height
:
100%
;
width
:
calc
(
100%
-
16px
)
!
important
;
width
:
100%
;
margin
:
0
8px
;
padding
:
0px
12px
;
box-sizing
:
border-box
;
&
.el-menu--inline
{
padding
:
0px
8px
;
box-sizing
:
border-box
;
}
}
.el-menu--inline
{
margin
:
0
;
width
:
100%
!
important
;
}
}
.el-menu--inline
.nest-menu
.el-menu-item
{
.el-menu--inline
.nest-menu
.el-menu-item
{
width
:
100%
!
important
;
width
:
100%
!
important
;
min-width
:
128px
;
min-width
:
128px
;
font-size
:
12px
;
font-size
:
12px
;
color
:
#fff
!
important
;
color
:
#fff
!
important
;
padding-left
:
2
3
px
!
important
;
padding-left
:
2
4
px
!
important
;
}
}
.el-menu--inline
.nest-menu
.el-menu-item
.svg-icon
{
.el-menu--inline
.nest-menu
.el-menu-item
.svg-icon
{
display
:
none
;
display
:
none
;
...
@@ -114,27 +129,37 @@
...
@@ -114,27 +129,37 @@
.el-menu-item
,
.el-menu-item
,
.el-submenu__title
{
.el-submenu__title
{
display
:
flex
;
align-items
:
center
;
height
:
40px
;
height
:
40px
;
line-height
:
40px
;
line-height
:
40px
;
border
:
1px
solid
#141b2f
;
border
:
1px
solid
#141b2f
;
border-radius
:
10px
;
color
:
#fff
;
color
:
#fff
;
margin-bottom
:
6
px
;
margin-bottom
:
8
px
;
padding
:
0
6
px
!
important
;
padding
:
0
8
px
!
important
;
overflow
:
hidden
!
important
;
overflow
:
hidden
!
important
;
text-overflow
:
ellipsis
!
important
;
text-overflow
:
ellipsis
!
important
;
white-space
:
nowrap
!
important
;
white-space
:
nowrap
!
important
;
}
}
.el-menu.el-menu--inline
{
margin
:
0
;
width
:
100%
!
important
;
.el-submenu__title
{
padding-left
:
24px
!
important
;
}
}
// menu hover
// menu hover
.el-menu-item.is-active
{
.el-menu-item.is-active
{
// 点击菜单的颜色
// 点击菜单的颜色
background-color
:
#1e2c4c
!
important
;
background-color
:
#1e2c4c
!
important
;
color
:
#fff
!
important
;
color
:
#fff
!
important
;
border-radius
:
10px
;
border
:
1px
solid
#2b3f69
;
border
:
1px
solid
#2b3f69
;
&
:hover
{
&
:hover
{
background-color
:
#1e2c4c
!
important
;
background-color
:
#1e2c4c
!
important
;
border-radius
:
10px
;
color
:
#fff
!
important
;
color
:
#fff
!
important
;
border
:
1px
solid
#2b3f69
;
border
:
1px
solid
#2b3f69
;
}
}
...
@@ -146,11 +171,11 @@
...
@@ -146,11 +171,11 @@
// menu hover
// menu hover
.submenu-title-noDropdown
,
.submenu-title-noDropdown
,
.el-submenu__title
{
.el-submenu__title
{
border-radius
:
10px
;
color
:
#fff
!
important
;
color
:
#fff
!
important
;
&
:hover
{
&
:hover
{
background-color
:
#1e2c4c
!
important
;
background-color
:
#1e2c4c
!
important
;
color
:
#fff
!
important
;
color
:
#fff
!
important
;
border-radius
:
10px
;
border
:
1px
solid
#2b3f69
;
border
:
1px
solid
#2b3f69
;
}
}
}
}
...
@@ -163,32 +188,48 @@
...
@@ -163,32 +188,48 @@
border
:
1px
solid
#2b3f69
;
border
:
1px
solid
#2b3f69
;
}
}
.sidebar-container
.el-submenu
.el-menu-item
:before
,
//
.sidebar-container .el-submenu .el-menu-item:before,
.sidebar-container
.nest-menu
.el-submenu
>
.el-submenu__title
:before
{
//
.sidebar-container .nest-menu .el-submenu > .el-submenu__title:before {
position
:
absolute
;
//
position: absolute;
width
:
2px
;
//
width: 2px;
height
:
2px
;
//
height: 2px;
border-radius
:
50%
;
//
border-radius: 50%;
background
:
#344062
;
//
background: #344062;
left
:
16px
;
//
left: 16px;
top
:
50%
;
//
top: 50%;
content
:
""
;
//
content: "";
}
//
}
.sidebar-container
.el-submenu
.el-menu-item
:hover:before
,
//
.sidebar-container .el-submenu .el-menu-item:hover:before,
.sidebar-container
.nest-menu
.el-submenu
>
.el-submenu__title
:hover:before
{
//
.sidebar-container .nest-menu .el-submenu > .el-submenu__title:hover:before {
position
:
absolute
;
//
position: absolute;
width
:
2px
;
//
width: 2px;
height
:
2px
;
//
height: 2px;
border-radius
:
50%
;
//
border-radius: 50%;
background
:
#fff
;
//
background: #fff;
left
:
16px
;
//
left: 16px;
top
:
50%
;
//
top: 50%;
content
:
""
;
//
content: "";
}
//
}
.hideSidebar
{
.hideSidebar
{
.sidebar-container
{
.sidebar-container
{
width
:
48px
!
important
;
width
:
48px
!
important
;
.sidebar-logo-container
{
padding
:
0px
;
.sidebar-logo-link
{
justify-content
:
center
;
}
}
.el-scrollbar
{
.el-menu--collapse
{
&
.el-menu
{
padding
:
0px
8px
;
}
}
}
}
}
.main-container
{
.main-container
{
...
...
dsk-operate-ui/src/assets/styles/variables.scss
View file @
0d952d0e
...
@@ -50,8 +50,8 @@ $menuHover:#263445;
...
@@ -50,8 +50,8 @@ $menuHover:#263445;
$subMenuBg
:
#1f2d3d
;
$subMenuBg
:
#1f2d3d
;
$subMenuHover
:
#001528
;
$subMenuHover
:
#001528
;
$base-sidebar-width
:
144
px
;
$base-sidebar-width
:
220
px
;
$sideBarWidth
:
144
px
;
$sideBarWidth
:
220
px
;
//系统默认颜色
//系统默认颜色
$systemColor
:
#0081FF
;
$systemColor
:
#0081FF
;
...
...
dsk-operate-ui/src/components/SvgIcon/index.vue
View file @
0d952d0e
...
@@ -46,8 +46,8 @@ export default {
...
@@ -46,8 +46,8 @@ export default {
<
style
scoped
>
<
style
scoped
>
.svg-icon
{
.svg-icon
{
width
:
1
.29em
;
width
:
1
6px
;
height
:
1
.29em
;
height
:
1
6px
;
/*vertical-align: -0.22em;*/
/*vertical-align: -0.22em;*/
fill
:
currentColor
;
fill
:
currentColor
;
overflow
:
hidden
;
overflow
:
hidden
;
...
...
dsk-operate-ui/src/layout/components/Sidebar/Logo.vue
View file @
0d952d0e
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
</router-link>
</router-link>
<router-link
v-else
key=
"expand"
class=
"sidebar-logo-link"
to=
"/"
>
<router-link
v-else
key=
"expand"
class=
"sidebar-logo-link"
to=
"/"
>
<img
v-if=
"logo"
:src=
"logo"
class=
"sidebar-logo"
/>
<img
v-if=
"logo"
:src=
"logo"
class=
"sidebar-logo"
/>
<h1
class=
"text-cl1 sidebar-title"
:style=
"
{
width: '98px',
color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">
{{
title
}}
</h1>
<h1
class=
"text-cl1 sidebar-title"
:style=
"
{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">
{{
title
}}
</h1>
</router-link>
</router-link>
</transition>
</transition>
</el-popover>
</el-popover>
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
</
template
>
</
template
>
<
script
>
<
script
>
import
logoImg
from
'@/assets/images/logo/
logo.pn
g'
import
logoImg
from
'@/assets/images/logo/
zjyj-logo.sv
g'
import
variables
from
'@/assets/styles/variables.scss'
import
variables
from
'@/assets/styles/variables.scss'
export
default
{
export
default
{
...
@@ -45,7 +45,7 @@ export default {
...
@@ -45,7 +45,7 @@ export default {
},
},
data
()
{
data
()
{
return
{
return
{
title
:
'
数字化经营履约全生命链路管理系统
'
,
title
:
'
中建一局二公司
'
,
logo
:
logoImg
logo
:
logoImg
}
}
}
}
...
@@ -65,11 +65,13 @@ export default {
...
@@ -65,11 +65,13 @@ export default {
.sidebar-logo-container
{
.sidebar-logo-container
{
position
:
relative
;
position
:
relative
;
width
:
100%
;
width
:
100%
;
height
:
5
5
px
;
height
:
5
6
px
;
line-height
:
5
5
px
;
line-height
:
5
6
px
;
background
:
#141b2f
;
background
:
#141b2f
;
border-bottom
:
1px
solid
#1a2743
;
border-bottom
:
1px
solid
#1a2743
;
text-align
:
center
;
text-align
:
center
;
padding
:
0px
18px
;
box-sizing
:
border-box
;
/*overflow: hidden;*/
/*overflow: hidden;*/
&
.sidebar-logo-link
{
&
.sidebar-logo-link
{
...
@@ -77,18 +79,17 @@ export default {
...
@@ -77,18 +79,17 @@ export default {
width
:
100%
;
width
:
100%
;
&
.sidebar-logo
{
&
.sidebar-logo
{
width
:
16
px
;
min-width
:
22
px
;
height
:
23
px
;
width
:
22
px
;
vertical-align
:
middle
;
height
:
22px
;
margin-right
:
3
px
;
margin-right
:
8
px
;
}
}
&
.sidebar-title
{
&
.sidebar-title
{
display
:
inline-block
;
margin
:
0px
;
margin
:
0
;
color
:
#fff
;
color
:
#fff
;
font-weight
:
6
00
;
font-weight
:
7
00
;
line-height
:
50
px
;
line-height
:
22
px
;
font-size
:
14px
;
font-size
:
14px
;
font-family
:
Avenir
,
Helvetica
Neue
,
Arial
,
Helvetica
,
sans-serif
;
font-family
:
Avenir
,
Helvetica
Neue
,
Arial
,
Helvetica
,
sans-serif
;
vertical-align
:
middle
;
vertical-align
:
middle
;
...
...
dsk-operate-ui/src/views/tool/build/index.vue
View file @
0d952d0e
...
@@ -147,7 +147,7 @@ import { makeUpHtml, vueTemplate, vueScript, cssStyle } from '@/utils/generator/
...
@@ -147,7 +147,7 @@ import { makeUpHtml, vueTemplate, vueScript, cssStyle } from '@/utils/generator/
import
{
makeUpJs
}
from
'@/utils/generator/js'
import
{
makeUpJs
}
from
'@/utils/generator/js'
import
{
makeUpCss
}
from
'@/utils/generator/css'
import
{
makeUpCss
}
from
'@/utils/generator/css'
import
drawingDefault
from
'@/utils/generator/drawingDefault'
import
drawingDefault
from
'@/utils/generator/drawingDefault'
import
logo
from
'@/assets/images/logo/
logo.pn
g'
import
logo
from
'@/assets/images/logo/
zjyj-logo.sv
g'
import
CodeTypeDialog
from
'./CodeTypeDialog'
import
CodeTypeDialog
from
'./CodeTypeDialog'
import
DraggableItem
from
'./DraggableItem'
import
DraggableItem
from
'./DraggableItem'
...
...
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