-
-
{{ scope.row.configValue }}
-
-
-
{{ scope.row.configValue }}
-
-
- {{ scope.row.configValue }}
+ true
+ false
@@ -81,7 +48,6 @@
+
+
diff --git a/src/views/publish/publishMap/project.vue b/src/views/publish/publishMap/project.vue
index 6f574459d..13ba7b462 100644
--- a/src/views/publish/publishMap/project.vue
+++ b/src/views/publish/publishMap/project.vue
@@ -66,7 +66,6 @@ export default {
ProjectList.forEach(item => {
this.options.push({label: item.label, value: item.value.toUpperCase()});
});
- console.log(this.options);
},
doSave() {
this.$refs['form'].validate((valid) => {
From 6fe5363706f21dee168c835d6deba5aef558e771 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 12 May 2020 16:46:41 +0800
Subject: [PATCH 29/48] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=B9=B3=E5=8F=B0=20?=
=?UTF-8?q?=E7=BB=BC=E5=90=88=E6=BC=94=E7=BB=83=20=E8=81=8A=E5=A4=A9?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/chat.js | 8 ++++
src/store/modules/socket.js | 20 ++++----
src/views/newMap/jointTrainingNew/chatBox.vue | 8 ++--
.../newMap/jointTrainingNew/chatContent.vue | 47 ++++++++++++++-----
4 files changed, 58 insertions(+), 25 deletions(-)
diff --git a/src/api/chat.js b/src/api/chat.js
index 865735cf4..1b9c88513 100644
--- a/src/api/chat.js
+++ b/src/api/chat.js
@@ -319,3 +319,11 @@ export function uploadAudioFileNew (group, lang, per, conversationId, file) {
data: file
});
}
+
+// 获取仿真会话消息列表（新版地图）
+export function getSimulationContextListNew(group, conversationId) {
+ return request({
+ url: `/simulation/${group}/conversation/${conversationId}`,
+ method: 'get'
+ });
+}
diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js
index 81fb2b9d4..cd22bf0a1 100644
--- a/src/store/modules/socket.js
+++ b/src/store/modules/socket.js
@@ -147,19 +147,19 @@ function handleSimulationInfo(state, data) {
memberRole:data.member.name,
memberOnline:data.member.online,
chatTime: data.chatTime,
- targetOnline:data.targetMember.online,
- targetName:data.targetMember.name,
- targetRole:data.targetMember.role,
+ targetOnline:data.targetMember ? data.targetMember.online : null,
+ targetName:data.targetMember ? data.targetMember.name : null,
+ targetRole:data.targetMember ? data.targetMember.role : null,
group: data.group,
date: +new Date(`${myDate1} ${chatTime}`)
};
state.simulationText = params;
- if (state.coversitionList[data.conversationId]) {
- state.coversitionList[data.conversationId].push(params);
- } else {
- state.coversitionList[data.conversationId] = [];
- state.coversitionList[data.conversationId].push(params);
- }
+ // if (state.coversitionList[data.conversationId]) {
+ // state.coversitionList[data.conversationId].push(params);
+ // } else {
+ // state.coversitionList[data.conversationId] = [];
+ // state.coversitionList[data.conversationId].push(params);
+ // }
// switch (data.member.role) {
// case '01':
@@ -242,7 +242,7 @@ const socket = {
simulationStart: '', // 仿真-开始消息
simulationReset: '', // 仿真-异常消息
simulationText: {}, // 仿真-用户交互消息（聊天/命令）
- coversitionList:{}, // 历史仿真-用户消息列表
+ // coversitionList:{}, // 历史仿真-用户消息列表
message: {}, // 仿真聊天
msgQueue: [], // 命令请求列表
diff --git a/src/views/newMap/jointTrainingNew/chatBox.vue b/src/views/newMap/jointTrainingNew/chatBox.vue
index f9862fce8..f835d15b3 100644
--- a/src/views/newMap/jointTrainingNew/chatBox.vue
+++ b/src/views/newMap/jointTrainingNew/chatBox.vue
@@ -95,7 +95,7 @@ export default {
language:'zh',
sex:'1'
},
- currentCoversition:{id:'all', name:'所有人', group:true},
+ currentCoversition:{},
headerTitle:'所有人'
};
},
@@ -112,7 +112,9 @@ export default {
getSimulationConversationListNew(this.$route.query.group).then(resp=>{
if (resp.data) {
this.coversitionList = resp.data;
- this.coversitionList.unshift({id:'all', name:'所有人', group:true});
+ if (resp.data && resp.data.length && resp.data.length > 0) {
+ this.currentCoversition = resp.data[0];
+ }
}
});
},
@@ -286,7 +288,7 @@ export default {
changeCoversition(coversition) {
this.headerTitle = coversition.name;
this.currentCoversition = {id:coversition.id, group:coversition.group};
- this.$refs.chatContent.reloadData(this.currentCoversition);
+ // this.$refs.chatContent.reloadData(this.currentCoversition);
}
}
};
diff --git a/src/views/newMap/jointTrainingNew/chatContent.vue b/src/views/newMap/jointTrainingNew/chatContent.vue
index 66e9c2600..4c69cb269 100644
--- a/src/views/newMap/jointTrainingNew/chatContent.vue
+++ b/src/views/newMap/jointTrainingNew/chatContent.vue
@@ -18,6 +18,7 @@
From 376662d96eaea7a49bd7ad73386b93cc17844f00 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 12 May 2020 17:49:00 +0800
Subject: [PATCH 30/48] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=B9=B3=E5=8F=B0=20?=
=?UTF-8?q?=E7=BB=BC=E5=90=88=E6=BC=94=E7=BB=83=20=E8=81=8A=E5=A4=A9?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/store/modules/socket.js | 2 +-
.../newMap/jointTrainingNew/chatContent.vue | 25 ++++++++++++++++---
2 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js
index cd22bf0a1..1a7d85da5 100644
--- a/src/store/modules/socket.js
+++ b/src/store/modules/socket.js
@@ -144,7 +144,7 @@ function handleSimulationInfo(state, data) {
voice: data.isAudio,
src: data.isAudio ? `/jlcloud/audio/${data.audioPath}` : '',
memberName:data.member.name,
- memberRole:data.member.name,
+ memberRole:data.member.role,
memberOnline:data.member.online,
chatTime: data.chatTime,
targetOnline:data.targetMember ? data.targetMember.online : null,
diff --git a/src/views/newMap/jointTrainingNew/chatContent.vue b/src/views/newMap/jointTrainingNew/chatContent.vue
index 4c69cb269..67f05b3c7 100644
--- a/src/views/newMap/jointTrainingNew/chatContent.vue
+++ b/src/views/newMap/jointTrainingNew/chatContent.vue
@@ -3,7 +3,7 @@