S某M修改

src/military/qz2022/apply/index.jsx

@@ -78,22 +78,22 @@ export default Form.create()(({ match, history, showNotification, form, current_
             { max: 32, message: '长度不能超过32个字符' }],
             <Input placeholder="请输入职务"/>
           )}
-          {helper('JX',
+          {helper('JXJXJX',
             'expertName',
-            [{ required: true, message: "JX不能为空" },
+            [{ required: true, message: "JXJXJX不能为空" },
             { max: 32, message: '长度不能超过32个字符' }],
-            <Input placeholder="请输入JX"/>
+            <Input placeholder="请输入JXJXJX"/>
           )}
           {helper('赛区',
             'expertName',
-            [{ required: true, message: "JX不能为空" }],
+            [{ required: true, message: "JXJXJX不能为空" }],
             <Select placeholder="请选择赛区">
               {competitionArea.map(item=> {return <Option value={item.value} key={item.value}>{item.title}</Option>})}
             </Select>
           )}
           {helper('赛项',
             'expertName',
-            [{ required: true, message: "JX不能为空" }],
+            [{ required: true, message: "JXJXJX不能为空" }],
             <Select placeholder="请选择赛项">
               {competitionType.map(item=> {return <Option value={item.value} key={item.value}>{item.title}</Option>})}
             </Select>
@@ -123,7 +123,7 @@ export default Form.create()(({ match, history, showNotification, form, current_
           <div><span>参赛单位 : </span></div>  
           <div className="info-right"><span>参赛团队负责人姓名 : </span></div>  
           <div><span>职务 : </span></div>  
-          <div className="info-right"><span>JX : </span></div>  
+          <div className="info-right"><span>JXJXJX : </span></div>  
           <div><span>赛区 : </span></div>  
           <div className="info-right"><span>赛项 : </span></div>  
           <div><span>课题来源 : </span></div>  

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,
       },

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',
       },

src/military/qz2022/notice/detail.jsx

@@ -25,7 +25,7 @@ function NoticeDetail({ form, showNotification, match, history }) {
         </div>
         <div className="notice_title _1818 font-18">启智2022大赛即将开始报名!</div>
         <div className="notice_time">发布时间: 2021年3月31日</div>
-        <div className="_1818">“启智 2022 创意征集行动”为JW联合参谋部、科学技术委员会联合举办，JS科学院、航天科技集团协手创办的大型竞赛。现竞赛已临近报名阶段，报名安排如下:</div>
+        <div className="_1818">“启智 2022 创意征集行动”为JWJWJWJWJWJWJW联合参谋部、科学技术委员会联合举办，JSJSJS科学院、航天科技集团协手创办的大型竞赛。现竞赛已临近报名阶段，报名安排如下:</div>
 
         <div className="_1818 notice_small_title">【报名时间】</div>
         <div className="_1818">2022年4月1日~2022年4月30日</div>

src/military/qz2022/notice/index.jsx

@@ -19,7 +19,7 @@ function Notice({ form, showNotification, match, history }) {
         <Link to={"/competition/qz2022/notice/1"}>
         <div className="qz_notice_cont">
           <div className="notCont_head">启智2022大赛即将开始报名!</div>
-          <div className="font-15">“启智 2022 创意征集行动”为JW联合参谋部、科学技术委员会联合举办，JS科学院、航天科技集团协手创办的大型竞赛。现竞赛已临近报名阶段，报名安排如下...</div>
+          <div className="font-15">“启智 2022 创意征集行动”为JWJWJWJWJWJWJW联合参谋部、科学技术委员会联合举办，JSJSJS科学院、航天科技集团协手创办的大型竞赛。现竞赛已临近报名阶段，报名安排如下...</div>
           <p>2022-03-31</p>
         </div>
         </Link>

src/military/qz2022/static.js

@@ -2,13 +2,13 @@
 // 赛项*（必填项，placeholder：请选择赛项，下拉列表选择，选项为：战略方向，作战领域，前沿技术）
 // 赛区配置
 export const competitionArea = [
-  { value: '0', title: "LJ分赛区"},
+  { value: '0', title: "LJLJLJ分赛区"},
-  { value: '1', title: "HJ分赛区"},
+  { value: '1', title: "HJHJHJ分赛区"},
-  { value: '2', title: "KJ分赛区"},
+  { value: '2', title: "KJKJKJ分赛区"},
-  { value: '3', title: "HJJ分赛区"},
+  { value: '3', title: "HJHJHJJHJJHJJ分赛区"},
   { value: '4', title: "战略支援部队分赛区"},
   { value: '5', title: "联勤保障分赛区"},
-  { value: '6', title: "WJ部队分赛区"}
+  { value: '6', title: "WJWJWJ部队分赛区"}
 ];
 // 赛项配置
 export const competitionType = [

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 (
+    <div  id={id} key={id} className={className} style={{minHeight:"20vh"}}>
+    </div>
+  )
+}

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 (
-    <div className="statistics qz_main clearfix">
+    <div className="statistics qz_main ">
       <div className="statistics-words">
-        <div className="statistics-tit">交流互动</div>
+        <div className="num-item sum">
-        <div className="statistics-content">
+          <div className="num-data">竞赛总报名数</div>
-          <p>集萃群智体会</p>
+          <div className="num-tit">竞赛总报名数</div>
-          <p>与论坛成员交流比赛经验，分享参赛心得</p>
-          <p>汇聚赛事资讯</p>
-          <p>助您第一时间解读竞赛动态，把握赛事脉搏</p>
-        </div>
-        <div className="statistics-btn">
-          <span className="detail1">了解详情</span>
-          <img
-            className="iconPlay1"
-            src={btn}
-          />
         </div>
       </div>
-
+      {/* <div className="echart"> */}
+        <EchartPie
+          id="network"
+          className="echart-box"
+        />
+        {/* <EchartBar
+          id="newAddedProjects"
+          className="echart-box"
+          title="新项目统计"
+          xData={monthArr}
+          yData={newAddedProjects}
+        /> */}
+      {/* </div> */}
     </div>
   )
 }

src/military/qz2022/statistics/index.scss

@@ -1,61 +1,11 @@
 .statistics {
-  margin: 9rem auto;
+  display: flex;
-  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;
-  }
 
   .statistics-words {
-    display: inline-block;
+    width: 16.25%;
-    padding: 1.5rem;
+    margin-right: 1rem;
   }
-  .statistics-tit {
+  .echart-box {
-    display: inline-block;
+    width: 50vw;
-    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%;
   }
 }