+
+
+
+
+
+
+
+
+
+
+
+
+ {{ buttonText }}
+ {{ $t('global.delete') }}
+ {{ $t('global.cancel') }}
+
+
+
+
+
diff --git a/src/views/iscs/iscsDraw/iscsCctvOperate/index.vue b/src/views/iscs/iscsDraw/iscsCctvOperate/index.vue
index 33f5a3552..631e26327 100644
--- a/src/views/iscs/iscsDraw/iscsCctvOperate/index.vue
+++ b/src/views/iscs/iscsDraw/iscsCctvOperate/index.vue
@@ -97,7 +97,7 @@ import IscsRect from '../iscsCommonElem/rect';
import BrakeMachine from '../iscsAfcOperate/brakeMachine';
import Staircase from '../iscsOperate/staircase';
import SingleStaircase from './singleStaircase';
-import StateTable from '../iscsOperate/stateTable';
+import StateTable from '../iscsCommonElem/stateTable';
export default {
name: 'IscsOperate',
components: {
diff --git a/src/views/iscs/iscsDraw/iscsOperate/stateTable.vue b/src/views/iscs/iscsDraw/iscsCommonElem/stateTable.vue
similarity index 94%
rename from src/views/iscs/iscsDraw/iscsOperate/stateTable.vue
rename to src/views/iscs/iscsDraw/iscsCommonElem/stateTable.vue
index 23ab25552..ce2f47138 100644
--- a/src/views/iscs/iscsDraw/iscsOperate/stateTable.vue
+++ b/src/views/iscs/iscsDraw/iscsCommonElem/stateTable.vue
@@ -56,7 +56,7 @@
+
+{{ $route.query.stationName }}机电、电扶梯
+
+
+
+
+
+
+
diff --git a/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue b/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue
index 68146e714..864f15923 100644
--- a/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue
+++ b/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue
@@ -74,6 +74,9 @@ export default {
'$store.state.config.canvasSizeCount': function (val) {
this.reSize();
},
+ widthCanvas() {
+ this.reSize();
+ },
'$store.state.socket.equipmentStatus': function (val) {
if (val.length) {
this.statusMessage(val);
@@ -95,12 +98,12 @@ export default {
};
this.iscsDestroy();
this.loading = true;
- const data = parser(iscsData[deviceCode], {width: this.canvasWidth, height: this.canvasHeight});
+ const data = parser(iscsData[deviceCode], {width: this.widthCanvas, height: this.canvasHeight});
this.$iscs = new Iscs({
dom: document.getElementById(this.iscsId),
config: {
renderer: 'canvas',
- width: this.canvasWidth,
+ width: this.widthCanvas,
height: this.canvasHeight
},
options: {
@@ -150,7 +153,7 @@ export default {
this.$nextTick(() => {
// this.width = this.$store.state.config.width;
// this.height = this.$store.state.config.height;
- // this.$iscs && this.$iscs.resize({ width: this.width, height: this.height });
+ this.$iscs && this.$iscs.resize({ width: this.widthCanvas, height: this.canvasHeight });
});
},
iscsDestroy() {
diff --git a/src/views/iscs/iscsSystem/config/deviceControl.vue b/src/views/iscs/iscsSystem/config/deviceControl.vue
index 9227ecc3c..f5fd5199d 100644
--- a/src/views/iscs/iscsSystem/config/deviceControl.vue
+++ b/src/views/iscs/iscsSystem/config/deviceControl.vue
@@ -14,8 +14,9 @@
{{ $route.query.stationName }}机电给排水
+
+
+ 设备名称
{{ modeName }}
{{ stationName }}
{{ deviceType }}
{{ stationName }}
{{ deviceType }}
{{ deviceCode|| ' ' }}
状态
-
@@ -64,6 +66,8 @@ import waterSystem from './bas/waterSystem';
import LightingSystem from './bas/lightingSystem';
import GraphicEle from './graphicEle';
import DeviceControl from './deviceControl';
+import ElectricEscalator from './bas/electricEscalator';
+import WaterSupply from './bas/waterSupply';
export default {
components: {
@@ -96,12 +100,27 @@ export default {
SmallSystem,
BigSystem,
waterSystem,
- LightingSystem
+ LightingSystem,
+ ElectricEscalator,
+ WaterSupply
},
data() {
return {
mode: 'standFAS',
- deviceList: ['ManualAlarmButton', 'SmokeDetector', 'FireHydranAlarmButton', 'GasFireControl']
+ deviceList: [
+ 'ManualAlarmButton',
+ 'SmokeDetector',
+ 'FireHydranAlarmButton',
+ 'GasFireControl',
+ 'LightingGroup',
+ 'Electrically',
+ 'VolumeControlDamper',
+ 'SmookExhaustFd',
+ 'Ventilator',
+ 'AirConditioner',
+ 'FireDamper',
+ 'SmookProofFd'
+ ]
};
},
watch: {
@@ -110,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/iscsSystem/index.vue b/src/views/iscsSystem/index.vue
index f5d82e57c..88cb176d4 100644
--- a/src/views/iscsSystem/index.vue
+++ b/src/views/iscsSystem/index.vue
@@ -139,13 +139,17 @@ export default {
if (this.selected && this.selected.code) {
switch (hook) {
case 'Ctrl_C': {
- this.copyModel = deepAssign({}, this.selected);
- this.copyModel.point = {
- x: this.selected.point.x + 10,
- y: this.selected.point.y + 10
- };
- const type1 = this.selected._type.charAt(0).toLowerCase() + this.selected._type.slice(1); // .toLowerCase()
- this.copyModel.code = getUID(this.selected._type, this.iscs[type1 + 'List'] || []);
+ if (this.selected._type != "CheckBox") {
+ this.copyModel = deepAssign({}, this.selected);
+ this.copyModel.point = {
+ x: this.selected.point.x + 10,
+ y: this.selected.point.y + 10
+ };
+ const type1 = this.selected._type.charAt(0).toLowerCase() + this.selected._type.slice(1); // .toLowerCase()
+ this.copyModel.code = getUID(this.selected._type, this.iscs[type1 + 'List'] || []);
+ } else {
+ this.copyModel = {}
+ }
} break;
case 'Ctrl_V':
this.copyModel.code && this.createDataModel(this.copyModel);
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/competition/examDetail.vue b/src/views/jsxt/competition/examDetail.vue
index 2137bd766..1a02efe47 100644
--- a/src/views/jsxt/competition/examDetail.vue
+++ b/src/views/jsxt/competition/examDetail.vue
@@ -50,7 +50,7 @@ export default {
this.$router.replace({ path: `/jsxt/theory/result?raceId=${this.$route.query.raceId}` });
} else if (this.$route.query.type == 'operation' && (res.data.status == 4 || res.data.status == 6)) {
// this.resultFlag = true;
- this.$router.replace({ path: `/jsxt/result`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId, type: 'operate', raceId:this.$route.query.raceId } });
+ this.$router.replace({ path: `/jsxt/result`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId, type: 'operate', raceId:this.$route.query.raceId } });
} else {
this.resultFlag = true;
}
diff --git a/src/views/jsxt/competition/result.vue b/src/views/jsxt/competition/result.vue
index 8edda17a5..311c96b31 100644
--- a/src/views/jsxt/competition/result.vue
+++ b/src/views/jsxt/competition/result.vue
@@ -4,7 +4,7 @@
{{ $t('exam.examResultsDetails') }}
报名成功!:
您的赛事信息如下: +
您的赛事信息如下: +
报名成功!
您的赛事信息如下:
竞赛名称：{{ compition.name }}
竞赛时间：{{ compition.startDate }}
姓名：{{ formModel.name }} @@ -85,7 +85,7 @@
您的赛事信息如下:
竞赛名称：{{ compition.name }}
竞赛时间：{{ compition.startDate }}
姓名：{{ formModel.name }} @@ -85,7 +85,7 @@
-
+
{{ `得分：${operateScore}分` }}
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/src/views/jsxt/refereeList/menuReplay.vue b/src/views/jsxt/refereeList/menuReplay.vue
new file mode 100644
index 000000000..ac52d9992
--- /dev/null
+++ b/src/views/jsxt/refereeList/menuReplay.vue
@@ -0,0 +1,204 @@
+
+ {{ raceName }}竞赛
+
+ 返回
+
+
+
+
diff --git a/src/views/jsxt/refereeList/theoryResult.vue b/src/views/jsxt/refereeList/theoryResult.vue
new file mode 100644
index 000000000..e9f9e6630
--- /dev/null
+++ b/src/views/jsxt/refereeList/theoryResult.vue
@@ -0,0 +1,81 @@
+
+ {{ userName }}的实操回放
+
+
+
+
+
+ {{ index2UnicodeList[i] }}、{{ el.title }}
+
+ 考试总分:
+ {{ totalScore }}分
+
+
- 开始
提交
@@ -34,8 +35,9 @@ import { putJointTrainingSimulationUserNew} from '@/api/jointTraining';
import { EventBus } from '@/scripts/event-bus';
import { getSessionStorage } from '@/utils/auth';
import RealDevice from './menuDraft/realDevice';
-import { participantCompleteCompetition, refereeExitSimulation, quitCurrentRace, startPracticalCompetition, submitPracticalCompetition } from '@/api/competition';
+import { refereeExitSimulation, quitCurrentRace, startPracticalCompetition, submitPracticalCompetition } from '@/api/competition';
import { prefixIntrger } from '@/utils/date';
+import localStore from 'storejs';
export default {
name: 'MenuDemonJoint',
@@ -56,6 +58,10 @@ export default {
type: String,
required: true
},
+ countdownTime: {
+ type: String,
+ required: true
+ },
deviceCode: {
type: String,
default() {
@@ -127,11 +133,6 @@ export default {
'$store.state.map.runPlanStatus': function (val) {
this.isDisable = val;
},
- // '$store.state.socket.competitionStart':function(val) {
- // if (val) {
- // this.startCompetition();
- // }
- // },
'$store.state.socket.simulationOver':function(val) {
if (val && this.project === 'refereeJsxt') {
this.$router.go(-1);
@@ -315,6 +316,7 @@ export default {
},
startCompetition() {
startPracticalCompetition(this.group, this.$route.query.raceId).then(resp => {
+ this.$emit('startCounting');
this.jsStart = false;
}).catch(()=> {
this.$message.error('开始竞赛失败');
@@ -326,12 +328,7 @@ export default {
cancelButtonText: this.$t('global.cancel'),
type: 'warning'
}).then(() => {
- submitPracticalCompetition(this.group, this.$route.query.raceId).then(resp => {
- // this.$router.go(-1);
- this.submit();
- }).catch(()=> {
- this.$message.error('提交试卷失败！');
- });
+ this.submit();
});
},
refeeEndCompetition() {
@@ -343,10 +340,13 @@ export default {
});
},
submit() {
- // this.$store.dispatch('exam/over').then(() => {
- // this.$store.dispatch('trainingList/clearTrainingList');
- this.$router.replace({ path: `/jsxt/result`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId, type: 'operate', raceId:this.$route.query.raceId } });
- // });
+ submitPracticalCompetition(this.group, this.$route.query.raceId).then(resp => {
+ const storeKey = this.$store.state.user.id + '' + this.$route.query.raceId + 'practical';
+ localStore.remove(storeKey);
+ this.$router.replace({ path: `/jsxt/result`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId, type: 'operate', raceId:this.$route.query.raceId } });
+ }).catch(()=> {
+ this.$message.error('提交试卷失败！');
+ });
}
}
};
diff --git a/src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue b/src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue
index 0437a5302..32f6d3af0 100644
--- a/src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue
@@ -3,7 +3,51 @@
-
+
+
@@ -285,6 +286,7 @@ export default {
switchType: '',
stationStandType:'',
psdType: '',
+ controlType: '',
ViewMode: ViewMode,
enabledTab: 'Section',
autoSaveTask: null,
@@ -351,7 +353,7 @@ export default {
this.enabledTab = 'Esp';
} else if (this.feild) {
this.enabledTab = 'Section';
- } else if (type == 'AutomaticRoute' || type == 'AutoTurnBack' || type == 'AxleReset' || type == 'LimitControl' || type == 'GuideLock') {
+ } else if (type == 'AutomaticRoute' || type == 'AutoTurnBack' || type == 'AxleReset' || type == 'LimitControl' || type == 'GuideLock' || type == 'StationTurnBack' || this.controlType) {
this.enabledTab = 'ControlDraft';
} else if (controlLampTypeList.includes(type) || this.saidLampType) {
this.enabledTab = 'ControlLamp';
@@ -359,6 +361,9 @@ export default {
this.enabledTab = type;
}
},
+ selectFiled(type) {
+ this.controlType = type;
+ },
esqTab(type) {
this.esqType = type;
},
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 @@
@@ -19,7 +19,7 @@
-
@@ -36,6 +48,7 @@
import MapSystemDraft from '@/views/newMap/mapsystemNew/index';
import MenuDemonJoint from './menuDemon';
import MenuDemonSchema from './menuSchema';
+import JsQuestion from './jsQuestion';
import JoinFaultChoose from '@/views/newMap/displayNew/demon/faultChoose';
import JoinRunPlanLoad from '@/views/newMap/displayNew/demon/runPlanLoad';
import JoinRunPlanView from '@/views/newMap/displayNew/demon/runPlanView';
@@ -48,7 +61,7 @@ import { checkLoginLine } from '@/api/login';
import { loadNewMapDataByGroup } from '@/utils/loaddata';
import { getUserRolesNew, deljointTrainRoomNew} from '@/api/jointTraining';
import { clearSimulation, getSimulationInfoNew } from '@/api/simulation';
-import {getRaceUserById} from '@/api/competition';
+import {getRaceUserById, getTestPaperDatail} from '@/api/competition';
import { getSessionStorage } from '@/utils/auth';
import Jl3dDrive from '@/views/jlmap3d/drive/jl3ddrive';
import Jl3dMaintainer from '@/views/jlmap3d/maintainer/jl3dmaintainer';
@@ -57,6 +70,7 @@ import ibpData from '@/ibp/constant/ibpData';
import { timeFormat } from '@/utils/date';
import { Message } from 'element-ui';
import Vue from 'vue';
+import localStore from 'storejs';
export default {
name: 'JointTrainingDraft',
@@ -71,7 +85,8 @@ export default {
menuSystemTime,
Jl3dDrive,
Jl3dMaintainer,
- IbpPlate
+ IbpPlate,
+ JsQuestion
},
data() {
return {
@@ -98,7 +113,12 @@ export default {
stationList: [],
showSelectStation: false,
mapViewLoadedOver: false,
- dataError: false
+ dataError: false,
+ countdownTime: '00:00:00',
+ practicalTime: 0,
+ countdown: null,
+ questionList: [],
+ practicalExamTime: 0
};
},
computed: {
@@ -209,6 +229,9 @@ export default {
await this.$store.dispatch('training/reset');
await this.$store.dispatch('map/mapClear');
await this.$store.dispatch('training/setGroup', '');
+ if (this.countdown) {
+ clearInterval(this.countdown);
+ }
Message.closeAll();
},
methods: {
@@ -367,6 +390,23 @@ export default {
if (this.project == 'jsxt' ) {
resp = await getRaceUserById(this.$route.query.raceId);
resp.data.userRole = resp.data.role;
+ 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 = this.practicalExamTime * 60;
+ }
+ this.countdownTime = this.computationTime(this.practicalTime);
+ paperResp.data.practicalQuestions.forEach(elem => {
+ this.questionList.push({name: elem.question.name, description:elem.question.description});
+ });
+ }
} else if (this.project == 'refereeJsxt') {
resp['code'] = 200;
resp.data['userRole'] = 'ADMIN';
@@ -395,6 +435,24 @@ export default {
this.endViewLoading();
}
},
+ 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) {
+ clearInterval(this.countdown);
+ }
+ this.$refs.demonMenu.submit();
+ }
+ this.practicalTime--;
+ this.countdownTime = this.computationTime(this.practicalTime);
+ }, 1000);
+ },
async getTrainDetail() {
try {
await loadNewMapDataByGroup(this.group);
@@ -419,6 +477,28 @@ export default {
faultChooseShow() {
this.$refs.faultChoose.doShow();
},
+ computationTime(time) {
+ let hours = Math.floor(time / 3600);
+ const newTime = time % 3600;
+ let minutes = Math.floor(newTime / 60) + '';
+ let seconds = newTime % 60;
+ if (hours < 0) {
+ hours = '00';
+ } else if (hours < 10) {
+ hours = '0' + hours;
+ }
+ if (minutes < 0) {
+ minutes = '00';
+ } else if (minutes < 10) {
+ minutes = '0' + minutes;
+ }
+ if (seconds < 0) {
+ seconds = '00';
+ } else if (seconds < 10) {
+ seconds = '0' + seconds;
+ }
+ return hours + ':' + minutes + ':' + seconds;
+ },
showdriving() {
this.panelShow = true;
this.drivingShow = false;
diff --git a/src/views/newMap/jointTrainingNew/jsQuestion.vue b/src/views/newMap/jointTrainingNew/jsQuestion.vue
new file mode 100644
index 000000000..eb2e3e440
--- /dev/null
+++ b/src/views/newMap/jointTrainingNew/jsQuestion.vue
@@ -0,0 +1,94 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index cb97a70fa..bf0515faa 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -12,6 +12,7 @@
+
@@ -56,6 +56,7 @@ import ChatCreateGroup from './chatCreateGroup';
import ChatTooltip from './chatTooltip';
import RecordRTC from 'recordrtc';
import {uploadAudioFileNew, quitCoversition} from '@/api/chat';
+import { getSessionStorage } from '@/utils/auth';
export default {
name: 'ChatBox',
components:{
@@ -92,7 +93,7 @@ export default {
language:'zh',
sex:'1'
},
- headerTitle:'所有人'
+ headerTitle:''
};
},
computed:{
@@ -101,13 +102,16 @@ export default {
},
isButtonShow() {
return this.userRole != 'ADMIN' && this.userRole != 'AUDIENCE' && this.isHasCoversition;
+ },
+ project() {
+ return getSessionStorage('project');
}
},
watch:{
'$store.state.map.mapViewLoadedCount':function(val) {
const object = document.querySelector('.menuButton');
if (object) {
- const objectBottom = parseInt(object.offsetHeight.style.bottom) || 0;
+ const objectBottom = parseInt(object.style.bottom) || 0;
this.bottom = this.bottom + object.offsetHeight + objectBottom;
}
}
@@ -133,7 +137,7 @@ export default {
this.$refs.chatCoversitionList.initPage(false);
},
setCurrentCoversition(coversition) {
- if (coversition.id) {
+ if (coversition && coversition.id) {
this.currentCoversition = coversition;
this.headerTitle = coversition.name;
} else {
diff --git a/src/views/newMap/jointTrainingNew/chatView/chatContent.vue b/src/views/newMap/jointTrainingNew/chatView/chatContent.vue
index e1977b6dc..6b7fbe617 100644
--- a/src/views/newMap/jointTrainingNew/chatView/chatContent.vue
+++ b/src/views/newMap/jointTrainingNew/chatView/chatContent.vue
@@ -26,11 +26,16 @@
import {getSimulationContextListNew} from '@/api/chat';
import ConstConfig from '@/scripts/ConstConfig';
import Cookies from 'js-cookie';
+
export default {
props:{
currentCoversition:{
type:Object,
required:true
+ },
+ project:{
+ type:String,
+ required:true
}
},
data() {
@@ -61,7 +66,7 @@ export default {
}
this.scrollTop();
} else {
- debugger;
+ // debugger;
if (!simulationText.all) {
this.$emit('changeCoversition', simulationText);
// this.$emit('addCoversition', {data:simulationText, headerTitle:''});
@@ -73,7 +78,12 @@ export default {
this.playAllAudio();
}
}
-
+ } else {
+ if (this.project == 'refereeJsxt') {
+ this.chatContentList.push(simulationText);
+ simulationText.name = '所有人';
+ this.$emit('changeCoversition', simulationText);
+ }
}
}
},
@@ -81,7 +91,7 @@ export default {
this.inintData();
},
currentCoversition:function (val, old) {
- if (val) {
+ if (val && this.project != 'refereeJsxt') {
this.chatContentList = [];
this.coversition = this.currentCoversition;
this.inintData();
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index e6cd8932b..f5b8feb10 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -7,7 +7,18 @@
-
{{ '剩余时间:'+countdownTime }}
+
+ 站后折返数据
+
+
+
+
+ 移出
+ 编辑
+
+
+
+
+
+
+
+ {{ cardTitle }}
+ 生成
+
+ 修改
+ 取消
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 激活
+
+
+
+
- {{ $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);
}
}
};