src/components/notificationMsg.vue

@@ -8,7 +8,7 @@
             <div class="notifation-wrap">
                 <!-- 防止tabs在popover前渲染,会导致tab选中状态不正确 -->
                 <el-tabs v-model="activeName" v-if="visible" @tab-click="getMsgList">
-                    <!-- 研报审批 -->
+                    <!-- 报告通知 -->
                     <el-tab-pane v-if="tabsShow.first" :label="`报告通知${activeName==='first'?'('+UnreadTotal+')':''}`" name="first"></el-tab-pane>
                     <!-- bi看板审批 -->
                     <el-tab-pane v-if="tabsShow.second" :label="`${$t('SystemManage.BaseConfig.bIDashboard_approval')}${activeName==='second'?'('+UnreadTotal+')':''}`" name="second"></el-tab-pane>

src/views/ppt_manage/newVersion/components/formatEl/ChartEl.vue

@@ -16,7 +16,6 @@
           v-if="isBtnShow&&![1,6].includes($parent.modelId)"
       ></div>
     </el-tooltip>
-    <span></span>
     <!-- <el-tooltip :content="$t('Slides.add_to_my_gallery_tooltip')" placement="bottom"  v-if="$parent.isAdd&&chartTitle.length&&item">
       <div class="addBtn"
         style="margin-right:2%;"
@@ -127,7 +126,7 @@ export default {
   .dragBtn,.copyBtn,.addBtn,.closeBtn{
     position: static;
   }
-  .addBtn{
+  .copyBtn{
     margin-left: auto;
   }
 }

src/views/report_manage/reportV2/list.vue

@@ -591,8 +591,8 @@ export default {
         {label:"撤销",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_cancelPublish'),States:[4,5,6],text:'ReportManage.smart_btn.withdraw'},
         {label:"下载Pdf",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_exportPdf'),States:[2,6],text:'ReportManage.smart_btn.download_pdf'},
         {label:"下载长图",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_exportImg'),States:[2,6],text:'ReportManage.smart_btn.download_long_image'},
-        {label:"推送消息",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_sendMsg'),States:[2,6],text:'ReportManage.smart_push_notification_btn'},
-        {label:"已推送消息",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_sendMsg'),States:[2,6],text:'ReportManage.smart_notification_pushed'},
+        // {label:"推送消息",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_sendMsg'),States:[2,6],text:'ReportManage.smart_push_notification_btn'},
+        // {label:"已推送消息",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_sendMsg'),States:[2,6],text:'ReportManage.smart_notification_pushed'},
       ],
 
       waterMarkStr:"",
@@ -896,16 +896,8 @@ export default {
       let baseUrl= localStorage.getItem('dynamicOutLinks') ? JSON.parse(localStorage.getItem('dynamicOutLinks')).ReportViewUrl : '';
 			this.linkPdfUrl = item.ReportLayout===1 ? `${baseUrl}/reportshare_pdf` : `${baseUrl}/reportshare_smart_pdf`;
 
-      if(item.ReportSource===2){
-        this.handlePublic(1)
-        return
-      }
-      const isPost = this.permissionBtn.checkPermissionBtn(this.permissionBtn.reportManageBtn.reportManage_sendMsg)
-      if(isPost){
-          this.showPublish = true;
-      }else{
-        this.handlePublic(1)
-      }
+      
+      this.handlePublic(1)
       
     },
 
@@ -914,18 +906,7 @@ export default {
     handlePublic(type) {
       reportpublish({ ReportIds: this.batches.join(","),ReportUrl:this.generatePdfLinks(this.publishReportCode)}).then((res) => {
         if (res.Ret == 200) {
-          if (type == 2) {
-            reportMessageSend({
-              ReportId: this.batches[0],
-            }).then((resMsg) => {
-              if (resMsg.Ret == 200) {
-                this.$message.success(this.$t('ReportManage.smart_msg.published_success'));
-                this.batches = [];
-                this.getReportList();
-                this.showPublish = false;
-              }
-            });
-          } else {
+         
             if (res.Data) {
               this.$alert(res.Data, this.$t('ReportManage.smart_msg.release_prompt'), {
                confirmButtonText: this.$t('Dialog.confirm_btn'),
@@ -938,7 +919,6 @@ export default {
             this.getReportList();
             this.showPublish = false;
           }
-        }
       });
     },
     generatePdfLinks(Code){
@@ -1019,11 +999,12 @@ export default {
     itemclickHandle({type,data}){
       switch (type) {
         case '发布':
-          this.publishreport(data)
-          break;
         case '提交':
-          this.handleSubmitReport(data)
+          this.publishreport(data)
           break;
+        // case '提交':
+        //   this.handleSubmitReport(data)
+        //   break;
         case '编辑':
           this.editreport(data, 'edit')
           break;
@@ -1036,9 +1017,9 @@ export default {
         case '取消发布':
           this.canclepublish(data)
           break;
-        case '撤销':
-          this.cancelReport(data)
-          break;
+        // case '撤销':
+        //   this.cancelReport(data)
+        //   break;
         case '推送消息':
           this.messageSend(data)
           break;
@@ -1111,6 +1092,8 @@ export default {
           return commonFilterPass && row.DetailPdfUrl    
         }else if(but.label==='下载长图'){
           return commonFilterPass && row.DetailImgUrl           
+        }else if(['删除','撤销'].includes(but.label)){
+          return commonFilterPass && row.ReportSource===1           
         }
 
         return commonFilterPass