Merge branch 'ppt-edit-lock'

src/views/ppt_manage/newVersion/pptCatalog.vue

@@ -596,7 +596,10 @@ export default {
       //若有人在编辑，则显示编辑中
       if(this.pptToolList.find(i=>i.key==='edit')){
         const {Editor={}} = pptDetail
-        const labelName = Editor.IsEditing?`${Editor.Editor}编辑中...`:'编辑'
+        let labelName = '编辑'
+        if(Editor.IsEditing&&Editor.AdminId!==Number(localStorage.getItem('AdminId'))){
+            labelName = `${Editor.Editor}编辑中...`
+        }
         this.pptToolList.map(i=>{
             if(i.key==='edit'){
                 i.label = labelName

src/views/ppt_manage/newVersion/pptEnCatalog.vue

@@ -564,7 +564,10 @@ export default {
       //若有人在编辑，则显示编辑中
       if(this.pptToolList.find(i=>i.key==='edit')){
         const {Editor={}} = pptDetail
-        const labelName = Editor.IsEditing?`${Editor.Editor}编辑中...`:'编辑'
+        let labelName = '编辑'
+        if(Editor.IsEditing&&Editor.AdminId!==Number(localStorage.getItem('AdminId'))){
+            labelName = `${Editor.Editor}编辑中...`
+        }
         this.pptToolList.map(i=>{
             if(i.key==='edit'){
                 i.label = labelName