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

client/src/views/testvideo/index.vue

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

client/src/views/testvideo/upload.vue

@@ -45,10 +45,9 @@
           </template>
           <template slot-scope="scope">
             <el-button
-              :disabled="!checkPermission(['video_update'])"
               type="primary"
               size="small"
-              icon="el-icon-edit"
+              icon="el-icon-view"
               @click="handleEdit(scope)"
             />
             <el-button
@@ -313,13 +312,14 @@ export default {
     },
     //编辑视频
     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.dialogVisible = true;
 
       this.$nextTick(() => {
         this.$refs["Forms"].clearValidate();
-      });
+      });*/
     },
     setVcExampleVideoName: function () {
       this.vcExampleVideoName = this.$refs.vcExampleVideo.files[0].name;