diff --git a/src/api/designPlatform.js b/src/api/designPlatform.js index e4ac178bc..6ba67a595 100644 --- a/src/api/designPlatform.js +++ b/src/api/designPlatform.js @@ -143,7 +143,7 @@ export function loadDraftScript(scriptId, memberId, group) { export function loadDraftScriptNew(memberId, group) { return request({ // url: `/simulation/${group}/choosePlay?memberId=${memberId}`, - url: `/api/scriptSimulation/${group}/chooseMember/${memberId}/StartScript`, + url: `/api/scriptSimulation/${group}/chooseMemberAndStart?memberId=${memberId}`, method: 'put' }); } diff --git a/src/api/simulation.js b/src/api/simulation.js index 394519d03..502a8e339 100644 --- a/src/api/simulation.js +++ b/src/api/simulation.js @@ -778,3 +778,24 @@ export function getAllSimulationUser(group) { method: 'get' }); } +// 获取仿真全部真实设备 +export function getAllSimulationList(group) { + return request({ + url: `/api/simulation/${group}/realDevice/list`, + method: 'get' + }); +} +// 连接仿真设备和真实设备 +export function postSimulationConnectById(group, id, sdCode) { + return request({ + url: `/api/simulation/${group}/realDevice/${id}/connect/${sdCode}`, + method: 'post' + }); +} +// 断开仿真设备和真实设备的连接 +export function putSimulationDisconnectById(group, id) { + return request({ + url: `/api/simulation/${group}/realDevice/${id}/disconnect`, + method: 'put' + }); +} diff --git a/src/jmapNew/theme/haerbin_01/menus/index.vue b/src/jmapNew/theme/haerbin_01/menus/index.vue index 0a2ad7610..3f17883ed 100644 --- a/src/jmapNew/theme/haerbin_01/menus/index.vue +++ b/src/jmapNew/theme/haerbin_01/menus/index.vue @@ -6,8 +6,8 @@ - + @@ -18,12 +18,12 @@ + + diff --git a/src/views/newMap/displayNew/menuScript.vue b/src/views/newMap/displayNew/menuScript.vue index 0a2aa67ec..f87389fb3 100644 --- a/src/views/newMap/displayNew/menuScript.vue +++ b/src/views/newMap/displayNew/menuScript.vue @@ -25,9 +25,8 @@ import ChatBox from './chatView/chatBox'; import TipScriptRecordNew from '@/views/scriptManage/display/tipScriptRecordNew'; import SetTime from './demon/setTime'; import { Notification } from 'element-ui'; -import { ranAsPlan, exitRunPlan } from '@/api/simulation'; +import { ranAsPlan, exitRunPlan, clearSimulation } from '@/api/simulation'; // import { timeFormat } from '@/utils/date'; -import { EventBus } from '@/scripts/event-bus'; import { mapGetters } from 'vuex'; export default { @@ -52,19 +51,8 @@ export default { data() { return { isDisable: false, - tryTime: 0, // 进入页面多少秒 - timeNow: 0, // 进入页面 相对时间 - time: null, // 定时器 - countTime: 0, // 显示 倒计时 - remainingTime: 0, - isScriptCommand:false, - goodsId: this.$route.query.goodsId, + isScriptCommand:false // isSaveStage: true, - training: { - id: '', - name: '', - remarks: '' - } }; }, computed: { @@ -90,10 +78,6 @@ export default { } }, beforeDestroy() { - if (this.time) { - this.setTryTime(); - clearTimeout(this.time); - } }, mounted() { // this.$store.state.training.prdType @@ -178,16 +162,9 @@ export default { this.$messageBox(this.$t('display.demon.endSimulationFail')); }); }, - setTryTime() { - if (this.try) { - this.$emit('tryTime', { time: this.tryTime, goodsId: this.goodsId }); - } - }, back() { this.$store.dispatch('training/over').then(() => { - EventBus.$emit('runPlanStop'); this.$store.dispatch('map/resetActiveTrainList'); - EventBus.$emit('chatSubscribeStop'); history.go(-1); Notification.closeAll(); }); diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue index 92aaa0765..9208948a0 100644 --- a/src/views/newMap/jointTrainingNew/index.vue +++ b/src/views/newMap/jointTrainingNew/index.vue @@ -11,6 +11,7 @@ - - + + { let offset = 10; + let offsetBottom = 15; const menuBar = document.getElementById('menuBar'); const menuTool = document.getElementById('menuTool'); + const menuBottom = document.getElementById('menuButton'); if (menuBar) { offset += (menuBar.offsetHeight || 0); } if (menuTool) { offset += (menuTool.offsetHeight || 0); } + if (menuBottom) { + offsetBottom += (menuBottom.offsetHeight || 0); + } if (this.$store.state.training.prdType === '07') { offset = 10; } if (this.offset != offset) { this.offset = offset; } + if (this.offsetBottom != offsetBottom) { + this.offsetBottom = offsetBottom; + } }); }, // 结束加载状态 diff --git a/src/views/newMap/jointTrainingNew/memberManage/e-members.vue b/src/views/newMap/jointTrainingNew/memberManage/e-members.vue index 3f98f988f..5ee59a7cc 100644 --- a/src/views/newMap/jointTrainingNew/memberManage/e-members.vue +++ b/src/views/newMap/jointTrainingNew/memberManage/e-members.vue @@ -140,7 +140,7 @@ export default { height: 520px; &--list { background: #fff; - height: 490px; + height: calc(100% - 39px); border-bottom: 1px #ccc solid; &::-webkit-scrollbar { @@ -149,4 +149,9 @@ export default { } } } + /deep/ { + .member__container{ + height: calc(100% - 40px); + } + } diff --git a/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue b/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue index 73a690e19..a6f3e9566 100644 --- a/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue +++ b/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue @@ -1,18 +1,16 @@ diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue index bbae0bdbf..18ef9b171 100644 --- a/src/views/newMap/jointTrainingNew/menuDemon.vue +++ b/src/views/newMap/jointTrainingNew/menuDemon.vue @@ -1,8 +1,9 @@