diff --git a/.env.development b/.env.development index 8527b4390..535c20d5e 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ NODE_ENV = 'development' # VUE_APP_BASE_API = 'https://joylink.club/jlcloud' # VUE_APP_BASE_API = 'http://192.168.3.4:9000' VUE_APP_BASE_API = 'http://192.168.3.6:9000' -VUE_VOICE_API = 'https://test.joylink.club' +VUE_APP_VOICE_API = 'https://test.joylink.club' # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, # to control whether the babel-plugin-dynamic-import-node plugin is enabled. diff --git a/.env.native b/.env.native index 5aeec66b3..d1152d456 100644 --- a/.env.native +++ b/.env.native @@ -4,4 +4,4 @@ VUE_APP_PRO = 'local' # base api VUE_APP_BASE_API = 'https://joylink.club/jlcloud' -VUE_VOICE_API = 'https://joylink.club' +VUE_APP_VOICE_API = 'https://joylink.club' diff --git a/.env.production b/.env.production index ec96837f2..684381f92 100644 --- a/.env.production +++ b/.env.production @@ -3,4 +3,4 @@ NODE_ENV = 'production' # base api VUE_APP_BASE_API = 'https://joylink.club/jlcloud' -VUE_VOICE_API = 'https://joylink.club' +VUE_APP_VOICE_API = 'https://joylink.club' diff --git a/.env.staging b/.env.staging index 74355abe2..605ec30ae 100644 --- a/.env.staging +++ b/.env.staging @@ -3,4 +3,4 @@ NODE_ENV = 'test' # base api VUE_APP_BASE_API = 'https://test.joylink.club/jlcloud' -VUE_VOICE_API = 'https://test.joylink.club' +VUE_APP_VOICE_API = 'https://test.joylink.club' diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js index 27836680d..81fb2b9d4 100644 --- a/src/store/modules/socket.js +++ b/src/store/modules/socket.js @@ -154,6 +154,13 @@ function handleSimulationInfo(state, data) { 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); + } + // switch (data.member.role) { // case '01': // role = '管理员'; @@ -235,6 +242,7 @@ const socket = { simulationStart: '', // 仿真-开始消息 simulationReset: '', // 仿真-异常消息 simulationText: {}, // 仿真-用户交互消息(聊天/命令) + coversitionList:{}, // 历史仿真-用户消息列表 message: {}, // 仿真聊天 msgQueue: [], // 命令请求列表 @@ -259,7 +267,6 @@ const socket = { beLogoutCount: 0, // 被登出 runPlanReloadCount: 0 // 仿真运行图变更 }, - getters: { }, mutations: { diff --git a/src/views/newMap/jointTrainingNew/chatBox.vue b/src/views/newMap/jointTrainingNew/chatBox.vue index 0a696d2df..f9862fce8 100644 --- a/src/views/newMap/jointTrainingNew/chatBox.vue +++ b/src/views/newMap/jointTrainingNew/chatBox.vue @@ -1,5 +1,6 @@