From 29b8d377d37666f841e2dc6500b0c1a301abb514 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, 24 Apr 2023 18:30:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E9=85=AC=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E5=88=86=E6=9E=90=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/reportView/components/reportContent.js    |  1 +
 .../pages/reportView/components/rightOptions.js     | 13 ++++++++-----
 .../components/statisticalMicroSettingsSlide.js     |  5 +++--
 pc4mobx/hrmSalary/pages/reportView/index.js         | 13 +++++++++++++
 pc4mobx/hrmSalary/pages/reportView/index.less       |  7 +++++--
 5 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js b/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js
index 3b72e070..413740e6 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js
@@ -99,6 +99,7 @@ class ReportContent extends Component {
             />
           </Spin>
         </div>
+        {/*侧边栏*/}
         <RightOptions/>
       </div>
     );
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/rightOptions.js b/pc4mobx/hrmSalary/pages/reportView/components/rightOptions.js
index 30d2b1b7..d5144ee6 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/rightOptions.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/rightOptions.js
@@ -5,8 +5,11 @@
  * Date: 2023/4/21
  */
 import React, { Component } from "react";
+import { WeaLocaleProvider } from "ecCom";
 import "../index.less";
 
+const { getLabel } = WeaLocaleProvider;
+
 class RightOptions extends Component {
   constructor(props) {
     super(props);
@@ -22,11 +25,11 @@ class RightOptions extends Component {
         <div className="sideBox">
           <div className="sideMain">
             <div className="toll-bar-container" style={{ alignItems: show && "center" }}>
-              <i className="icon-coms-background" title="数据视图"/>
-              <i className="icon-portal-reportform-o" title="柱状图"/>
-              <i className="icon-coms-Line" title="折线图"/>
-              <i className="icon-coms-Pie" title="饼图"/>
-              <i className="icon-coms-Flow-setting" title="设置"/>
+              <i className="icon-coms-background" title={getLabel(111, "数据视图")}/>
+              <i className="icon-portal-reportform-o" title={getLabel(111, "柱状图")}/>
+              <i className="icon-coms-Line" title={getLabel(111, "折线图")}/>
+              <i className="icon-coms-Pie" title={getLabel(111, "饼图")}/>
+              <i className="icon-coms-Flow-setting" title={getLabel(111, "设置")}/>
             </div>
           </div>
           <span className="show-btn-right"
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
index 471a9a16..97306cd7 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
@@ -32,7 +32,6 @@ import {
 import { commonEnumList } from "../../../apis/ruleconfig";
 import "../index.less";
 
-
 const { getLabel } = WeaLocaleProvider;
 
 class StatisticalMicroSettingsSlide extends Component {
@@ -284,7 +283,9 @@ class StatisticalMicroSettingsSlide extends Component {
                 columns={columns}
                 dataSource={dataSource}
                 draggable={true}
-                onDrop={dataSource => this.setState({ dataSource })}
+                onDrop={datas => this.setState({
+                  dataSource: _.map(datas, (it, idx) => ({ ...it, indexValue: idx.toString() }))
+                })}
                 pagination={false}
                 rowSelection={rowSelection}
               />
diff --git a/pc4mobx/hrmSalary/pages/reportView/index.js b/pc4mobx/hrmSalary/pages/reportView/index.js
index de4f9f6d..e16680a2 100644
--- a/pc4mobx/hrmSalary/pages/reportView/index.js
+++ b/pc4mobx/hrmSalary/pages/reportView/index.js
@@ -84,6 +84,17 @@ class Index extends Component {
       }
     });
   };
+  /*
+   * Author: 黎永顺
+   * Description: 导出报表数据
+   * Params:
+   * Date: 2023/4/24
+   */
+  exportData = () => {
+    const { report } = this.state;
+    const { id, dimensionId } = report;
+    window.open(`${window.location.origin}/api/bs/hrmsalary/report/statistics/report/exportData?id=${id}&dimensionId=${dimensionId}`, "_self");
+  };
 
   render() {
     const { report, dimensionList, statisticalPayload } = this.state;
@@ -123,10 +134,12 @@ class Index extends Component {
                     <div className="iconWrapper">
                       <i
                         className="icon-coms02-currency"
+                        title={getLabel(111, "统计数据范围及规则设置")}
                         onClick={() => this.setState({
                           statisticalPayload: { visible: true, id: report.id, dimension: report.dimensionId }
                         })}
                       />
+                      <i className="icon-coms-export" onClick={this.exportData} title={getLabel(111, "导出")}/>
                     </div>
                     {/*统计数据范围及规则设置弹框*/}
                     <StatisticalMicroSettingsSlide
diff --git a/pc4mobx/hrmSalary/pages/reportView/index.less b/pc4mobx/hrmSalary/pages/reportView/index.less
index 8d604ee1..a77a7050 100644
--- a/pc4mobx/hrmSalary/pages/reportView/index.less
+++ b/pc4mobx/hrmSalary/pages/reportView/index.less
@@ -70,13 +70,16 @@
               align-items: center;
               white-space: nowrap;
 
-              .icon-coms02-currency {
+              i.icon-coms02-currency, i.icon-coms-export {
                 font-size: 16px;
                 color: #2db7f5;
-                margin: 0 10px;
                 cursor: pointer;
               }
 
+              i.icon-coms02-currency {
+                margin: 0 10px;
+              }
+
               .dimension {
                 display: flex;
                 align-items: center;