From 8c99f4a3cee5429dd9593fa292af8f5042c6f6a2 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Fri, 29 May 2020 09:16:35 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=A5=BF=E5=AE=89=E4=B8=80/=E4=B8=89?= =?UTF-8?q?=E5=8F=B7=E7=BA=BF=E7=9A=84=E4=BE=A7=E8=BE=B9=E6=A0=8F=20?= =?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/views/newMap/displayNew/menuTrainList.vue | 6 +++--- src/views/newMap/jointTrainingNew/menuTrainList.vue | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/newMap/displayNew/menuTrainList.vue b/src/views/newMap/displayNew/menuTrainList.vue index 787d697ce..7345e8f7a 100644 --- a/src/views/newMap/displayNew/menuTrainList.vue +++ b/src/views/newMap/displayNew/menuTrainList.vue @@ -13,8 +13,8 @@ style="height: 100%;" >
-
下行列车详细信息
- +
下行列车详细信息
+ @@ -163,7 +163,7 @@ export default { // padding: 5px; background: #fff; } -.topTrainListInfo{ +.topTrainListInfo,.bottomTrainListInfo{ padding: 10px 10px; background: #cde2ef; font-size: 13px; diff --git a/src/views/newMap/jointTrainingNew/menuTrainList.vue b/src/views/newMap/jointTrainingNew/menuTrainList.vue index 787d697ce..7345e8f7a 100644 --- a/src/views/newMap/jointTrainingNew/menuTrainList.vue +++ b/src/views/newMap/jointTrainingNew/menuTrainList.vue @@ -13,8 +13,8 @@ style="height: 100%;" >
-
下行列车详细信息
- +
下行列车详细信息
+ @@ -163,7 +163,7 @@ export default { // padding: 5px; background: #fff; } -.topTrainListInfo{ +.topTrainListInfo,.bottomTrainListInfo{ padding: 10px 10px; background: #cde2ef; font-size: 13px; From 97f2b847416d57ec4faed7f17398624e95ff5076 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 29 May 2020 09:19:59 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B0=8F=E4=BA=A4?= =?UTF-8?q?=E8=B7=AF=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/xian_01.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jmapNew/config/skinCode/xian_01.js b/src/jmapNew/config/skinCode/xian_01.js index 549f88141..acffb3a6f 100644 --- a/src/jmapNew/config/skinCode/xian_01.js +++ b/src/jmapNew/config/skinCode/xian_01.js @@ -603,7 +603,7 @@ class SkinCode extends defaultStyle { defaultDirectionCode: 'D', // 默认车次号1 defaultTripNumber: 'CCC', // 默认车次号2 trainTargetOffset: { x: 42, y: 1}, // 列车车次号偏移 - smallColor: '#70ECEE', // 小交路颜色 + smallColor: '#00FFFF', // 小交路颜色 bigColor: '#FFFFFF', // 大交路颜色 inboundColor: '#00FF00', // 回库颜色 planTypeColor: '#FFFFFF' // 计划车颜色 From f21751fcd397bf5f37f56d984cd36dd354152349 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 29 May 2020 11:08:38 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=93=88=E5=B0=94=E6=BB=A8title=E8=B0=83?= =?UTF-8?q?=E6=95=B4&=E7=90=86=E8=AE=BA=E8=80=83=E8=AF=95=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/scripts/ProjectConfig.js | 2 +- .../iscs/iscsSystem/config/pis/lcdControl.vue | 18 +++++----- .../jsxt/competition/theory/quiz/index.vue | 34 +++++++++++++++---- src/views/login/hydLogin.vue | 8 +++-- 4 files changed, 44 insertions(+), 18 deletions(-) diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js index 0c952a264..2c63e791d 100644 --- a/src/scripts/ProjectConfig.js +++ b/src/scripts/ProjectConfig.js @@ -32,7 +32,7 @@ export const loginInfo = { // 页面title & 退出登录跳转路径 loginPath: '/designgzb/login' }, hyd: { - title: '城市轨道交通实训平台', + title: '城市轨道交通综合行车模拟仿真系统', loginPath: '/login' }, designhyd: { diff --git a/src/views/iscs/iscsSystem/config/pis/lcdControl.vue b/src/views/iscs/iscsSystem/config/pis/lcdControl.vue index 27af4ddd9..fcb242f65 100644 --- a/src/views/iscs/iscsSystem/config/pis/lcdControl.vue +++ b/src/views/iscs/iscsSystem/config/pis/lcdControl.vue @@ -15,14 +15,16 @@
-
-
车站
-
选择
-
-
-
{{ station }}
-
-
+
+
+
车站
+
选择
+
+
+
{{ station }}
+
+
+
diff --git a/src/views/jsxt/competition/theory/quiz/index.vue b/src/views/jsxt/competition/theory/quiz/index.vue index 2d3b90835..a3b7d0718 100644 --- a/src/views/jsxt/competition/theory/quiz/index.vue +++ b/src/views/jsxt/competition/theory/quiz/index.vue @@ -28,6 +28,7 @@ // import { commitExam, getExamInfo, getUserExam, saveExamAnswer } from '@/api/exam.js'; // import WindowResizeHandler from '@/mixin/WindowResizeHandler'; import Question from './question'; +import localStore from 'storejs'; import { postCompetitionTheory, getTheoryQuestion, quitCurrentRace } from '@/api/competition'; export default { @@ -52,6 +53,7 @@ export default { }, examQuestions: [], theoryAnswers: [], + theoryAnswersMap: {}, countdownTime: '00:00:00', theoryExamTime: 0, countdown: null @@ -100,8 +102,14 @@ export default { }, methods: { loadInitData() { - this.theoryAnswers = []; + // this.theoryAnswers = []; + this.theoryAnswersMap = {}; getTheoryQuestion(this.$route.query.raceId).then((resp)=>{ + const storeAnswersKey = this.$store.state.user.id + '' + this.$route.query.raceId + 'theoryAnswers'; + const storeAnswers = localStore.get(storeAnswersKey); + if (storeAnswers) { + this.theoryAnswersMap = storeAnswers; + } if (resp.data) { this.examQuestions = resp.data.questions.map((el, i) => { el.index = i; @@ -109,6 +117,16 @@ export default { }); this.theoryExamTime = resp.data.theoryExamTime * 60; this.countdownTime = this.computationTime(this.theoryExamTime); + const storeKey = this.$store.state.user.id + '' + this.$route.query.raceId + 'theory'; + const startTime = localStore.get(storeKey); + + if (startTime) { + const dt = new Date().getTime() - startTime; + this.theoryExamTime = resp.data.theoryExamTime * 60 - Math.floor(dt / 1000); + } else { + const storeValue = new Date().getTime(); + localStore.set(storeKey, storeValue); + } this.countdown = setInterval(() => { if (this.theoryExamTime <= 0) { if (this.countdown) { @@ -166,11 +184,15 @@ export default { }); }, onSave(data) { - // console.log(data, '问答题'); - this.theoryAnswers.push({ - answerOptionId: data.answer, - questionId: data.userExamQuestionId - }); + // this.theoryAnswers.push({ + // answerOptionId: data.answer, + // questionId: data.userExamQuestionId + // }); + this.theoryAnswersMap[data.userExamQuestionId] = data.answer; + // console.log(data, '问答题', this.theoryAnswers, this.theoryAnswersMap); + const storeKey = this.$store.state.user.id + '' + this.$route.query.raceId + 'theoryAnswers'; + localStore.set(storeKey, this.theoryAnswersMap); + }, computationTime(time) { let hours = Math.floor(time / 3600); diff --git a/src/views/login/hydLogin.vue b/src/views/login/hydLogin.vue index 2eb18d7e5..88193741f 100644 --- a/src/views/login/hydLogin.vue +++ b/src/views/login/hydLogin.vue @@ -69,7 +69,7 @@ import { setSessionStorage, removeSessionStorage } from '@/utils/auth'; import Cookies from 'js-cookie'; import md5 from 'js-md5'; import { UrlConfig } from '@/scripts/ConstDic'; -import { ProjectIcon } from '@/scripts/ProjectConfig'; +import { loginInfo, ProjectIcon } from '@/scripts/ProjectConfig'; import { removeToken } from '@/utils/auth'; import LangStorage from '@/utils/lang'; import logoImgHyd from '@/assets/project_icon/logo_hyd.png'; @@ -121,7 +121,7 @@ export default { lang: 'zh', language: '中文', logoImg: logoImgHyd, - title: '城市轨道交通实训平台' + title: '' }; }, computed: { @@ -151,7 +151,9 @@ export default { }, mounted() { if (this.project.startsWith('design')) { - this.title = '城市轨道交通设计平台'; + this.title = loginInfo['designhyd'].title; + } else { + this.title = loginInfo['hyd'].title; } document.title = this.title; }, From 2abe815c87c2cf14ab906a7830b043aad06cfd65 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 29 May 2020 11:18:44 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=90=86=E8=AE=BA=E8=80=83=E8=AF=95?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/jsxt/competition/theory/quiz/index.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/views/jsxt/competition/theory/quiz/index.vue b/src/views/jsxt/competition/theory/quiz/index.vue index a3b7d0718..210023695 100644 --- a/src/views/jsxt/competition/theory/quiz/index.vue +++ b/src/views/jsxt/competition/theory/quiz/index.vue @@ -52,7 +52,6 @@ export default { passScore: 10 }, examQuestions: [], - theoryAnswers: [], theoryAnswersMap: {}, countdownTime: '00:00:00', theoryExamTime: 0, @@ -113,6 +112,7 @@ export default { if (resp.data) { this.examQuestions = resp.data.questions.map((el, i) => { el.index = i; + el.answer = this.theoryAnswersMap[el.id]; return el; }); this.theoryExamTime = resp.data.theoryExamTime * 60; @@ -175,9 +175,13 @@ export default { } }, doEnd() { + const theoryAnswers = []; + for (const key in this.theoryAnswersMap) { + theoryAnswers.push({questionId: key, answerOptionId: this.theoryAnswersMap[key]}); + } const params = { competitionId: this.$route.query.raceId, - theoryAnswers: this.theoryAnswers + theoryAnswers: theoryAnswers }; postCompetitionTheory(params).then(()=>{ this.$router.push({ path: `/jsxt/result`, query: { type: 'theory', raceId:this.$route.query.raceId } }); From e0b5f1d2496c0732576f1f25c215a6c4b98c2cd9 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 29 May 2020 13:02:44 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/baseUrl.js | 4 ++-- src/views/jsxt/competition/theory/quiz/index.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 836771751..778caeb7b 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,11 +2,11 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - // BASE_API = 'https://test.joylink.club/jlcloud'; + BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 // BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.41:9000'; // 张赛 - BASE_API = 'http://192.168.3.82:9000'; // 杜康 + // BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 diff --git a/src/views/jsxt/competition/theory/quiz/index.vue b/src/views/jsxt/competition/theory/quiz/index.vue index 210023695..3861be186 100644 --- a/src/views/jsxt/competition/theory/quiz/index.vue +++ b/src/views/jsxt/competition/theory/quiz/index.vue @@ -14,7 +14,7 @@
-
温馨提示：考试过程中请不要刷新或关闭本页面！
+
温馨提示：考试过程中请退出或关闭本页面不会终止计时！
{{ '剩余时间:'+countdownTime }}
提 交 From 7449b6b2a3a2d9c369fe36c9344a82f3e702e911 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Fri, 29 May 2020 14:03:43 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=BC=94=E7=BB=83=20?= =?UTF-8?q?=E4=BB=BF=E7=9C=9F=E8=81=8A=E5=A4=A9=E4=BB=A3=E7=A0=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/socket.js | 6 +- .../{ => chatView}/chatBox.vue | 5 +- .../{ => chatView}/chatContent.vue | 0 .../{ => chatView}/chatCoversitionList.vue | 141 +++++++++--------- .../{ => chatView}/chatCreateGroup.vue | 74 +++++---- .../{ => chatView}/chatMemberList.vue | 0 .../{ => chatView}/chatSetting.vue | 0 .../jointTrainingNew/chatView/chatTooltip.vue | 94 ++++++++++++ .../newMap/jointTrainingNew/menuDemon.vue | 2 +- 9 files changed, 218 insertions(+), 104 deletions(-) rename src/views/newMap/jointTrainingNew/{ => chatView}/chatBox.vue (99%) rename src/views/newMap/jointTrainingNew/{ => chatView}/chatContent.vue (100%) rename src/views/newMap/jointTrainingNew/{ => chatView}/chatCoversitionList.vue (50%) rename src/views/newMap/jointTrainingNew/{ => chatView}/chatCreateGroup.vue (81%) rename src/views/newMap/jointTrainingNew/{ => chatView}/chatMemberList.vue (100%) rename src/views/newMap/jointTrainingNew/{ => chatView}/chatSetting.vue (100%) create mode 100644 src/views/newMap/jointTrainingNew/chatView/chatTooltip.vue diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js index e287a3194..12c9f15c4 100644 --- a/src/store/modules/socket.js +++ b/src/store/modules/socket.js @@ -29,6 +29,9 @@ function handle(state, data) { case 'Simulation_Script_Tip': // 仿真-聊天界面用户进出仿真消息 handleSimulationScriptTipInfo(state, msg); // 用户进出仿真消息 break; + case 'Simulation_Start_Conversation': // 综合演练仿真-聊天界面用户邀请其他人加入群聊 + state.inviteOtherIntoChat = msg; + break; case 'Competition_Practical': // 竞赛裁判系统裁判员开始考试推送消息 state.competitionStart++; // 竞赛裁判系统裁判员开始考试推送消息 break; @@ -213,7 +216,8 @@ const socket = { simulationStart: '', // 仿真-开始消息 simulationOver:0, // 退出仿真推送消息 simulationReset: '', // 仿真-异常消息 - simulationText: {}, // 仿真-用户交互消息（聊天/命令） + simulationText: {}, // 仿真-用户交互消息（聊天/命令）, + inviteOtherIntoChat:{}, // 综合演练仿真-聊天界面用户邀请其他人加入群聊推送信息 // coversitionList:{}, // 历史仿真-用户消息列表 message: {}, // 仿真聊天 diff --git a/src/views/newMap/jointTrainingNew/chatBox.vue b/src/views/newMap/jointTrainingNew/chatView/chatBox.vue similarity index 99% rename from src/views/newMap/jointTrainingNew/chatBox.vue rename to src/views/newMap/jointTrainingNew/chatView/chatBox.vue index d1c1f8846..23e97bbb0 100644 --- a/src/views/newMap/jointTrainingNew/chatBox.vue +++ b/src/views/newMap/jointTrainingNew/chatView/chatBox.vue @@ -43,6 +43,7 @@
+
diff --git a/src/views/newMap/jointTrainingNew/chatCreateGroup.vue b/src/views/newMap/jointTrainingNew/chatView/chatCreateGroup.vue similarity index 81% rename from src/views/newMap/jointTrainingNew/chatCreateGroup.vue rename to src/views/newMap/jointTrainingNew/chatView/chatCreateGroup.vue index 68bcf6b89..5f16484b8 100644 --- a/src/views/newMap/jointTrainingNew/chatCreateGroup.vue +++ b/src/views/newMap/jointTrainingNew/chatView/chatCreateGroup.vue @@ -1,38 +1,40 @@ @@ -102,7 +104,7 @@ export default { this.checkList = []; } }).catch(error=>{ - this.$messageBox('创建会话失败: ' + error.messagfe); + this.$messageBox('创建会话失败: ' + error.message); this.loading = false; this.dialogVisible = false; this.checkList = []; @@ -118,6 +120,14 @@ export default { }; diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue index fd84b70da..258768701 100644 --- a/src/views/newMap/jointTrainingNew/menuDemon.vue +++ b/src/views/newMap/jointTrainingNew/menuDemon.vue @@ -26,7 +26,7 @@