diff --git a/src/forge/Upload/attachment.js b/src/forge/Upload/attachment.js index 9918363df..3e74cec70 100644 --- a/src/forge/Upload/attachment.js +++ b/src/forge/Upload/attachment.js @@ -50,10 +50,14 @@ class Attachment extends Component { if (result) { this.setState({ show_video: status === "preview", + // video_url: + // status === "preview" + // ? "https://forgeplus.trustie.net" + result.data.url + // : undefined, video_url: - status === "preview" - ? "https://forgeplus.trustie.net" + result.data.url - : undefined, + status === "preview" + ? result.data.url + : undefined, move_spin: false, }); } else { diff --git a/src/military/qz2022/image/introduce.png b/src/military/qz2022/image/introduce.png new file mode 100644 index 000000000..ef58cb4ec Binary files /dev/null and b/src/military/qz2022/image/introduce.png differ diff --git a/src/military/qz2022/index.scss b/src/military/qz2022/index.scss index 05826f74a..44c071cca 100644 --- a/src/military/qz2022/index.scss +++ b/src/military/qz2022/index.scss @@ -1,10 +1,9 @@ // 启智2022主页样式 .qz_banner{ - width: 100vw; - height: 380px; + width: 100%; } .qz2022 { - font-size: 16px; + font-size: 1rem; .qz2022Menu { // width: 1200px; // margin: 0 auto; @@ -17,7 +16,7 @@ a{ font-weight:700; color:#2e5bfe; - font-size:18px; + font-size:1.125rem; } } li.active::before{ @@ -30,13 +29,12 @@ } } .menu_border { - // width: 1200px; height: 1px; - // margin: 0 auto; background-image: linear-gradient(90deg,#ffffff 0%,#373f5e 43.51%,#373f5e 54.81%,#ffffff 100% ); } .qzCont{ + min-height: 35vh; border-radius:4px; box-shadow:0px 3px 12px #ecf0ff; } @@ -66,6 +64,8 @@ // 公共样式 .qz_main{ width: 1200px; + min-width: 62.5vw; + max-width: 98vw; margin: 0 auto; } // 按钮样式 @@ -82,4 +82,31 @@ background-color: #2e5bfe; opacity: 0.9; } -} \ No newline at end of file + +} + + +@media screen and (max-width: 1200px) { + .qz_main{ + width: 98vw; + } +} + + +html{ + font-size: 16px; +} + +@media screen and (min-width: 1921px) { + html{ + font-size: calc(100% + (100vw - 1921px) / 250 ); + } +} + +@media screen and (min-width: 2880px) { + html{ + font-size: calc(125% + (100vw - 2880px) / 400 ); + } +} + + diff --git a/src/military/qz2022/introduce/index.jsx b/src/military/qz2022/introduce/index.jsx index d8556677b..71e294af9 100644 --- a/src/military/qz2022/introduce/index.jsx +++ b/src/military/qz2022/introduce/index.jsx @@ -9,13 +9,34 @@ const Option = Select.Option; function Introduce({ form, showNotification, match, history }) { useEffect(() => { - + }, []); return ( - - da - +
+
+
+ +
+

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

+ {/*
*/} +

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

+ +

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

+

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

+ {/*
*/} + +
+ +
+
) } export default Introduce; \ No newline at end of file diff --git a/src/military/qz2022/introduce/index.scss b/src/military/qz2022/introduce/index.scss index e69de29bb..0026eeed5 100644 --- a/src/military/qz2022/introduce/index.scss +++ b/src/military/qz2022/introduce/index.scss @@ -0,0 +1,40 @@ +.introduce { + width: 100%; + height: 36.3vw; + background-image: url("../image/introduce.png"); + background-size: 100% 100.5%; + + .introduce-content{ + width:62.5% ; + height: 100%; + margin:0 auto; + padding:5% 2.5%; + box-sizing: border-box; + } + .introduce-video { + width: 61.6%; + height: 80%; + float: left; + video{ + max-width: 100%; + max-height: 100%; + } + } + + .introduce-info{ + display: flex; + flex-direction: column; + justify-content: space-around; + min-height: 75%; + } + + .info-tit{ + font-family: PingFang SC; + font-weight: 700; + color: #2e3341; + font-size: 1.25rem; + } + .content-item{ + text-indent: 2em; + } +}