|
|
@@ -502,12 +502,15 @@ export default {
|
|
|
|
|
|
if(this.$route.query.key1){
|
|
|
this.wholeOutTaskId = this.$route.query.key1;
|
|
|
+ this.currentTaskName = this.$route.query.taskName;
|
|
|
if(location.href.indexOf('#reloaded')==-1){
|
|
|
location.href=location.href+"#reloaded";
|
|
|
location.reload();
|
|
|
}
|
|
|
}else{
|
|
|
this.wholeOutTaskId = data[0].taskId;
|
|
|
+ this.currentTaskName = data[0].taskName;
|
|
|
+ this.currentTaskGrade = data[0].syntheticTaskScore;
|
|
|
}
|
|
|
|
|
|
this.processInstanceId = this.wholeOutTaskId;
|
|
|
@@ -524,15 +527,13 @@ export default {
|
|
|
this.processDefinitionId = res1.data;
|
|
|
this.initWebsoketBpmn();
|
|
|
this.isReady = true;
|
|
|
- this.currentTaskName = data[0].taskName;
|
|
|
- this.currentTaskGrade = data[0].syntheticTaskScore;
|
|
|
// 获取地图的信息
|
|
|
if (data.length) {
|
|
|
// 获取任务的课目信息
|
|
|
- this.getSubjectList(data[0].taskId);
|
|
|
+ this.getSubjectList(this.wholeOutTaskId);
|
|
|
// 获取任务的指令信息
|
|
|
- this.getinstructList(data[0].taskId);
|
|
|
- this.getSubjectAndMemberScore(data[0].taskId);
|
|
|
+ this.getinstructList(this.wholeOutTaskId);
|
|
|
+ this.getSubjectAndMemberScore(this.wholeOutTaskId);
|
|
|
// 建立指令websocket 链接
|
|
|
this.initInstructWebsoket();
|
|
|
}
|
