Commit 0424ce2a authored by zhanglw's avatar zhanglw

修复相册错位等

parent 8a35fadf
...@@ -16,8 +16,7 @@ ...@@ -16,8 +16,7 @@
<DPcomputer17 class="DPcomputer17Class"></DPcomputer17> <DPcomputer17 class="DPcomputer17Class"></DPcomputer17>
<div v-show="noPtz" class="noPtzVideo1"> <div v-show="noPtz" class="noPtzVideo1">
<!-- <video id="videoRealtime" class="video-js vjs-default-skin vjs-big-play-centered" controls preload="auto" data-setup="{}" style="width: 100%;height: 100%;" autoplay>--> <video id="videoRealtime" class="video-js vjs-default-skin vjs-big-play-centered" controls preload="auto" data-setup="{}" style="width: 100%;height: 100%;" autoplay>
<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. 您的浏览器不支持:HTML5 video.
</video> </video>
<!-- <el-select v-model="cameraSrc" class="noPtzCameraList" @change="videoPlay()" :popper-append-to-body="false">--> <!-- <el-select v-model="cameraSrc" class="noPtzCameraList" @change="videoPlay()" :popper-append-to-body="false">-->
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</div> </div>
<!-- 嵌入三维地图页面 --> <!-- 嵌入三维地图页面 -->
<!-- <iframe :src="url" frameborder="0" class="mapcontainer1"></iframe>--> <!-- <iframe :src="url" frameborder="0" class="mapcontainer1"></iframe>-->
<iframe ref="iframe" src="http://39.164.225.220:5001//#/Index" frameborder="0" class="mapcontainer1"></iframe> <!-- <iframe ref="iframe" src="http://39.164.225.220:5001//#/Index" frameborder="0" class="mapcontainer1"></iframe>-->
<!-- <iframe ref="iframe" src="http://192.168.3.38:3002/#/Index" frameborder="0" class="mapcontainer1"></iframe>--> <!-- <iframe ref="iframe" src="http://192.168.3.38:3002/#/Index" frameborder="0" class="mapcontainer1"></iframe>-->
<!-- 单个车辆视频监控 --> <!-- 单个车辆视频监控 -->
......
...@@ -139,10 +139,13 @@ ...@@ -139,10 +139,13 @@
</el-dialog> </el-dialog>
<!-- 相册 --> <!-- 相册 -->
<el-dialog append-to-body :close-on-click-modal="false" :before-close="cancelForm" :visible="photoView" :title="title" width="1600px"> <el-dialog append-to-body :close-on-click-modal="false" :before-close="cancelForm" :visible="photoView" :title="title" width="1600px">
<div id="items"> <div class="items">
<div class="item" v-for="(item,index) in photoList" :key="index"> <div class="item" v-for="(item,index) in photoList" :key="index">
<el-image :src="item.image_url" :preview-src-list="[item.image_url]"><div slot="placeholder" class="image-slot">加载中<span class="dot">...</span></div></el-image> <el-image :src="item.image_url" :preview-src-list="[item.image_url]"><div slot="placeholder" class="image-slot">加载中<span class="dot">...</span></div></el-image>
{{formatDate(item.time)}} <div>{{formatDate(item.time)}}</div>
</div>
<div class="item" v-for="(item,index) in photoListVoid" :key="index">
<div style="line-height: 200px;opacity:20%">暂无更多图片...</div>
</div> </div>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -198,6 +201,7 @@ export default { ...@@ -198,6 +201,7 @@ export default {
], ],
pageP: 1, pageP: 1,
photoList: [], photoList: [],
photoListVoid: [],
videoDate: '', videoDate: '',
videoList: [], videoList: [],
peoItem: null, peoItem: null,
...@@ -359,6 +363,10 @@ export default { ...@@ -359,6 +363,10 @@ export default {
if(res.body.data){ if(res.body.data){
this.photoList = res.body.data; this.photoList = res.body.data;
this.totalP = res.body.total; this.totalP = res.body.total;
this.photoListVoid=[];
for(let i=10-this.photoList.length;i>0;i--){
this.photoListVoid.push({});
}
}else{ }else{
this.pageP--; this.pageP--;
this.$message({ this.$message({
...@@ -674,21 +682,24 @@ div::-webkit-scrollbar{ ...@@ -674,21 +682,24 @@ div::-webkit-scrollbar{
cursor: pointer; cursor: pointer;
} }
#items { .items {
width: 100%; width: 100%;
height: 420px; height: 420px;
margin: 0 auto; margin: 0 auto;
column-count: 5; column-count: 5;
column-gap: 0; column-gap: 0;
list-style: none;
column-fill: balance;
} }
.item { .item {
padding: 2px; padding: 2px;
width: 100%; width: 100%;
color: purple; color: #3e3e3e;
font-size: 18px; font-size: 18px;
font-weight: bolder; font-weight: bolder;
text-align: center; text-align: center;
break-inside: avoid;
} }
.image-slot { .image-slot {
width: 308px; width: 308px;
......
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