Merge branch 'xqc_waterMark'

src/api/modules/setApi.js

@@ -2,6 +2,10 @@ import http from "@/api/http.js"
 
 /* 部门管理模块 */
 const departInterence = {
+	//系统用户详情
+	systemUserInfo:params=>{
+		return http.get('/system/sysuser/detail',{})
+	},
 
 	/**
 	 * AdminId

src/views/report_manage/reportdtl.vue

@@ -66,7 +66,7 @@
 </template>
 
 <script>
-	import { reportdetail } from 'api/api.js';
+	import { reportdetail,departInterence } from 'api/api.js';
 	import http from '@/api/http.js';
 	import * as reportEnInterface from '@/api/modules/reportEnApi';
 	import {strategyReportInterence} from '@/api/api.js'
@@ -77,10 +77,18 @@
 				let str=''
 				const baseUrl= localStorage.getItem('dynamicOutLinks') ? JSON.parse(localStorage.getItem('dynamicOutLinks')).ReportViewUrl : '';
 				if(this.$route.query.code){
+					// 设置水印文案
+					let waterMarkStr=''
+					if(this.systemUserInfo){
+						waterMarkStr=`${this.systemUserInfo.RealName}${this.systemUserInfo.Mobile?this.systemUserInfo.Mobile:this.systemUserInfo.Email}`
+						const base64=new http.Base64()
+						waterMarkStr=base64.encode(waterMarkStr)
+					}
+					
 					if(this.$route.query.fromPage == 'en'){
-						str=`${baseUrl}/reportshare_crm_report_en?code=${this.$route.query.code}`
+						str=`${baseUrl}/reportshare_crm_report_en?code=${this.$route.query.code}&flag=${waterMarkStr}`
 					}else{
-						str=`${baseUrl}/reportshare_crm_report?code=${this.$route.query.code}`
+						str=`${baseUrl}/reportshare_crm_report?code=${this.$route.query.code}&flag=${waterMarkStr}`
 					}
 				}
 				
@@ -93,6 +101,8 @@
 				isshow:false,
 				reportInfo:{},
 				isShowCode:false,
+
+				systemUserInfo:null,
 				// linkUrl:this.$route.query.code?'https://share.hzinsights.com/reportdtl?code='+this.$route.query.code:''
 			}
 		},
@@ -109,6 +119,7 @@
 				console.log(this.reportInfo);
 				this.isshow=true;
 			}
+			this.getSystemUserInfo()
 		},
 		updated(){
 		  $('#resetcss').find('img').css({display:'block',margin:'0 auto'});
@@ -116,6 +127,13 @@
 			$("#resetcss").find("pre").css({display: "block",whiteSpace: "pre-wrap"});
 		},
 		methods: {
+			getSystemUserInfo(){
+				departInterence.systemUserInfo().then(res=>{
+					if(res.Ret===200){
+						this.systemUserInfo=res.Data
+					}
+				})
+			},
 			async getreportdetail(){
 				let res
 				if(this.$route.query.fromPage == 'en'){

src/views/system_manage/etaBaseConfig.vue

@@ -16,10 +16,23 @@
                             @remove="deleteFormImg('CompanyWatermark')"
                             />
                         <!-- 后面可能会有新的选项 -->
-                        <el-checkbox-group v-if="isShowYBChart"
-                            v-model="checkList" style="position: absolute;top: -40px;left: 100px;">
-                            <el-checkbox label="研报图表"></el-checkbox>
-                        </el-checkbox-group>
+                        <div style="position: absolute;top: -40px;left: 100px;display:flex;gap:0 20px">
+                            <el-checkbox-group v-if="isShowYBChart"
+                                v-model="checkList" >
+                                <el-checkbox label="研报图表"></el-checkbox>
+                            </el-checkbox-group>
+                            <div>
+                                <el-checkbox label="研报分享" v-model="formData.WatermarkReport"></el-checkbox>
+                                <el-tooltip 
+                                    effect="dark" 
+                                    content="研报详情分享页水印,水印内容为分享人用户名称+手机号(无手机号时为邮箱地址)" 
+                                    placement="top"
+                                >
+                                    <i class="el-icon-warning"></i>
+                                </el-tooltip>
+                            </div>
+                            
+                        </div>
                         <ConfigAnnotation picName="CompanyWatermark" @showImage="previewImage"/>
                     </el-form-item>
                 </div>
@@ -313,6 +326,8 @@ export default {
                 EnPptBackgroundImg:'',//英文ppt背景图
                 EnPptBottomImg:'',//英文ppt封底图
 
+                WatermarkReport:false,//研报分享水印
+
             },//表单预设值
             rules: {
                 Disclaimer:[{ required: true, message: '请输入免责声明', trigger: 'blur' }],
@@ -501,6 +516,7 @@ export default {
                     this.formData = {...this.formData,...res.Data}
                     this.formData.CnPptCoverImgs = CnPptCoverImgs.length?CnPptCoverImgs.split(','):[]
                     this.formData.EnPptCoverImgs = EnPptCoverImgs.length?EnPptCoverImgs.split(','):[]
+                    this.formData.WatermarkReport=res.Data.WatermarkReport==='true'?true:false
                 }
                 this.configLoading&&this.configLoading.close()
             })
@@ -547,7 +563,14 @@ export default {
                     const EnPptCoverImgs = this.formData.EnPptCoverImgs.join(',')
                     //通过验证后,提交数据前
                     //根据isShowXunFei,isShowPPTisShowEnPPT这三个计算属性将对应的表单项隐藏
-                    etaBaseConfigInterence.saveBaseConfig({...this.formData,...{CnPptCoverImgs,EnPptCoverImgs}}).then(res=>{
+                    etaBaseConfigInterence.saveBaseConfig({
+                        ...this.formData,
+                        ...{
+                            CnPptCoverImgs,
+                            EnPptCoverImgs,
+                            WatermarkReport:this.formData.WatermarkReport?'true':'false'
+                        }
+                    }).then(res=>{
                         if(res.Ret!==200) return 
                         this.$message.success('保存成功，请稍后到对应页面/项目查看')
                     })