diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css index 80fb12a64..4f51ab4cd 100644 --- a/public/css/edu-purge.css +++ b/public/css/edu-purge.css @@ -3971,7 +3971,9 @@ html>body #ajax-indicator { cursor: pointer; position: relative; font-size: 16px; - padding:0px 20px; + margin-right: 40px; +}.head-nav ul#header-nav li:first-child{ + margin-left: 20px; } .head-nav ul#header-nav li a { diff --git a/public/index.html b/public/index.html index bfd2b5004..dab74e08c 100755 --- a/public/index.html +++ b/public/index.html @@ -2,9 +2,11 @@ - + 红山开源社区 + + diff --git a/src/forge/Main/Index.js b/src/forge/Main/Index.js index ade074a04..080907f25 100644 --- a/src/forge/Main/Index.js +++ b/src/forge/Main/Index.js @@ -276,12 +276,14 @@ class Index extends Component {
diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss index 913312ff1..e91504ac1 100644 --- a/src/forge/css/index.scss +++ b/src/forge/css/index.scss @@ -168,7 +168,7 @@ form{ background-color: #fff; .list-affix{ min-height: 20px; - max-height: 180px; + max-height: 240px; overflow-y: auto; } & li{ @@ -210,7 +210,7 @@ form{ width: 6px; content: ''; height: 33px; - background: #4CACFF; + background: #1484EF; } .MenuTitle{ font-size: 16px; @@ -220,6 +220,21 @@ form{ line-height: 62px; border-bottom: 1px solid #E0E0E0; font-weight: 400; + + span{ + display: block; + width: 50%; + height: 100%; + cursor: pointer; + } + + span:hover{ + color: #1484EF; + + .iconfont{ + color: #1484EF !important; + } + } } .ant-menu-inline{ border:none; diff --git a/src/military/notice/image/banner.png b/src/military/notice/image/banner.png index 3f9698341..ef365f97f 100644 Binary files a/src/military/notice/image/banner.png and b/src/military/notice/image/banner.png differ diff --git a/src/military/notice/noticeList/index.jsx b/src/military/notice/noticeList/index.jsx index 19dea8765..344dc1d04 100644 --- a/src/military/notice/noticeList/index.jsx +++ b/src/military/notice/noticeList/index.jsx @@ -1,21 +1,14 @@ import React, { useEffect, useState } from 'react'; import classNames from 'classnames'; -import { Menu, Pagination, Icon, Input } from 'antd'; -import { Link } from "react-router-dom"; +import { Pagination, Icon, Input } from 'antd'; import ItemList from '../components/itemList'; import Nodata from '../../../forge/Nodata'; import Loading from "../../../Loading"; -// import { AbandonSvg, AllSvg, ChangeSvg, CallSvg, CheckSvg } from '../svg'; import noticePng from '../image/banner.png'; import { getNoticeList } from '../api'; import './index.scss'; const Search = Input.Search; -// const { SubMenu } = Menu; - -// const defaultColor = '#848684'; -// const activeColor = '#ffffff'; -// const svgColor = '#1890ff'; export default (props) => { @@ -101,6 +94,7 @@ export default (props) => { function sortNav() { return
{
} - // function onOpenChange(e) { - // if(e.length===2){ - // if(e[1]==='sub1'){ - // setTab('0'); - // }else{ - // setTab('7'); - // } - // }else{ - // if(e[0]==='sub1'){ - // setTab('0'); - // } else if (e[0] == 'sub2') { - // setTab('7'); - // } else { - // setTab('8'); - // } - // } - // setCurPage(1); - // setTitle(''); - // setOrderBy('publishDateDesc'); - // } - function handleClick(e) { setTab(e.key); setCurPage(1); @@ -142,6 +115,15 @@ export default (props) => { setOrderBy('publishDateDesc'); } + function click(e){ + console.log("aa"); + console.log(e); + setTab(e); + setCurPage(1); + setTitle(''); + setOrderBy('publishDateDesc'); + } + function cont(param, titleStr, key, svgStr) { return
@@ -252,33 +234,24 @@ export default (props) => { 图片加载失败
-
+ {/*
首页 >  公告 -
+
*/}
- - 项目公告 - {/* 项目公告} > */} - 招标公告 - 更正公告 - 中标公告 - 废标公告 - {/* */} - 成果转化 - {/* 成果转化}> */} - 技术资产 - 成交公告 - {/* */} - +
    +
  • click('0')}>项目公告
    • +
  • click('4')}>招标公告
    • +
  • click('1')}>更正公告
    • +
  • click('2')}>中标公告
    • +
  • click('3')}>废标公告
    • +
