zcdsj
/
cma_search
mirror of https://e.coding.net/ctcdevteam/cma_search.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search

This commit is contained in:
caoqianming 2022-04-20 16:30:42 +08:00
parent 7c2a5f78b3 132244b49e
commit 3549c91007
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/views/testvideo/index.vue
View File

@ -133,7 +133,7 @@
plugins:{ plugins:{
DynamicWatermark: { DynamicWatermark: {
speed: 0.1, speed: 0.1,
content: text content: "用户："+that.userName
} }
} }
}; };
@ -155,6 +155,7 @@
}); });
} else { } else {
that.player.loadVideoByID(playerParm); that.player.loadVideoByID(playerParm);
that.player.loadVideoByID(that.tcPlayerId);
} }
}, },
}, },

8
client/src/views/testvideo/upload.vue
View File

@ -45,10 +45,9 @@
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
:disabled="!checkPermission(['video_update'])"
type="primary" type="primary"
size="small" size="small"
icon="el-icon-edit" icon="el-icon-view"
@click="handleEdit(scope)" @click="handleEdit(scope)"
/> />
<el-button <el-button
@ -313,13 +312,14 @@ export default {
}, },
//编辑视频 //编辑视频
handleEdit(scope) { handleEdit(scope) {
this.VideoContent = Object.assign({}, scope.row); // copy obj this.$router.push({name: "Index", params: {fileid: scope.row.fileid, id: scope.row.id}})
/*this.VideoContent = Object.assign({}, scope.row); // copy obj
this.dialogType = "edit"; this.dialogType = "edit";
this.dialogVisible = true; this.dialogVisible = true;
this.$nextTick(() => { this.$nextTick(() => {
this.$refs["Forms"].clearValidate(); this.$refs["Forms"].clearValidate();
}); });*/
}, },
setVcExampleVideoName: function () { setVcExampleVideoName: function () {
this.vcExampleVideoName = this.$refs.vcExampleVideo.files[0].name; this.vcExampleVideoName = this.$refs.vcExampleVideo.files[0].name;