*/}
diff --git a/src/military/notice/noticeList/index.jsx b/src/military/notice/noticeList/index.jsx
index 0cf6b529..292e5dc9 100644
--- a/src/military/notice/noticeList/index.jsx
+++ b/src/military/notice/noticeList/index.jsx
@@ -1,22 +1,21 @@
import React, { useEffect, useState } from 'react';
import classNames from 'classnames';
-import { Menu, Pagination, Icon, Input, Tabs } from 'antd';
+import { Menu, Pagination, Icon, Input } from 'antd';
import { Link } from "react-router-dom";
import ItemList from '../components/itemList';
import Nodata from '../../../forge/Nodata';
import Loading from "../../../Loading";
-import { AbandonSvg, AllSvg, ChangeSvg, CheckSvg, CallSvg } from '../svg';
+// import { AbandonSvg, AllSvg, ChangeSvg, CallSvg, CheckSvg } from '../svg';
import noticePng from '../image/banner.png';
import { getNoticeList } from '../api';
import './index.scss';
-import { backgroundColor } from 'echarts/lib/theme/dark';
const Search = Input.Search;
-const { SubMenu } = Menu;
+// const { SubMenu } = Menu;
-const defaultColor = '#848684';
-const activeColor = '#ffffff';
-const svgColor = '#1890ff';
+// const defaultColor = '#848684';
+// const activeColor = '#ffffff';
+// const svgColor = '#1890ff';
export default (props) => {
@@ -37,10 +36,6 @@ export default (props) => {
const [technologyList, setTechnologyList] = useState([]);
const [dealList, setDealList] = useState([]);
- const [openKeys, setOpenKeys] = useState(['sub2']);
- const rootSubmenuKeys = ['sub1', 'sub2'];
-
-
useEffect(() => {
setLoading(true);
if (tab === '0' || tab === '7') {
@@ -119,24 +114,26 @@ export default (props) => {
}
- function onOpenChange(e) {
- setCurPage(1);
- setTitle('');
- setOrderBy('publishDateDesc');
- const latestOpenKey = e.find(key => openKeys.indexOf(key) === -1);
- if (latestOpenKey == 'sub2') {
- setTab('0');
- } else if (latestOpenKey == 'sub1') {
- setTab('7');
- } else {
- setTab('8');
- }
- if (rootSubmenuKeys.indexOf(latestOpenKey) === -1) {
- setOpenKeys([e]);
- } else {
- setOpenKeys(latestOpenKey ? [latestOpenKey] : []);
- }
- }
+ // 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);
@@ -145,11 +142,11 @@ export default (props) => {
setOrderBy('publishDateDesc');
}
- function cont(param, titleStr, key) {
+ function cont(param, titleStr, key,svgStr) {
return
-
{param.length === 5 && { handleClick({ key: key }) }}>查看更多
-
+ {noticeList.length === 10 &&
{ setCurPage(page) }}
@@ -218,40 +222,41 @@ export default (props) => {
total={total}
showTotal={total => `共 ${total} 条`}
/>
- :
}
首页 >
- 公告 >
+ 公告
diff --git a/src/military/notice/noticeList/index.scss b/src/military/notice/noticeList/index.scss
index b2c8e837..2c81b4cd 100644
--- a/src/military/notice/noticeList/index.scss
+++ b/src/military/notice/noticeList/index.scss
@@ -38,19 +38,18 @@ body{
display: none !important;
}
}
-
.notice-sort-nav{
display: flex;
justify-content: space-between;
padding: .625rem 1rem .5rem;
background: #f5f5f5;
- width: 920px;
}
.notice-center-content{
padding:1.25rem;
background: #fff;
+ flex: auto;
}
.item-head-title{
@@ -62,9 +61,12 @@ body{
display: flex;
align-items: center;
font-size: 1rem;
- font-weight: bold;
- svg{
+ span{
+ font-weight: bold;
+ }
+ i{
margin-right: .25em;
+ color: #1890FF;
}
}
}
@@ -100,28 +102,36 @@ body{
.body{
display: flex;
justify-content: space-between;
-}
-Menu.Item{
- display: flex;
- align-items: center;
+ .navigationMenu{
+ margin-right: 24px;
+ width: 15.4em;
+ }
}
#menu-selected{
- background-color: #1890ff;
+ background-color: #1890FF;
color: #fff;
.subMenuspan{
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;
+ color: #1890FF;
}
.ant-menu-submenu-selected{
@@ -132,8 +142,8 @@ Menu.Item{
display: flex;
align-items: center;
font-size: 18px;
-
- svg{
+ .iconfont{
margin-right:.75em;
+ color: #1890FF;
}
}
\ No newline at end of file
diff --git a/src/military/notice/svg.js b/src/military/notice/svg.js
index 541f75dc..c4bc6b35 100644
--- a/src/military/notice/svg.js
+++ b/src/military/notice/svg.js
@@ -1,6 +1,6 @@
import React from 'react';
-export function AbandonSvg({color}) {
+export function AbandonSvg({ color }) {
return
}
-export function AllSvg({color}) {
+export function AllSvg({ color }) {
return
}
-export function ChangeSvg({color}) {
+export function ChangeSvg({ color }) {
return
}
-export function CheckSvg({color}) {
- return
+
}
-export function NewSvg({color}) {
+export function NewSvg({ color }) {
return
+
+
+
}
-export function CallSvg({color}){
- return
+export function CallSvg({ color }) {
+ return
}
\ No newline at end of file