diff --git a/src/assets/img/echartsTitlebg.png b/src/assets/img/echartsTitlebg.png new file mode 100644 index 0000000..8613050 Binary files /dev/null and b/src/assets/img/echartsTitlebg.png differ diff --git a/src/assets/img/icon-logo.png b/src/assets/img/icon-logo.png new file mode 100644 index 0000000..04f12b1 Binary files /dev/null and b/src/assets/img/icon-logo.png differ diff --git a/src/assets/img/icon-文件接引数量.png b/src/assets/img/icon-文件接引数量.png new file mode 100644 index 0000000..8d93159 Binary files /dev/null and b/src/assets/img/icon-文件接引数量.png differ diff --git a/src/assets/img/icon-文档数量.png b/src/assets/img/icon-文档数量.png new file mode 100644 index 0000000..5d4c2c4 Binary files /dev/null and b/src/assets/img/icon-文档数量.png differ diff --git a/src/assets/img/icon-结构化数据条数.png b/src/assets/img/icon-结构化数据条数.png new file mode 100644 index 0000000..55d539c Binary files /dev/null and b/src/assets/img/icon-结构化数据条数.png differ diff --git a/src/assets/img/icon-表数量.png b/src/assets/img/icon-表数量.png new file mode 100644 index 0000000..a3adf32 Binary files /dev/null and b/src/assets/img/icon-表数量.png differ diff --git a/src/assets/img/icon非结构化文件大小.png b/src/assets/img/icon非结构化文件大小.png new file mode 100644 index 0000000..e7dcb76 Binary files /dev/null and b/src/assets/img/icon非结构化文件大小.png differ diff --git a/src/assets/img/layoutbg.png b/src/assets/img/layoutbg.png index 3cde7b3..603a0a8 100644 Binary files a/src/assets/img/layoutbg.png and b/src/assets/img/layoutbg.png differ diff --git a/src/assets/img/main-logo.png b/src/assets/img/main-logo.png new file mode 100644 index 0000000..0738578 Binary files /dev/null and b/src/assets/img/main-logo.png differ diff --git a/src/assets/img/menuDefault.png b/src/assets/img/menuDefault.png index ad46ca1..5dd41ad 100644 Binary files a/src/assets/img/menuDefault.png and b/src/assets/img/menuDefault.png differ diff --git a/src/assets/img/menuSelect.png b/src/assets/img/menuSelect.png index 463a066..3f57335 100644 Binary files a/src/assets/img/menuSelect.png and b/src/assets/img/menuSelect.png differ diff --git a/src/assets/less/Acens-1.ttf b/src/assets/less/Acens-1.ttf new file mode 100644 index 0000000..a2b18df Binary files /dev/null and b/src/assets/less/Acens-1.ttf differ diff --git a/src/assets/less/JAreaLinkage.less b/src/assets/less/JAreaLinkage.less index b05b468..e15bbc0 100644 --- a/src/assets/less/JAreaLinkage.less +++ b/src/assets/less/JAreaLinkage.less @@ -117,7 +117,6 @@ z-index: 15000; background-color: #fff; box-sizing: border-box; - overflow-x: auto; margin: 2px 0; border-radius: 4px; outline: none; diff --git a/src/assets/less/Suless.less b/src/assets/less/Suless.less index 86df419..c876fed 100644 --- a/src/assets/less/Suless.less +++ b/src/assets/less/Suless.less @@ -1,12 +1,58 @@ -@bordercolor : #C8C8C8; +@bordercolor : rgb(98,133,151); @headercolor : #ffffff; @backcolor : #ffffff; -@inpuitbackcolor : #ffffff; -@labelDeaultColor : #000000; -@defaultWhiteColor: #000000; -@fontfamily : 'Microsoft YaHei'; +@inpuitbordercolor : rgb(10,63,85); +@inpuitbackcolor : rgb(4,27,43); +@labelDeaultColor : rgb(98,133,151); +@defaultWhiteColor: rgb(98,133,151); +@fontfamily : 'MyCustomFont1', sans-serif; @tableheadColor : #E5E8EB; -@tableColor : #000000; +@tableheadBgColor : linear-gradient(180deg, rgb(20,108,173),rgb(11,57,90)); +@tableColor : rgb(98,133,151); + +@font-face { + font-family: 'MyCustomFont1'; + src: url('~@/assets/less/Acens-1.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: 'MyCustomFont2'; + src: url('~@/assets/less/锐字潮牌真言简2.0免费 特粗(REEJI-ZhenyanGB2.0-Black).ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: 'MyCustomFont3'; + src: url('~@/assets/less/锐字潮牌真言简2.0免费 常规(REEJI-ZhenyanGB2.0-Regular).ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} + +.datanum{ + font-family: 'MyCustomFont2', sans-serif; +} +.echartsTitle{ + height: 36px; + background: linear-gradient(90deg, rgb(9,62,81),rgb(8,43,62)); + color: #ffffff; + font-size: 16px; + line-height: 34px; + .ecicon{ + margin-top: 2px; + width:30px; + height: 30px; + float: left; + background: url('~@/assets/img/echartsTitlebg.png') no-repeat; + } +} + +.linese{ + width: 100%; + height: 2px; + margin: 10px 0; + background: linear-gradient(90deg, rgb(49,112,157) 20px,rgb(26,63,86) 20px,rgb(26,63,86) calc(100% - 20px),rgb(49,112,157) calc(100% - 20px)); +} /* 滚动条优化 start */ ::-webkit-scrollbar { @@ -72,15 +118,17 @@ body { } .ant-layout { - // background: url('~@/assets/img/layoutbg.png') no-repeat center bottom !important; - background-color: #fff !important; + background-image: url('~@/assets/img/layoutbg.png') !important; + background-size: 100% 100%; + // background-color: #fff !important; overflow: hidden; } .ant-layout-header { - background-image: url('~@/assets/img/header_bg.png') !important; - background-size: 100% 100%; - height: 64px !important; + // background-image: url('~@/assets/img/header_bg.png') !important; + // background-size: 100% 100%; + background: transparent !important; + height: 130px !important; } @@ -92,7 +140,6 @@ body { .ant-breadcrumb-separator, .border-card, .ant-tabs-tab { - font-family: @fontfamily; font-weight: 400 !important; font-size : 16px !important; color : @labelDeaultColor !important; @@ -206,7 +253,7 @@ ul { ul li { line-height: 32px; font-family: @fontfamily; - font-weight: 400 !important; + font-weight: 400; font-size : 16px !important; color : @tableColor !important; } @@ -276,7 +323,7 @@ ul li { .ant-pagination-disabled .ant-pagination-item-link, .ant-pagination-item a, .ant-empty-normal, -.anticon.anticon-schedule, .border-card:hover, +.border-card:hover, .ant-tabs-tab:hover, .ant-form-item, .ant-select-arrow, @@ -296,10 +343,10 @@ ul li { } .ant-layout-content { - padding : 0 !important; + padding : 0 20px !important; // background : url(~@/assets/img/layoutcontentTop.png) 0 0 no-repeat, url(~@/assets/img/layoutcontentMiddle.png) 0 24px no-repeat, url(~@/assets/img/layoutcontentBottom.png) 0 calc(100vh - 182px) no-repeat; // background-size: calc(100vw - 80px) 24px, calc(100vw - 80px) calc(100vh - 206px), calc(100vw - 80px) 24px; - height : calc(100vh - 64px) !important; + height : calc(100vh - 130px) !important; margin-top: -2px; overflow: hidden; } @@ -568,6 +615,7 @@ textarea, .ant-select-dropdown.ant-select-dropdown--multiple .ant-select-dropdown-menu-item-selected .ant-select-selected-icon, .ant-select-dropdown.ant-select-dropdown--multiple .ant-select-dropdown-menu-item:hover .ant-select-selected-icon { color: @defaultWhiteColor !important; + min-height: 38px; } input:not(.ant-calendar-input):not(.ant-calendar-range-picker-input):not(.ant-select-search__field):not(.ant-input-lg), @@ -576,12 +624,12 @@ textarea, .ant-calendar-picker-input, .ant-input-number-handler-wrap, .ant-select-dropdown-content { - border : 1px solid @bordercolor !important; + border : 1px solid @inpuitbordercolor !important; border-radius: 3px; } .ant-input-number-handler-down { - border-top: 1px solid @bordercolor !important; + border-top: 1px solid @inpuitbordercolor !important; } .ant-dropdown-menu, @@ -623,8 +671,8 @@ textarea, .ant-table-tbody tr th, .ant-table-tbody tr td { - background-color: @backcolor !important; - color : @defaultWhiteColor; + color : @tableheadColor; + font-family: 'MyCustomFont3', sans-serif; // height: 50px; a { @@ -639,6 +687,7 @@ textarea, border-right : 0 !important; border-bottom: 1px solid #31343d !important; line-height : 22px; + background: @tableheadBgColor; } } @@ -755,11 +804,11 @@ textarea, background-size: 100% 100% !important; min-width : 130px !important; margin : 0 10px !important; - min-height : 36px !important; - line-height : 36px !important; + min-height : 55px !important; + line-height : 50px !important; text-align : center; - font-weight : bold; - font-size : 16px !important; + font-weight : 800; + font-size : 20px !important; padding :0 20px !important; vertical-align: middle !important; font-family : @fontfamily; @@ -768,7 +817,7 @@ textarea, .ant-menu-item>a>span, .ant-menu-submenu { - color: #787a89 !important; + color: rgb(28,204,253) !important; } .ant-menu-item-selected>a>span, @@ -860,6 +909,9 @@ textarea, .ant-menu-inline .ant-menu-submenu-title { font-size: 16px !important; } +.ant-menu-item .anticon, .ant-menu-submenu-title .anticon{ + font-size: 20px !important; +} // 外置的样式控制 .user-dropdown-menu-wrapper.ant-dropdown-menu { @@ -887,7 +939,6 @@ textarea, .ant-table-row-expand-icon { background-color: transparent !important; color : @labelDeaultColor !important; - font-family : @fontfamily; font-weight : 400 !important; font-size : 16px !important; } @@ -901,11 +952,6 @@ tr.ant-table-expanded-row:hover { background: transparent !important; } -// .ant-table-bordered .ant-table-thead > tr > th:first-child -// { -// background-color:#112834; -// color:#00DEF4; -// } .ant-table-row, .ant-table-row .ant-table-selection-column, .ant-avatar, @@ -914,7 +960,7 @@ tr.ant-table-expanded-row:hover { background-color: transparent !important; color : #00A2FF; height : 50px; - font-family : @fontfamily; + font-family : 'MyCustomFont1', sans-serif; font-weight : 400 !important; font-size : 16px !important; } @@ -935,9 +981,6 @@ tr.ant-table-expanded-row:hover { // color: #00DEF4 !important; // } -.ant-table-body { - overflow-x: auto !important; -} .ant-alert-info, // .ant-pagination, @@ -971,7 +1014,7 @@ tr.ant-table-expanded-row:hover { .ant-table-thead>tr>th, .ant-table-tbody>tr>td { border-right : 0px solid #096A87 !important; - border-bottom: 1px solid #31343d !important; + border-bottom: 1px solid rgb(10,49,75) !important; } .ant-table-tbody>tr>td { @@ -979,9 +1022,10 @@ tr.ant-table-expanded-row:hover { } .ant-table-align-center, .ant-table-thead tr th { - background-color: @tableheadColor !important; - color : @labelDeaultColor !important; - font-weight: 700 !important; + background: @tableheadBgColor !important; + color : @tableheadColor !important; + font-family: 'MyCustomFont3', sans-serif; + font-size: 16px; } .ant-alert-info { diff --git a/src/assets/less/锐字潮牌真言简2.0免费 常规(REEJI-ZhenyanGB2.0-Regular).ttf b/src/assets/less/锐字潮牌真言简2.0免费 常规(REEJI-ZhenyanGB2.0-Regular).ttf new file mode 100644 index 0000000..5e1fd8e Binary files /dev/null and b/src/assets/less/锐字潮牌真言简2.0免费 常规(REEJI-ZhenyanGB2.0-Regular).ttf differ diff --git a/src/assets/less/锐字潮牌真言简2.0免费 特粗(REEJI-ZhenyanGB2.0-Black).ttf b/src/assets/less/锐字潮牌真言简2.0免费 特粗(REEJI-ZhenyanGB2.0-Black).ttf new file mode 100644 index 0000000..e69ee77 Binary files /dev/null and b/src/assets/less/锐字潮牌真言简2.0免费 特粗(REEJI-ZhenyanGB2.0-Black).ttf differ diff --git a/src/assets/u6.png b/src/assets/u6.png index 561828b..705b75c 100644 Binary files a/src/assets/u6.png and b/src/assets/u6.png differ diff --git a/src/assets/u8.png b/src/assets/u8.png index b1bc87a..650fc88 100644 Binary files a/src/assets/u8.png and b/src/assets/u8.png differ diff --git a/src/components/layouts/UserLayout.vue b/src/components/layouts/UserLayout.vue index 41602a5..1f4f8a1 100644 --- a/src/components/layouts/UserLayout.vue +++ b/src/components/layouts/UserLayout.vue @@ -114,7 +114,8 @@ export default { .main { width: 596px; height: 468px; - margin: 390px 1020px; + margin: 335px 1173px; + padding-top: 80px; background: url(~@/assets/img/login_bg.png) no-repeat; } diff --git a/src/components/page/GlobalHeader.vue b/src/components/page/GlobalHeader.vue index 68de8ec..4305992 100644 --- a/src/components/page/GlobalHeader.vue +++ b/src/components/page/GlobalHeader.vue @@ -27,16 +27,16 @@
-
-
末端数据接入处理系统
-
+
+
+
- +
@@ -205,7 +205,9 @@ export default { } } } - +.header-index-center{ + text-align: center; +} .ant-layout-header { height: 64px; line-height: 64px; @@ -213,9 +215,15 @@ export default { .header-nowTime { color: #fff; font-family: 'Microsoft YaHei'; - font-size: 26px; + font-size: 28px; letter-spacing: 3px; font-weight: 700; - padding-left:23px; + height:70px; +} +.header-index-right{ + position: absolute; + right: 10px; + top: -4px; + line-height: 20px; } \ No newline at end of file diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue index 60bc7e8..6767cfa 100644 --- a/src/components/page/GlobalLayout.vue +++ b/src/components/page/GlobalLayout.vue @@ -90,8 +90,9 @@ export default { created() { //--update-begin----author:scott---date:20190320------for:根据后台菜单配置，判断是否路由菜单字段，动态选择是否生成路由（为了支持参数URL菜单）------ //this.menus = this.mainRouters.find((item) => item.path === '/').children; + var cc = this.permissionMenuList.shift() this.menus = this.permissionMenuList - console.log(this.permissionMenuList) + console.log('顶部菜单',this.permissionMenuList) // 根据后台配置菜单，重新排序加载路由信息 //console.log('----加载菜单逻辑----') //console.log(this.mainRouters) diff --git a/src/components/page/PageHeader.vue b/src/components/page/PageHeader.vue index 29087a1..7924b9e 100644 --- a/src/components/page/PageHeader.vue +++ b/src/components/page/PageHeader.vue @@ -88,7 +88,6 @@ this.name = this.$route.name this.$route.matched.forEach((item) => { // item.name !== 'index' && this.breadList.push(item) - console.log(this.$route.matched); this.breadList.push(item) }) } diff --git a/src/components/page/PageLayout.vue b/src/components/page/PageLayout.vue index 497958d..7d0c40f 100644 --- a/src/components/page/PageLayout.vue +++ b/src/components/page/PageLayout.vue @@ -1,5 +1,5 @@