-
+
diff --git a/src/forge/Component/NoticeModal/SystemNotice.jsx b/src/forge/Component/NoticeModal/SystemNotice.jsx
index c95a8030..33871e8c 100644
--- a/src/forge/Component/NoticeModal/SystemNotice.jsx
+++ b/src/forge/Component/NoticeModal/SystemNotice.jsx
@@ -3,41 +3,46 @@ import { Modal , Button } from 'antd';
import './Index.scss';
import '../../css/index.scss';
import RenderHtml from '../../../components/render-html';
-// import cookie from 'react-cookies';
-import axios from 'axios';
+import cookie from 'react-cookies';
+// import axios from 'axios';
function SystemNotice({showNotice,system_notification,history,login,hideSystemNotice}){
const [ visible , setVisible ] = useState(false);
-
useEffect(()=>{
-
- if(system_notification && !system_notification.is_read && showNotice && login){
+ if(system_notification && !cookie.load('notice_stage')){
setVisible(true);
}
- },[system_notification,login])
+ },[system_notification,history.location])
+
+ // useEffect(()=>{
+
+ // if(system_notification && !system_notification.is_read && showNotice && login){
+ // setVisible(true);
+ // }
+ // },[system_notification,login])
function sureContinue() {
- if(login && ( system_notification && system_notification.id )){
- const url = `/users/${login}/system_notification_histories.json`;
- axios.post(url,{
- system_notification_id:system_notification.id
- }).then(result=>{
- if(result){
- setVisible(false);
- hideSystemNotice();
- }
- }).catch(error=>{})
- }else{
- setVisible(false);
- hideSystemNotice();
- }
- // cookie.remove('notice_stage');
+ // if(login && ( system_notification && system_notification.id )){
+ // const url = `/users/${login}/system_notification_histories.json`;
+ // axios.post(url,{
+ // system_notification_id:system_notification.id
+ // }).then(result=>{
+ // if(result){
+ // setVisible(false);
+ // hideSystemNotice();
+ // }
+ // }).catch(error=>{})
+ // }else{
+ // setVisible(false);
+ // hideSystemNotice();
+ // }
+ cookie.remove('notice_stage');
- // let inFifteenMinutes = new Date(new Date().getTime() + 24 * 3600 * 1000);//一天
- // // let inFifteenMinutes = new Date(new Date().getTime() + 60 * 1000);//一分钟
- // cookie.save('notice_stage', true,{ expires: inFifteenMinutes,path:"/" });
+ let inFifteenMinutes = new Date(new Date().getTime() + 24 * 3600 * 1000);//一天
+ // let inFifteenMinutes = new Date(new Date().getTime() + 60 * 1000);//一分钟
+ cookie.save('notice_stage', true,{ expires: inFifteenMinutes,path:"/" });
- // setVisible(false);
+ setVisible(false);
}
return (
diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index 47dbbd90..a7f8219d 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -184,7 +184,7 @@ class NewHeader extends Component {
axios.get(url).then((response) => {
if (response && response.data && response.data.setting) {
this.setState({ settings: response.data.setting });
- localStorage.setItem('chromesetting', JSON.stringify(response.data.setting));
+ response.data.setting&&localStorage.setItem('chromesetting', JSON.stringify(response.data.setting));
localStorage.setItem('chromesettingresponse', JSON.stringify(response));
} else {
this.gettablogourlnull();
diff --git a/src/forge/Head/header.scss b/src/forge/Head/header.scss
index b6c8e221..d5f4d571 100644
--- a/src/forge/Head/header.scss
+++ b/src/forge/Head/header.scss
@@ -69,7 +69,7 @@
}
.newFooter {
- position: absolute;
+ // position: absolute;
bottom: 0;
width: 100%;
background: #323232;
diff --git a/src/forge/Index.js b/src/forge/Index.js
index ddf7552c..562ee447 100644
--- a/src/forge/Index.js
+++ b/src/forge/Index.js
@@ -41,7 +41,7 @@ class Index extends Component {
return (
-
{
+ let qzModalTime = localStorage.qzModalTime;
+ let nowTime = new Date().getTime();
+ if (qzModalTime) {
+ if (nowTime - qzModalTime > 24 * 3600 * 1000) {
+ // 延时展示，保证渲染modal不会白屏
+ setTimeout(()=>{setVisible(true);},500)
+ localStorage.setItem('qzModalTime', nowTime);
+ }
+ } else {
+ setTimeout(()=>{setVisible(true);},500)
+ localStorage.setItem('qzModalTime', nowTime);
+ }
+ }, [])
+
+ return (
+ { setVisible(false) }}
+ footer={null}
+ className='qzModal'
+ width='728px'
+ maskClosable={false}
+ >
+ )
-1?bg_local: bg} />
+
+ 查看详情
+
+ )
+}
+
+export default memo(QzModal);
\ No newline at end of file
diff --git a/src/home/QzModal/index.scss b/src/home/QzModal/index.scss
new file mode 100644
index 00000000..1fedd47d
--- /dev/null
+++ b/src/home/QzModal/index.scss
@@ -0,0 +1,46 @@
+.qzModal {
+ .ant-modal-body {
+ padding: 0;
+ background: rgb(48,118,207);
+
+ img {
+ border-radius: 2px;
+ }
+ }
+
+ .ant-modal-header {
+ height: 0;
+ background: rgb(48,118,207);
+ display: none !important;
+ }
+
+ .ant-modal-close {
+ top: 0 !important;
+ }
+ .ant-modal-close-icon {
+ border: 1px solid #fff;
+ color: #fff;
+ border-radius: 50%;
+ padding: 5%;
+ }
+
+ .qz-btn {
+ position: absolute;
+ bottom: -70px;
+ left: 295px;
+ width: 137px;
+ height: 49px;
+ background-color: #e96d2a;
+ border-color: #e96d2a;
+ border-radius: 6px;
+ color: #fff;
+ font-size:16px;
+ text-align: center;
+ line-height: 49px;
+ &:hover{
+ color: #fff !important;
+ background-color: #f96d2a;
+ border-color: #f96d2a;
+ }
+ }
+}
diff --git a/src/home/Slider/index.jsx b/src/home/Slider/index.jsx
new file mode 100644
index 00000000..c5237855
--- /dev/null
+++ b/src/home/Slider/index.jsx
@@ -0,0 +1,59 @@
+import React, { memo, useEffect, useState } from 'react';
+import Slider from 'react-slick';
+import { Link } from "react-router-dom";
+// import notice from '../img/slider.gif';
+import notice from '../img/notice.png';
+import text from '../img/slider.png';
+import "slick-carousel/slick/slick.css";
+import "slick-carousel/slick/slick-theme.css";
+
+import './index.scss';
+
+
+let setting = {
+ infinite: true,
+ speed: 21000,
+ slidesToShow: 1,
+ slidesToScroll: 1,
+ autoplaySpeed: 0,
+ // autoplaySpeed: 10000000,
+ centerMode: true,
+ centerPadding: '0px',
+ // pauseOnDotsHover: true,
+ // pauseOnFocus: true,
+ autoplay: true,
+ arrows: false,
+ vertical: false,
+ easing: 'linear',
+ useTransform: false,
+ cssEase: 'linear',
+}
+
+
+function SecondSection() {
+
+
+ return (
+
+
+
+
+
+ )
+}
+
+export default memo(SecondSection);
\ No newline at end of file
diff --git a/src/home/Slider/index.scss b/src/home/Slider/index.scss
new file mode 100644
index 00000000..5cfd035d
--- /dev/null
+++ b/src/home/Slider/index.scss
@@ -0,0 +1,37 @@
+.home-competition-slide {
+ position: relative;
+ overflow: hidden;
+ top: 4.375em;
+ left: 0;
+ right: 0;
+ z-index: 10;
+
+ .competition-slide-item {
+ display: flex;
+ justify-content: center;
+ height: 2.6vw;
+ }
+
+ .competition-notice {
+ width: 2.6vw;
+ animation: ballRotation 1s infinite alternate;
+ }
+
+ .competition-text {
+ width: 23.5vw;
+ }
+
+ @keyframes ballRotation {
+ 0% {
+ transform: scale(0.75);
+ }
+
+ 50% {
+ transform: scale(1.2);
+ }
+
+ 100% {
+ transform: scale(0.75);
+ }
+ }
+}
diff --git a/src/home/img/modal.png b/src/home/img/modal.png
new file mode 100644
index 00000000..20befebd
Binary files /dev/null and b/src/home/img/modal.png differ
diff --git a/src/home/img/modal_local.png b/src/home/img/modal_local.png
new file mode 100644
index 00000000..085cc9eb
Binary files /dev/null and b/src/home/img/modal_local.png differ
diff --git a/src/home/img/notice.png b/src/home/img/notice.png
new file mode 100644
index 00000000..022b6170
Binary files /dev/null and b/src/home/img/notice.png differ
diff --git a/src/home/img/slider.png b/src/home/img/slider.png
new file mode 100644
index 00000000..598e7a7d
Binary files /dev/null and b/src/home/img/slider.png differ
diff --git a/src/home/index.jsx b/src/home/index.jsx
index 46b5db6e..dd16d75e 100644
--- a/src/home/index.jsx
+++ b/src/home/index.jsx
@@ -3,6 +3,8 @@ import { TPMIndexHOC } from '../modules/tpm/TPMIndexHOC';
import { isMobile } from 'educoder';
import './index.scss';
+import Slider from './Slider';
+import QzModal from './QzModal';
import FirstSection from './FirstSection';
import SecondSection from './SecondSection';
import ThirdSection from './ThirdSection';
@@ -33,15 +35,15 @@ function HomePage({ history }) {
let settings = JSON.parse(localStorage.chromesetting);
let main_web_site_url = settings.main_web_site_url;
- let forumUrl ="";
- let competitionUrl ="";
- if(settings.navbar){
- for (const item of settings.navbar){
- if(item.name.indexOf("论坛")>-1){
- forumUrl=item.link;
+ let forumUrl = "";
+ let competitionUrl = "";
+ if (settings.navbar) {
+ for (const item of settings.navbar) {
+ if (item.name.indexOf("论坛") > -1) {
+ forumUrl = item.link;
}
- if(item.name.indexOf("竞赛")>-1){
- competitionUrl=item.link;
+ if (item.name.indexOf("竞赛") > -1) {
+ competitionUrl = item.link;
}
}
}
@@ -116,7 +118,7 @@ function HomePage({ history }) {
setSixth(false);
}
- if(isHuawei){
+ if (isHuawei) {
setFourth(true);
setSixth(true);
}
@@ -126,13 +128,15 @@ function HomePage({ history }) {
return (
+
+ 
+ 
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -149,11 +153,11 @@ function HomePage({ history }) {
-
+
-
+
diff --git a/src/military/components/login/index.jsx b/src/military/components/login/index.jsx
new file mode 100644
index 00000000..57d3804f
--- /dev/null
+++ b/src/military/components/login/index.jsx
@@ -0,0 +1,123 @@
+import React, { useEffect, useState } from 'react';
+import axios from 'axios';
+import { getImageUrl,getLogoImageUrl } from 'educoder';
+import { Link } from "react-router-dom";
+import './index.scss';
+
+export default ({ current_user, showLoginDialog }) => {
+
+ const [mygetHelmetapi2, setMygetHelmetapi2] = useState();
+
+ useEffect(() => {
+ let url = "/setting.json";
+ axios.get(url).then((response) => {
+ if (response && response.data) {
+ setMygetHelmetapi2(response.data.setting);
+ try {
+ if (response.data.setting.tab_logo_url) {
+ gettablogourldata(response);
+ } else {
+ gettablogourlnull();
+ }
+ } catch (e) {
+ gettablogourlnull();
+ }
+ } else {
+ gettablogourlnull();
+ }
+ }).catch((error) => {
+ gettablogourlnull();
+ });
+ },[])
+
+ //获取数据为空的时候
+ function gettablogourlnull() {
+ let link = document.createElement('link'),
+ oldLink = document.getElementById('dynamic-favicon');
+ link.id = 'dynamic-favicon';
+ link.rel = 'shortcut icon';
+ link.href = "/react/build/./favicon.ico";
+ if (oldLink) {
+ document.head.removeChild(oldLink);
+ }
+ document.head.appendChild(link);
+ };
+
+ //获取数据的时候
+ function gettablogourldata(response) {
+ document.title = response.data.setting.name;
+ let link = document.createElement('link'),
+ oldLink = document.getElementById('dynamic-favicon');
+ link.id = 'dynamic-favicon';
+ link.rel = 'shortcut icon';
+ link.href = '/' + response.data.setting.tab_logo_url;
+ if (oldLink) {
+ document.head.removeChild(oldLink);
+ }
+ console.log("ac12111:", response.data.setting.tab_logo_url);
+ document.head.appendChild(link);
+ }
+
+ function educoderloginysl() {
+ //退出账号
+ let url = `/accounts/logout.json`;
+ axios.get((url)).then((result) => {
+ if (result !== undefined) {
+ window.location.href = "/";
+ }
+ }).catch((error) => {
+ console.log(error);
+ })
+ }
+
+ const main_web_site_url =
+ localStorage.chromesetting &&
+ JSON.parse(localStorage.chromesetting).main_web_site_url;
+
+ return (
+
+ {current_user === undefined || current_user.login === "" ?
+
+ {showLoginDialog()}} className={`mr5`}>登录
+ {
+ mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.register_url && (
+ 注册
+ )
+ }
+
+ :
+
+ )
+}
+
+
+
+
diff --git a/src/military/components/login/index.scss b/src/military/components/login/index.scss
new file mode 100644
index 00000000..884b1447
--- /dev/null
+++ b/src/military/components/login/index.scss
@@ -0,0 +1,25 @@
+.qz2022Container{
+ padding-top:0 !important;
+ background:#fff ;
+}
+
+.qz-login{
+ position: absolute;
+ right: 70px;
+ top: 0;
+ color: #fff;
+ .login-box{
+ a{
+ color: #fff !important;
+ cursor: pointer;
+ :hover{
+ opacity: .8;
+ }
+ }
+
+ }
+}
+
+.newFooter{
+ position: relative;
+}
\ No newline at end of file
diff --git a/src/military/components/paginationTable/index.jsx b/src/military/components/paginationTable/index.jsx
index 4dfb3e70..dc05f5d2 100644
--- a/src/military/components/paginationTable/index.jsx
+++ b/src/military/components/paginationTable/index.jsx
@@ -3,10 +3,10 @@ import { Table, Pagination } from 'antd';
import './index.scss';
export default (props) => {
- const { loading, dataSource, columns, handleRow, total, setCurPage, current, rowSelection, expandedRowRender, expandIconColumnIndex, expandIconAsCell, onShowSizeChange, showSizeChanger, pagination, scroll } = props;
-
+ const {className, loading, dataSource, columns, handleRow, total, setCurPage, current, rowSelection, expandedRowRender, expandIconColumnIndex, expandIconAsCell, onShowSizeChange, showSizeChanger, pagination, scroll,pageSize } = props;
+
return (
-
+ {/* */}
+ })
+
+ {/* */}
+
+
+ }
+
+
{
current={current}
total={total}
showSizeChanger={showSizeChanger}
+ pageSize={pageSize||10}
/>}
diff --git a/src/military/expert/competionList/index.jsx b/src/military/expert/competionList/index.jsx
index 85a00d92..5e0420df 100644
--- a/src/military/expert/competionList/index.jsx
+++ b/src/military/expert/competionList/index.jsx
@@ -369,14 +369,16 @@ function Competition(props){
return(
|
+ {editable ? (
+ |
+ );
+ }
+}
+
+class EditableTable extends React.Component {
+ constructor(props) {
+ super(props);
+ this.columns = [
+ {
+ title: '姓名',
+ dataIndex: 'real_name',
+ editable: true,
+ width: "40%"
+ },
+ {
+ title: '单位',
+ dataIndex: 'org_name',
+ editable: true,
+ width: '50%',
+ },
+ {
+ title: '操作',
+ dataIndex: 'operation',
+ width: '10%',
+ render: (text, record) =>
+ this.state.dataSource.length >= 1 ? (
+