集群突击issue

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 }) {
             <p>{item.updated_at.substring(0, 10)}</p>
           </div>
         })}
+        {noticeList && !noticeList.length && <Nodata _html="暂无数据"/>}
       </div>
     </div>
   )

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);
 				})

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) {
 			<div className="qz_main recordList">
 				<div className="recordHead pb15">
 					<div className="font-18">
-					{repoId && <img src={repoId === '3' ? jqtj3 : repoId === '4' ? jqtj9 : repoId === '5' ? jqtj5 : repoId === '7' ? jqtj7 : repoId === '1' ? jqtj1 : repoId === '6' ? jqtj10 : jqtj8} width={26} className="mr15"/>}
-						无人机编队控制科目
+						{repoId && <img src={repoId === '3' ? jqtj3 : repoId === '4' ? jqtj9 : repoId === '5' ? jqtj5 : repoId === '7' ? jqtj7 : repoId === '1' ? jqtj1 : repoId === '6' ? jqtj10 : jqtj8} width={26} className="mr15"/>}
+						{repoName[repoId-1]}
 					</div>
 					<div>
 						<Button onClick={()=>{history.goBack()}} style={{width: '53px', padding: '0'}}>返回</Button>