+
    +
  • click('7')}>成果转化
    • +
  • click('5')}>技术资产
    • +
  • click('6')}>成交公告
    • +
{sortNav()} diff --git a/src/military/notice/noticeList/index.scss b/src/military/notice/noticeList/index.scss index a0a02574e..c942d00eb 100644 --- a/src/military/notice/noticeList/index.scss +++ b/src/military/notice/noticeList/index.scss @@ -39,8 +39,11 @@ .notice-sort-nav{ display: flex; justify-content: space-between; - padding: .625rem 1rem .5rem; - background: #f5f5f5; + padding: .3rem 2rem 1.5rem; + margin: 0px -1.25rem; + // border: 1px solid; + border-bottom: 1px solid #E0E0E0; + // background: #f5f5f5; } .notice-center-content{ @@ -68,7 +71,6 @@ } } - .ant-input-group-addon{ border: 0 !important; } @@ -100,10 +102,11 @@ .body{ display: flex; justify-content: space-between; + margin-top: -20px; .navigationMenu{ - margin-right: 24px; - width: 15.4em; + margin-right: 20px; + width: 20.8em; caret-color: rgba(0, 0, 0, 0); } @@ -112,50 +115,71 @@ } } -#menu-selected{ - background-color: #1890FF; - color: #fff; - .subMenuspan{ - color: #fff; +.menu-ul{ + background-color: white; + margin-bottom: 12px; + border-radius:2px; + + .MenuTitle{ + border-bottom: 1px solid #E0E0E0; + + span{ + display: block; + width: 50%; + height: 100%; + cursor: pointer; + border-bottom: 0px solid; + i{ + color: #afaaae; + } + } + + span:hover{ + color: #1484EF; + .iconfont{ + color: #1484EF !important; + } + } + } + + li{ + padding:0px 0px 0px 20px; + position: relative; + height: 62px; + line-height: 62px; + font-size: 16px; + color: #333; + span{ + display: block; + height: 62px; + cursor: pointer; + border-bottom: 1px solid #eee; + } + + &:last-child > span{ + border-bottom: none; + } + } + + li:hover{ + background: #fafafa; + } + + .active::before{ + position: absolute; + left: 0px; + top: 15px; + width: 6px; + content: ''; + height: 30px; + background: #1484EF; + } + + & i{ + margin-right: 5px; } } -// #menu-selected>div>.itemClass>.iconfont{ -// color: #fff; -// } - -#menu-selected>.itemClass>.iconfont{ - color: #fff; -} - -#menu-selected .ant-menu-submenu-arrow::after,#menu-selected .ant-menu-submenu-arrow::before,#menu-selected .ant-menu-submenu-arrow:after,#menu-selected .ant-menu-submenu-arrow:before{ - background: #fff; -} - -.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected{ - background-color: #fff; - color: #595959; -} - -.ant-menu-item-active{ - color: #1890FF; -} - -.ant-menu-submenu-selected{ - color: #595959; -} - -.itemClass{ - display: flex; - align-items: center; - font-size: 18px; - .iconfont{ - margin-right:.75em; - color: #1890FF; - } -} - -.ant-menu-vertical .ant-menu-item, .ant-menu-vertical-left .ant-menu-item, .ant-menu-vertical-right .ant-menu-item, .ant-menu-inline .ant-menu-item, .ant-menu-vertical .ant-menu-submenu-title, .ant-menu-vertical-left .ant-menu-submenu-title, .ant-menu-vertical-right .ant-menu-submenu-title, .ant-menu-inline .ant-menu-submenu-title{ - margin-top: 0px; - margin-bottom: 0px; +.ant-input-group-addon .ant-btn-lg { + height: 40px; } \ No newline at end of file diff --git a/src/modules/page/Header.js b/src/modules/page/Header.js index 0c09b851b..ff27094b1 100644 --- a/src/modules/page/Header.js +++ b/src/modules/page/Header.js @@ -108,3 +108,4 @@ class Header extends Component { } export default withStyles(styles)(Header); +// /images/avatars/LaboratorySetting/1tab?t=1625195016 \ No newline at end of file diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js index 0c9f3f624..4f373fcb2 100644 --- a/src/modules/tpm/NewHeader.js +++ b/src/modules/tpm/NewHeader.js @@ -278,7 +278,6 @@ class NewHeader extends Component { }) }; HideAddcoursestypess = (i) => { - console.log("调用了"); this.setState({ Addcoursestypes: false, mydisplay: true, @@ -497,9 +496,9 @@ class NewHeader extends Component { } //获取数据为空的时候 gettablogourlnull = () => { - this.setState({ - mygetHelmetapi2: undefined - }); + // this.setState({ + // mygetHelmetapi2: undefined + // }); var link = document.createElement('link'), oldLink = document.getElementById('dynamic-favicon'); link.id = 'dynamic-favicon'; @@ -522,6 +521,7 @@ class NewHeader extends Component { if (oldLink) { document.head.removeChild(oldLink); } + console.log("ac12111:",response.data.setting.tab_logo_url); document.head.appendChild(link); } @@ -574,8 +574,6 @@ class NewHeader extends Component { matchpaths = (url) => { const { match } = this.props; - console.log(url); - console.log(match); if(url){ if (url.indexOf('forums') > -1 && match.path.indexOf('forums') > -1) {