新增背景等
This commit is contained in:
何童崇
parent
d7b3303bcb
commit
05e5d4eb6c
|
|
@ -148,7 +148,7 @@ const Qz2022 = (props) => {
|
|||
{/* 大赛介绍 */}
|
||||
<Route path="/competition/qz2022/introduce"
|
||||
render={
|
||||
() => (<Introduce {...props} />)
|
||||
() => (<Introduce {...props} qzDetail={qzDetail||{}} />)
|
||||
}
|
||||
></Route>
|
||||
{/* 大赛指南 */}
|
||||
|
|
@ -190,7 +190,7 @@ const Qz2022 = (props) => {
|
|||
{/* 联系我们 */}
|
||||
<Route path="/competition/qz2022/contact"
|
||||
render={
|
||||
() => (<Contact {...props} />)
|
||||
() => (<Contact {...props} aboutUs={qzDetail&&qzDetail.about_us}/>)
|
||||
}
|
||||
></Route>
|
||||
{/* 数据统计 */}
|
||||
|
|
|
|||
|
|
@ -8,25 +8,27 @@ function Chat({ form, showNotification, match, history }) {
|
|||
|
||||
|
||||
return (
|
||||
<div className="chat qz_main clearfix">
|
||||
<img className="chat-left" src={chatSvg} ></img>
|
||||
<div className="chat-words">
|
||||
<div className="chat-tit">交流互动</div>
|
||||
<div className="chat-content">
|
||||
<p>集萃群智体会</p>
|
||||
<p>与论坛成员交流比赛经验，分享参赛心得</p>
|
||||
<p>汇聚赛事资讯</p>
|
||||
<p>助您第一时间解读竞赛动态，把握赛事脉搏</p>
|
||||
<div className="chat-bg">
|
||||
<div className="chat qz_main clearfix">
|
||||
<img className="chat-left" src={chatSvg} ></img>
|
||||
<div className="chat-words">
|
||||
<div className="chat-tit">交流互动</div>
|
||||
<div className="chat-content">
|
||||
<p>集萃群智体会</p>
|
||||
<p>与论坛成员交流比赛经验，分享参赛心得</p>
|
||||
<p>汇聚赛事资讯</p>
|
||||
<p>助您第一时间解读竞赛动态，把握赛事脉搏</p>
|
||||
</div>
|
||||
<div className="chat-btn" onClick={() => { window.open('https://fc.osredm.com/forums/theme/105') }}>
|
||||
<span className="detail1">了解详情</span>
|
||||
<img
|
||||
className="iconPlay1"
|
||||
src={btn}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div className="chat-btn" onClick={()=>{window.open('https://fc.osredm.com/forums/theme/105')}}>
|
||||
<span className="detail1">了解详情</span>
|
||||
<img
|
||||
className="iconPlay1"
|
||||
src={btn}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 (
|
||||
<div className="contact qz_main clearfix">
|
||||
<div className="contact-top">
|
||||
<img className="contact-png" src={contactPng} ></img>
|
||||
<div className="contact-tit">联系我们</div>
|
||||
</div>
|
||||
<div className="contact-words">
|
||||
<div className="contact-content">
|
||||
<p>主办方：JWJWJW联合参谋部、科学技术委员会</p>
|
||||
<p>协办方：军事科学院、航天科技集团</p>
|
||||
<div className="contact-bg">
|
||||
<div className="contact qz_main clearfix">
|
||||
<div className="contact-top">
|
||||
<img className="contact-png" src={contactPng} ></img>
|
||||
<div className="contact-tit">联系我们</div>
|
||||
</div>
|
||||
<div className="contact-content">
|
||||
<div className="contact-words">
|
||||
<div className="contact-content" dangerouslySetInnerHTML={{ __html: aboutUs }}>
|
||||
</div>
|
||||
{/* <p>主办方：JWJWJW联合参谋部、科学技术委员会</p>
|
||||
<p>协办方：军事科学院、航天科技集团</p> */}
|
||||
{/* <div className="contact-content">
|
||||
<p>地址：北京市海淀区西三环北路72号</p>
|
||||
<p>Email：osredm@163.com</p>
|
||||
<p>电话：+86-010-66357650</p>
|
||||
</div> */}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
)
|
||||
}
|
||||
export default Contact;
|
||||
|
|
@ -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{
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 473 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 572 KiB After Width: | Height: | Size: 592 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 117 KiB |
|
|
@ -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 (
|
||||
<div className="introduce">
|
||||
<div className="introduce-content clearfix">
|
||||
<div className="introduce-video"><video src="http://111.8.36.180:8000/preview/93579e3f4bc0ba33075a905c08c79322_1648197024501.mp4" autoPlay controls muted></video></div>
|
||||
|
||||
<div className="introduce-video"><video src={video_url} autoPlay controls muted></video></div>
|
||||
<div className="introduce-info">
|
||||
<h3 className="info-tit">“启智”2022作战概念·事需求创新大赛</h3>
|
||||
{/* <div className="info-content"> */}
|
||||
<p className="content-item">创客以用户创新为核心理念，是面向知识社会
|
||||
的创新2.0模式在设计与制造领域的典型体现。创
|
||||
客运动最重要的标志是掌握了自生产工具，
|
||||
他们是一群新人类。</p>
|
||||
|
||||
<p className="content-item">在中文里，“创”的含义是：
|
||||
开始做，创造，首创，开创，创立。它体现了一种
|
||||
积极向上的生活态度。</p>
|
||||
<p className="content-item">
|
||||
同时有一种通过行动和实践去发现问题和需求，
|
||||
并努力找到解决方案的含义...</p>
|
||||
{/* </div> */}
|
||||
|
||||
<div className="info-content" dangerouslySetInnerHTML={{ __html:content}}>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -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%;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -80,7 +80,9 @@ function Statistics({ showNotification, qzDetail }) {
|
|||
|
||||
|
||||
return (
|
||||
<div className="statistics qz_main ">
|
||||
<div className="statistics-bg">
|
||||
<div className="statistics qz_main ">
|
||||
|
||||
<div className="statistics-words">
|
||||
<div className="num-item sum">
|
||||
<img src={statisticsSum} ></img>
|
||||
|
|
@ -120,6 +122,8 @@ function Statistics({ showNotification, qzDetail }) {
|
|||
yData={barYData}
|
||||
/>
|
||||
</div>}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in New Issue