Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
This commit is contained in:
joylink_cuiweidong
commit
edc9f4601c
@ -2,9 +2,9 @@ export function getBaseUrl() {
|
||||
let BASE_API;
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
// BASE_API = 'https://joylink.club/jlcloud';
|
||||
// BASE_API = 'https://test.joylink.club/jlcloud';
|
||||
BASE_API = 'https://test.joylink.club/jlcloud';
|
||||
// BASE_API = 'http://192.168.3.5:9000'; // 袁琪
|
||||
BASE_API = 'http://192.168.3.6:9000'; // 旭强
|
||||
// BASE_API = 'http://192.168.3.6:9000'; // 旭强
|
||||
// BASE_API = 'http://192.168.3.41:9000'; // 张赛
|
||||
// BASE_API = 'http://192.168.3.82:9000'; // 杜康
|
||||
// BASE_API = 'http://b29z135112.zicp.vip';
|
||||
|
||||
@ -1,17 +1,14 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-dialog
|
||||
title="设备管理"
|
||||
:visible.sync="show"
|
||||
custom-class="dialog_box"
|
||||
top="0px"
|
||||
width="800px"
|
||||
:modal="false"
|
||||
:before-do-close="doClose"
|
||||
:close-on-click-modal="false"
|
||||
:z-index="2000"
|
||||
>
|
||||
<div style="margin-bottom: 3px; overflow: hidden;">
|
||||
<el-drawer
|
||||
title="设备管理"
|
||||
:visible.sync="show"
|
||||
direction="ltr"
|
||||
:before-close="doClose"
|
||||
custom-class="dialog_box"
|
||||
size="43%"
|
||||
>
|
||||
<div style="margin-bottom: 3px; overflow: hidden; padding: 0 10px;">
|
||||
<div class="plc_box">名称: {{ plcInfo.name }}</div>
|
||||
<div class="plc_box">状态: <span :style="{'color': plcInfo.status ? 'green' : 'red'}">{{ plcInfo.status ? '在线' : '不在线' }}</span></div>
|
||||
<el-button type="text" size="small" class="freshen_box" @click="getList">刷新</el-button>
|
||||
@ -32,7 +29,7 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-dialog>
|
||||
</el-drawer>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
||||
@ -6,26 +6,26 @@
|
||||
<span v-if="countTime" class="display-score">{{ $t('display.demon.trialTime') }} {{ countTime }}</span>
|
||||
</el-row>
|
||||
</div>
|
||||
<div class="display-draft" :style="{bottom: offsetBottom + 'px'}">
|
||||
<div class="display-draft" :class="{'haerbin_btn_box': $route.query.lineCode == '07'}" :style="{bottom: offsetBottom + 'px'}">
|
||||
<el-button-group>
|
||||
<!-- 排班计划 -->
|
||||
<el-button v-if="isShowScheduling && !dataError" type="primary" @click="jumpScheduling">{{ $t('display.demon.dispatchingPlan') }}</el-button>
|
||||
<el-button v-if="isShowScheduling && !dataError" type="primary" @click="jumpScheduling" size="small">{{ $t('display.demon.dispatchingPlan') }}</el-button>
|
||||
<!-- cctv视图 -->
|
||||
<el-button v-if="!isShowScheduling && !dataError" type="jl3dpassflow" @click="jumpjl3dpassflow">{{ jl3dpassflow }}</el-button>
|
||||
<!-- <el-button v-if="!isShowScheduling && !dataError" type="jl3dstation" @click="jumpjl3dstation">{{ jl3dstation }}</el-button> -->
|
||||
<el-button v-if="!isShowScheduling && !dataError" @click="jumpjl3dpassflow" size="small">{{ jl3dpassflow }}</el-button>
|
||||
<!-- <el-button v-if="!isShowScheduling && !dataError" @click="jumpjl3dstation">{{ jl3dstation }}</el-button> -->
|
||||
<!-- 三维视图 -->
|
||||
<el-button v-if="!isShowScheduling && !dataError" type="jumpjlmap3d" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
|
||||
<el-button v-if="!isShowScheduling && !dataError" @click="jumpjlmap3d" size="small">{{ jl3dname }}</el-button>
|
||||
<!-- 设备视图 -->
|
||||
<el-button v-if="isShow3dmodel && !isShowScheduling && !dataError" type="jumpjlmap3dmodel" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button>
|
||||
<el-button v-if="isShow3dmodel && !isShowScheduling && !dataError" @click="jumpjlmap3dmodel" size="small">{{ jl3dmodel }}</el-button>
|
||||
<template v-if="isShowQuest">
|
||||
<!-- && !isDesignPlatform -->
|
||||
<el-button v-if="!isDesignPlatform && !dataError" type="danger" @click="handleQuitQuest">{{ $t('display.demon.exitScript') }}</el-button>
|
||||
<el-button v-if="!isDesignPlatform && !dataError" type="danger" @click="handleQuitQuest" size="small">{{ $t('display.demon.exitScript') }}</el-button>
|
||||
</template>
|
||||
<template v-else-if="!projectDevice">
|
||||
<el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button>
|
||||
<el-button type="danger" :disabled="dataError" @click="end">{{ $t('display.demon.initialize') }}</el-button>
|
||||
<el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime" size="small">{{ $t('display.demon.drivingByPlan') }}</el-button>
|
||||
<el-button type="danger" :disabled="dataError" @click="end" size="small">{{ $t('display.demon.initialize') }}</el-button>
|
||||
</template>
|
||||
<el-button type="primary" @click="back">{{ projectDevice?'退出':$t('display.demon.back') }}</el-button>
|
||||
<el-button type="primary" @click="back" size="small">{{ projectDevice?'退出':$t('display.demon.back') }}</el-button>
|
||||
</el-button-group>
|
||||
</div>
|
||||
<set-time ref="setTime" @ConfirmSelectBeginTime="start" />
|
||||
@ -352,12 +352,16 @@ export default {
|
||||
font-size: 18px !important;
|
||||
color: #fff;
|
||||
}
|
||||
.haerbin_btn_box{
|
||||
width: 450px;
|
||||
bottom: 15px!important;
|
||||
}
|
||||
</style>
|
||||
<style lang="scss">
|
||||
.display-draft {
|
||||
position: absolute;
|
||||
float: right;
|
||||
right: 20px;
|
||||
right: 5px;
|
||||
bottom: 15px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -265,7 +265,7 @@ export default {
|
||||
z-index: 9;
|
||||
display: inline;
|
||||
position: absolute;
|
||||
right: 15px;
|
||||
right: 5px;
|
||||
}
|
||||
|
||||
/deep/ .el-button+.el-button {
|
||||
|
||||
@ -21,7 +21,7 @@ export default {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
offset: 15
|
||||
offset: 10
|
||||
};
|
||||
},
|
||||
watch: {
|
||||
@ -67,7 +67,7 @@ export default {
|
||||
.zoom-box {
|
||||
z-index: 7;
|
||||
position: absolute;
|
||||
left: 20px;
|
||||
left: 5px;
|
||||
width: 120px;
|
||||
height: 32px;
|
||||
background: rgb(224, 223, 223);
|
||||
|
||||
@ -516,10 +516,6 @@ export default {
|
||||
window.open(routeData.href, '_blank', 'noopener noreferrer');
|
||||
},
|
||||
hidepanel() { // 司机视角
|
||||
// this.panelShow = false;
|
||||
// this.drivingShow = true;
|
||||
// this.ibpShow = false;
|
||||
// this.$refs.Jl3dDrive.show(this.mapId, this.group);
|
||||
if (this.$store.state.training.prdType == '04') {
|
||||
this.panelShow = false;
|
||||
this.drivingShow = true;
|
||||
|
||||
@ -1,31 +1,33 @@
|
||||
<template>
|
||||
<div>
|
||||
<chat-box :group="group" :user-role="userRole" />
|
||||
<div class="display-draft" :class="{'display-type-hb': $route.query.lineCode == '07' && $store.state.training.prdType=='01'}" :style="{bottom: offsetBottom + 'px'}">
|
||||
<!-- <div class="btn_hover" @mouseenter="btnHover"><i class="el-icon-s-promotion" /></div> -->
|
||||
<!-- @mouseenter="btnBoxEnter" @mouseleave.stop="btnBoxLeave" -->
|
||||
<div class="display-draft" :class="{'display-type-hb': $route.query.lineCode == '07' && $store.state.training.prdType=='01', 'haerbin_btn_box': $route.query.lineCode == '07'}" :style="{bottom: offsetBottom + 'px'}">
|
||||
<el-button-group>
|
||||
<el-button v-if="isAdmin && isProject" @click="handleEquipment">设备管理</el-button>
|
||||
<el-button v-if="isAdmin" @click="memberManage">成员管理</el-button>
|
||||
<el-button v-if="isAdmin && !noQrcodeList.includes(project)" type="primary" @click="generateQrCode">生成二维码</el-button>
|
||||
<el-button v-if="isAdmin && isProject" @click="handleEquipment" size="small">设备管理</el-button>
|
||||
<el-button v-if="isAdmin" @click="memberManage" size="small">成员管理</el-button>
|
||||
<el-button v-if="isAdmin && !noQrcodeList.includes(project)" type="primary" @click="generateQrCode" size="small">生成二维码</el-button>
|
||||
|
||||
<!-- cctv视图 -->
|
||||
<el-button v-if="(isShowScheduling && !dataError) || (isStationSupervisor && !dataError)" @click="jumpjl3dpassflow">{{ $t('display.demon.passengerflow') }}</el-button>
|
||||
<el-button v-if="(isShowScheduling && !dataError) || (isStationSupervisor && !dataError)" @click="jumpjl3dpassflow" size="small">{{ $t('display.demon.passengerflow') }}</el-button>
|
||||
<!-- 三维视图 / 司机视角 -->
|
||||
<el-button v-if="(isShowScheduling && !dataError) || (isDriver && !dataError)" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
|
||||
<el-button v-if="(isShowScheduling && !dataError) || (isDriver && !dataError)" @click="jumpjlmap3d" size="small">{{ jl3dname }}</el-button>
|
||||
<!-- 设备视图 -->
|
||||
<el-button v-if="isShow3dmodel && isShowScheduling && !dataError" @click="jumpjlmap3dmodel">{{ $t('display.demon.deviceView') }}</el-button>
|
||||
<el-button v-if="isShow3dmodel && isShowScheduling && !dataError" @click="jumpjlmap3dmodel" size="small">{{ $t('display.demon.deviceView') }}</el-button>
|
||||
|
||||
<template v-if="isAdmin && project != 'refereeJsxt'">
|
||||
<el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('joinTraining.drivingByPlan') }}</el-button>
|
||||
<el-button type="danger" :disabled="dataError" @click="end">{{ $t('joinTraining.initialize') }}</el-button>
|
||||
<el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime" size="small">{{ $t('joinTraining.drivingByPlan') }}</el-button>
|
||||
<el-button type="danger" :disabled="dataError" @click="end" size="small">{{ $t('joinTraining.initialize') }}</el-button>
|
||||
</template>
|
||||
<template v-if="project==='jsxt'">
|
||||
<div style="background: #FFF;display: inline-block;height: 40px;line-height: 40px;padding: 0 5px;border: 2px solid #F00;border-radius: 6px;margin-right: 8px;">{{ '剩余时间:' + countdownTime }}</div>
|
||||
<el-button :disabled="!jsStart" type="success" @click="startCompetition" size="small">开始</el-button>
|
||||
<el-button :disabled="jsStart" type="danger" @click="endCompetition" size="small">提交</el-button>
|
||||
</template>
|
||||
<el-button v-if="project==='refereeJsxt'" type="success" @click="refeeEndCompetition" size="small">退出</el-button>
|
||||
<el-button v-if="project!=='jsxt'&&project!=='refereeJsxt'" type="primary" :loading="backLoading" @click="back" size="small">退出</el-button>
|
||||
</el-button-group>
|
||||
<template v-if="project==='jsxt'">
|
||||
<div style="background: #FFF;display: inline-block;height: 40px;line-height: 40px;padding: 0 5px;border: 2px solid #F00;border-radius: 6px;margin-right: 8px;">{{ '剩余时间:' + countdownTime }}</div>
|
||||
<el-button :disabled="!jsStart" type="success" @click="startCompetition">开始</el-button>
|
||||
<el-button :disabled="jsStart" type="danger" @click="endCompetition">提交</el-button>
|
||||
</template>
|
||||
<el-button v-if="project==='refereeJsxt'" type="success" @click="refeeEndCompetition">退出</el-button>
|
||||
<el-button v-if="project!=='jsxt'&&project!=='refereeJsxt'" type="primary" :loading="backLoading" @click="back">退出</el-button>
|
||||
</div>
|
||||
<qr-code ref="qrCode" />
|
||||
<set-time ref="setTime" @ConfirmSelectBeginTime="start" />
|
||||
@ -98,9 +100,10 @@ export default {
|
||||
chatShow: true,
|
||||
jsStart: true,
|
||||
isGoback: false,
|
||||
noQrcodeList: NoQrcodeList,
|
||||
isShow3dmodel :false,
|
||||
jl3dname: this.$t('display.demon.threeDimensionalView')
|
||||
noQrcodeList: NoQrcodeList,
|
||||
isShow3dmodel :false,
|
||||
jl3dname: this.$t('display.demon.threeDimensionalView'),
|
||||
hoverBtn: false
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
@ -372,7 +375,32 @@ export default {
|
||||
this.jl3dname = this.$t('display.demon.threeDimensionalView'); // 三维视图
|
||||
this.isShow3dmodel = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
// btnHover() {
|
||||
// if (!this.btnHoverTime) {
|
||||
// this.btnHoverTime = setTimeout(() => {
|
||||
// this.hoverBtn = false;
|
||||
// }, 8000)
|
||||
// }
|
||||
// this.hoverBtn = true;
|
||||
// },
|
||||
// btnBoxEnter() {
|
||||
// if (this.btnHoverTime) {
|
||||
// clearTimeout(this.btnHoverTime);
|
||||
// this.btnHoverTime = null;
|
||||
// }
|
||||
// if (this.btnBoxLeaveTime) {
|
||||
// clearTimeout(this.btnBoxLeaveTime);
|
||||
// this.btnBoxLeaveTime = null;
|
||||
// }
|
||||
// },
|
||||
// btnBoxLeave() {
|
||||
// if (!this.btnBoxLeaveTime) {
|
||||
// this.btnBoxLeaveTime = setTimeout(() => {
|
||||
// this.hoverBtn = false;
|
||||
// }, 5000)
|
||||
// }
|
||||
// }
|
||||
}
|
||||
};
|
||||
</script>
|
||||
@ -459,11 +487,30 @@ export default {
|
||||
}
|
||||
}
|
||||
|
||||
.btn_hover{
|
||||
position: absolute;
|
||||
right: -2px;
|
||||
bottom: 15px;
|
||||
color: #fff;
|
||||
font-size: 24px;
|
||||
background: #1756e4;
|
||||
padding: 8px 2px;
|
||||
border-radius: 5px;
|
||||
}
|
||||
.display-draft {
|
||||
position: absolute;
|
||||
float: right;
|
||||
right: 40px;
|
||||
// float: right;
|
||||
right: 5px;
|
||||
bottom: 28px;
|
||||
// transform: translateX(calc(100% + 40px));
|
||||
// transition: all 0.5s;
|
||||
// &.active{
|
||||
// transform: translateX(0);
|
||||
// }
|
||||
}
|
||||
.haerbin_btn_box{
|
||||
width: 450px;
|
||||
bottom: 15px!important;
|
||||
}
|
||||
.display-type-hb{
|
||||
bottom: 105px;
|
||||
|
||||
@ -182,7 +182,7 @@ export default {
|
||||
z-index: 9;
|
||||
display: inline;
|
||||
position: absolute;
|
||||
right: 20px;
|
||||
right: 5px;
|
||||
}
|
||||
|
||||
.schema .el-radio-group .el-radio-button__inner {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user