状态
-
@@ -107,7 +107,20 @@ export default {
data() {
return {
mode: 'standFAS',
- deviceList: ['ManualAlarmButton', 'SmokeDetector', 'FireHydranAlarmButton', 'GasFireControl']
+ deviceList: [
+ 'ManualAlarmButton',
+ 'SmokeDetector',
+ 'FireHydranAlarmButton',
+ 'GasFireControl',
+ 'LightingGroup',
+ 'Electrically',
+ 'VolumeControlDamper',
+ 'SmookExhaustFd',
+ 'Ventilator',
+ 'AirConditioner',
+ 'FireDamper',
+ 'SmookProofFd'
+ ]
};
},
watch: {
@@ -116,9 +129,10 @@ export default {
},
'$store.state.iscs.selectedCount': function() {
const device = this.$store.state.iscs.selected;
- if (device._type === 'IscsButton' && device.function === 'GraphicEle') {
+ console.log(device, '11111111111111');
+ if (device && device._type === 'IscsButton' && device.function === 'GraphicEle') {
this.$refs.graphicEle.doShow();
- } else if (this.deviceList.includes(device._type)) {
+ } else if (device && this.deviceList.includes(device._type)) {
this.$refs.deviceControl.doShow(device);
}
}
diff --git a/src/views/jsxt/apply/index.vue b/src/views/jsxt/apply/index.vue
index 8333e0aed..0a0bffba8 100644
--- a/src/views/jsxt/apply/index.vue
+++ b/src/views/jsxt/apply/index.vue
@@ -58,7 +58,7 @@
-
-
+
diff --git a/src/views/jsxt/refereeList/display.vue b/src/views/jsxt/refereeList/display.vue
index f60c7f7f3..8195c8eb1 100644
--- a/src/views/jsxt/refereeList/display.vue
+++ b/src/views/jsxt/refereeList/display.vue
@@ -16,7 +16,9 @@ import { mapGetters } from 'vuex';
import { checkLoginLine } from '@/api/login';
import { EventBus } from '@/scripts/event-bus';
import MenuReplay from './menuReplay';
+import { getToken } from '@/utils/auth';
import { DeviceMenu, getDeviceMenuByDeviceType } from '@/scripts/ConstDic';
+import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp';
export default {
name:'RefereeDisplay',
components: {
@@ -52,25 +54,49 @@ export default {
},
height() {
return this.$store.state.app.height;
+ },
+ group() {
+ return this.$route.query.group;
}
},
watch: {
'$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识 开始加载默认状态
+ this.subscribe();
this.mapBoxP = document.getElementById(this.canvasId).children[0];
this.mapBoxP.style.cursor = '';
},
- // 'size.width': function(val) {
- // this.setWindowSize();
+ '$store.state.socket.equipmentStatus': function (val) {
+ if (val.length) {
+ this.statusMessage(val);
+ }
+ },
+ '$store.state.socket.trainStationList': function (val) {
+ if (val.length) {
+ this.runFactMessage(val);
+ }
+ },
+ // '$store.state.socket.simulationError': function (val) {
+ // if (val) {
+ // this.simulationError(val);
+ // }
// },
+ '$store.state.socket.simulationReset': function (val) {
+ if (val) {
+ this.simulationReset(val);
+ }
+ },
'$store.state.app.windowSizeCount': function() {
this.setWindowSize();
}
},
+
async mounted() {
+ window.onbeforeunload = this.clearSubscribe;
await this.setWindowSize();
await this.initLoadData();
},
async beforeDestroy() {
+ this.clearSubscribe();
await this.clearAllTimer();
await this.quit();
await this.$store.dispatch('training/reset');
@@ -81,6 +107,47 @@ export default {
async back() {
// await this.$refs.menuScript.back();
},
+ clearSubscribe() {
+ clearSubscribe(`${displayTopic}\/${this.group}`);
+ },
+ async subscribe() {
+ this.clearSubscribe();
+ const header = { group: this.group || '', 'X-Token': getToken() };
+ creatSubscribe(`${displayTopic}\/${this.group}`, header);
+
+ await this.$store.dispatch('training/setHasSubscribed');
+ },
+ async statusMessage(list) {
+ await this.$store.dispatch('training/updateMapState', list);
+ await this.$store.dispatch('socket/setEquipmentStatus');
+ },
+ async runFactMessage(list) {
+ await this.$store.dispatch('runPlan/updateRunPlanData', list);
+ await this.$store.dispatch('socket/setTrainStationList');
+ },
+ async simulationReset() {
+ await this.$store.dispatch('map/clearJlmapTrainView');
+ await this.$store.dispatch('map/setTrainWindowShow', false);
+ await this.$store.dispatch('training/over');
+ await this.$store.dispatch('socket/setSimulationReset');
+ await this.$store.dispatch('socket/setSimulationStart');
+ await this.$store.dispatch('training/setMapDefaultState');
+ },
+ // async simulationError() {
+ // await this.$store.dispatch('map/clearJlmapTrainView');
+ // await this.$store.dispatch('map/setTrainWindowShow', false);
+ // await this.$store.dispatch('socket/setSimulationError');
+ // await this.$store.dispatch('training/setMapDefaultState');
+ // this.clearSubscribe();
+ // this.$confirm(this.$t('tip.getMapStateDataException'), this.$t('tip.hint'), {
+ // confirmButtonText: this.$t('global.confirm'),
+ // showCancelButton: false,
+ // type: 'warning'
+ // }).then(() => {
+ // this.$emit('back');
+ // }).catch(() => {
+ // });
+ // },
// 加载数据
async initLoadData() {
this.$store.dispatch('training/reset');
diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue
index 8f7c52e78..94c1b04fe 100644
--- a/src/views/jsxt/refereeList/index.vue
+++ b/src/views/jsxt/refereeList/index.vue
@@ -82,7 +82,7 @@ export default {
prop: 'theoryScore',
width:100,
type: 'tag',
- columnValue: (row) => { return row.artificialTheoryScore ? `${row.theoryScore}(${row.artificialTheoryScore})` : row.theoryScore || '0'; },
+ columnValue: (row) => { return row.artificialTheoryScore ? `${row.theoryScore}(${row.artificialTheoryScore})` : this.covert(row.theoryScore); },
tagType: (row) => { return 'success'; }
},
{
@@ -90,7 +90,7 @@ export default {
prop: 'practiceScore',
width:100,
type: 'tag',
- columnValue: (row) => { return row.artificialPracticeScore ? `${row.practiceScore}(${row.artificialPracticeScore})` : row.practiceScore || '0'; },
+ columnValue: (row) => { return row.artificialPracticeScore ? `${row.practiceScore}(${row.artificialPracticeScore})` : this.covert(row.practiceScore); },
tagType: (row) => { return 'success'; }
},
{
@@ -119,13 +119,13 @@ export default {
name: '理论结果',
handleClick: this.handleTheoryResult,
type: '',
- showControl: (row) => { return row.status == '5' || row.status == '4'; }
+ showControl: (row) => { return row.status == '5' || row.status == '4' || row.theoryScore != undefined; }
},
{
name: '实操回放',
handleClick: this.playBack,
type: '',
- showControl: (row) => { return row.status == '4'; }
+ showControl: (row) => { return row.status == '4' || row.status == '6' || row.practiceScore != undefined; }
},
{
name: '修改',
@@ -183,6 +183,17 @@ export default {
this.$refs.theoryResult.doShow({row:row, raceId:this.$route.query.raceId});
// this.$router.replace({ path: `/jsxt/theory/result?raceId=${this.$route.query.raceId}&result=true` });
},
+ covert(data) {
+ if (data != undefined) {
+ if (data > 0) {
+ return data;
+ } else {
+ return '0';
+ }
+ } else {
+ return '';
+ }
+ },
handleAdd() {
const loading = this.$loading({
lock: true,
diff --git a/src/views/jsxt/refereeList/theoryResult.vue b/src/views/jsxt/refereeList/theoryResult.vue
index 9f545408d..e9f9e6630 100644
--- a/src/views/jsxt/refereeList/theoryResult.vue
+++ b/src/views/jsxt/refereeList/theoryResult.vue
@@ -1,10 +1,12 @@
- 报名成功!:
您的赛事信息如下: +
您的赛事信息如下: +
报名成功!
您的赛事信息如下:
竞赛名称：{{ compition.name }}
竞赛时间：{{ compition.startDate }}
姓名：{{ formModel.name }} @@ -85,7 +85,7 @@
您的赛事信息如下:
竞赛名称：{{ compition.name }}
竞赛时间：{{ compition.startDate }}
姓名：{{ formModel.name }} @@ -85,7 +85,7 @@
-
-
+
{{ index2UnicodeList[i] }}、{{ el.title }}
-
+
+
+
{{ index2UnicodeList[i] }}、{{ el.title }}
+
考试总分:
@@ -13,9 +15,13 @@
+
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index 76bb4eb7a..f5b8feb10 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -117,7 +117,8 @@ export default {
countdownTime: '00:00:00',
practicalTime: 0,
countdown: null,
- questionList: []
+ questionList: [],
+ practicalExamTime: 0
};
},
computed: {
@@ -392,15 +393,14 @@ export default {
const paperResp = await getTestPaperDatail(this.$route.query.raceId);
if (paperResp.data && paperResp.data.practicalQuestions) {
this.questionList = [];
+ this.practicalExamTime = paperResp.data.practicalExamTime;
const storeKey = this.$store.state.user.id + '' + this.$route.query.raceId + 'practical';
const startTime = localStore.get(storeKey);
if (startTime) {
const dt = new Date().getTime() - startTime;
this.practicalTime = paperResp.data.practicalExamTime * 60 - Math.floor(dt / 1000);
} else {
- this.practicalTime = paperResp.data.practicalExamTime * 60;
- const storeValue = new Date().getTime();
- localStore.set(storeKey, storeValue);
+ this.practicalTime = this.practicalExamTime * 60;
}
this.countdownTime = this.computationTime(this.practicalTime);
paperResp.data.practicalQuestions.forEach(elem => {
@@ -436,6 +436,12 @@ export default {
}
},
startCounting() {
+ const storeKey = this.$store.state.user.id + '' + this.$route.query.raceId + 'practical';
+ const startTime = localStore.get(storeKey);
+ if (!startTime) {
+ const storeValue = new Date().getTime();
+ localStore.set(storeKey, storeValue);
+ }
this.countdown = setInterval(() => {
if (this.practicalTime <= 0) {
if (this.countdown) {
diff --git a/src/views/scriptManage/scriptRecord/addAction.vue b/src/views/scriptManage/scriptRecord/addAction.vue
index 66bb76afc..46d315955 100644
--- a/src/views/scriptManage/scriptRecord/addAction.vue
+++ b/src/views/scriptManage/scriptRecord/addAction.vue
@@ -75,7 +75,7 @@ import Vue from 'vue';
import Cookies from 'js-cookie';
import ConstConfig from '@/scripts/ConstConfig';
import CommandOperation from './command';
-import {addScriptAction, addScriptActionNew, modifyScriptAction, getAvailableDeviceCommand, getScriptPlayMember, getScriptPlayMemberNew} from '@/api/simulation';
+import {addScriptAction, addScriptActionNew, modifyScriptAction, modifyScriptActionNew, getAvailableDeviceCommand, getScriptPlayMember, getScriptPlayMemberNew} from '@/api/simulation';
export default {
name: 'AddAction',
components:{
@@ -451,20 +451,39 @@ export default {
} else {
const actionId = this.modalData.actionVO.id;
- modifyScriptAction(group, actionId, data).then(response=>{
- this.modifying = false;
- this.isNotModify = true;
- this.$emit('setDisabled', this.isNotModify);
- this.buttonName = this.$t('scriptRecord.addConversitionButton');
- this.operateType = 'add';
- this.$message.success(this.$t('scriptRecord.modifyConversitionSuccess'));
- this.$emit('create');
- // this.$parent.$parent.$refs['addRole'].resetData([this.modalData.action.memberId,this.modalData.action.targetId]);
- this.initActionData();
- }).catch(error => {
- this.modifying = false;
- this.$messageBox(`${this.$t('scriptRecord.modifyConversitionFail')}: ${error.message}`);
- });
+ if (this.drawWay) {
+ data.id = actionId;
+ modifyScriptActionNew(group, data).then(response=>{
+ this.modifying = false;
+ this.isNotModify = true;
+ this.$emit('setDisabled', this.isNotModify);
+ this.buttonName = this.$t('scriptRecord.addConversitionButton');
+ this.operateType = 'add';
+ this.$message.success(this.$t('scriptRecord.modifyConversitionSuccess'));
+ this.$emit('create');
+ // this.$parent.$parent.$refs['addRole'].resetData([this.modalData.action.memberId,this.modalData.action.targetId]);
+ this.initActionData();
+ }).catch(error => {
+ this.modifying = false;
+ this.$messageBox(`${this.$t('scriptRecord.modifyConversitionFail')}: ${error.message}`);
+ });
+ } else {
+ modifyScriptAction(group, actionId, data).then(response=>{
+ this.modifying = false;
+ this.isNotModify = true;
+ this.$emit('setDisabled', this.isNotModify);
+ this.buttonName = this.$t('scriptRecord.addConversitionButton');
+ this.operateType = 'add';
+ this.$message.success(this.$t('scriptRecord.modifyConversitionSuccess'));
+ this.$emit('create');
+ // this.$parent.$parent.$refs['addRole'].resetData([this.modalData.action.memberId,this.modalData.action.targetId]);
+ this.initActionData();
+ }).catch(error => {
+ this.modifying = false;
+ this.$messageBox(`${this.$t('scriptRecord.modifyConversitionFail')}: ${error.message}`);
+ });
+ }
+
}
} else {
console.log('error submit!!');
diff --git a/src/views/scriptManage/scriptRecord/getAction.vue b/src/views/scriptManage/scriptRecord/getAction.vue
index 3de960ade..0d78946cd 100644
--- a/src/views/scriptManage/scriptRecord/getAction.vue
+++ b/src/views/scriptManage/scriptRecord/getAction.vue
@@ -20,7 +20,7 @@
- {{ $t('scriptRecord.modifyConversitionButton') }}
+ {{ $t('scriptRecord.modifyConversitionButton') }}
@@ -158,8 +158,8 @@ export default {
// memberVOList = memberVOList.replace(new RegExp(rolename, 'g'), element.label);
// });
// memberVOList = JSON.parse(memberVOList);
- const lastData = JSON.stringify(response.data);
- const memberVOList = this.covert(lastData, ConstConfig.ConstSelect.roleTypeNew);
+ const lastData = JSON.stringify(response.data.memberVOList);
+ const memberVOList = this.covert(lastData, ConstConfig.ConstSelect.roleType);
const actionList = response.data.actionVOList;
@@ -218,9 +218,7 @@ export default {
this.loadInitData();
},
modifyAction(row) {
- if (!this.drawWay) {
- this.$emit('setAction', row);
- }
+ this.$emit('setAction', row);
}
}
};