From 661b3f66ca37a3275f14d1e616c5ce1173b13f3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 19 Jun 2023 09:44:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=B7=A5=E8=B5=84=E5=8D=95?=
 =?UTF-8?q?=E5=8F=91=E6=94=BE=E5=9F=BA=E7=A1=80=E8=AE=BE=E7=BD=AE=E6=B0=B4?=
 =?UTF-8?q?=E5=8D=B0=E8=AE=BE=E7=BD=AE=E7=9A=84=E6=B0=B4=E5=8D=B0=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payroll/components/waterMarkSetModal.js   | 17 ++++++++++------
 .../pages/payroll/watermarkPreview.js         | 20 ++++++++++---------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payroll/components/waterMarkSetModal.js b/pc4mobx/hrmSalary/pages/payroll/components/waterMarkSetModal.js
index baaafa6c..aeaee2aa 100644
--- a/pc4mobx/hrmSalary/pages/payroll/components/waterMarkSetModal.js
+++ b/pc4mobx/hrmSalary/pages/payroll/components/waterMarkSetModal.js
@@ -118,12 +118,17 @@ class WaterMarkSetModal extends Component {
                            onClick={() => this.setState({ wmcontSet: { ...wmcontSet, visible: true } })}/>
                         {
                           _.isEmpty(wmcontSet.textSet) ? <img src="/images/BacoError_wev9.png" alt=""/> :
-                            <span className="previewBtn txtPrew"><i className="icon-coms-Selected" style={{
-                              "color": "#093",
-                              "marginRight": "5px"
-                            }} onClick={() => {
-                              window.open(`${window.location.origin}/spa/hrmSalary/static/index.html#/main/hrmSalary/payroll/watermark/preview`, "_blank");
-                            }}/> 预览</span>
+                            <span className="previewBtn txtPrew"
+                                  onClick={() => {
+                                    window.open(`${window.location.origin}/spa/hrmSalary/static/index.html#/main/hrmSalary/payroll/watermark/preview`, "_blank");
+                                  }}
+                            >
+                              <i className="icon-coms-Selected" style={{
+                                "color": "#093",
+                                "marginRight": "5px"
+                              }}/>
+                              预览
+                            </span>
                         }
                       </div>
                     </WeaError> :
diff --git a/pc4mobx/hrmSalary/pages/payroll/watermarkPreview.js b/pc4mobx/hrmSalary/pages/payroll/watermarkPreview.js
index 12d3e2ff..4ea21411 100644
--- a/pc4mobx/hrmSalary/pages/payroll/watermarkPreview.js
+++ b/pc4mobx/hrmSalary/pages/payroll/watermarkPreview.js
@@ -19,11 +19,13 @@ class WatermarkPreview extends Component {
   salaryBillBaseSetPreviewWaterMark = (payload) => {
     salaryBillBaseSetPreviewWaterMark(payload).then(({ status, data }) => {
       if (status) {
+        const { wmHeight: height, wmWidth: width, wmNoTransparent, wmRotate } = payload;
         watermark({
           text: data,
           src: "",
-          rotate: `-15`,
-          alpha: 0.15,
+          width, height,
+          rotate: `-${wmRotate || 15}`,
+          alpha: wmNoTransparent / 100 || 0.15,
           interval: 2000,
           intervalCheck: true,
           clickCheck: true
@@ -34,20 +36,20 @@ class WatermarkPreview extends Component {
 
   render() {
     return (
-      <div>
+      <div style={{ display: "flex", alignItems: "center", flexDirection: "column" }}>
         <h1 style={{ textAlign: "center" }}>水印预览效果</h1>
         <p
-          style={{ fonsSize: 14 }}>水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果</p>
+          style={{ fontSize: 14 }}>水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果</p>
         <p
-          style={{ fonsSize: 14 }}>水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果</p>
+          style={{ fontSize: 14 }}>水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果</p>
         <p
-          style={{ fonsSize: 14 }}>水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果</p>
+          style={{ fontSize: 14 }}>水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果</p>
         <p
-          style={{ fonsSize: 14 }}>水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果</p>
+          style={{ fontSize: 14 }}>水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果</p>
         <p
-          style={{ fonsSize: 14 }}>水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果</p>
+          style={{ fontSize: 14 }}>水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果</p>
         <p
-          style={{ fonsSize: 14 }}>水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果</p>
+          style={{ fontSize: 14 }}>水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果水印预览效果</p>
       </div>
     );
   }