Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev
commit
2787535ef5
|
@ -47,7 +47,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="视频路径" align="center" prop="videoUrl" >
|
||||
<template slot-scope="{row}">
|
||||
<video height="80" controls>
|
||||
<video height="80" controls :key="row.videoUrl" v-if="row.videoUrl">
|
||||
<source :src="row.videoUrl" type="video/mp4"/>
|
||||
您的浏览器不支持Video标签。
|
||||
</video>
|
||||
|
@ -187,7 +187,13 @@ export default {
|
|||
getList() {
|
||||
this.loading = true;
|
||||
queryPrjphotography(this.queryParams).then(response => {
|
||||
this.prjphotographyList = response.rows;
|
||||
this.prjphotographyList = (response.rows||[]).map(it=>{
|
||||
let tmps=it.imageUrl?this.$tryToJson(it.imageUrl,[]):[];
|
||||
it.imageUrls=tmps;
|
||||
it.images=tmps.map(item=>item.url);
|
||||
it.image=it.images.length>0?it.images[0]:'';
|
||||
return it;
|
||||
});
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
|
|
|
@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="isDel != null "> and is_del = #{isDel}</if>
|
||||
<if test="createDate != null "> and create_date = #{createDate}</if>
|
||||
<if test="updateDate != null "> and video_date <= #{updateDate}</if>
|
||||
order by video_date
|
||||
order by video_date desc
|
||||
</select>
|
||||
|
||||
<select id="selectSurProjectPhotographyById" parameterType="Long" resultMap="SurProjectPhotographyResult">
|
||||
|
|
Loading…
Reference in New Issue