diff --git a/src/military/qz2022.js b/src/military/qz2022.js index dce124ef..849b1eb1 100644 --- a/src/military/qz2022.js +++ b/src/military/qz2022.js @@ -148,7 +148,7 @@ const Qz2022 = (props) => { {/* 大赛介绍 */} () + () => () } > {/* 大赛指南 */} @@ -190,7 +190,7 @@ const Qz2022 = (props) => { {/* 联系我们 */} () + () => () } > {/* 数据统计 */} diff --git a/src/military/qz2022/chat/index.jsx b/src/military/qz2022/chat/index.jsx index faa50989..2aa9e183 100644 --- a/src/military/qz2022/chat/index.jsx +++ b/src/military/qz2022/chat/index.jsx @@ -8,25 +8,27 @@ function Chat({ form, showNotification, match, history }) { return ( -
- -
-
交流互动
-
-

集萃群智体会

-

与论坛成员交流比赛经验,分享参赛心得

-

汇聚赛事资讯

-

助您第一时间解读竞赛动态,把握赛事脉搏

+
+
+ +
+
交流互动
+
+

集萃群智体会

+

与论坛成员交流比赛经验,分享参赛心得

+

汇聚赛事资讯

+

助您第一时间解读竞赛动态,把握赛事脉搏

+
+
{ window.open('https://fc.osredm.com/forums/theme/105') }}> + 了解详情 + +
-
{window.open('https://fc.osredm.com/forums/theme/105')}}> - 了解详情 - -
-
+
) } diff --git a/src/military/qz2022/chat/index.scss b/src/military/qz2022/chat/index.scss index 4a5c75b1..318ca2d6 100644 --- a/src/military/qz2022/chat/index.scss +++ b/src/military/qz2022/chat/index.scss @@ -1,7 +1,13 @@ +.chat-bg{ + padding:9rem 0 5rem 0; + background-image: url('../image/chat-bg.png'); + background-size: 100% 100%; +} .chat { - margin: 9rem auto; + margin: 0 auto; padding: 0 1.5rem; background: #fff; + .chat-left { float: left; position: relative; diff --git a/src/military/qz2022/contact/index.jsx b/src/military/qz2022/contact/index.jsx index 1208e77c..972a7ed0 100644 --- a/src/military/qz2022/contact/index.jsx +++ b/src/military/qz2022/contact/index.jsx @@ -1,30 +1,33 @@ import React from "react"; import contactPng from "../image/contact.png"; -import btn from "../image/btn-right.png"; +// import btn from "../image/btn-right.png"; import './index.scss'; import '../../index.scss'; -function Contact({ form, showNotification, match, history }) { +function Contact({ aboutUs }) { return ( -
-
- -
联系我们
-
-
-
-

主办方:JWJWJW联合参谋部、科学技术委员会

-

协办方:军事科学院、航天科技集团

+
+
+
+ +
联系我们
-
+
+
+
+ {/*

主办方:JWJWJW联合参谋部、科学技术委员会

+

协办方:军事科学院、航天科技集团

*/} + {/*

地址:北京市海淀区西三环北路72号

Email:osredm@163.com

电话:+86-010-66357650

+
*/}
+ ) } export default Contact; \ No newline at end of file diff --git a/src/military/qz2022/contact/index.scss b/src/military/qz2022/contact/index.scss index 02a7c2f1..4cea2afe 100644 --- a/src/military/qz2022/contact/index.scss +++ b/src/military/qz2022/contact/index.scss @@ -1,5 +1,10 @@ +.contact-bg{ + padding:3rem 0; + background-image: url('../image/chat-bg.png'); + background-size:100% 100%; +} .contact { - margin: 3rem auto; + margin: 0 auto; padding: 1rem 1.5rem; background: #fff; .contact-top{ diff --git a/src/military/qz2022/image/chat-bg.png b/src/military/qz2022/image/chat-bg.png new file mode 100644 index 00000000..b16020fa Binary files /dev/null and b/src/military/qz2022/image/chat-bg.png differ diff --git a/src/military/qz2022/image/introduce.png b/src/military/qz2022/image/introduce.png index a2646829..ffde83e0 100644 Binary files a/src/military/qz2022/image/introduce.png and b/src/military/qz2022/image/introduce.png differ diff --git a/src/military/qz2022/image/statistics.png b/src/military/qz2022/image/statistics.png new file mode 100644 index 00000000..1a7da951 Binary files /dev/null and b/src/military/qz2022/image/statistics.png differ diff --git a/src/military/qz2022/introduce/index.jsx b/src/military/qz2022/introduce/index.jsx index 22a7d469..2f172ede 100644 --- a/src/military/qz2022/introduce/index.jsx +++ b/src/military/qz2022/introduce/index.jsx @@ -1,38 +1,19 @@ -import React, { useState, useCallback, useMemo, useEffect } from "react"; -import { Input, Select, Button, Form, DatePicker, Table, Pagination, Upload, Modal } from 'antd'; -import { Link } from "react-router-dom"; -import { formatDuring } from 'educoder'; +import React, { useEffect, useState } from "react"; import './index.scss'; import '../../index.scss'; -const Option = Select.Option; -function Introduce({ form, showNotification, match, history }) { - useEffect(() => { +function Introduce({ qzDetail }) { - }, []); + let { content, video_url } = qzDetail; return (
-
- +
-

“启智”2022作战概念·事需求创新大赛

- {/*
*/} -

创客以用户创新为核心理念,是面向知识社会 - 的创新2.0模式在设计与制造领域的典型体现。创 - 客运动最重要的标志是掌握了自生产工具, - 他们是一群新人类。

- -

在中文里,“创”的含义是: - 开始做,创造,首创,开创,创立。它体现了一种 - 积极向上的生活态度。

-

- 同时有一种通过行动和实践去发现问题和需求, - 并努力找到解决方案的含义...

- {/*
*/} - +
+
diff --git a/src/military/qz2022/introduce/index.scss b/src/military/qz2022/introduce/index.scss index 18a90ca6..8485008f 100644 --- a/src/military/qz2022/introduce/index.scss +++ b/src/military/qz2022/introduce/index.scss @@ -1,6 +1,7 @@ .introduce { width: 100%; height: 36.3vw; + background: #f1f7fc; background-image: url("../image/introduce.png"); background-size: 100% 100.5%; @@ -14,8 +15,10 @@ .introduce-video { height: 80%; margin-right: 2.2%; + min-width: 30%; float: left; video { + width: 100%; max-width: 100%; max-height: 100%; } diff --git a/src/military/qz2022/statistics/index.jsx b/src/military/qz2022/statistics/index.jsx index 152fb15c..f0179284 100644 --- a/src/military/qz2022/statistics/index.jsx +++ b/src/military/qz2022/statistics/index.jsx @@ -80,7 +80,9 @@ function Statistics({ showNotification, qzDetail }) { return ( -
+
+
+
@@ -120,6 +122,8 @@ function Statistics({ showNotification, qzDetail }) { yData={barYData} />
} + +
) } diff --git a/src/military/qz2022/statistics/index.scss b/src/military/qz2022/statistics/index.scss index 7ba468dd..0b5d45e6 100644 --- a/src/military/qz2022/statistics/index.scss +++ b/src/military/qz2022/statistics/index.scss @@ -1,6 +1,12 @@ +.statistics-bg{ + background-image: url('../image/statistics.png'); + background-size: 100% 100%; + padding:3rem 0; +} .statistics { display: flex; - margin: 3rem auto; + margin: 0 auto; + .statistics-words { width: 30%; @@ -14,10 +20,13 @@ height: 12.25rem; background-color: #ffffff; - &.sum { + &:first-child{ + margin-bottom: 1rem; + } + + &:hover { border: 2px solid #2e5bfe; box-shadow: 0px 3px 12px #ecf0ff; - margin-bottom: 1rem; .num-data { color: #2e5bfe;