diff --git a/src/managements/competition/setting/index.jsx b/src/managements/competition/setting/index.jsx index 00b24959..6981a9ee 100644 --- a/src/managements/competition/setting/index.jsx +++ b/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) => { diff --git a/src/military/qz2022.js b/src/military/qz2022.js index 5b6f3ade..f95e4822 100644 --- a/src/military/qz2022.js +++ b/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) => {
{paths.indexOf(active) !== -1 &&
diff --git a/src/military/qz2022/image/logo.png b/src/military/qz2022/image/logo.png new file mode 100644 index 00000000..7dee9376 Binary files /dev/null and b/src/military/qz2022/image/logo.png differ diff --git a/src/military/qz2022/refer/index.jsx b/src/military/qz2022/refer/index.jsx index 0308b3f6..66b3cdae 100644 --- a/src/military/qz2022/refer/index.jsx +++ b/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 { ]; - 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",