*/}
diff --git a/src/military/notice/noticeList/index.jsx b/src/military/notice/noticeList/index.jsx
index 5c625c45..5b4ef5d1 100644
--- a/src/military/notice/noticeList/index.jsx
+++ b/src/military/notice/noticeList/index.jsx
@@ -1,20 +1,21 @@
import React, { useEffect, useState } from 'react';
import classNames from 'classnames';
-import { 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';
const Search = Input.Search;
-const { TabPane } = Tabs;
+// const { SubMenu } = Menu;
-const defaultColor = '#1890ff';
-const activeColor = '#fff';
+// const defaultColor = '#848684';
+// const activeColor = '#ffffff';
+// const svgColor = '#1890ff';
export default (props) => {
@@ -32,12 +33,12 @@ export default (props) => {
const [changeList, setChangeList] = useState([]);
const [checkList, setCheckList] = useState([]);
const [abandonList, setAbandonList] = useState([]);
-
-
+ const [technologyList, setTechnologyList] = useState([]);
+ const [dealList, setDealList] = useState([]);
useEffect(() => {
setLoading(true);
- if (tab === '0') {
+ if (tab === '0' || tab === '7') {
const params = {
orderBy,
curPage: 1,
@@ -62,6 +63,13 @@ export default (props) => {
setAbandonList(data.rows);
setLoading(false);
});
+ getNoticeList({ ...params, type: 5 }).then(data => {
+ setTechnologyList(data.rows);
+ });
+ getNoticeList({ ...params, type: 6 }).then(data => {
+ setDealList(data.rows);
+ setLoading(false);
+ });
} else {
const params = {
orderBy,
@@ -81,7 +89,6 @@ export default (props) => {
}
}, [tab, title, orderBy, curPage]);
-
function changeSort(sortType) {
setOrderBy(sortType);
setCurPage(1);
@@ -93,14 +100,12 @@ export default (props) => {
function sortNav() {
return
- {/*
}
- function changeTab(key) {
- setTab(key);
+ // 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);
setTitle('');
setOrderBy('publishDateDesc');
}
+ function cont(param, titleStr, key,svgStr) {
+ return
+
+ }
+
+ function content() {
+ if (tab === '0') {
+ return
+ {/* {callList.length <= 0 && changeList.length <= 0 && checkList.length <= 0 && abandonList.length <= 0 ?
+ } else if (tab === '7') {
+ return
+ {/* {technologyList.length <= 0 && dealList.length <= 0 ?
+ } else if (tab === '8') {
+ return
+ } else {
+ let titleStr;
+ let svgStr;
+ switch (tab) {
+ case '1':
+ titleStr = "更正公告";
+ svgStr = "iconfont icon-gengzhenggonggao"
+ break;
+ case '2':
+ titleStr = "中标公告";
+ svgStr = "iconfont icon-zhongbiaogonggao"
+ break;
+ case '3':
+ titleStr = "废标公告";
+ svgStr = "iconfont icon-feibiaogonggao"
+ break;
+ case '4':
+ titleStr = "招标公告";
+ svgStr = "iconfont icon-zhaobiaogonggao"
+ break;
+ case '5':
+ titleStr = "技术资产";
+ svgStr = "iconfont icon-jishuzichan"
+ break;
+ default:
+ titleStr = "成交公告";
+ svgStr = "iconfont icon-chengjiaogonggao"
+ }
+ return
+
+ }
+ }
+
return (
{ changeTab(key) }}>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
)
}
\ No newline at end of file
diff --git a/src/military/notice/noticeList/index.scss b/src/military/notice/noticeList/index.scss
index 76e2a88f..d0c88901 100644
--- a/src/military/notice/noticeList/index.scss
+++ b/src/military/notice/noticeList/index.scss
@@ -1,3 +1,6 @@
+body{
+ caret-color: rgba(0, 0, 0, 0);
+}
.notice-list{
.ant-tabs {
.ant-tabs-left-bar{
@@ -35,7 +38,6 @@
display: none !important;
}
}
-
.notice-sort-nav{
display: flex;
@@ -47,23 +49,24 @@
.notice-center-content{
padding:1.25rem;
background: #fff;
-
-
+ flex: auto;
}
.item-head-title{
display: flex;
justify-content: space-between;
align-items: center;
- // height: 3.75rem;
padding: 1.25rem 0 .6rem 0;
.item-head-title-content{
display: flex;
align-items: center;
font-size: 1rem;
- font-weight: bold;
- svg{
+ span{
+ font-weight: bold;
+ }
+ i{
margin-right: .25em;
+ color: #1890FF;
}
}
}
@@ -96,3 +99,60 @@
}
}
+.body{
+ display: flex;
+ justify-content: space-between;
+
+ .navigationMenu{
+ margin-right: 24px;
+ width: 15.4em;
+ }
+}
+
+#menu-selected{
+ background-color: #1890FF;
+ color: #fff;
+ .subMenuspan{
+ color: #fff;
+ }
+}
+
+// #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;
+}
\ No newline at end of file
diff --git a/src/military/notice/static.js b/src/military/notice/static.js
index f0d8a9c5..397d93d3 100644
--- a/src/military/notice/static.js
+++ b/src/military/notice/static.js
@@ -10,6 +10,8 @@ export const noticeType = [
{ code: 2, name: "中标公告", dicItemName: "中标" },
{ code: 3, name: "废标公告", dicItemName: "废标" },
{ code: 4, name: "招标公告", dicItemName: "招标" },
+ { code: 5, name: "技术资产", dicItemName: "技术" },
+ { code: 6, name: "成交公告", dicItemName: "成交" },
];
export const noticeChecked = [
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
*/}
*/}
{ changeSort('publishDateDesc') }}>时间降序
|
@@ -109,288 +114,171 @@ export default (props) => {
+
+ {param.length>0?
+
+ {titleStr}
+
+ {param.length === 5 && { handleClick({ key: key }) }}>查看更多
+
+
+
+ {titleStr}
+
+
+ { setCurPage(page) }}
+ current={curPage}
+ total={total}
+ showTotal={total => `共 ${total} 条`}
+ />
+
} */}
+ {noticeList.length > 0 ? noticeList.length === 10 &&
+ { setCurPage(page) }}
+ current={curPage}
+ total={total}
+ showTotal={total => `共 ${total} 条`}
+ />
+
:
首页 >
- 公告 >
+ 公告
+
+
+
-
+
+
+
+ {sortNav()}
+ {loading ?
- {
- sortNav()
- }
-
- {
- loading ?
-
- {callList.length > 0 &&
-
- }
-
- {changeList.length > 0 &&
-
- }
-
- {checkList.length > 0 &&
-
- }
-
- {abandonList.length > 0 &&
-
- }
-
- {changeList.length === 0 && checkList.length === 0 && abandonList.length === 0 &&
- }
-
-
-
-
-
-
- {callList.length === 5 && { changeTab('4') }}>查看更多
-
-
-
- {changeList.length === 5 && { changeTab('1') }}>查看更多
-
-
-
- {checkList.length === 5 && { changeTab('2') }}>查看更多
-
-
-
- {abandonList.length === 5 && { changeTab('3') }}>查看更多
- {
- sortNav()
- }
-
- {
- loading ?
-
- }
-
-
-
-
-
-
-
- { setCurPage(page) }}
- current={curPage}
- total={total}
- showTotal={total => `共 ${total} 条`}
- />
-
:
- {
- sortNav()
- }
-
- {
- loading ?
-
- }
-
-
-
-
-
-
-
- { setCurPage(page) }}
- current={curPage}
- total={total}
- showTotal={total => `共 ${total} 条`}
- />
-
:
- {
- sortNav()
- }
-
- {
- loading ?
-
- }
-
-
-
-
-
-
-
- { setCurPage(page) }}
- current={curPage}
- total={total}
- showTotal={total => `共 ${total} 条`}
- />
-
:
- {
- sortNav()
- }
-
- {
- loading ?
-
- }
-
-
-
-
-
-
-
- { setCurPage(page) }}
- current={curPage}
- total={total}
- showTotal={total => `共 ${total} 条`}
- />
-
: