diff --git a/src/military/qz2022/apply/index.jsx b/src/military/qz2022/apply/index.jsx index 0ce323e7e..1a5424a9f 100644 --- a/src/military/qz2022/apply/index.jsx +++ b/src/military/qz2022/apply/index.jsx @@ -78,22 +78,22 @@ export default Form.create()(({ match, history, showNotification, form, current_ { max: 32, message: '长度不能超过32个字符' }], )} - {helper('JX', + {helper('JXJXJX', 'expertName', - [{ required: true, message: "JX不能为空" }, + [{ required: true, message: "JXJXJX不能为空" }, { max: 32, message: '长度不能超过32个字符' }], - + )} {helper('赛区', 'expertName', - [{ required: true, message: "JX不能为空" }], + [{ required: true, message: "JXJXJX不能为空" }], )} {helper('赛项', 'expertName', - [{ required: true, message: "JX不能为空" }], + [{ required: true, message: "JXJXJX不能为空" }], @@ -123,7 +123,7 @@ export default Form.create()(({ match, history, showNotification, form, current_
参赛单位 :
参赛团队负责人姓名 :
职务 :
-
JX :
+
JXJXJX :
赛区 :
赛项 :
课题来源 :
diff --git a/src/military/qz2022/editTable/index.jsx b/src/military/qz2022/editTable/index.jsx index c415ccfca..b293506c1 100644 --- a/src/military/qz2022/editTable/index.jsx +++ b/src/military/qz2022/editTable/index.jsx @@ -86,7 +86,7 @@ class EditableTable extends React.Component { editable: true, }, { - title: 'JX', + title: 'JXJXJX', dataIndex: 'militaryRank', editable: true, }, diff --git a/src/military/qz2022/image/statistics-sum.png b/src/military/qz2022/image/statistics-sum.png new file mode 100644 index 000000000..35ba7c25a Binary files /dev/null and b/src/military/qz2022/image/statistics-sum.png differ diff --git a/src/military/qz2022/image/statistics-work.png b/src/military/qz2022/image/statistics-work.png new file mode 100644 index 000000000..a7986978f Binary files /dev/null and b/src/military/qz2022/image/statistics-work.png differ diff --git a/src/military/qz2022/management/index.jsx b/src/military/qz2022/management/index.jsx index fac39c09e..b668b55a6 100644 --- a/src/military/qz2022/management/index.jsx +++ b/src/military/qz2022/management/index.jsx @@ -40,7 +40,7 @@ function Introduce({ form, showNotification, match, history:{location:{pathname} key: 'reviewEndOn', }, { - title: 'JX', + title: 'JXJXJX', dataIndex: 'surplus', key: 'surplus', }, diff --git a/src/military/qz2022/notice/detail.jsx b/src/military/qz2022/notice/detail.jsx index 2217b3bf1..cd78b67bd 100644 --- a/src/military/qz2022/notice/detail.jsx +++ b/src/military/qz2022/notice/detail.jsx @@ -25,7 +25,7 @@ function NoticeDetail({ form, showNotification, match, history }) {
启智2022大赛即将开始报名!
发布时间: 2021年3月31日
-
“启智 2022 创意征集行动”为JW联合参谋部、科学技术委员会联合举办,JS科学院、航天科技集团协手创办的大型竞赛。现竞赛已临近报名阶段,报名安排如下:
+
“启智 2022 创意征集行动”为JWJWJWJWJWJWJW联合参谋部、科学技术委员会联合举办,JSJSJS科学院、航天科技集团协手创办的大型竞赛。现竞赛已临近报名阶段,报名安排如下:
【报名时间】
2022年4月1日~2022年4月30日
diff --git a/src/military/qz2022/notice/index.jsx b/src/military/qz2022/notice/index.jsx index b87a501f3..2a11ed259 100644 --- a/src/military/qz2022/notice/index.jsx +++ b/src/military/qz2022/notice/index.jsx @@ -19,7 +19,7 @@ function Notice({ form, showNotification, match, history }) {
启智2022大赛即将开始报名!
-
“启智 2022 创意征集行动”为JW联合参谋部、科学技术委员会联合举办,JS科学院、航天科技集团协手创办的大型竞赛。现竞赛已临近报名阶段,报名安排如下...
+
“启智 2022 创意征集行动”为JWJWJWJWJWJWJW联合参谋部、科学技术委员会联合举办,JSJSJS科学院、航天科技集团协手创办的大型竞赛。现竞赛已临近报名阶段,报名安排如下...

2022-03-31

diff --git a/src/military/qz2022/static.js b/src/military/qz2022/static.js index abf6c6ffb..b63bdfdee 100644 --- a/src/military/qz2022/static.js +++ b/src/military/qz2022/static.js @@ -2,13 +2,13 @@ // 赛项*(必填项,placeholder:请选择赛项,下拉列表选择,选项为:战略方向,作战领域,前沿技术) // 赛区配置 export const competitionArea = [ - { value: '0', title: "LJ分赛区"}, - { value: '1', title: "HJ分赛区"}, - { value: '2', title: "KJ分赛区"}, - { value: '3', title: "HJJ分赛区"}, + { value: '0', title: "LJLJLJ分赛区"}, + { value: '1', title: "HJHJHJ分赛区"}, + { value: '2', title: "KJKJKJ分赛区"}, + { value: '3', title: "HJHJHJJHJJHJJ分赛区"}, { value: '4', title: "战略支援部队分赛区"}, { value: '5', title: "联勤保障分赛区"}, - { value: '6', title: "WJ部队分赛区"} + { value: '6', title: "WJWJWJ部队分赛区"} ]; // 赛项配置 export const competitionType = [ diff --git a/src/military/qz2022/statistics/EchartPie/index.jsx b/src/military/qz2022/statistics/EchartPie/index.jsx new file mode 100644 index 000000000..2a3df0ec7 --- /dev/null +++ b/src/military/qz2022/statistics/EchartPie/index.jsx @@ -0,0 +1,104 @@ +import React, { useEffect } from 'react'; +import * as echarts from 'echarts'; + +let fontSizeText = 16; +let clientWidth = document.body.clientWidth; +if (clientWidth < 1000) { + fontSizeText = 16 +} else if (clientWidth >= 1000 && clientWidth <= 2000) { + fontSizeText = 14 + (clientWidth - 1000) / 500; +} else if (clientWidth > 2000) { + fontSizeText = 16 + (clientWidth - 2000) / 500; +} else if (clientWidth > 3000) { + fontSizeText = 18 + (clientWidth - 3000) / 2000; +} +let fontSizeTitle = 1.25 * fontSizeText; + + +export default ({ id,className, title, xData, yData }) => { + + useEffect(() => { + let newEchartBar = document.getElementById(id) && echarts.init(document.getElementById(id)); + let textColor = "#7988a5"; + let normalColor = "#e8e8ed"; + + let option = { + color: ["#FC4567", "#2F8DF4", "#C25EC4"], + title: { + text: "", + // left: "center", + // top: "50%", + // textStyle: { + // fontSize: 22, + // color: textColor, + // fontWeight: "normal", + // }, + }, + tooltip: { + trigger: "item", + }, + legend: { + orient: "vertical", + right: 20, + top: 20, + }, + series: [ + { + type: "pie", + roseType: "radius", + radius: ["30%", "60%"], + data: [ + { + value: 220, + name: "战略方向", + }, + { + value: 120, + name: "前沿技术", + }, + { + value: 189, + name: "作战领域", + }, + ], + label: { + normal: { + formatter: "{font|{c}}\n{hr|}\n{font|{d}%}", + rich: { + font: { + fontSize: 20, + padding: [5, 0], + color: "#fff", + }, + hr: { + height: 0, + borderWidth: 1, + width: "100%", + borderColor: "#fff", + }, + }, + }, + }, + labelLine: { + lineStyle: { + color: "#fff", + }, + }, + emphasis: { + itemStyle: { + shadowBlur: 10, + shadowOffsetX: 0, + shadowColor: "rgba(0,0,0,0.5)", + }, + }, + }, + ], + }; + newEchartBar && newEchartBar.setOption(option); + }, [id, title, xData, yData]) + + return ( +
+
+ ) +} \ No newline at end of file diff --git a/src/military/qz2022/statistics/index.jsx b/src/military/qz2022/statistics/index.jsx index c6cb66f28..1f2c9649a 100644 --- a/src/military/qz2022/statistics/index.jsx +++ b/src/military/qz2022/statistics/index.jsx @@ -1,29 +1,33 @@ import React from "react"; -import btn from "../image/btn-right.png"; import './index.scss'; import '../../index.scss'; +// import EchartBar from './EchartBar'; +import EchartPie from './EchartPie'; + function Statistics({ form, showNotification, match, history }) { return ( -
+
-
交流互动
-
-

集萃群智体会

-

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

-

汇聚赛事资讯

-

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

-
-
- 了解详情 - +
+
竞赛总报名数
+
竞赛总报名数
- + {/*
*/} + + {/* */} + {/*
*/}
) } diff --git a/src/military/qz2022/statistics/index.scss b/src/military/qz2022/statistics/index.scss index f42818ac7..cf0b9a520 100644 --- a/src/military/qz2022/statistics/index.scss +++ b/src/military/qz2022/statistics/index.scss @@ -1,61 +1,11 @@ .statistics { - margin: 9rem auto; - padding: 0 1.5rem; - background: #fff; - .statistics-left { - float: left; - position: relative; - top: -5rem; - width: 56.6%; - box-shadow: 0px 3px 8px rgba(219, 227, 255, 0.7) inset; - margin-bottom: -3.5rem; - padding: 1.25rem; - } + display: flex; .statistics-words { - display: inline-block; - padding: 1.5rem; + width: 16.25%; + margin-right: 1rem; } - .statistics-tit { - display: inline-block; - font-weight: 700; - color: #2e3341; - font-size: 1.25rem; - line-height: 1rem; - - &::after { - content: ""; - display: inline-block; - width: 100%; - height: 1px; - background-color: #2e5bfe; - } - } - .statistics-conten { - font-size: 1rem; - line-height: 1.625rem; - } - - .statistics-btn { - margin-top:1.5rem; - width: 9.5rem; - height: 2.5rem; - display: flex; - justify-content: space-between; - align-items: center; - border: 2px solid #2e5bfe; - background-color: #2e5bfe; - } - - .detail1 { - white-space: nowrap; - color: #ffffff; - font-size: 1rem; - font-weight: 400; - margin-left:1em; - } - - .iconPlay1 { - height: 100%; + .echart-box { + width: 50vw; } }