|
@@ -172,38 +172,79 @@
|
|
|
fit="contain"
|
|
|
>
|
|
|
</el-image>
|
|
|
- 指令监控
|
|
|
+ 课目成绩
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
<div class="subject_list_container_int" id="moninter">
|
|
|
<div class="task_other_cotainer_scrool">
|
|
|
- <myscrollBoard :key="updatekey" :config="scrollTableConfig" style="width: 100%; height: 100%" />
|
|
|
+<!-- <myscrollBoard :key="updatekey1" :config="subjectScoreTableConfig" style="width: 100%; height: 100%" />-->
|
|
|
+ <div class="subject_list_container" id="subjectList">
|
|
|
+ <template v-for="(item,index) in subjectDatas">
|
|
|
+ <div class="subject_list_item" :key="index">
|
|
|
+ <div class="subject_list_header">
|
|
|
+ <div>
|
|
|
+ <div class="subject_list_name">
|
|
|
+ {{ item.subjectName ||'-' }}
|
|
|
+ </div>
|
|
|
+ <div class="SubjectNumber_style" style="font-size: 16px; color: #F1D73A;">
|
|
|
+ {{ item.overallScore || '暂无课目成绩' }}
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="system_task_style">
|
|
|
+ <div
|
|
|
+ class="view_table_style"
|
|
|
+ @click="viewManData(item)">
|
|
|
+ 参与人员成绩
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="unit_map_box_task">
|
|
|
- <!-- <div class="task_outer_cotnainer_status"> -->
|
|
|
<div class="map_more_box">
|
|
|
- <div class="task_list_header" style="font-size: 16px; margin-bottom: 8px">
|
|
|
+ <div class="task_list_header" style="font-size:16px; margin-bottom:8px;">
|
|
|
<el-image
|
|
|
- style="width: 30px; height: 22px; margin-right: 6px"
|
|
|
- :src="require('../assets/img/rightIcon.svg')"
|
|
|
- fit="contain"
|
|
|
- ></el-image>
|
|
|
-<!-- 训练态势监控-->
|
|
|
+ style="width: 30px; height: 22px; margin-right:6px;"
|
|
|
+ :src="require('../assets/img/rightIcon.svg')"
|
|
|
+ fit="contain"
|
|
|
+ >
|
|
|
+ </el-image>
|
|
|
指令监控
|
|
|
</div>
|
|
|
-<!-- <el-image-->
|
|
|
-<!-- @click="showFull('allVideo')"-->
|
|
|
-<!-- style="width: 20px; height: 20px; margin-right: 6px; margin-top: -10px"-->
|
|
|
-<!-- :src="require('../assets/img/iconMore.svg')"-->
|
|
|
-<!-- fit="contain"-->
|
|
|
-<!-- class="moreBtn_style"-->
|
|
|
-<!-- ></el-image>-->
|
|
|
</div>
|
|
|
+
|
|
|
+ <div class="subject_list_container_int" id="moninter">
|
|
|
+ <div class="task_other_cotainer_scrool">
|
|
|
+ <myscrollBoard :key="updatekey" :config="scrollTableConfig" style="width: 100%; height: 100%" />
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <!-- <div class="task_outer_cotnainer_status"> -->
|
|
|
+<!-- <div class="map_more_box">-->
|
|
|
+<!-- <div class="task_list_header" style="font-size: 16px; margin-bottom: 8px">-->
|
|
|
+<!-- <el-image-->
|
|
|
+<!-- style="width: 30px; height: 22px; margin-right: 6px"-->
|
|
|
+<!-- :src="require('../assets/img/rightIcon.svg')"-->
|
|
|
+<!-- fit="contain"-->
|
|
|
+<!-- ></el-image>-->
|
|
|
+<!--<!– 训练态势监控–>-->
|
|
|
+<!-- 指令监控-->
|
|
|
+<!-- </div>-->
|
|
|
+<!--<!– <el-image–>-->
|
|
|
+<!--<!– @click="showFull('allVideo')"–>-->
|
|
|
+<!--<!– style="width: 20px; height: 20px; margin-right: 6px; margin-top: -10px"–>-->
|
|
|
+<!--<!– :src="require('../assets/img/iconMore.svg')"–>-->
|
|
|
+<!--<!– fit="contain"–>-->
|
|
|
+<!--<!– class="moreBtn_style"–>-->
|
|
|
+<!--<!– ></el-image>–>-->
|
|
|
+<!-- </div>-->
|
|
|
<!-- <div class="video_title">{{ camaraName[0] }}</div>-->
|
|
|
<!-- <hk-camara v-if="HKCamaraShow" :companyVideoData="camaraData" @init="HKCardInit" ref="hkCard"/>-->
|
|
|
</div>
|
|
@@ -325,11 +366,21 @@ export default {
|
|
|
websocketOrder: null, //建立的连接
|
|
|
websocketBpmn: null, //建立的连接
|
|
|
updatekey:'1',
|
|
|
+ updatekey1: '2',
|
|
|
scrollTableConfig:{
|
|
|
header: ['课目名称', '指令名称', '特情注入', '指令内容', '模训系统', '时间'],
|
|
|
waitTime:1500,
|
|
|
data: [],
|
|
|
- columnWidth: [80],
|
|
|
+ columnWidth: [150, 150, 150, 150, 150, 150],
|
|
|
+ oddRowBGC:'#072347',
|
|
|
+ evenRowBGC:'#021736'
|
|
|
+ },
|
|
|
+ subjectScoreTableConfig:{
|
|
|
+ header: ['课目名称', '课目成绩', '人员成绩'],
|
|
|
+ waitTime:1500,
|
|
|
+ data: [],
|
|
|
+ columnWidth: [200, 200, 200],
|
|
|
+ align: ['center', 'center', 'center'],
|
|
|
oddRowBGC:'#072347',
|
|
|
evenRowBGC:'#021736'
|
|
|
},
|
|
@@ -480,6 +531,7 @@ export default {
|
|
|
this.getSubjectList(data[0].taskId);
|
|
|
// 获取任务的指令信息
|
|
|
this.getinstructList(data[0].taskId);
|
|
|
+ this.getSubjectAndMemberScore(data[0].taskId);
|
|
|
// 建立指令websocket 链接
|
|
|
this.initInstructWebsoket();
|
|
|
}
|
|
@@ -508,6 +560,7 @@ export default {
|
|
|
this.getSubjectList(this.wholeOutTaskId);
|
|
|
// 获取任务的指令信息
|
|
|
this.getinstructList(this.wholeOutTaskId);
|
|
|
+ this.getSubjectAndMemberScore(this.wholeOutTaskId);
|
|
|
// 建立指令websocket 链接
|
|
|
this.initInstructWebsoket();
|
|
|
this.initWebsoketBpmn();
|
|
@@ -540,6 +593,8 @@ export default {
|
|
|
this.SubjectInfo1=this.subjectDatas[0].subjectName
|
|
|
this.SubjectInfo2=taskId
|
|
|
|
|
|
+ this.getSubjectAndMemberScore(taskId)
|
|
|
+
|
|
|
|
|
|
this.initUrl(this.subjectDatas[0].subjectName)
|
|
|
} else {
|
|
@@ -566,6 +621,21 @@ export default {
|
|
|
this.$message.error(errorMessage)
|
|
|
}
|
|
|
},
|
|
|
+ // 获取课目成绩和人员成绩
|
|
|
+ async getSubjectAndMemberScore (taskId) {
|
|
|
+ this.subjectScoreTableConfig.data = []
|
|
|
+ this.subjectDatas.forEach((data) => {
|
|
|
+ console.log("🚀 datadata >> ", data)
|
|
|
+ let subjectScoreData = {
|
|
|
+ "subjectName": data.subjectName,
|
|
|
+ "subjectScore": data.overallScore === undefined ? "暂无成绩" : data.overallScore,
|
|
|
+ "button": `<button @click="viewMemberTable()">查看人员成绩</button>`,
|
|
|
+ // "memberScore": data.subjectScore,
|
|
|
+ };
|
|
|
+ this.subjectScoreTableConfig.data.push(subjectScoreData);
|
|
|
+ })
|
|
|
+ this.updatekey1=new Date().getTime()
|
|
|
+ },
|
|
|
// 切换单位再结合任务id 获取课目课目列表
|
|
|
async getUnitSubjectList(taskId,unitId){
|
|
|
let params={}
|