Skip to content

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

部分页面切换分辨率未自适应缩放修正

parent 2bca4fe8
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 79 deletions
wj-manage-web/src/views/analysis/historyReports/index.vue
View file @ c5587e1b
......@@ -112,7 +112,7 @@
</template>
<script>
// import { download, getBlob } from "../../../utils/request";
import { download, getBlob } from "../../../utils/request";
// import fetch from "@/utils/fetch";
import { getReports, getReportsByPage } from "../../../dao/analysis";
import JSZip from "jszip";
......
wj-manage-web/src/views/analysis/reportCross.vue
View file @ c5587e1b
......@@ -590,6 +590,7 @@ export default {
width: 65%;
padding: 16px;
overflow-y: auto;
font-size: 14px;
.check-all {
height: 30px;
......
wj-manage-web/src/views/safety/totalPieChart.vue
View file @ c5587e1b
......@@ -263,6 +263,7 @@ export default {
width: 65%;
height: 100%;
padding: 20px 30px 20px 0;
font-size: 14px;
.legendsTitle {
height: 25px;
......
wj-manage-web/src/views/safety/typePieChart.vue
View file @ c5587e1b
......@@ -256,19 +256,7 @@ export default {
height: calc(100% - 30px);
margin-top: 30px;
padding: 20px 30px 20px 0;
//.legendsTitle {
// height: 25px;
// margin-top: 30px;
// width: 100%;
// color: #dbdee5;
// display: flex;
// align-items: center;
// justify-content: space-between;
// padding: 0 10px;
// border-left: 3px solid #0d7fd7;
// background-color: #1a2557;
//}
font-size: 14px;
.legendsT {
display: flex;
......
wj-manage-web/src/views/track/menuKeyVehicle.vue
View file @ c5587e1b
......@@ -16,10 +16,9 @@
header-row-class-name="tab-table-header"
header-cell-class-name="tab-table-header-cell"
>
<el-table-column min-width="50" type="index" label="序号">
<el-table-column prop='index' label="序号">
</el-table-column>
<el-table-column
min-width="80"
:show-overflow-tooltip="true"
prop="plateNum"
label="号牌号码"
......@@ -28,7 +27,6 @@
</el-table-column>
<el-table-column
min-width="60"
:show-overflow-tooltip="true"
label="车辆类型"
>
......@@ -37,7 +35,6 @@
</template>
</el-table-column>
<!-- <el-table-column
min-width="60"
:show-overflow-tooltip="true"
label="使用性质"
>
......@@ -46,7 +43,6 @@
</template>
</el-table-column> -->
<el-table-column
min-width="80"
:show-overflow-tooltip="true"
label="最近出现时间"
>
......@@ -58,7 +54,7 @@
}}
</template>
</el-table-column>
<el-table-column fixed="right" min-width="70" label="操作">
<el-table-column fixed="right" label="操作">
<template slot-scope="scope">
<i
@click="playTrack(scope.row)"
......@@ -172,6 +168,7 @@ export default {
return item.code == res.content.rows[i].type;
});
res.content.rows[i].typeName = match ? match.name : "未定义";
res.content.rows[i].index = i+1;
}
this.tableData = res.content.rows;
this.tableTotal = res.content.total;
......@@ -432,25 +429,6 @@ export default {
}
}
.title-text {
padding-left: 30px;
display: flex;
align-items: center;
position: relative;
height: 30px;
.form-item-icon {
position: absolute;
width: 12px;
height: 12px;
left: 5px;
border: 3px solid #2d5fa4;
rotate: 45deg;
//background-size: 100% 100%;
//background-image: url("../../assets/images/track/title_prefix.png");
}
}
.search-form {
max-height: 340px;
overflow: auto;
......
wj-manage-web/src/views/track/menuTrafficCrowd.vue
View file @ c5587e1b
......@@ -11,7 +11,6 @@
ref="searchForm"
class="search-form"
label-position="right"
label-width="90px"
:model="searchForm"
>
<el-form-item label="开始时间:" prop="startTime">
......@@ -106,10 +105,9 @@
header-row-class-name="tab-table-header"
header-cell-class-name="tab-table-header-cell"
>
<el-table-column min-width="50" type="index" label="序号">
<el-table-column prop="index" label="序号">
</el-table-column>
<el-table-column
min-width="55"
:show-overflow-tooltip="true"
label="拥堵程度"
>
......@@ -119,7 +117,6 @@
</el-table-column>
<el-table-column
:show-overflow-tooltip="true"
min-width="60"
prop="placeDesc"
label="拥堵地点"
>
......@@ -139,7 +136,7 @@
{{ scope.row.duration }} min
</template>
</el-table-column>
<el-table-column min-width="60" fixed="right" label="车辆轨迹">
<el-table-column fixed="right" label="车辆轨迹">
<template slot-scope="scope">
<i @click="playTrack(scope.row)" class="el-icon-video-play" />
</template>
......@@ -296,6 +293,9 @@ export default {
console.log(sendData);
crowdTracksList(sendData).then((res) => {
console.log("crowd multi", res);
for (let i = 0; i < res.content.rows.length; i++) {
res.content.rows[i].index = i + 1;
}
this.tableData = res.content.rows;
this.tableTotal = res.content.total;
this.tableLoading = false;
......@@ -618,6 +618,7 @@ export default {
align-items: center;
position: relative;
height: 30px;
font-size: 14px;
.form-item-icon {
position: absolute;
......@@ -639,15 +640,18 @@ export default {
::v-deep .el-form-item__label {
color: rgba(255, 255, 255, 0.85);
width: 90px;
}
::v-deep .el-form-item__content {
height: 30px;
line-height: 30px;
width: calc(100% - 90px);
}
::v-deep .el-form-item {
margin-bottom: 15px;
display: flex;
}
::v-deep .el-input__inner {
......
wj-manage-web/src/views/track/menuTrafficEvent.vue
View file @ c5587e1b
......@@ -12,7 +12,6 @@
ref="searchForm"
class="search-form"
label-position="right"
label-width="90px"
:model="searchForm"
>
<el-form-item label="开始时间:" prop="startTime">
......@@ -129,12 +128,11 @@
header-row-class-name="tab-table-header"
header-cell-class-name="tab-table-header-cell"
>
<el-table-column type="index" min-width="50" label="序号">
<el-table-column prop="index" label="序号">
</el-table-column>
<el-table-column
:show-overflow-tooltip="true"
label="事件类型"
min-width="60"
>
<template slot-scope="scope">
{{ getNameByCode(scope.row.eventType, "EventType") }}
......@@ -154,14 +152,13 @@
</el-table-column>
<el-table-column
:show-overflow-tooltip="true"
min-width="60"
prop="plateNo"
label="号牌号码"
><template slot-scope="scope">{{
scope.row.plateNo || "-"
}}</template>
</el-table-column>
<el-table-column min-width="60" label="事件轨迹">
<el-table-column label="事件轨迹">
<template slot-scope="scope">
<i @click="playTrack(scope.row)" class="el-icon-video-play" />
</template>
......@@ -350,6 +347,7 @@ export default {
return item !== "";
});
table.content.rows[i].channels = fChannels;
table.content.rows[i].index = i+1;
}
this.tableData = table.content.rows;
this.tableTotal = table.content.total;
......@@ -661,6 +659,7 @@ export default {
align-items: center;
position: relative;
height: 30px;
font-size: 14px;
.form-item-icon {
position: absolute;
......@@ -682,15 +681,18 @@ export default {
::v-deep .el-form-item__label {
color: rgba(255, 255, 255, 0.85);
width: 90px;
}
::v-deep .el-form-item__content {
height: 30px;
line-height: 30px;
width: calc(100% - 90px);
}
::v-deep .el-form-item {
margin-bottom: 15px;
display: flex;
}
::v-deep .el-input__inner {
......
wj-manage-web/src/views/track/menuVehicleTrack.vue
View file @ c5587e1b
......@@ -11,7 +11,6 @@
ref="searchForm"
class="search-form"
label-position="right"
label-width="90px"
:model="searchForm"
>
<!-- :picker-options="pickOptionsStart" -->
......@@ -207,7 +206,6 @@
>
<el-table-column type="selection"> </el-table-column>
<el-table-column
min-width="70px"
:show-overflow-tooltip="true"
prop="plateNum"
label="号牌号码"
......@@ -216,11 +214,7 @@
scope.row.plateNum || "-"
}}</template>
</el-table-column>
<el-table-column
:show-overflow-tooltip="true"
label="号牌颜色"
min-width="60px"
>
<el-table-column :show-overflow-tooltip="true" label="号牌颜色">
<template slot-scope="scope">
{{ getNameByCode(scope.row.plateColor, "PlateColor") }}
</template>
......@@ -230,16 +224,12 @@
{{ getNameByCode(scope.row.type, "CarType") }}
</template>
</el-table-column>
<el-table-column
:show-overflow-tooltip="true"
min-width="60px"
label="车身颜色"
>
<el-table-column :show-overflow-tooltip="true" label="车身颜色">
<template slot-scope="scope">
{{ getNameByCode(scope.row.color, "CarColor") }}
</template>
</el-table-column>
<el-table-column fixed="right" min-width="55px" label="操作">
<el-table-column fixed="right" label="操作">
<template slot-scope="scope">
<i @click="playTrack(scope.row)" class="el-icon-video-play" />
<i
......@@ -748,18 +738,6 @@ export default {
align-items: center;
cursor: pointer;
font-size: 14px;
//.el-icon-arrow-up-c{
// width: 20px;
// height: 20px;
// background-image: url("../../assets/images/track/arrow_down.png");
// background-size: 100% 100%;
//}
//.el-icon-arrow-down-c{
// width: 20px;
// height: 20px;
// background-image: url("../../assets/images/track/arrow_down.png");
// background-size: 100% 100%;
//}
}
.track-result-table {
......@@ -817,6 +795,7 @@ export default {
align-items: center;
position: relative;
height: 30px;
font-size: 14px;
.form-item-icon {
position: absolute;
......@@ -825,8 +804,6 @@ export default {
left: 5px;
border: 3px solid #2d5fa4;
rotate: 45deg;
//background-size: 100% 100%;
//background-image: url("../../assets/images/track/title_prefix.png");
}
}
......@@ -838,20 +815,22 @@ export default {
::v-deep .el-form-item__label {
color: rgba(255, 255, 255, 0.85);
width: 90px;
}
::v-deep .el-form-item__content {
height: 30px;
line-height: 30px;
width: calc(100% - 90px);
}
::v-deep .el-form-item {
margin-bottom: 15px;
display: flex;
}
::v-deep .el-input__inner {
color: white;
// font-size: 14px;
}
::v-deep .el-range-input {
......@@ -865,8 +844,6 @@ export default {
}
.top {
//max-height: 400px;
//flex: 0 0 45%;
overflow: auto;
}
......@@ -910,6 +887,7 @@ export default {
padding: 2px 2px;
line-height: unset;
text-align: center;
}
padding: 1px 1px;
......@@ -924,6 +902,8 @@ export default {
height: 30px;
padding: 2px 2px;
text-align: center;
overflow: unset;
text-overflow: unset;
}
}
......
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