Skip to content

H
holo-web
Commit 7764ca9d authored by ninglx's avatar ninglx
Browse files
Options

nlx

parent a71bc7d3
Show whitespace changes
Inline Side-by-side
Showing with 238 additions and 181 deletions
wj-smartcity/src/common/api/signalEvaluation.js
View file @ 7764ca9d
...@@ -20,6 +20,18 @@ export function crossList(data) { ...@@ -20,6 +20,18 @@ export function crossList(data) {
params: data params: data
}) })
} }
// 1
export function crossListSignal(data) {
return axios({
url: optBaseUrl + "/runningEvaluate/crossList",
method: 'post',
data: data
// url: "/holo/base-cross-info/list",
// method: 'get',
// params: data
})
}
//溢出情况 //溢出情况
export function spilloverStatus(data) { export function spilloverStatus(data) {
return axios({ return axios({
......
wj-smartcity/src/components/Standard/cameraVideo.vue
View file @ 7764ca9d
...@@ -10,24 +10,26 @@ ...@@ -10,24 +10,26 @@
<div class="cameraTable"> <div class="cameraTable">
<el-table <el-table
:data="tableData" :data="tableData"
height="180PX" height="100%"
style="width: 100%;"> style="width: 100%;">
<el-table-column show-overflow-tooltip prop="channelName" label="通道名称" width="60"/> <el-table-column show-overflow-tooltip align="center" prop="channelName" label="通道名称" width="60"/>
<el-table-column show-overflow-tooltip prop="startTime" label="统计开始时间" width="80"/> <el-table-column show-overflow-tooltip align="center" prop="startTime" label="统计开始时间" width="80"/>
<el-table-column show-overflow-tooltip prop="laneNum" align="right" label="车道号" width="45"/> <el-table-column show-overflow-tooltip align="center" prop="laneNum" label="车道号" width="45"/>
<el-table-column show-overflow-tooltip prop="flowTypeDesc" align="right" label="车道类型" width="80"/> <el-table-column show-overflow-tooltip align="center" prop="flowTypeDesc" label="车道类型" width="80"/>
<el-table-column show-overflow-tooltip prop="vehicleCount" align="right" label="车道总流量" width="80"/> <el-table-column show-overflow-tooltip align="center" prop="vehicleCount" label="车道总流量" width="80"/>
<el-table-column show-overflow-tooltip prop="straightCount" align="right" label="直行通道车辆数" width="90"/> <el-table-column show-overflow-tooltip align="center" prop="straightCount" label="直行通道车辆数" width="90"/>
<el-table-column show-overflow-tooltip prop="leftCount" align="right" label="左转通道车辆数" width="90"/> <el-table-column show-overflow-tooltip align="center" prop="leftCount" label="左转通道车辆数" width="90"/>
<el-table-column show-overflow-tooltip prop="rightCount" align="right" label="右转通道车辆数" width="90"/> <el-table-column show-overflow-tooltip align="center" prop="rightCount" label="右转通道车辆数" width="90"/>
<el-table-column show-overflow-tooltip prop="turnCount" align="right" label="掉头通道车辆数" width="90"/> <el-table-column show-overflow-tooltip align="center" prop="turnCount" label="掉头通道车辆数" width="90"/>
<el-table-column show-overflow-tooltip prop="producer" label="厂商" width="50"/> <el-table-column show-overflow-tooltip align="center" prop="producer" label="厂商" width="50"/>
</el-table> </el-table>
</div>
<div class="pageContainer">
<el-pagination <el-pagination
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="paginationData.pageNum" :current-page.sync="paginationData.pageNum"
:page-size="paginationData.pageSize" :page-size="paginationData.pageSize"
layout=" prev, pager, next" layout="prev, pager, next"
:total="paginationData.total"> :total="paginationData.total">
</el-pagination> </el-pagination>
</div> </div>
...@@ -35,38 +37,40 @@ ...@@ -35,38 +37,40 @@
</template> </template>
<script> <script>
import { equip_camera,api_getCameraTable } from "../../dao/situation"; import {equip_camera, api_getCameraTable} from "../../dao/situation";
import Videojs from "video.js"; import Videojs from "video.js";
import "./videojs-flvjs-plugin"; import "./videojs-flvjs-plugin";
export default { export default {
name: "cameraVideo", name: "cameraVideo",
props: ["videoData"], props: ["videoData"],
watch: {}, watch: {},
data() { data() {
return { return {
distroyFlag: false,
player: null, player: null,
ownVideoData:{}, ownVideoData: {},
tableData: [], tableData: [],
paginationData:{ paginationData: {
total:0, total: 0,
pageNum:1, pageNum: 1,
pageSize:8, pageSize: 8,
}, },
}; };
}, },
methods: { methods: {
handleCurrentChange(e){ handleCurrentChange(e) {
this.paginationData.pageNum = e this.paginationData.pageNum = e
this.getCameraTable(); this.getCameraTable();
}, },
getCameraTable(){ getCameraTable() {
console.log(this.videoData); console.log(this.videoData);
api_getCameraTable({ api_getCameraTable({
"channelName": this.videoData.equipName, "channelName": this.videoData.equipName,
"pageNum": this.paginationData.pageNum, "pageNum": this.paginationData.pageNum,
"pageSize": this.paginationData.pageSize "pageSize": this.paginationData.pageSize
}).then(res=>{ }).then(res => {
if(res.code== 200){ if (res.code == 200) {
this.tableData = res.content.rows this.tableData = res.content.rows
this.paginationData.total = res.content.total this.paginationData.total = res.content.total
} }
...@@ -75,12 +79,18 @@ export default { ...@@ -75,12 +79,18 @@ export default {
canplay() { canplay() {
this.$emit("vidCanplay", this.ownVideoData); this.$emit("vidCanplay", this.ownVideoData);
}, },
loadstart() {}, loadstart() {
loadVideo() {}, },
bindEvents() {}, loadVideo() {
handleErr() {}, },
pause() {}, bindEvents() {
},
handleErr() {
},
pause() {
},
destroy() { destroy() {
this.distroyFlag = true
if (this.player) { if (this.player) {
this.player.dispose(); this.player.dispose();
this.player = null; this.player = null;
...@@ -142,7 +152,7 @@ export default { ...@@ -142,7 +152,7 @@ export default {
}, 100); }, 100);
}); });
}); });
}, 0); }, 100);
} }
// flv // flv
else { else {
...@@ -175,8 +185,7 @@ export default { ...@@ -175,8 +185,7 @@ export default {
}, 0); }, 0);
} }
}, },
computed: { computed: {},
},
beforeDestroy() { beforeDestroy() {
this.destroy(); this.destroy();
}, },
...@@ -214,71 +223,92 @@ video { ...@@ -214,71 +223,92 @@ video {
object-fit: fill; object-fit: fill;
} }
} }
.cameraTable{
.cameraTable {
//position: absolute; //position: absolute;
//left: 100% ; //left: 100% ;
//top: 0; //top: 0;
height: 100%; height: calc(100% - 230PX);
//width:50%; //width:50%;
overflow-x:auto; overflow-x: auto;
background: #0f2645; background: #0f2645;
border-left:1PX solid #037bb2; border-left: 1PX solid #037bb2;
margin-left: 1PX; margin-left: 1PX;
padding:10PX 20PX; padding: 10PX 20PX;
box-sizing:border-box; box-sizing: border-box;
z-index:1000; z-index: 1000;
::v-deep .el-table__body tr.hover-row > td.el-table__cell { ::v-deep .el-table__body tr.hover-row > td.el-table__cell {
background-color: transparent !important; background-color: transparent !important;
} }
::v-deep .el-table__body-wrapper{
::v-deep .el-table__body-wrapper {
z-index: 6 z-index: 6
} }
::v-deep .el-table{
::v-deep .el-table {
background: transparent; background: transparent;
&::before{
&::before {
background: none; background: none;
height: 0 !important; height: 0 !important;
} }
tr:hover > td { tr:hover > td {
background-color: transparent; background-color: transparent;
} }
td.el-table__cell{
border-bottom: 1PX solid rgba(255,255,255,.1) !important; td.el-table__cell {
border-bottom: 1PX solid rgba(255, 255, 255, .1) !important;
} }
th{
th {
text-align: center; text-align: center;
} }
th,td,tr{
th, td, tr {
padding: 0; padding: 0;
color: #fff; color: #fff;
background: #0f2645; background: #0f2645;
} }
.cell{
.cell {
padding-right: 0; padding-right: 0;
padding-left: 5PX; padding-left: 5PX;
color:#fff; color: #fff;
font-size: 12PX; font-size: 12PX;
} }
} }
::v-deep .el-pagination{
}
.pageContainer {
height: 30px;
width: 100%;
display: flex;
justify-content: center;
::v-deep .el-pagination {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
display: flex; display: flex;
justify-content: center; justify-content: center;
button:disabled,.el-pager li ,.btn-next, .btn-prev{
button:disabled, .el-pager li, .btn-next, .btn-prev {
background: transparent; background: transparent;
color:rgba(255,255,255,.5); color: rgba(255, 255, 255, .5);
font-size: 12PX; font-size: 12PX;
width: 35PX; width: 35PX;
height: 28PX; height: 28PX;
} }
.btn-next .el-icon, .btn-prev .el-icon{ .btn-next .el-icon, .btn-prev .el-icon {
font-size: 12PX; font-size: 12PX;
} }
.el-pager li.active{
color:#409EFF !important; .el-pager li.active {
color: #409EFF !important;
} }
} }
} }
...@@ -289,19 +319,24 @@ video { ...@@ -289,19 +319,24 @@ video {
top: -14PX; top: -14PX;
transform: translateX(-50%); transform: translateX(-50%);
} }
::v-deep .vjs-control-bar { ::v-deep .vjs-control-bar {
display: none !important; display: none !important;
} }
::v-deep .vjs-big-play-button { ::v-deep .vjs-big-play-button {
display: none !important; display: none !important;
} }
::v-deep .vjs-control-text { ::v-deep .vjs-control-text {
display: none !important; display: none !important;
} }
::v-deep .vjs-text-track-display{
::v-deep .vjs-text-track-display {
display: none !important; display: none !important;
} }
::v-deep .vjs-modal-dialog{
::v-deep .vjs-modal-dialog {
display: none !important; display: none !important;
} }
</style> </style>
wj-smartcity/src/views/dataQueries/index.vue
View file @ 7764ca9d
...@@ -26,7 +26,6 @@ export default { ...@@ -26,7 +26,6 @@ export default {
setTimeout(()=>{ setTimeout(()=>{
this.$refs.rightForm.getData() this.$refs.rightForm.getData()
},0) },0)
} }
} }
} }
......
wj-smartcity/src/views/dataQueries/rightForm/RealTimeData.vue
View file @ 7764ca9d
...@@ -73,10 +73,10 @@ export default { ...@@ -73,10 +73,10 @@ export default {
laneTableColumn: [], laneTableColumn: [],
locationType1: "1", locationType1: "1",
locationOptions1: [ locationOptions1: [
{ value: "1", label: "车道数据" }, {value: "1", label: "车道数据"},
{ value: "2", label: "人行横道数据" }, {value: "2", label: "人行横道数据"},
{ value: "3", label: "行人等待区数据" }, {value: "3", label: "行人等待区数据"},
{ value: "4", label: "非机动车数据" }, {value: "4", label: "非机动车数据"},
// { value: "5", label: "事件信息" }, // { value: "5", label: "事件信息" },
// { value: "6", label: "30s车道数据" }, // { value: "6", label: "30s车道数据" },
// { value: "7", label: "30s路口综合指标" }, // { value: "7", label: "30s路口综合指标" },
...@@ -84,91 +84,91 @@ export default { ...@@ -84,91 +84,91 @@ export default {
dateTimeRange: [], dateTimeRange: [],
tableData: [], tableData: [],
laneTableColumn1: [ laneTableColumn1: [
{ label: "数据曝光时间", prop: "expTime" }, {label: "数据曝光时间", prop: "expTime"},
{ label: "数据生成时间", prop: "pdTime" }, {label: "数据生成时间", prop: "pdTime"},
{ label: "厂商名称", prop: "producer" }, {label: "厂商名称", prop: "producer"},
{ label: "方向编号", prop: "laneDir" }, {label: "方向编号", prop: "laneDir"},
{ label: "方向名称", prop: "laneDirDesc" }, {label: "方向名称", prop: "laneDirDesc"},
{ label: "车流类型", prop: "flowTypeDesc" }, {label: "车流类型", prop: "flowTypeDesc"},
{ label: "静止车辆数", prop: "staticCount" }, {label: "静止车辆数", prop: "staticCount"},
{ label: "运动车辆数", prop: "movingCount" }, {label: "运动车辆数", prop: "movingCount"},
{ label: "车辆总数", prop: "count" }, {label: "车辆总数", prop: "count"},
], ],
laneTableColumn2: [ laneTableColumn2: [
{ label: "数据曝光时间", prop: "expTime" }, {label: "数据曝光时间", prop: "expTime"},
{ label: "数据生成时间", prop: "pdTime" }, {label: "数据生成时间", prop: "pdTime"},
{ label: "厂商名称", prop: "producer" }, {label: "厂商名称", prop: "producer"},
{ label: "方向编号", prop: "zebraDir" }, {label: "方向编号", prop: "zebraDir"},
{ label: "方向名称", prop: "zebraDirDesc" }, {label: "方向名称", prop: "zebraDirDesc"},
{ label: "行人数", prop: "zebraCount" }, {label: "行人数", prop: "zebraCount"},
{ label: "进口行人数", prop: "zebraCountIn" }, {label: "进口行人数", prop: "zebraCountIn"},
{ label: "出口行人数", prop: "zebraCountOut" }, {label: "出口行人数", prop: "zebraCountOut"},
], ],
laneTableColumn3: [ laneTableColumn3: [
{ label: "数据曝光时间", prop: "expTime" }, {label: "数据曝光时间", prop: "expTime"},
{ label: "数据生成时间", prop: "pdTime" }, {label: "数据生成时间", prop: "pdTime"},
{ label: "厂商名称", prop: "producer" }, {label: "厂商名称", prop: "producer"},
{ label: "方向编号", prop: "waitDir" }, {label: "方向编号", prop: "waitDir"},
{ label: "方向名称", prop: "waitDirDesc" }, {label: "方向名称", prop: "waitDirDesc"},
{ label: "行人等待数量", prop: "waitCount" }, {label: "行人等待数量", prop: "waitCount"},
], ],
laneTableColumn4: [ laneTableColumn4: [
{ label: "数据曝光时间", prop: "expTime" }, {label: "数据曝光时间", prop: "expTime"},
{ label: "数据生成时间", prop: "pdTime" }, {label: "数据生成时间", prop: "pdTime"},
{ label: "厂商名称", prop: "producer" }, {label: "厂商名称", prop: "producer"},
{ label: "方向编号", prop: "nonMotorsDir" }, {label: "方向编号", prop: "nonMotorsDir"},
{ label: "方向名称", prop: "nonMotorsDirDesc" }, {label: "方向名称", prop: "nonMotorsDirDesc"},
{ label: "非机动车数量", prop: "nonMotorsCount" }, {label: "非机动车数量", prop: "nonMotorsCount"},
{ label: "非机动车排队", prop: "nonMotorsLength" }, {label: "非机动车排队", prop: "nonMotorsLength"},
], ],
laneTableColumn5: [ laneTableColumn5: [
{ label: "数据曝光时间", prop: "time" }, {label: "数据曝光时间", prop: "time"},
{ label: "数据生成时间", prop: "time" }, {label: "数据生成时间", prop: "time"},
{ label: "厂商名称", prop: "time" }, {label: "厂商名称", prop: "time"},
{ label: "溢出方向", prop: "time" }, {label: "溢出方向", prop: "time"},
{ label: "溢出状态", prop: "time" }, {label: "溢出状态", prop: "time"},
{ label: "溢出原因", prop: "time" }, {label: "溢出原因", prop: "time"},
], ],
laneTableColumn6: [ laneTableColumn6: [
{ label: "统计开始时间", prop: "time" }, {label: "统计开始时间", prop: "time"},
{ label: "数据曝光时间", prop: "time" }, {label: "数据曝光时间", prop: "time"},
{ label: "数据生成时间", prop: "time" }, {label: "数据生成时间", prop: "time"},
{ label: "统计周期", prop: "time" }, {label: "统计周期", prop: "time"},
{ label: "厂商名称", prop: "time" }, {label: "厂商名称", prop: "time"},
{ label: "方向", prop: "time" }, {label: "方向", prop: "time"},
{ label: "编号", prop: "time" }, {label: "编号", prop: "time"},
{ label: "车流类型", prop: "time" }, {label: "车流类型", prop: "time"},
{ label: "车流总数", prop: "time" }, {label: "车流总数", prop: "time"},
{ label: "左转流量", prop: "time" }, {label: "左转流量", prop: "time"},
{ label: "直行流量", prop: "time" }, {label: "直行流量", prop: "time"},
{ label: "右转流量", prop: "time" }, {label: "右转流量", prop: "time"},
{ label: "掉头流量", prop: "time" }, {label: "掉头流量", prop: "time"},
{ label: "平均速度", prop: "time" }, {label: "平均速度", prop: "time"},
], ],
laneTableColumn7: [ laneTableColumn7: [
{ label: "统计开始时间", prop: "time" }, {label: "统计开始时间", prop: "time"},
{ label: "数据曝光时间", prop: "time" }, {label: "数据曝光时间", prop: "time"},
{ label: "数据生成时间", prop: "time" }, {label: "数据生成时间", prop: "time"},
{ label: "统计周期", prop: "time" }, {label: "统计周期", prop: "time"},
{ label: "厂商名称", prop: "time" }, {label: "厂商名称", prop: "time"},
{ label: "方向", prop: "time" }, {label: "方向", prop: "time"},
{ label: "非机动车数量(非机动车道)", prop: "time" }, {label: "非机动车数量(非机动车道)", prop: "time"},
{ label: "非机动车数量(人行横道)", prop: "time" }, {label: "非机动车数量(人行横道)", prop: "time"},
{ label: "停车次数", prop: "time" }, {label: "停车次数", prop: "time"},
{ label: "平均速度", prop: "time" }, {label: "平均速度", prop: "time"},
], ],
paginationData:{ paginationData: {
total:0, total: 0,
pageNum:1, pageNum: 1,
pageSize:10, pageSize: 10,
}, },
}; };
}, },
created(){ created() {
this.laneTableColumn = this.laneTableColumn1 this.laneTableColumn = this.laneTableColumn1
}, },
mounted() { mounted() {
console.log(this.crossData);
// if (time_config.dataQuery_cycleTime) { // if (time_config.dataQuery_cycleTime) {
// this.dateTimeRange = [ // this.dateTimeRange = [
// new Date(time_config.dataQuery_cycleTime[0]), // new Date(time_config.dataQuery_cycleTime[0]),
...@@ -181,22 +181,30 @@ export default { ...@@ -181,22 +181,30 @@ export default {
new Date(), new Date(),
]; ];
// if (this.crossData.crossId) { // if (this.crossData.crossId) {
if (this.crossData.id) { // if (this.crossData?.id) {
// this.getData();
// }
},
watch: {
crossData(val) {
if (val) {
console.log('watch', val)
this.getData(); this.getData();
} }
}
}, },
methods: { methods: {
changeTableTh(){ changeTableTh() {
this.laneTableColumn = this['laneTableColumn'+this.locationType1]; this.laneTableColumn = this['laneTableColumn' + this.locationType1];
this.getData(); this.getData();
}, },
handleCurrentChange(e){ handleCurrentChange(e) {
this.paginationData.pageNum = e this.paginationData.pageNum = e
this.getData(); this.getData();
}, },
getData() { getData() {
let params = { let params = {
channelName:this.crossData.name, channelName: this.crossData.name,
// channelName:"龙鼎大道与龙翔路路口北向南", // channelName:"龙鼎大道与龙翔路路口北向南",
//endTime: this.dateTimeRange[1].toLocaleString().replaceAll("/", "-"), //endTime: this.dateTimeRange[1].toLocaleString().replaceAll("/", "-"),
//startTime: this.dateTimeRange[0].toLocaleString().replaceAll("/", "-"), //startTime: this.dateTimeRange[0].toLocaleString().replaceAll("/", "-"),
...@@ -208,7 +216,7 @@ export default { ...@@ -208,7 +216,7 @@ export default {
if (this.locationType1 === "1") { if (this.locationType1 === "1") {
analysisLanePage(params).then((res) => { analysisLanePage(params).then((res) => {
console.log(res); console.log(res);
if(res.code==200){ if (res.code == 200) {
this.tableData = res.content.rows; this.tableData = res.content.rows;
this.paginationData.total = res.content.total; this.paginationData.total = res.content.total;
this.$nextTick(() => { this.$nextTick(() => {
...@@ -216,11 +224,10 @@ export default { ...@@ -216,11 +224,10 @@ export default {
}); });
} }
}); });
} } else if (this.locationType1 === "2") {
else if (this.locationType1 === "2") {
analysisZebraPage(params).then((res) => { analysisZebraPage(params).then((res) => {
console.log(res); console.log(res);
if(res.code==200){ if (res.code == 200) {
this.tableData = res.content.rows; this.tableData = res.content.rows;
this.paginationData.total = res.content.total; this.paginationData.total = res.content.total;
this.$nextTick(() => { this.$nextTick(() => {
...@@ -228,11 +235,10 @@ export default { ...@@ -228,11 +235,10 @@ export default {
}); });
} }
}); });
} } else if (this.locationType1 === "3") {
else if (this.locationType1 === "3") {
analysisWaitareaPage(params).then((res) => { analysisWaitareaPage(params).then((res) => {
console.log(res); console.log(res);
if(res.code==200){ if (res.code == 200) {
this.tableData = res.content.rows; this.tableData = res.content.rows;
this.paginationData.total = res.content.total; this.paginationData.total = res.content.total;
this.$nextTick(() => { this.$nextTick(() => {
...@@ -240,11 +246,10 @@ export default { ...@@ -240,11 +246,10 @@ export default {
}); });
} }
}); });
} } else if (this.locationType1 === "4") {
else if (this.locationType1 === "4") {
analysisNonmotorLanePage(params).then((res) => { analysisNonmotorLanePage(params).then((res) => {
console.log(res); console.log(res);
if(res.code==200){ if (res.code == 200) {
this.tableData = res.content.rows; this.tableData = res.content.rows;
this.paginationData.total = res.content.total; this.paginationData.total = res.content.total;
this.$nextTick(() => { this.$nextTick(() => {
...@@ -286,8 +291,8 @@ export default { ...@@ -286,8 +291,8 @@ export default {
}, },
occupancyValue, occupancyValue,
dateChange(){ dateChange() {
if(new Date(this.dateTimeRange[1]).getTime() - new Date(this.dateTimeRange[0]).getTime() > 30*24*60*60*1000){ if (new Date(this.dateTimeRange[1]).getTime() - new Date(this.dateTimeRange[0]).getTime() > 30 * 24 * 60 * 60 * 1000) {
this.$message('选择时段需小于30天') this.$message('选择时段需小于30天')
return return
} }
...@@ -388,6 +393,7 @@ label:first-child { ...@@ -388,6 +393,7 @@ label:first-child {
flex-direction: column; flex-direction: column;
padding: 0 10px; padding: 0 10px;
} }
.custom-export-button { .custom-export-button {
position: absolute; position: absolute;
right: 0; right: 0;
...@@ -400,30 +406,33 @@ label:first-child { ...@@ -400,30 +406,33 @@ label:first-child {
font-size: 14px; font-size: 14px;
height: 28px; height: 28px;
} }
.custom-export-button:hover { .custom-export-button:hover {
background-color: #355287; background-color: #355287;
} }
::v-deep .el-pagination{ ::v-deep .el-pagination {
position: absolute; position: absolute;
top: 650PX; top: 650PX;
left: 0; left: 0;
right: 0; right: 0;
margin: auto; margin: auto;
button:disabled,.el-pager li ,.btn-next, .btn-prev{
button:disabled, .el-pager li, .btn-next, .btn-prev {
background: transparent; background: transparent;
color:rgba(255,255,255,.5); color: rgba(255, 255, 255, .5);
font-size: 12PX; font-size: 12PX;
width: 35PX; width: 35PX;
height: 28PX; height: 28PX;
} }
.btn-next .el-icon, .btn-prev .el-icon{ .btn-next .el-icon, .btn-prev .el-icon {
font-size: 12PX; font-size: 12PX;
} }
.el-pager li.active{
color:#409EFF !important; .el-pager li.active {
color: #409EFF !important;
} }
} }
</style> </style>
wj-smartcity/src/views/dataQueries/rightForm/index.vue
View file @ 7764ca9d
...@@ -12,25 +12,25 @@ ...@@ -12,25 +12,25 @@
</div> </div>
<div class="custom-tab-content"> <div class="custom-tab-content">
<div class="tab-item" v-if="activeTab === '0'"> <div class="tab-item" v-if="activeTab === '0'">
<RealTimeData ref="tab0" :crossData="crossData" /> <RealTimeData ref="tab0" :crossData="crossData"/>
</div> </div>
<div class="tab-item" v-if="activeTab === '1'"> <div class="tab-item" v-if="activeTab === '1'">
<cycle-data ref="tab1" :crossData="crossData" /> <cycle-data ref="tab1" :crossData="crossData"/>
</div> </div>
<div class="tab-item" v-if="activeTab === '2'"> <div class="tab-item" v-if="activeTab === '2'">
<snapshot-data ref="tab2" :crossData="crossData" /> <snapshot-data ref="tab2" :crossData="crossData"/>
</div> </div>
<div class="tab-item" v-if="activeTab === '3'"> <div class="tab-item" v-if="activeTab === '3'">
<event-data ref="tab3" :crossData="crossData" /> <event-data ref="tab3" :crossData="crossData"/>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { getLanePeriodTurnData, getLaneTrafficIndex } from "@/dao/optApi"; import {getLanePeriodTurnData, getLaneTrafficIndex} from "@/dao/optApi";
import { noDataTitle } from "@/utils/chartStyle"; import {noDataTitle} from "@/utils/chartStyle";
import { getFontSize } from "@/config/holo/fontSize"; import {getFontSize} from "@/config/holo/fontSize";
import RealTimeData from "@/views/dataQueries/rightForm/RealTimeData.vue"; import RealTimeData from "@/views/dataQueries/rightForm/RealTimeData.vue";
import CycleData from "@/views/dataQueries/rightForm/cycleData.vue"; import CycleData from "@/views/dataQueries/rightForm/cycleData.vue";
import SnapshotData from "@/views/dataQueries/rightForm/snapshotData.vue"; import SnapshotData from "@/views/dataQueries/rightForm/snapshotData.vue";
...@@ -38,18 +38,19 @@ import EventData from "@/views/dataQueries/rightForm/eventData.vue"; ...@@ -38,18 +38,19 @@ import EventData from "@/views/dataQueries/rightForm/eventData.vue";
export default { export default {
name: "rightForm", name: "rightForm",
components: { RealTimeData,EventData, SnapshotData, CycleData }, components: {RealTimeData, EventData, SnapshotData, CycleData},
props: ["crossData"], props: ["crossData"],
data() { data() {
return { return {
activeTab: "0", activeTab: "0",
tabs: [{ 0: "实时数据" },{ 1: "周期数据" }, { 2: "快照数据" }, tabs: [{0: "实时数据"}, {1: "周期数据"}, {2: "快照数据"},
// { 3: "事件数据" } // { 3: "事件数据" }
], ],
}; };
}, },
computed: {}, computed: {},
mounted() {}, mounted() {
},
methods: { methods: {
clickTab(item) { clickTab(item) {
// if(Object.keys(item)[0]==='3') return // if(Object.keys(item)[0]==='3') return
......
wj-smartcity/src/views/signal/mapPopup/equipmentPopup.vue
View file @ 7764ca9d
...@@ -359,7 +359,7 @@ export default { ...@@ -359,7 +359,7 @@ export default {
.equip_camera { .equip_camera {
width: 800PX; width: 800PX;
height: 500PX; height: 475PX;
overflow:hidden; overflow:hidden;
.camera_header { .camera_header {
...@@ -375,7 +375,8 @@ export default { ...@@ -375,7 +375,8 @@ export default {
} }
.camera_main { .camera_main {
height: 276PX; //height: 276PX;
height: calc(100% - 43PX);
border: 1PX solid #037bb2; border: 1PX solid #037bb2;
//padding: 18PX; //padding: 18PX;
display: flex; display: flex;
......
wj-smartcity/src/views/signalEvaluation/leftLists/components/crossRank.vue
View file @ 7764ca9d
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<script> <script>
import MsgCard from "@/components/Standard/msg-card.vue"; import MsgCard from "@/components/Standard/msg-card.vue";
import {crossList} from "@/common/api/signalEvaluation"; import {crossList,crossListSignal} from "@/common/api/signalEvaluation";
export default { export default {
name: 'crossRank', name: 'crossRank',
...@@ -87,7 +87,7 @@ export default { ...@@ -87,7 +87,7 @@ export default {
this.currentRowKey = null this.currentRowKey = null
}, },
getList() { getList() {
crossList({}).then(res => { crossListSignal({}).then(res => {
this.tableLoading = false; this.tableLoading = false;
this.fullData = res.data.content.sort((a,b)=>{ this.fullData = res.data.content.sort((a,b)=>{
return b.congestionIndex - a.congestionIndex return b.congestionIndex - a.congestionIndex
......
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