调度大赛调整
This commit is contained in:
fan
parent
9dc290a550
commit
0a90249b37
@ -11,7 +11,7 @@
|
||||
<img class="logo" :src="logoImg" :style="{width: logoWidth}">
|
||||
<span>{{ loginTitle==='空串'?'':loginTitle }}</span>
|
||||
</div>
|
||||
<div v-if="project === 'drts' && !gameOver" style="position: absolute; top: 10px;font-size: 40px;">
|
||||
<div v-if="project === 'drts' && !gameOver" style="position: absolute; top: 10%;font-size: 50px;color:#F00;">
|
||||
<div style="display: inline-block;">距离全国调度大赛还剩</div>
|
||||
<div class="countdown_box">{{ days[0] }}</div>
|
||||
<div class="countdown_box">{{ days[1] }}</div>
|
||||
@ -26,7 +26,7 @@
|
||||
<div class="countdown_box">{{ seconds[0] }}</div>
|
||||
<div class="countdown_box">{{ seconds[1] }}</div>
|
||||
</div>
|
||||
<div v-else-if="project === 'drts' && gameOver" style="position: absolute; top: 10px;font-size: 40px;">
|
||||
<div v-else-if="project === 'drts' && gameOver" style="position: absolute; top: 100px;font-size: 50px;color:#F00;">
|
||||
<div style="display: inline-block;">全国调度大赛已结束</div>
|
||||
</div>
|
||||
<div v-if="!syncLogin" class="language_box">
|
||||
@ -65,7 +65,7 @@
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
<el-form ref="loginForm" class="login-form" :model="loginForm" :rules="loginRules" label-position="left">
|
||||
<el-form ref="loginForm" v-loading="loading" class="login-form" :model="loginForm" :rules="loginRules" label-position="left">
|
||||
<div v-if="!isProject&&!project.endsWith('heb')" class="title_box">{{ $t('login.welcomeTo') + title }}</div>
|
||||
<el-form-item prop="username" class="item_form_box">
|
||||
<span class="svg-container svg-container_login">
|
||||
@ -111,7 +111,7 @@
|
||||
</el-popover>
|
||||
</div>
|
||||
<el-form-item>
|
||||
<el-button type="primary" style="width:100%;" :loading="loading" @click.native.prevent="handleLogin">
|
||||
<el-button type="primary" style="width:100%;" @click.native.prevent="handleLogin">
|
||||
{{ $t('login.login') }}
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
@ -119,11 +119,13 @@
|
||||
</div>
|
||||
<float-part v-if="isProject && !versionBaseNoShow.includes(project)" />
|
||||
<div v-if="!mainBodyNoShow.includes(project)" style="position: absolute; bottom: 10px;right: 20px; font-size: 14px;"><span>主体：北京玖琏科技有限公司 备案号：京ICP备18028522号</span></div>
|
||||
<div v-if="project === 'drts'" style="position: absolute; bottom: 30px;right: 20px; font-size: 14px;font-weight: bold;">
|
||||
<div>服务须知:</div>
|
||||
<div style="text-indent: 2em;">定制线路数据需三天时间</div>
|
||||
<div>服务宗旨:</div>
|
||||
<div style="text-indent: 2em;">满足客户的一切技术需要</div>
|
||||
<div v-if="project === 'drts'" style="position: absolute; bottom: 30px;text-align: center; font-size: 32px;">
|
||||
<div style="text-align: left;">
|
||||
<span>定制新线路需三周时间!</span><br>
|
||||
<span>满足客户的一切技术需要!</span><br>
|
||||
<span>联系电话: 13289398171</span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@ -472,7 +474,7 @@ export default {
|
||||
},
|
||||
handleLoginSucessRoute() {
|
||||
// 设置路由
|
||||
this.loading = false;
|
||||
this.loading = this.project === 'drts' || false;
|
||||
this.tipsMsg = '';
|
||||
removeSessionStorage('againEnter');
|
||||
if (this.$route.query.raceId) {
|
||||
@ -566,6 +568,7 @@ export default {
|
||||
try:'0',
|
||||
project:this.project
|
||||
}});
|
||||
this.loading = false;
|
||||
});
|
||||
});
|
||||
} else if (!this.$route.path.includes('jsxt/login') && !this.$route.path.includes('refereeJsxt/login')) {
|
||||
@ -665,7 +668,7 @@ export default {
|
||||
width: 35px;
|
||||
margin-right: 5px;
|
||||
background: #000;
|
||||
color: #FFF;
|
||||
color: #F00;
|
||||
text-align: center;
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
@ -19,6 +19,7 @@
|
||||
<!-- 排班计划 -->
|
||||
<el-button v-if="scheduleLoadShow" type="primary" size="small" @click="jumpScheduling">派班计划加载</el-button>
|
||||
<el-button v-if="schedulePreviewShow" type="primary" size="small" @click="schedulingView">派班计划预览</el-button>
|
||||
<el-button v-if="isContest" size="small" type="primary" @click="viewChangeMap">切换地图</el-button>
|
||||
</el-button-group>
|
||||
</div>
|
||||
<Jl3d-Device
|
||||
@ -30,12 +31,14 @@
|
||||
<Jl3d-Drive v-show="drivingShow" ref="Jl3dDrive" :panel-show="drivingShow" @showdriving="showdriving" />
|
||||
<scheduling v-if="scheduleLoadShow" ref="scheduling" :group="group" />
|
||||
<scheduling-view v-if="schedulePreviewShow" ref="schedulingView" :group="group" />
|
||||
<change-map v-if="isContest" ref="changeMap" @changeMap="changeMap" />
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import Jl3dDevice from '@/views/jlmap3d/device/jl3ddevice';
|
||||
import Jl3dDrive from '@/views/jlmap3d/drive/jl3ddrive';
|
||||
import { getToken } from '@/utils/auth';
|
||||
import ChangeMap from './changeMap';
|
||||
import { getSessionStorage } from '@/utils/auth';
|
||||
import Scheduling from '@/views/newMap/displayNew/demon/scheduling';
|
||||
import SchedulingView from '@/views/newMap/displayNew/demon/schedulingView';
|
||||
@ -45,7 +48,8 @@ export default {
|
||||
Jl3dDevice,
|
||||
Jl3dDrive,
|
||||
Scheduling,
|
||||
SchedulingView
|
||||
SchedulingView,
|
||||
ChangeMap
|
||||
},
|
||||
props:{
|
||||
isAllShow:{
|
||||
@ -106,6 +110,9 @@ export default {
|
||||
},
|
||||
project() {
|
||||
return getSessionStorage('project');
|
||||
},
|
||||
isContest() {
|
||||
return this.$route.params.mode === 'demon' && this.project == 'drts';
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
@ -188,6 +195,12 @@ export default {
|
||||
} else {
|
||||
this.$refs.schedulingView && this.$refs.schedulingView.doClose();
|
||||
}
|
||||
},
|
||||
viewChangeMap() {
|
||||
this.$refs.changeMap.doShow();
|
||||
},
|
||||
changeMap(query) {
|
||||
this.$emit('changeMap', query);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
:jlmap3d-fault-show="false"
|
||||
:driver-show="isDrive"
|
||||
:all-style="'top:'+(offset+textStatusHeight)+'px'"
|
||||
@changeMap="changeMap"
|
||||
/>
|
||||
|
||||
<div class="display-draft" :class="{'haerbin_btn_box': $route.query.lineCode == '07'}" :style="{bottom: offsetBottom + 'px'}">
|
||||
@ -38,7 +39,6 @@
|
||||
:data-error="dataError"
|
||||
:offset-bottom="offsetBottom"
|
||||
@selectQuest="selectQuest"
|
||||
@changeMap="changeMap"
|
||||
/>
|
||||
|
||||
<!-- :station-list="stationListMode"
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
<template v-if="!dataError">
|
||||
<el-button-group>
|
||||
<el-button v-if="isScheduling && isDepot" size="small" type="primary" @click="runPlanEditShow">运行图编辑</el-button>
|
||||
<el-button v-if="isContest" size="small" :disabled="viewDisabled" type="primary" @click="viewChangeMap">切换地图</el-button>
|
||||
<!-- 加载剧本 -->
|
||||
<el-button v-if="isDemon && !isScheduling" size="small" :disabled="viewDisabled" type="success" @click="viewRunQuest">{{ $t('display.schema.loadScript') }}</el-button>
|
||||
<!-- 运行图加载 -->
|
||||
@ -23,7 +22,6 @@
|
||||
<!-- 加载剧本列表弹窗 -->
|
||||
<add-quest ref="addQuest" @selectQuest="selectQuest" />
|
||||
<run-plan-edit v-if="isScheduling && isDepot" ref="runPlanEdit" />
|
||||
<change-map v-if="isContest" ref="changeMap" @changeMap="changeMap" />
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
@ -32,7 +30,6 @@ import RunPlanLoad from './demon/runPlanLoad';
|
||||
import RunPlanView from './demon/runPlanView';
|
||||
import FaultChoose from './demon/faultChoose';
|
||||
import AddQuest from './demon/addQuest';
|
||||
import ChangeMap from './changeMap';
|
||||
import { OperateMode } from '@/scripts/ConstDic';
|
||||
import { getByGroupStationList } from '@/api/jmap/map';
|
||||
import RunPlanEdit from './demon/runPlanEdit';
|
||||
@ -48,8 +45,7 @@ export default {
|
||||
FaultChoose,
|
||||
AddQuest,
|
||||
RunPlanEdit,
|
||||
SelectStation,
|
||||
ChangeMap
|
||||
SelectStation
|
||||
},
|
||||
props: {
|
||||
offset: {
|
||||
@ -87,9 +83,6 @@ export default {
|
||||
project() {
|
||||
return getSessionStorage('project');
|
||||
},
|
||||
isContest() {
|
||||
return this.$route.params.mode === 'demon' && this.project == 'drts';
|
||||
},
|
||||
isDemon() {
|
||||
return this.$route.params.mode === 'demon';
|
||||
},
|
||||
@ -177,9 +170,6 @@ export default {
|
||||
// }
|
||||
// this.$store.dispatch('training/changeOperateMode', { mode: mode });
|
||||
// },
|
||||
viewChangeMap() {
|
||||
this.$refs.changeMap.doShow();
|
||||
},
|
||||
setFault() {
|
||||
this.$refs.faultChoose.doShow();
|
||||
},
|
||||
@ -195,9 +185,6 @@ export default {
|
||||
selectQuest(row, id, mapLocation, roleName) {
|
||||
this.$emit('selectQuest', {row, id, mapLocation, roleName});
|
||||
},
|
||||
changeMap(query) {
|
||||
this.$emit('changeMap', query);
|
||||
},
|
||||
switchModeInner(swch) {
|
||||
let showMode = '03';
|
||||
if (swch == '01') {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user