diff --git a/src/assets/images/del.png b/src/assets/images/del.png new file mode 100644 index 0000000..1bb2cd1 Binary files /dev/null and b/src/assets/images/del.png differ diff --git a/src/assets/images/edit.png b/src/assets/images/edit.png new file mode 100644 index 0000000..db6f52e Binary files /dev/null and b/src/assets/images/edit.png differ diff --git a/src/assets/images/icon-ck@2x.png b/src/assets/images/icon-ck@2x.png new file mode 100644 index 0000000..c96cb12 Binary files /dev/null and b/src/assets/images/icon-ck@2x.png differ diff --git a/src/assets/images/icon-dc@2x.png b/src/assets/images/icon-dc@2x.png new file mode 100644 index 0000000..210db4a Binary files /dev/null and b/src/assets/images/icon-dc@2x.png differ diff --git a/src/assets/images/icon-rwcj@2x.png b/src/assets/images/icon-rwcj@2x.png new file mode 100644 index 0000000..91a443b Binary files /dev/null and b/src/assets/images/icon-rwcj@2x.png differ diff --git a/src/assets/images/icon-shenhe@2x.png b/src/assets/images/icon-shenhe@2x.png new file mode 100644 index 0000000..5b600d2 Binary files /dev/null and b/src/assets/images/icon-shenhe@2x.png differ diff --git a/src/assets/images/position.png b/src/assets/images/position.png index e717f27..fb97be8 100644 Binary files a/src/assets/images/position.png and b/src/assets/images/position.png differ diff --git a/src/assets/styles/font.css b/src/assets/styles/font.css new file mode 100644 index 0000000..37927e4 --- /dev/null +++ b/src/assets/styles/font.css @@ -0,0 +1,12 @@ +@font-face { + font-family: "Alibaba PuHuiTi"; + src: url("./fonts/Alibaba-PuHuiTi-Bold.ttf"); +} +@font-face { + font-family: "Alimama ShuHeiTi"; + src: url("./fonts/AlimamaShuHeiTi-Bold.ttf"); +} +@font-face { + font-family: "Alibaba PuHuiTiR"; + src: url("./fonts/Alibaba-PuHuiTi-Regular.ttf"); +} \ No newline at end of file diff --git a/src/assets/styles/fonts/Alibaba-PuHuiTi-Bold.ttf b/src/assets/styles/fonts/Alibaba-PuHuiTi-Bold.ttf new file mode 100644 index 0000000..dcca29c Binary files /dev/null and b/src/assets/styles/fonts/Alibaba-PuHuiTi-Bold.ttf differ diff --git a/src/assets/styles/fonts/Alibaba-PuHuiTi-Regular.ttf b/src/assets/styles/fonts/Alibaba-PuHuiTi-Regular.ttf new file mode 100644 index 0000000..4261e49 Binary files /dev/null and b/src/assets/styles/fonts/Alibaba-PuHuiTi-Regular.ttf differ diff --git a/src/assets/styles/fonts/AlimamaShuHeiTi-Bold.ttf b/src/assets/styles/fonts/AlimamaShuHeiTi-Bold.ttf new file mode 100644 index 0000000..d2b4384 Binary files /dev/null and b/src/assets/styles/fonts/AlimamaShuHeiTi-Bold.ttf differ diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index fe94f30..9e9bcee 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -5,6 +5,7 @@ @import './sidebar.scss'; @import './btn.scss'; @import './public.scss'; +@import './font.css'; body { height: 100%; @@ -25,7 +26,7 @@ html { #app { height: 100%; - background-color: #f2f2f2; + background-color: #F2F4F6; } *, diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss index d9c5307..8028182 100644 --- a/src/assets/styles/public.scss +++ b/src/assets/styles/public.scss @@ -3,22 +3,30 @@ width: 100%; display: flex; flex-direction: column; + background-color: #F2F4F6; .content-search { padding-top: 20px; - border-bottom: 1px solid #ccc; + margin-bottom: 15px; + background-color: #fff; + border-radius: 5px; .search-title { - font-weight: 700; - font-size: 18px; - color: #3D3D3D; - padding-left: 10px; + font-family: Alibaba PuHuiTi; + font-weight: bold; + font-size: 16px; + color: #192734; + padding-left: 20px; + position: relative; + padding-bottom: 15px; + border-bottom: 1px solid #F2F4F6; &::before { content: ""; display: block; - width: 72px; - height: 3px; + width: 4px; + height: 20px; border-radius: 5px; - position: relative; - top: 30px; + position: absolute; + top: 0px; + left: 0px; background-color: #2F8AE5; } } @@ -34,6 +42,11 @@ } } } + .tyshxydm-class { + .el-form-item__content { + width: calc(100% - 140px); + } + } .unit-form { .el-form-item__content { width: 100%; @@ -42,36 +55,58 @@ } main { flex: 1; - padding: 20px 10px; + padding: 20px 0px; + background-color: #fff; + border-radius: 5px; .search-title { display: flex; justify-content: space-between; + border-bottom: 1px solid #F2F4F6; + padding: 0px 10px 0px 0px; .search-title-span { - font-weight: 700; - font-size: 18px; - color: #3D3D3D; - padding-left: 10px; - padding-right: 50px; + font-family: Alibaba PuHuiTi; + font-weight: bold; + font-size: 16px; + color: #192734; + padding-left: 20px; + position: relative; + &::before { content: ""; display: block; - width: 72px; - height: 3px; + width: 4px; + height: 20px; border-radius: 5px; - position: relative; - top: 30px; + position: absolute; + top: 0px; + left: 0px; background-color: #2F8AE5; } } } + .search-title-two { + padding-bottom: 15px; + } section { margin: 10px 0; + padding: 0px 10px; + .el-table { + th { + background: rgba(98,153,204,0.1); + } + td { + border-bottom: none; + } + .evenNumber-row { + background-color: #F6F9FD; + } + } } } } #L-pagination { margin-top: 15px; - + padding: 0px 10px; .btn-prev, .btn-next { padding: 0px 15px; @@ -120,52 +155,76 @@ } .audit-pages-box,.info-left { height: 100%; + background-color: #fff; + border-radius: 5px; .content-info { padding: 20px 0; + margin-bottom: 15px; + background-color: #fff; + border-radius: 5px; .info-title { - font-weight: 700; - font-size: 18px; - color: #3D3D3D; - padding-left: 10px; + font-family: Alibaba PuHuiTi; + font-weight: bold; + font-size: 16px; + color: #192734; + padding-left: 20px; + position: relative; + padding-bottom: 15px; + border-bottom: 1px solid #F2F4F6; + &::before { content: ""; display: block; - width: 72px; - height: 3px; - position: relative; - top: 30px; - background-color: #2F8AE5; + width: 4px; + height: 20px; border-radius: 5px; + position: absolute; + top: 0px; + left: 0px; + background-color: #2F8AE5; } } .top-info { + margin: 20px 20px 0px 20px; padding: 20px; + background: #FAFBFC; .top-row { - margin-bottom: 50px; + margin-bottom: 20px; } .el-col { - color: #464242; + color: #192733; + font-family: Alibaba PuHuiTi; + font-weight: 400; + font-size: 14px; span { - color: black; + font-family: Alibaba PuHuiTi; + font-weight: 400; + font-size: 14px; + color: #5C6166; } } } } .content-info-two { - border-bottom: 1px solid #ccc; - margin-bottom: 20px; + // border-bottom: 1px solid #ccc; + // margin-bottom: 20px; } .info-cut-off-rule { - border-bottom: 1px solid #ccc; + border-bottom: 1px solid #F2F4F6; display: flex; margin-bottom: 20px; div { padding: 10px; padding: 10px 20px; - border: 1px solid #ccc; + border: 1px solid #F5F5F5; + font-weight: 400; + font-family: Alibaba PuHuiTiR; + font-size: 14px; + color: #192733; border-bottom: none; - background-color: #fff; + background-color: #F5F5F5; cursor: pointer; + margin-right: 10px; } .left-tab { margin-left: 20px; @@ -173,30 +232,62 @@ } .active-tab { color: #fff; - background-color: #555555; + background-color: #1485EF; + border: 1px solid #1485EF; } } .info-cut-off-rule-my { + padding-top: 15px; + padding-bottom: 15px; + border-bottom: 1px solid #F2F4F6; margin-bottom: 20px; .info-title { - font-weight: 700; - font-size: 18px; - color: #3D3D3D; - padding-left: 10px; + font-family: Alibaba PuHuiTi; + font-weight: bold; + font-size: 16px; + color: #192734; + padding-left: 20px; + position: relative; + + &::before { content: ""; display: block; - width: 72px; - height: 3px; - position: relative; - top: 30px; - background-color: #2F8AE5; + width: 4px; + height: 20px; border-radius: 5px; + position: absolute; + top: 0px; + left: 0px; + background-color: #2F8AE5; } } } .info-bottom-box { padding: 0px 20px; + section { + .el-table { + th { + background: rgba(98,153,204,0.1); + } + td { + border-bottom: none; + } + .evenNumber-row { + background-color: #F6F9FD; + } + } + } + } +} +.audit-pages-box-two,.info-left-two { + background-color: #F2F4F6 !important; + display: flex; + flex-direction: column; + .renwuxiangqing { + flex: 1; + background-color: #fff; + border-radius: 5px; } } diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index 7e110cf..ebf8222 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -54,6 +54,32 @@ .el-scrollbar { height: calc(100% - 50px); } + .sever-TITLE { + text-align: center; + font-family: Alimama ShuHeiTi; + font-weight: bold; + font-size: 20px; + color: #FFFFFF; + line-height: 50px; + } + } + + .cheshileiming { + padding: 10px 20px; + .is-active { + height: 30px; + line-height: 30px; + border-radius: 5px; + background-color: #1485EF !important; + } + li { + height: 30px; + line-height: 30px; + } + .el-submenu__title { + height: 30px; + line-height: 30px; + } } .is-horizontal { @@ -85,8 +111,10 @@ // menu hover .submenu-title-noDropdown, .el-submenu__title { + border-radius: 5px; &:hover { - background-color: rgba(0, 0, 0, 0.06) !important; + // background-color: rgba(0, 0, 0, 0.06) !important; + background-color: #1485EF !important; } } @@ -96,19 +124,20 @@ & .nest-menu .el-submenu>.el-submenu__title, & .el-submenu .el-menu-item { - min-width: $base-sidebar-width !important; - + min-width: 180px !important; + border-radius: 5px; &:hover { - background-color: rgba(0, 0, 0, 0.06) !important; + // background-color: rgba(0, 0, 0, 0.06) !important; + background-color: #1485EF !important; } } & .theme-dark .nest-menu .el-submenu>.el-submenu__title, & .theme-dark .el-submenu .el-menu-item { - background-color: $base-sub-menu-background !important; + background-color: $base-menu-background !important; &:hover { - background-color: $base-sub-menu-hover !important; + background-color: #1485EF !important; } } } diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss index 72f4cb9..96caaa3 100644 --- a/src/assets/styles/variables.scss +++ b/src/assets/styles/variables.scss @@ -9,7 +9,8 @@ $yellow:#FEC171; $panGreen: #30B08F; // 默认菜单主题风格 -$base-menu-color:#bfcbd9; +// $base-menu-color:#bfcbd9; +$base-menu-color:#B8C4CC; $base-menu-color-active:#f4f4f5; $base-menu-background:#304156; $base-logo-title-color: #ffffff; diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index 026de00..0a71a8c 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -82,6 +82,10 @@ export default { const route = sidebarRouters.filter(item => item.path == '') const twoActiveRoute = route[0].children.filter(item => item.path == "mytaskAudit") this.levelList = [activeRoute[0].children[0],twoActiveRoute[0],matched[0]] + } else if(matched[0].path == "/unitAuth" ) { + // 管理端--资产管理--新增资产 + const activeRoute = sidebarRouters.filter(item => item.path == '/' && item.children[0].path == 'unit') + this.levelList = [activeRoute[0].children[0],matched[0]] } else { this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false) } diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 690c917..881f8b4 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -30,7 +30,7 @@ export default { .app-main { /* 50= navbar 50 */ border-radius: 5px; - height: calc(100vh - 60px); + height: calc(100vh - 75px); width: calc(100% - 20px); position: relative; // overflow: scroll; diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue index 82ba407..b6a538e 100644 --- a/src/layout/components/Sidebar/SidebarItem.vue +++ b/src/layout/components/Sidebar/SidebarItem.vue @@ -1,14 +1,14 @@