Commit 3c11baf0 authored by xxx's avatar xxx

1

parent c263695a
...@@ -1124,7 +1124,7 @@ export default { ...@@ -1124,7 +1124,7 @@ export default {
height: 32vh; height: 32vh;
/* background:no-repeat center center url('~@/assets/images/cutGraph/yuanjianjuxing1.png'); /* background:no-repeat center center url('~@/assets/images/cutGraph/yuanjianjuxing1.png');
background-size:100% 100%; */ background-size:100% 100%; */
background-color: rgba(32,42,67,0.8); background-color: rgba(32,42,67,0.95);
padding: 5px 7px; padding: 5px 7px;
box-sizing: border-box; box-sizing: border-box;
overflow: hidden; overflow: hidden;
...@@ -1134,7 +1134,7 @@ export default { ...@@ -1134,7 +1134,7 @@ export default {
height: 31.8vh; height: 31.8vh;
/* background:no-repeat center center url('~@/assets/images/cutGraph/yuanjianjuxing1.png'); /* background:no-repeat center center url('~@/assets/images/cutGraph/yuanjianjuxing1.png');
background-size:100% 100%; */ background-size:100% 100%; */
background-color: rgba(32,42,67,0.8); background-color: rgba(32,42,67,0.95);
padding: 5px 7px; padding: 5px 7px;
box-sizing: border-box; box-sizing: border-box;
overflow: hidden; overflow: hidden;
......
...@@ -83,7 +83,6 @@ import * as echarts from 'echarts'; ...@@ -83,7 +83,6 @@ import * as echarts from 'echarts';
import "echarts-gl"; import "echarts-gl";
import { getPie3D } from "../../../components/echarts/bingtu3d"; import { getPie3D } from "../../../components/echarts/bingtu3d";
export default { export default {
data() { data() {
return { return {
...@@ -1455,7 +1454,7 @@ export default { ...@@ -1455,7 +1454,7 @@ export default {
height: 23.5vh; height: 23.5vh;
/* background:no-repeat center center url('~@/assets/images/cutGraph/yuanjianjuxing1.png'); /* background:no-repeat center center url('~@/assets/images/cutGraph/yuanjianjuxing1.png');
background-size:100% 100%; */ background-size:100% 100%; */
background-color: rgba(32,42,67,0.8); background-color: rgba(32,42,67,0.95);
padding: 5px 7px; padding: 5px 7px;
box-sizing: border-box; box-sizing: border-box;
overflow: hidden; overflow: hidden;
...@@ -1465,7 +1464,7 @@ export default { ...@@ -1465,7 +1464,7 @@ export default {
height: 23.5vh; height: 23.5vh;
/* background:no-repeat center center url('~@/assets/images/cutGraph/yuanjianjuxing1.png'); /* background:no-repeat center center url('~@/assets/images/cutGraph/yuanjianjuxing1.png');
background-size:100% 100%; */ background-size:100% 100%; */
background-color: rgba(32,42,67,0.8); background-color: rgba(32,42,67,0.95);
padding: 5px 7px; padding: 5px 7px;
box-sizing: border-box; box-sizing: border-box;
overflow: hidden; overflow: hidden;
......
...@@ -1224,6 +1224,12 @@ export default { ...@@ -1224,6 +1224,12 @@ export default {
color: 'white' color: 'white'
} }
}, },
splitLine: {
lineStyle: {
// 使用深浅的间隔色
color: ['rgba(255,255,255,0.3)']
}
},
axisLine: { axisLine: {
lineStyle: { lineStyle: {
color: 'white', color: 'white',
...@@ -1473,7 +1479,7 @@ export default { ...@@ -1473,7 +1479,7 @@ export default {
.dataScrView_leftView>div{ .dataScrView_leftView>div{
width: 100%; width: 100%;
height: 23.5vh; height: 23.5vh;
background-color: rgba(32,42,67,0.8); background-color: rgba(32,42,67,0.95);
padding: 5px 7px; padding: 5px 7px;
box-sizing: border-box; box-sizing: border-box;
overflow: hidden; overflow: hidden;
...@@ -1481,7 +1487,7 @@ export default { ...@@ -1481,7 +1487,7 @@ export default {
.dataScrView_rightView>div{ .dataScrView_rightView>div{
width: 100%; width: 100%;
height: 23.5vh; height: 23.5vh;
background-color: rgba(32,42,67,0.8); background-color: rgba(32,42,67,0.95);
padding: 5px 7px; padding: 5px 7px;
box-sizing: border-box; box-sizing: border-box;
overflow: hidden; overflow: hidden;
...@@ -1708,7 +1714,7 @@ dd>div{ ...@@ -1708,7 +1714,7 @@ dd>div{
bottom: 0px; bottom: 0px;
width: 100%; width: 100%;
height: 23.5vh; height: 23.5vh;
background-color: rgba(32,42,67,0.8); background-color: rgba(32,42,67,0.95);
padding: 5px 7px; padding: 5px 7px;
box-sizing: border-box; box-sizing: border-box;
overflow: hidden; overflow: hidden;
......
...@@ -34,10 +34,10 @@ ...@@ -34,10 +34,10 @@
</div> </div>
</div> </div>
<div class="voiceAppContent_4"> <div class="voiceAppContent_4">
<el-button type="primary" @click="toNoticeFn('广播')">广播</el-button> <button class="voiceAppContent_4_btns" @click="toNoticeFn('广播')">广播</button>
<el-button type="primary" @click="toNoticeFn('紧急通知')">紧急通知</el-button> <button class="voiceAppContent_4_btns" @click="toNoticeFn('紧急通知')">紧急通知</button>
<el-button type="primary" @click="toNoticeFn('通话')">通话</el-button> <button class="voiceAppContent_4_btns" @click="toNoticeFn('通话')">通话</button>
<el-button type="primary" @click="todispatchChange()">{{dispatchBtnTitle}}</el-button> <button class="voiceAppContent_4_btns" @click="todispatchChange()">{{dispatchBtnTitle}}</button>
</div> </div>
</div> </div>
</div> </div>
...@@ -321,17 +321,17 @@ export default { ...@@ -321,17 +321,17 @@ export default {
HttpReq.truckDispatching.recentNoticeQuery({size:50,sort:'id,desc'}).then((res) => { HttpReq.truckDispatching.recentNoticeQuery({size:50,sort:'id,desc'}).then((res) => {
if(res.code == 200){ if(res.code == 200){
this.recentNoticeData = res.data.content; this.recentNoticeData = res.data.content;
// let flag0 = []; let flag0 = [];
// this.recentNoticeData.forEach((item)=>{ this.recentNoticeData.forEach((item)=>{
// if(item.flag == 0){ if(item.flag == 0){
// flag0.push(item); flag0.push(item);
// } }
// }) })
// if(flag0.length == 0){ if(flag0.length == 0){
// this.dispatchBtnTitle = '人工调度'; this.dispatchBtnTitle = '人工调度';
// }else{ }else{
// this.dispatchBtnTitle = flag0[0].noticeClass; this.dispatchBtnTitle = flag0[0].noticeClass;
// } }
}; };
}) })
//智能调度情况 //智能调度情况
...@@ -1327,6 +1327,30 @@ export default { ...@@ -1327,6 +1327,30 @@ export default {
</script> </script>
<style scoped> <style scoped>
.voiceAppContent_4_btns{
background-color: #112251;
border: 1px solid #00FCF9;
color: #00FFFF;
border-radius: 5px;
height: 3.5vh;
font-size: 17px;
margin: 0px 2vw 10px;
width: 25%;
font-size: 15px;
cursor: pointer;
}
.voiceAppContent_4_btns:active{
background:linear-gradient( to top,#007EFF,#30CFBE);
border: 0px solid #00FCF9;
color: white;
border-radius: 5px;
height: 3.5vh;
font-size: 17px;
margin: 0px 2vw 10px;
width: 25%;
font-size: 15px;
cursor: pointer;
}
.intelligentSchScrView{ .intelligentSchScrView{
position: absolute; position: absolute;
width: 100%; width: 100%;
...@@ -1350,7 +1374,7 @@ export default { ...@@ -1350,7 +1374,7 @@ export default {
height: 64vh; height: 64vh;
/* background:no-repeat center center url('~@/assets/images/cutGraph/yuanjianjuxing1.png'); /* background:no-repeat center center url('~@/assets/images/cutGraph/yuanjianjuxing1.png');
background-size:100% 100%; */ background-size:100% 100%; */
background-color: rgba(32,42,67,0.8); background-color: rgba(32,42,67,0.95);
padding: 5px 7px; padding: 5px 7px;
box-sizing: border-box; box-sizing: border-box;
overflow: hidden; overflow: hidden;
...@@ -1360,7 +1384,7 @@ export default { ...@@ -1360,7 +1384,7 @@ export default {
height: 32vh; height: 32vh;
/* background:no-repeat center center url('~@/assets/images/cutGraph/yuanjianjuxing1.png'); /* background:no-repeat center center url('~@/assets/images/cutGraph/yuanjianjuxing1.png');
background-size:100% 100%; */ background-size:100% 100%; */
background-color: rgba(32,42,67,0.8); background-color: rgba(32,42,67,0.95);
padding: 5px 7px; padding: 5px 7px;
box-sizing: border-box; box-sizing: border-box;
overflow: hidden; overflow: hidden;
...@@ -1370,7 +1394,7 @@ export default { ...@@ -1370,7 +1394,7 @@ export default {
height: 31.8vh; height: 31.8vh;
/* background:no-repeat center center url('~@/assets/images/cutGraph/yuanjianjuxing1.png'); /* background:no-repeat center center url('~@/assets/images/cutGraph/yuanjianjuxing1.png');
background-size:100% 100%; */ background-size:100% 100%; */
background-color: rgba(32,42,67,0.8); background-color: rgba(32,42,67,0.95);
padding: 5px 7px; padding: 5px 7px;
box-sizing: border-box; box-sizing: border-box;
overflow: hidden; overflow: hidden;
...@@ -1450,7 +1474,7 @@ dd>div{ ...@@ -1450,7 +1474,7 @@ dd>div{
.voiceAppContent_2_title{ .voiceAppContent_2_title{
border-top-left-radius: 10px; border-top-left-radius: 10px;
border-top-right-radius: 10px; border-top-right-radius: 10px;
background-color: rgb(25,41,94); background-color: #274088;
height: 3vh; height: 3vh;
line-height: 3vh; line-height: 3vh;
color: rgb(24,228,240); color: rgb(24,228,240);
...@@ -1464,6 +1488,7 @@ dd>div{ ...@@ -1464,6 +1488,7 @@ dd>div{
overflow-y:auto; overflow-y:auto;
padding: 0px 10px; padding: 0px 10px;
box-sizing: border-box; box-sizing: border-box;
background-color: #020C39;
} }
.voiceAppContent_2_content::-webkit-scrollbar { .voiceAppContent_2_content::-webkit-scrollbar {
/*滚动条整体样式*/ /*滚动条整体样式*/
...@@ -1496,8 +1521,9 @@ dd>div{ ...@@ -1496,8 +1521,9 @@ dd>div{
} }
.el-checkbox__label>div{ .el-checkbox__label>div{
display: inline-block; display: inline-block;
color: rgb(24,228,240); color: #A6F6F9;
font-size: 17px; font-size: 16px;
font-family: 'SourceHanSansCN-Regular';
} }
.el-checkbox{ .el-checkbox{
display: block; display: block;
...@@ -1536,6 +1562,7 @@ dd>div{ ...@@ -1536,6 +1562,7 @@ dd>div{
overflow-y:auto; overflow-y:auto;
padding: 0px 10px; padding: 0px 10px;
box-sizing: border-box; box-sizing: border-box;
background-color: #020C39;
} }
.voiceAppContent_3_content::-webkit-scrollbar { .voiceAppContent_3_content::-webkit-scrollbar {
/*滚动条整体样式*/ /*滚动条整体样式*/
...@@ -1566,10 +1593,11 @@ dd>div{ ...@@ -1566,10 +1593,11 @@ dd>div{
.voiceAppContent_3_content_selectCar{ .voiceAppContent_3_content_selectCar{
width: 45%; width: 45%;
margin-top: 5px; margin-top: 5px;
color: rgb(24,228,240); color: #A6F6F9;
font-size: 16px; font-size: 16px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
} }
.voiceAppContent_3_content_selectCar>div{ .voiceAppContent_3_content_selectCar>div{
height: 20px; height: 20px;
...@@ -1583,11 +1611,6 @@ dd>div{ ...@@ -1583,11 +1611,6 @@ dd>div{
flex-wrap: wrap; flex-wrap: wrap;
align-content:flex-start; align-content:flex-start;
} }
.voiceAppContent_4 button{
margin: 0px 2vw 10px;
width: 25%;
font-size: 14px;
}
.intelligentSchScrView_rightView_content_1_top{ .intelligentSchScrView_rightView_content_1_top{
width: 100%; width: 100%;
display: flex; display: flex;
...@@ -1650,6 +1673,7 @@ dd>div{ ...@@ -1650,6 +1673,7 @@ dd>div{
padding-top: 10px; padding-top: 10px;
box-sizing: border-box; box-sizing: border-box;
overflow-y: scroll; overflow-y: scroll;
background-color: rgba(32,42,67,0.95);
} }
.videoListView_content::-webkit-scrollbar { .videoListView_content::-webkit-scrollbar {
...@@ -1710,4 +1734,39 @@ dd>div{ ...@@ -1710,4 +1734,39 @@ dd>div{
color: white; color: white;
font-size: 15px; font-size: 15px;
} }
.intelligentSchScrView .el-input--small .el-input__inner{
background-color: #021445;
border: 2px solid #01f5fe;
color: #01f5fe;
}
.intelligentSchScrView .el-input--small .el-input__inner{
background-color: #021445;
border: 2px solid #01f5fe;
color: #01f5fe;
}
.intelligentSchScrView .el-input--small .el-input__inner::placeholder {
color: #31E5F5;
}
.intelligentSchScrView .el-select .el-input .el-select__caret{
color: #01f5fe;
}
.intelligentSchScrView .el-textarea__inner{
background-color: #021445;
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;
}
</style> </style>
\ No newline at end of file
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<kaungEZUIKitJs v-if="kaungEZUIKitJsShow"/> <kaungEZUIKitJs v-if="kaungEZUIKitJsShow"/>
</div> </div>
<!-- 嵌入三维地图页面 --> <!-- 嵌入三维地图页面 -->
<iframe src="http://8.143.203.103:9092/#/Index" frameborder="0" class="mapcontainer1"></iframe> <!-- <iframe src="http://8.143.203.103:9092/#/Index" frameborder="0" class="mapcontainer1"></iframe> -->
<!-- <iframe src="http://192.168.0.101:3003/#/Index" frameborder="0" class="mapcontainer1"></iframe> --> <!-- <iframe src="http://192.168.0.101:3003/#/Index" frameborder="0" class="mapcontainer1"></iframe> -->
<!-- 单个车辆视频监控 --> <!-- 单个车辆视频监控 -->
<div class="monitorCover1" v-show="monitorCover1Show"> <div class="monitorCover1" v-show="monitorCover1Show">
...@@ -97,7 +97,7 @@ export default { ...@@ -97,7 +97,7 @@ export default {
this.timer = setInterval(() => { this.timer = setInterval(() => {
this.setNowTimes(); this.setNowTimes();
}, 1000) }, 1000)
window.addEventListener('message', this.handleMessage); //window.addEventListener('message', this.handleMessage);
}, },
methods: { methods: {
loadData() { loadData() {
......
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