From eff99d3609ad51df0a05232159b1bd78fb054628 Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Tue, 10 Sep 2024 16:21:03 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=88=90=E5=B7=A5=E9=99=A2=E5=A4=A7?=
=?UTF-8?q?=E9=93=81=E6=A0=87=E5=87=86=E7=AB=99=E5=8C=BA=E6=95=85=E8=A7=A3?=
=?UTF-8?q?=E8=BF=9E=E7=BB=AD=E6=93=8D=E4=BD=9C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../theme/datie_02/menus/menuButton.vue | 30 +++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/jmapNew/theme/datie_02/menus/menuButton.vue b/src/jmapNew/theme/datie_02/menus/menuButton.vue
index 1adbbdf91..4a08f77ba 100644
--- a/src/jmapNew/theme/datie_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuButton.vue
@@ -168,7 +168,8 @@ export default {
routeDataMap: null, // btnCodeList 为key
routeButtonCodeList: [], // btnCodeList 拼接code list
guideLockRightFlag: false,
- guideLockLeftFlag: false
+ guideLockLeftFlag: false,
+ continueSectionFault: false
};
},
computed: {
@@ -330,6 +331,9 @@ export default {
if (operate.operationPre === this.Station.powerUnLock.button.operation || operate.cmdType) {
this.clearOperate();
}
+ if (operate.operationPre === this.Section.fault.button.operation) {
+ this.continueSectionFault = true;
+ }
}
}).catch(e =>{
console.error(e);
@@ -417,6 +421,7 @@ export default {
operation: operation,
userOperationType: UserOperationType.LEFTCLICK
};
+
// 以下 会弹出密码框 （总人解，区故解） 铅封按钮
const operationList = [this.Signal.humanTrainRoute.button.operation,
this.Section.fault.button.operation,
@@ -437,12 +442,30 @@ export default {
// ];
this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
if (valid) {
- if (operation === this.Command.cancel.clearMbm.operation) {
+ if (operation == this.Section.fault.button.operation) {
+ this.operation = operation;
+ this.commandTypeList = commandTypeList;
+ this.$store.dispatch('menuOperation/setButtonOperation', operation);
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ // 判断是否需要 弹窗密码框
+ if (!this.continueSectionFault) {
+ operate['operateNext'] = this.Command.close.password.operation;
+ if (operation === this.Station.powerUnLock.button.operation) {
+ operate.nextCmdType = CMD.Station.CMD_STATION_POWER_ON_UNLOCK;
+ operate.param = {stationCode: this.$store.state.training.roleDeviceCode};
+ }
+ this.$refs.password.doShow(operate, operationMap[operation]);
+ }
+ this.timeNode = this.$store.state.socket.simulationTimeSync;
+ this.$store.dispatch('training/emitTipFresh');
+ } else if (operation === this.Command.cancel.clearMbm.operation) {
+ this.continueSectionFault = false;
this.commandTypeList = [];
this.$store.dispatch('menuOperation/setButtonOperation', null);
this.guideLockRightFlag = false;
this.guideLockLeftFlag = false;
} else {
+ this.continueSectionFault = false;
this.operation = operation;
this.commandTypeList = commandTypeList;
this.$store.dispatch('menuOperation/setButtonOperation', operation);
@@ -781,6 +804,9 @@ export default {
if (this.selected._event !== MouseEvent.Left || (!model._type && !model._code)) {
return;
}
+ if (this.continueSectionFault && model._type !== 'Section') {
+ this.continueSectionFault = false;
+ }
const buttonOperation = this.$store.state.menuOperation.buttonOperation;
const switchOperation = [
this.Switch.lock.button.operation,
From 5470a32bb74a1328f59e56e98e6b941c2bc853ea Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Wed, 11 Sep 2024 09:33:02 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=88=90=E5=B7=A5=E9=99=A2=E5=A4=A7?=
=?UTF-8?q?=E9=93=81=E6=A0=87=E5=87=86=E7=BA=BF=E5=AE=9E=E8=AE=AD=E6=B5=8B?=
=?UTF-8?q?=E9=AA=8C=E6=A8=A1=E5=BC=8F=E7=BB=93=E6=9D=9F=E5=90=8E=E5=BC=B9?=
=?UTF-8?q?=E5=87=BA=E7=9A=84=E7=BB=93=E6=9E=9C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../newMap/display/trainingList/testResult.vue | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/views/newMap/display/trainingList/testResult.vue b/src/views/newMap/display/trainingList/testResult.vue
index edb0be58c..a07a2d289 100644
--- a/src/views/newMap/display/trainingList/testResult.vue
+++ b/src/views/newMap/display/trainingList/testResult.vue
@@ -15,6 +15,7 @@
style="width: 100%"
>
+
{{ scope.row.success?'正确':'错误' }}
@@ -22,7 +23,7 @@
- {{ scope.row.score || 0 }}
+ {{ scope.row.score }}
@@ -54,7 +55,11 @@ export default {
if (scoreList && scoreList.length) {
scoreList.forEach(score => {
const step = this.stepList.find(step => step.id == score.stepId);
- this.tableData.push({ ...score, desc: step.description });
+ const role = this.$store.state.training.memberData[parseInt(step.memberId)];
+ if (!score.hasOwnProperty('score')) {
+ score.score = '/';
+ }
+ this.tableData.push({ ...score, role: role.labelName, desc: step.description });
});
}
this.dialogVisible = true;
@@ -66,7 +71,7 @@ export default {
if (index === 0) {
sums[index] = '合计';
return;
- } else if (index === 1) {
+ } else if (index === 2) {
const MyMemberId = this.$store.state.training.myMemberId;
const scoringRuleList = this.$store.state.trainingNew.scoringRules.find(rule => rule.memberId == MyMemberId );
let total = 0;
@@ -76,7 +81,7 @@ export default {
});
}
sums[index] = total;
- } else if (index === 2) {
+ } else if (index === 3) {
const values = data.map(item => Number(item[column.property]));
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
From 13f16e5570ec82f1e789b73a0fda4ba662a2ef85 Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Wed, 11 Sep 2024 11:18:26 +0800
Subject: [PATCH 3/4] =?UTF-8?q?f=E4=BB=BF=E7=9C=9F=E9=87=8D=E7=BD=AE?=
=?UTF-8?q?=E5=90=8E=E6=B8=85=E6=A5=9A=E5=8C=BA=E6=95=85=E8=A7=A3=E8=BF=9E?=
=?UTF-8?q?=E7=BB=AD=E6=93=8D=E4=BD=9C=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/jmapNew/theme/datie_02/menus/menuButton.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/jmapNew/theme/datie_02/menus/menuButton.vue b/src/jmapNew/theme/datie_02/menus/menuButton.vue
index 4a08f77ba..16a89f463 100644
--- a/src/jmapNew/theme/datie_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuButton.vue
@@ -291,6 +291,7 @@ export default {
this.clearOperate();
this.guideLockRightFlag = false;
this.guideLockLeftFlag = false;
+ this.continueSectionFault = false;
}
},
beforeDestroy() {
From 954ee991faa2441df3b490f5221f1e222a868dff Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Wed, 11 Sep 2024 13:44:23 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/newMap/display/trainingList/trainingLeftSlider.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/newMap/display/trainingList/trainingLeftSlider.vue b/src/views/newMap/display/trainingList/trainingLeftSlider.vue
index 1b20ddced..75e5649e4 100644
--- a/src/views/newMap/display/trainingList/trainingLeftSlider.vue
+++ b/src/views/newMap/display/trainingList/trainingLeftSlider.vue
@@ -58,9 +58,10 @@ export default {
},
methods: {
initLoadPage() {
- const trainingType = this.$store.state.training.domConfig ? this.$store.state.training.domConfig.trainingType : '';
+ let trainingType = this.$store.state.training.domConfig ? this.$store.state.training.domConfig.trainingType : '';
+ trainingType = trainingType ? trainingType.toLowerCase() : null;
// labels: ['车站', '控制权']
- const data = {mapId: this.mapId, type: trainingType.toLowerCase()};
+ const data = {mapId: this.mapId, type: trainingType};
if (this.$route.query.labels) {
const labels = this.$route.query.labels.split('-');
const labelMap = { loc: '现地', dis: '行调', section: '区段', signal: '信号机', switch: '道岔', stand: '站台', station: '车站', control: '控制权' };