sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev

dev_xds
姜玉琦 2024-05-06 23:56:41 +08:00
parent 0f4d98f854 a87456e66c
commit 2787535ef5
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-ui/src/views/video/prjphotography/index.vue
View File

@ -47,7 +47,7 @@
</el-table-column> </el-table-column>
<el-table-column label="视频路径" align="center" prop="videoUrl" > <el-table-column label="视频路径" align="center" prop="videoUrl" >
<template slot-scope="{row}"> <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"/> <source :src="row.videoUrl" type="video/mp4"/>
您的浏览器不支持Video标签。 您的浏览器不支持Video标签。
</video> </video>
@ -187,7 +187,13 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
queryPrjphotography(this.queryParams).then(response => { 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.total = response.total;
this.loading = false; this.loading = false;
}); });

2
yanzhu-jh/src/main/resources/mapper/video/SurProjectPhotographyMapper.xml
View File

@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isDel != null "> and is_del = #{isDel}</if> <if test="isDel != null "> and is_del = #{isDel}</if>
<if test="createDate != null "> and create_date = #{createDate}</if> <if test="createDate != null "> and create_date = #{createDate}</if>
<if test="updateDate != null "> and video_date &lt;= #{updateDate}</if> <if test="updateDate != null "> and video_date &lt;= #{updateDate}</if>
order by video_date order by video_date desc
</select> </select>
<select id="selectSurProjectPhotographyById" parameterType="Long" resultMap="SurProjectPhotographyResult"> <select id="selectSurProjectPhotographyById" parameterType="Long" resultMap="SurProjectPhotographyResult">