Merge pull request '启智2022修改' (#369) from durian/forgeplus-react:dev_military_qz2022 into pre_dev_military

src/managements/competition/setting/index.jsx

@@ -63,7 +63,7 @@ export default Form.create()(({ form, match, history, current_user, showNotifica
                     } else {
                         zonesArr(details.zones);
                     }
-                    setAdmin_data(details.admin_data || []);
+                    setAdmin_data(Array.isArray(details.admin_data)?details.admin_data:[]);
                 }
                 setLoading(false);
             }).catch((error) => {

src/military/qz2022.js

@@ -11,6 +11,7 @@ import './qz2022/index.scss';
 import { Menu, Popover, Spin } from "antd";
 import banner from './qz2022/image/banner.jpg';
 import banner_local from './qz2022/image/banner_local.jpg';
+import logo from './qz2022/image/logo.png';
 import { getQz2022, userCompetitionStatus } from "./qz2022/api";
 import { paths } from "./qz2022/static";
 import Login from './components/login';
@@ -171,6 +172,9 @@ const Qz2022 = (props) => {
       <div className="qz2022">
         <div className={`qz2022-top ${fixedTop}`}>
         {paths.indexOf(active) !== -1 && <ul className="qz2022Menu mt20 qz_main">
+          <li>
+            <a href="/"><img src={logo} alt="" style={{width: 120}}/></a>
+          </li>
           <li className={ active==='qz2022' ||active === "introduce"? "active" : ""}>
             <Link to={{ pathname: `/competition/qz2022/introduce` }}>首页</Link>
           </li>

src/military/qz2022/apply/index.jsx

@@ -1,6 +1,6 @@
 import React, {useState, useCallback} from "react";
 import { Input, Select, Button, Form, message, Radio, Modal, Upload, Icon, Tooltip } from 'antd';
-import { appendFileSizeToUploadFileAll } from 'educoder';
+import { appendFileSizeToUploadFileAll, getUploadActionUrl } from 'educoder';
 import { Base64 } from 'js-base64';
 import {enrollCompetition, enrollUpdate, updateTemplate} from '../api';
 import {current_main_site_url} from '../fetch';
@@ -136,7 +136,7 @@ export default Form.create()((props) => {
   function errorSource(rule, value, callback){
     if(sourceBy === 1 && !value){
       // 计划支持 必须输入课题名称
-      callback('请正确输入课题来源');
+      callback('请正确输入项目名称');
     }else{
       callback();
     }
@@ -303,7 +303,7 @@ export default Form.create()((props) => {
             </a>:<Upload
               accept=".zip,.rar"
               // 开发时 action需要添加?debug=admin
-              action={`${current_main_site_url}/api/attachments.json?debug=admin`}
+              action={getUploadActionUrl}
               fileList={files}
               onChange={handleChange}
               onDownload={download}
@@ -319,7 +319,7 @@ export default Form.create()((props) => {
               <div className="tips mt10">
                 1. 您可选择是否上传单位盖章后的报名表扫描件<br/>
                 2. 上传附件名称需更改为“单位名称+参赛团队负责人”<br/>
-                3. 支持上传单个zip、rar格式文件，文件大小限制10m<br/>
+                3. 支持上传单个zip、rar格式文件，文件大小限制10M<br/>
                 4. 密级必须为{qzDetail && qzDetail.is_local ? '秘密及以下' : '公开级'}</div>
             </Upload>}
           </div>

src/military/qz2022/refer/index.jsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from "react";
 import {Prompt} from 'react-router-dom'
 import {Select, Button, Upload, Modal, Icon, message } from 'antd';
-import { appendFileSizeToUploadFileAll } from 'educoder';
+import { appendFileSizeToUploadFileAll, getUploadActionUrl } from 'educoder';
 import {current_main_site_url} from '../fetch.js';
 import {uploadCompetition} from '../api';
 import refer from "../image/refer.svg";
@@ -108,7 +108,7 @@ function Introduce({ form, showNotification, match, history, enrollStatus, curre
         <Upload
           accept=".zip,.rar,.tar"
           // 开发时 action需要添加?debug=admin
-          action={`${current_main_site_url}/api/attachments.json?debug=admin`}
+          action={getUploadActionUrl}
           fileList={files}
           onChange={handleChange}
           onDownload={download}

src/military/qz2022/statistics/EchartBar/index.jsx

@@ -79,7 +79,7 @@ export default ({ id, className, title, legendArr, xData, yData }) => {
     ];
 
 
-    let barWidth = 25;
+    let barWidth = 20;
 
     let option = {
       grid: {
@@ -141,6 +141,7 @@ export default ({ id, className, title, legendArr, xData, yData }) => {
         top: '2%',
         right: "8%",
         fontSize: fontSizeText,
+        selectedMode: false
       },
       xAxis: [{
         type: "category",