diff --git a/src/api/chat.js b/src/api/chat.js index 7b493411a..f9d1220a2 100644 --- a/src/api/chat.js +++ b/src/api/chat.js @@ -312,11 +312,11 @@ export function getSimulationConversationListNew(group) { } // 获取/创建仿真会话(新版地图) -export function getSimulationConversationIdNew(params, group) { +export function getSimulationConversationIdNew(data, group) { return request({ url: `/simulation/${group}/wx/conversation`, - method: 'get', - params: params + method: 'post', + data }); } diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js index 470488e82..e287a3194 100644 --- a/src/store/modules/socket.js +++ b/src/store/modules/socket.js @@ -163,7 +163,7 @@ function handleSimulationInfo(state, data) { targetOnline:data.targetMember ? data.targetMember.online : null, targetName:data.targetMember ? data.targetMember : 'All', targetRole:data.targetMember ? data.targetMember.role : null, - group: data.group, + all: data.all, date: +new Date(`${myDate1} ${chatTime}`) }; state.simulationText = params; diff --git a/src/views/jsxt/competition/examDetail.vue b/src/views/jsxt/competition/examDetail.vue index b7290c1fd..48ecc8904 100644 --- a/src/views/jsxt/competition/examDetail.vue +++ b/src/views/jsxt/competition/examDetail.vue @@ -176,7 +176,9 @@ export default { this.$messageBox('试卷还没被加载'); } - }).catch(()=>{}); + }).catch(()=>{ + this.$messageBox('试卷还没被加载'); + }); } else { getPracticalQuestion(this.$route.query.raceId).then((responese)=>{ if (responese.data) { @@ -187,6 +189,8 @@ export default { } else { this.$messageBox('试卷还没被加载'); } + }).catch(()=>{ + this.$messageBox('试卷还没被加载'); }); } } diff --git a/src/views/newMap/jointTrainingNew/chatBox.vue b/src/views/newMap/jointTrainingNew/chatBox.vue index 72f0a1b69..cc7a33ed7 100644 --- a/src/views/newMap/jointTrainingNew/chatBox.vue +++ b/src/views/newMap/jointTrainingNew/chatBox.vue @@ -11,8 +11,11 @@
-
+ +
+
@@ -42,6 +45,7 @@
+ + diff --git a/src/views/newMap/jointTrainingNew/chatMemberList.vue b/src/views/newMap/jointTrainingNew/chatMemberList.vue index ed497a016..150af4e94 100644 --- a/src/views/newMap/jointTrainingNew/chatMemberList.vue +++ b/src/views/newMap/jointTrainingNew/chatMemberList.vue @@ -7,13 +7,12 @@ :key="member.id" :class="member.online?'each-chat-member':'each-chat-member each-chat-member-outline'" :style="member.userId === userId ?'color:red':''" - @click="createConversition(member)" >{{ member.memberName }}