Skip to content

K
kd_control
Commit fa5eef01 authored by zhanglw's avatar zhanglw
Browse files
Options

人员轨迹回放

parent 8d42e2f3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 1470 deletions
src/assets/styles/mlargeScreen.css
View file @ fa5eef01
......@@ -1097,21 +1097,21 @@
/* color: #31E5F5;*/
/* font-size: 16px;*/
/*}*/
.el-cascader-panel{
background-color: #021445 !important;
color: #31E5F5;
font-size: 16px;
}
.el-cascader-menu{
border: 0px;
}
.el-cascader-menu__list{
color: #31E5F5;
border: 1px solid #01f5fe;
}
.el-cascader-node:not(.is-disabled):hover, .el-cascader-node:not(.is-disabled):focus{
background-color: #021445 !important;
}
/*.el-cascader-panel{*/
/* background-color: #021445 !important;*/
/* color: #31E5F5;*/
/* font-size: 16px;*/
/*}*/
/*.el-cascader-menu{*/
/* border: 0px;*/
/*}*/
/*.el-cascader-menu__list{*/
/* color: #31E5F5;*/
/* border: 1px solid #01f5fe;*/
/*}*/
/*.el-cascader-node:not(.is-disabled):hover, .el-cascader-node:not(.is-disabled):focus{*/
/* background-color: #021445 !important;*/
/*}*/
.intelligentSchScrView .voiceAppContent_4_btns{
background-color: #112251;
border: 1px solid #00FCF9;
......
src/components/ezuikit/carsEZUIKitJs.vue
View file @ fa5eef01
......@@ -19,7 +19,7 @@
<video id="videoRealtime" class="video-js vjs-default-skin vjs-big-play-centered" controls preload="auto" data-setup="{}" style="width: 100%;height: 100%;">
您的浏览器不支持：HTML5 video.
</video>
<el-select v-model="cameraSrc" class="noPtzCameraList" @change="videoPlay()">
<el-select v-model="cameraSrc" class="noPtzCameraList" @change="videoPlay()" :popper-append-to-body="false">
<el-option v-for="item in cameraList" :key="item.id" :label="item.monitorName" :value="item.monitorUrl" style="font-size:16px;font-weight:400"></el-option>
</el-select>
<el-button class="noPtzCloseStyle" type="danger" icon="el-icon-close" @click="noPtzCloseFn()" size="mini">关闭</el-button>
......@@ -1110,4 +1110,26 @@ export default {
font-weight: 600;
cursor: pointer;
}
.noPtzVideo1 .el-scrollbar {
background-color: #021445 !important;
}
.noPtzVideo1 .el-select-dropdown__item.hover, .el-select-dropdown__item:hover {
background-color: #021445 !important;
color: #31E5F5;
}
.noPtzVideo1 .el-select-dropdown__item.selected{
background-color: #021445 !important;
color: #31E5F5;
font-weight: 800;
}
.noPtzVideo1 .el-select-dropdown__item {
padding: 0px 20px;
box-sizing: border-box;
background-color: #021445 !important;
color: #31E5F5;
font-size: 16px;
}
</style>
src/components/mars3d/Map2.vue
View file @ fa5eef01
......@@ -350,30 +350,26 @@ export default {
var graphic = new mars3d.graphic.PathEntity({
position: property,
orientation: new Cesium.VelocityOrientationProperty(property),
style: {
width: 4,
color: "rgb(251,84,48)",
opacity: 1.0,
leadTime: 0, // 前方的路线不显示
trailTime: 0,
//高亮时的样式（默认为鼠标移入，也可以指定type:'click'单击高亮），构造后也可以openHighlight、closeHighlight方法来手动调用
highlight: {
type: mars3d.EventType.click,
color: "#ff0000",
},
},
label: {
//text: truckName,
font_size: 22,
font_family: "楷体",
color: Cesium.Color.AZURE,
outline: true,
outlineColor: Cesium.Color.BLACK,
outlineWidth: 2,
horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
pixelOffset: new Cesium.Cartesian2(10, -25), //偏移量
resolution: 1,
leadTime: 0,
trailTime: 3600,
color: "#ff0000",
width: 3
},
// label: {
// text: truckName,
// font_size: 18,
// font_family: "楷体",
// color: Cesium.Color.AZURE,
// outline: true,
// outlineColor: Cesium.Color.BLACK,
// outlineWidth: 2,
// horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
// verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
// pixelOffset: new Cesium.Cartesian2(0, -25), //偏移量
// },
model: {
url: '//data.mars3d.cn/gltf/mars/car/tufangche.glb',
scale: 0.1,
......
src/views/MLargeScreen/components/intelligentSchedul/index.vue
View file @ fa5eef01
......@@ -69,7 +69,7 @@
</div>
</div>
</div>
<div class="intelligentSchScrView_rightView">
<!-- 智能调度信息 -->
<div>
......@@ -141,10 +141,10 @@
<button @click="recOpen">打开录音,请求权限</button>
<button @click="recClose">关闭录音,释放资源</button>
</div>
<button @click="recStart">录制</button>
<button @click="recStop" style="margin-right:80px">停止</button>
<span style="display: inline-block;">
<button @click="recPause">暂停</button>
<button @click="recResume">继续</button>
......@@ -163,22 +163,22 @@
<div class="ctrlProcessT" style="padding-left:50px; line-height:40px; position: relative;">{{ duration+"/"+powerLevel }}</div>
</div>
</div>
<div class="mainBox">
<audio ref="LogAudioPlayer" style="width:100%"></audio>
<div class="mainLog">
</div>
</div>
<div v-if="recOpenDialogShow" style="z-index:99999;width:100%;height:100%;top:0;left:0;position:fixed;background:rgba(0,0,0,0.3);">
</div>
<slot name="bottom"></slot>
</div>
<!-- 播放器 -->
<audio controls currentTime autoplay :src='srcUrl' style="display:none;"></audio>
......@@ -529,7 +529,7 @@ export default {
});
this.caiquData1 = caiquCenArr1;
this.xiequData1 = xiequ1;
})
})
};
})
},
......@@ -583,7 +583,7 @@ export default {
},
//取消发送语音
quxiaoVideo(){
this.dialogVisible = false;
this.dialogVisible = false;
this.tanchuCarListArray = [];
this.selectCarRadioArray = [];
},
......@@ -621,7 +621,7 @@ export default {
// }).catch(function(error) {});
}
//关闭发起通知组件
this.dialogVisible = false;
this.dialogVisible = false;
this.tanchuCarListArray = [];
},
//发起人工调度
......@@ -666,7 +666,7 @@ export default {
query1.destination = this.zaDestination[0] + (this.zaDestination[1] ? '/' + this.zaDestination[1] : '');
HttpReq.truckDispatching.manualSchedulingAdd(query1).then((res) => {
if(res.code == 200){
}else{
this.$notify({
title: res.msg,
......@@ -677,7 +677,7 @@ export default {
}).catch(function(error) { });
HttpReq.truckDispatching.manualOrderAdd(query1).then((res) => {
if(res.code == 200){
}else{
this.$notify({
title: res.msg,
......@@ -694,7 +694,7 @@ export default {
query2.destination = this.xzDestination;
HttpReq.truckDispatching.manualSchedulingAdd(query2).then((res) => {
if(res.code == 200){
}else{
this.$notify({
title: res.msg,
......@@ -705,7 +705,7 @@ export default {
}).catch(function(error) { });
HttpReq.truckDispatching.manualOrderAdd(query2).then((res) => {
if(res.code == 200){
}else{
this.$notify({
title: res.msg,
......@@ -766,7 +766,7 @@ export default {
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'shadow'
type: 'shadow'
}
},
legend: {
......@@ -945,14 +945,14 @@ export default {
option && myChart.setOption(option);
},
//初始化weosocket
//初始化weosocket
initWebSocket(){
//const wsuri = "ws://114.116.108.246:81/websocket/socketServer?userId="+userId;//连接地址，可加参数
const wsuri = process.env.VUE_APP_WS_API + "/" + 'pcBigScreen';
this.websocket = new WebSocket(wsuri);
this.websocket = new WebSocket(wsuri);
this.websocket.onopen = this.websocketonopen;
this.websocket.onerror = this.websocketonerror;
this.websocket.onmessage = this.websocketonmessage;
this.websocket.onmessage = this.websocketonmessage;
this.websocket.onclose = this.websocketclose;
this.websocketonmessage();
},
......@@ -961,11 +961,11 @@ export default {
console.log("WebSocket连接成功");
},
//WebSocket连接错误
websocketonerror(e) {
websocketonerror(e) {
console.log("WebSocket连接发生错误");
},
//WebSocket数据接收
websocketonmessage(e){
//WebSocket数据接收
websocketonmessage(e){
console.log("e",e);
if(e == undefined){
return
......@@ -987,15 +987,15 @@ export default {
})
}
}).catch(function(error) { });
}
},
//WebSocket数据发送
}
},
//WebSocket数据发送
websocketsend(agentData){
this.websocket.send(agentData);
},
//WebSocket关闭
this.websocket.send(agentData);
},
//WebSocket关闭
websocketclose(e){
console.log("connection closed (" + e.code + ")");
console.log("connection closed (" + e.code + ")");
},
//WebSocket重连
reconnect(){
......@@ -1035,7 +1035,7 @@ export default {
rec.open(function(){
This.dialogCancel();
This.reclog("已打开:"+This.type+" "+This.sampleRate+"hz "+This.bitRate+"kbps",2);
This.wave=Recorder.WaveView({elem:".ctrlProcessWave"});
},function(msg,isUserNotAllow){
This.dialogCancel();
......@@ -1058,7 +1058,7 @@ export default {
};
},
recStart:function(){
if(!this.rec||!Recorder.IsOpen()){
//this.reclog("未打开录音",1);
this.recOpen()
......@@ -1073,7 +1073,7 @@ export default {
type: 'success',
duration: 5000
});
},
recPause:function(){
if(this.rec&&Recorder.IsOpen()){
......@@ -1099,7 +1099,7 @@ export default {
});
return;
}
var This=this;
var rec=This.rec;
rec.stop(function(blob,duration){
......@@ -1123,14 +1123,14 @@ export default {
});
this.recOpen();
},
recPlayLast:function(){
if(!this.recLogLast){
this.reclog("请先录音，然后停止后再播放",1);
return;
};
this.recplay(this.recLogLast.idx);
},
recUploadLast:function(){
......@@ -1151,7 +1151,7 @@ export default {
});
return;
};
var blob=this.recLogLast.res.blob;
this.blobToDataURI(blob);
......@@ -1335,7 +1335,7 @@ export default {
this.srcUrl = (window.URL||webkitURL).createObjectURL(blob);
};
}
},
addWavHeader(samples, sampleRateTmp, sampleBits, channelCount) {
const dataLength = samples.byteLength;
......@@ -1763,7 +1763,7 @@ dd>div{
box-sizing: border-box;
overflow-y: scroll;
background-color: rgba(32,42,67,0.95);
}
.videoListView_content::-webkit-scrollbar {
/*滚动条整体样式*/
......@@ -1844,33 +1844,33 @@ dd>div{
color: #01f5fe;
border: 2px solid #01f5fe;
}
.el-select-dropdown__list{
background-color: #021445 !important;
border: 1px solid #01f5fe;
color: #31E5F5;
}
.el-select-dropdown__item.hover, .el-select-dropdown__item:hover{
background-color: #021445 !important;
color: #31E5F5;
}
.el-select-dropdown__item{
background-color: #021445 !important;
color: #31E5F5;
font-size: 16px;
}
.el-cascader-panel{
background-color: #021445 !important;
color: #31E5F5;
font-size: 16px;
}
.el-cascader-menu{
border: 0px;
}
.el-cascader-menu__list{
color: #31E5F5;
border: 1px solid #01f5fe;
}
.el-cascader-node:not(.is-disabled):hover, .el-cascader-node:not(.is-disabled):focus{
background-color: #021445 !important;
}
</style>
\ No newline at end of file
/*.el-select-dropdown__list{*/
/* background-color: #021445 !important;*/
/* border: 1px solid #01f5fe;*/
/* color: #31E5F5;*/
/*}*/
/*.el-select-dropdown__item.hover, .el-select-dropdown__item:hover{*/
/* background-color: #021445 !important;*/
/* color: #31E5F5;*/
/*}*/
/*.el-select-dropdown__item{*/
/* background-color: #021445 !important;*/
/* color: #31E5F5;*/
/* font-size: 16px;*/
/*}*/
/*.el-cascader-panel{*/
/* background-color: #021445 !important;*/
/* color: #31E5F5;*/
/* font-size: 16px;*/
/*}*/
/*.el-cascader-menu{*/
/* border: 0px;*/
/*}*/
/*.el-cascader-menu__list{*/
/* color: #31E5F5;*/
/* border: 1px solid #01f5fe;*/
/*}*/
/*.el-cascader-node:not(.is-disabled):hover, .el-cascader-node:not(.is-disabled):focus{*/
/* background-color: #021445 !important;*/
/*}*/
</style>
src/views/MLargeScreen/components/smallComponents/DPcomputer16.vue
View file @ fa5eef01
......@@ -189,7 +189,7 @@
<!-- 录音弹窗 -->
<div class="peopleScheAssembly" v-if="voiceViewShow">
<div style="color:white;font-size:14px;margin-bottom:1vh;font-size: 18px;font-weight: 600;">车辆调度<span style="font-size:14px">（{{curPaItem.pointName}}）</span></div>
<el-select v-show="actionType!=='通话'" v-model="selectCarFleet" placeholder="请选择车队" style="width:100%;margin:5px" @change="toSearchFn()">
<el-select v-show="actionType!=='通话'" v-model="selectCarFleet" placeholder="请选择车队" style="width:100%;margin:5px" @change="toSearchFn()" :popper-append-to-body="false">
<el-option v-for="(item,index) in carFleetData" :key="index" :label="item.name" :value="item.name" style="font-size:14px;"></el-option>
</el-select>
<div class="rolling">
......@@ -1162,6 +1162,7 @@ export default {
padding: 0 15% 10px;
box-sizing: border-box;
}
</style>
<style>
......@@ -1355,50 +1356,26 @@ export default {
background: #ededed;
border-radius: 10px;
}
.el-cascader-node.is-selectable.in-active-path {
color: #1890ff;
}
.el-select-dropdown__list {
.DPcomputer16Box .el-scrollbar {
background-color: #021445 !important;
border: 1px solid #01f5fe;
color: #31E5F5;
}
.el-select-dropdown__item.hover, .el-select-dropdown__item:hover {
.DPcomputer16Box .el-select-dropdown__item.hover, .el-select-dropdown__item:hover {
background-color: #021445 !important;
color: #31E5F5;
}
.el-select-dropdown__item.selected{
.DPcomputer16Box .el-select-dropdown__item.selected{
background-color: #021445 !important;
color: #31E5F5;
font-weight: 800;
}
.el-select-dropdown__item {
.DPcomputer16Box .el-select-dropdown__item {
padding: 0px 20px;
box-sizing: border-box;
background-color: #021445 !important;
color: #31E5F5;
font-size: 16px;
}
.el-cascader-panel {
background-color: #021445 !important;
color: #31E5F5;
font-size: 16px;
}
.el-cascader-menu {
border: 0px;
}
.el-cascader-menu__list {
color: #31E5F5;
border: 1px solid #01f5fe;
}
.el-cascader-node:not(.is-disabled):hover, .el-cascader-node:not(.is-disabled):focus {
background-color: #021445 !important;
}
</style>
src/views/carManagement/carTrajectory/index.vue
View file @ fa5eef01
......@@ -95,7 +95,7 @@ export default {
//测距按钮是否能用
measureDistanceDis:true,
//是否显示轨迹
leadTime:false,
leadTime:true,
//轨迹时间点
trajectoryTimePoint:'',
trajectoryTimePointPlaceholder:'轨迹时间点',
......@@ -227,7 +227,7 @@ export default {
});
}
})
},
// 重置搜索
clearLimit(){
......@@ -421,7 +421,7 @@ export default {
var day = date.getDate(); //日 ,从 Date 对象返回一个月中的某一天 (1 ~ 31)
var hours = date.getHours(); //小时 ,返回 Date 对象的小时 (0 ~ 23)
var minutes = date.getMinutes(); //分钟 ,返回 Date 对象的分钟 (0 ~ 59)
var seconds = date.getSeconds(); //秒 ,返回 Date 对象的秒数 (0 ~ 59)
var seconds = date.getSeconds(); //秒 ,返回 Date 对象的秒数 (0 ~ 59)
//修改月份格式
if (month >= 1 && month <= 9) {
month = "0" + month;
......@@ -456,7 +456,7 @@ export default {
</script>
<style rel="stylesheet/scss" lang="scss" scope>
.device-manage{
.mapcontainer2{
border: 1px blue solid;
......@@ -481,7 +481,7 @@ export default {
width: 16vw;
overflow: hidden;
}
}
</style>
src/views/personnelPositioning/peopleLogData/index.vue
View file @ fa5eef01
......@@ -699,4 +699,13 @@ div::-webkit-scrollbar{
width: 1160px;
overflow: hidden;
}
.mars3d-clockAnimate {
position: absolute;
bottom: 0;
left: 0;
height: 28px;
z-index: 999;
color: white;
background: linear-gradient(to bottom, rgba(116, 117, 119, 1) 0%, rgba(58, 68, 82, 1) 11%, rgba(46, 50, 56, 1) 46%, rgba(53, 53, 53, 1) 81%, rgba(53, 53, 53, 1) 100%);
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment