diff --git a/src/military/competition/image/jqtjGZ1.png b/src/military/competition/image/jqtjGZ1.png index 341733ee3..08fc1fe96 100644 Binary files a/src/military/competition/image/jqtjGZ1.png and b/src/military/competition/image/jqtjGZ1.png differ diff --git a/src/military/competition/image/jqtjGZ11.png b/src/military/competition/image/jqtjGZ11.png index e1b67fa94..c2d230da9 100644 Binary files a/src/military/competition/image/jqtjGZ11.png and b/src/military/competition/image/jqtjGZ11.png differ diff --git a/src/military/competition/image/jqtjGZ14.png b/src/military/competition/image/jqtjGZ14.png index dacf41b52..76a630d1c 100644 Binary files a/src/military/competition/image/jqtjGZ14.png and b/src/military/competition/image/jqtjGZ14.png differ diff --git a/src/military/competition/image/jqtjGZ17.png b/src/military/competition/image/jqtjGZ17.png index 09f054539..56437deda 100644 Binary files a/src/military/competition/image/jqtjGZ17.png and b/src/military/competition/image/jqtjGZ17.png differ diff --git a/src/military/competition/image/jqtjGZ3.png b/src/military/competition/image/jqtjGZ3.png index 51a4dc3dd..5a13123a9 100644 Binary files a/src/military/competition/image/jqtjGZ3.png and b/src/military/competition/image/jqtjGZ3.png differ diff --git a/src/military/competition/image/jqtjGZ5.png b/src/military/competition/image/jqtjGZ5.png index c2657d221..fd093de48 100644 Binary files a/src/military/competition/image/jqtjGZ5.png and b/src/military/competition/image/jqtjGZ5.png differ diff --git a/src/military/competition/image/jqtjGZ8.png b/src/military/competition/image/jqtjGZ8.png index e4fedf34f..685c40ac8 100644 Binary files a/src/military/competition/image/jqtjGZ8.png and b/src/military/competition/image/jqtjGZ8.png differ diff --git a/src/military/competition/notice/index.jsx b/src/military/competition/notice/index.jsx index 0db79e50d..c658d213a 100644 --- a/src/military/competition/notice/index.jsx +++ b/src/military/competition/notice/index.jsx @@ -6,6 +6,7 @@ import './index.scss'; import '../../index.scss'; import { getNoticeList, deleteCompetitionNotice } from "../api"; import RenderHtml from "src/components/render-html"; +import Nodata from "src/forge/Nodata"; function Notice({ current_user, qzDetail,match }) { const { competitionId } = match.params; @@ -62,6 +63,7 @@ function Notice({ current_user, qzDetail,match }) {

{item.updated_at.substring(0, 10)}

})} + {noticeList && !noticeList.length && } ) diff --git a/src/military/competition/refer/jqtz.jsx b/src/military/competition/refer/jqtz.jsx index 4fd9728fc..54d02a039 100644 --- a/src/military/competition/refer/jqtz.jsx +++ b/src/military/competition/refer/jqtz.jsx @@ -34,7 +34,7 @@ import '../apply/index.scss'; // 定制竞赛-集群突击竞赛 提案提交 function Introduce({ form, match, history, current_user }) { - const repoName = ["无人车编队简单协同机动", "无人车编队复杂协同机动", "无人车编队协同突击", "无人车编队协同飞行", "无人车编队自主避障", "无人机集群协同攻击", "跨域集群对抗-夺标攻防"] + const repoName = ["无人车编队简单协同机动", "无人车编队复杂协同机动", "无人车编队协同突击", "无人机编队协同飞行", "无人机编队自主避障", "无人机集群协同攻击", "跨域集群对抗-夺标攻防"] const {getFieldDecorator, validateFields, setFieldsValue} = form; const { competitionId } = match.params; const {user_id} = current_user; @@ -145,6 +145,8 @@ function Introduce({ form, match, history, current_user }) { return } setTimeout(() => { window.open(response.result.live_url);}) + }else{ + message.error(res.msg); } setSimulateUploading(false); }) diff --git a/src/military/competition/refer/record.jsx b/src/military/competition/refer/record.jsx index 41b3c9ad9..152dd1ab5 100644 --- a/src/military/competition/refer/record.jsx +++ b/src/military/competition/refer/record.jsx @@ -15,6 +15,7 @@ import './index.scss'; // 定制竞赛-集群突击竞赛 模拟结果记录列表 function Introduce(props) { + const repoName = ["无人车编队简单协同机动", "无人车编队复杂协同机动", "无人车编队协同突击", "无人机编队协同飞行", "无人机编队自主避障", "无人机集群协同攻击", "跨域集群对抗-夺标攻防"] const {history, current_user, location:{pathname} } = props; const repoId = pathname && pathname.substring(pathname.lastIndexOf('/')+1, pathname.length); const {user_id} = current_user; @@ -145,7 +146,7 @@ function Introduce(props) { key: 3, align: 'center', render: (text) => { - return text || '--' + return typeof(text) === 'number' ? text : '--' } }, { @@ -289,8 +290,8 @@ function Introduce(props) {
- {repoId && } - 无人机编队控制科目 + {repoId && } + {repoName[repoId-1]}