diff --git a/myems-api/excelexporters/shopfloorcost.py b/myems-api/excelexporters/shopfloorcost.py
index 3b88f2d2..aadf8544 100644
--- a/myems-api/excelexporters/shopfloorcost.py
+++ b/myems-api/excelexporters/shopfloorcost.py
@@ -3,6 +3,7 @@ import uuid
 import os
 from openpyxl.chart import (
         PieChart,
+        LineChart,
         BarChart,
         Reference,
     )
@@ -11,7 +12,6 @@ from openpyxl.drawing.image import Image
 from openpyxl import Workbook
 from openpyxl.chart.label import DataLabelList
 
-
 ####################################################################################################################
 # PROCEDURES
 # Step 1: Validate the report data
@@ -66,6 +66,7 @@ def generate_excel(report,
                    reporting_start_datetime_local,
                    reporting_end_datetime_local,
                    period_type):
+
     wb = Workbook()
     ws = wb.active
 
@@ -77,7 +78,7 @@ def generate_excel(report,
     # for i in range(2, 37 + 1):
     #     ws.row_dimensions[i].height = 30
     #
-    # for i in range(38, 69 + 1):
+    # for i in range(38, 90 + 1):
     #     ws.row_dimensions[i].height = 30
 
     # Col width
@@ -157,8 +158,401 @@ def generate_excel(report,
     ws['F3'].font = name_font
     ws['F3'].alignment = b_r_alignment
     ws['F3'] = 'Date:'
-    ws['G3'].border = b_border
     ws['G3'].alignment = b_c_alignment
     ws['G3'].font = name_font
     ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
     ws.merge_cells("G3:H3")
+
+    if "reporting_period" not in report.keys() or \
+            "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0:
+        filename = str(uuid.uuid4()) + '.xlsx'
+        wb.save(filename)
+
+        return filename
+
+    #################################################
+
+    reporting_period_data = report['reporting_period']
+
+    has_energy_data_flag = True
+    if "names" not in reporting_period_data.keys() or \
+            reporting_period_data['names'] is None or \
+            len(reporting_period_data['names']) == 0:
+        has_energy_data_flag = False
+
+    if has_energy_data_flag:
+        ws['B6'].font = title_font
+        ws['B6'] = name+' 报告期成本'
+
+        category = reporting_period_data['names']
+        ca_len = len(category)
+
+        ws.row_dimensions[7].height = 60
+        ws['B7'].fill = table_fill
+        ws['B7'].border = f_border
+
+        ws['B8'].font = title_font
+        ws['B8'].alignment = c_c_alignment
+        ws['B8'] = '成本'
+        ws['B8'].border = f_border
+
+        ws['B9'].font = title_font
+        ws['B9'].alignment = c_c_alignment
+        ws['B9'] = '单位面积能耗'
+        ws['B9'].border = f_border
+
+        ws['B10'].font = title_font
+        ws['B10'].alignment = c_c_alignment
+        ws['B10'] = '环比'
+        ws['B10'].border = f_border
+
+        col = 'B'
+
+        for i in range(0, ca_len):
+            col = chr(ord('C') + i)
+            ws[col + '7'].fill = table_fill
+            ws[col + '7'].font = name_font
+            ws[col + '7'].alignment = c_c_alignment
+            ws[col + '7'] = reporting_period_data['names'][i] + " (" + reporting_period_data['units'][i] + ")"
+            ws[col + '7'].border = f_border
+
+            ws[col + '8'].font = name_font
+            ws[col + '8'].alignment = c_c_alignment
+            ws[col + '8'] = round(reporting_period_data['subtotals'][i], 2)
+            ws[col + '8'].border = f_border
+
+            ws[col + '9'].font = name_font
+            ws[col + '9'].alignment = c_c_alignment
+            ws[col + '9'] = round(reporting_period_data['subtotals_per_unit_area'][i], 2)
+            ws[col + '9'].border = f_border
+
+            ws[col + '10'].font = name_font
+            ws[col + '10'].alignment = c_c_alignment
+            ws[col + '10'] = str(round(reporting_period_data['increment_rates'][i] * 100, 2)) + "%" \
+                if reporting_period_data['increment_rates'][i] is not None else "-"
+            ws[col + '10'].border = f_border
+
+        end_col = chr(ord(col)+1)
+        ws[end_col + '7'].fill = table_fill
+        ws[end_col + '7'].font = name_font
+        ws[end_col + '7'].alignment = c_c_alignment
+        ws[end_col + '7'] = "总计 (" + reporting_period_data['total_unit'] + ")"
+        ws[end_col + '7'].border = f_border
+
+        ws[end_col + '8'].font = name_font
+        ws[end_col + '8'].alignment = c_c_alignment
+        ws[end_col + '8'] = round(reporting_period_data['total'], 2)
+        ws[end_col + '8'].border = f_border
+
+        ws[end_col + '9'].font = name_font
+        ws[end_col + '9'].alignment = c_c_alignment
+        ws[end_col + '9'] = round(reporting_period_data['total_per_unit_area'], 2)
+        ws[end_col + '9'].border = f_border
+
+        ws[end_col + '10'].font = name_font
+        ws[end_col + '10'].alignment = c_c_alignment
+        ws[end_col + '10'] = str(round(reporting_period_data['total_increment_rate'] * 100, 2)) + "%" \
+            if reporting_period_data['total_increment_rate'] is not None else "-"
+        ws[end_col + '10'].border = f_border
+
+    else:
+        for i in range(6, 10 + 1):
+            ws.row_dimensions[i].height = 0.1
+
+    #################################################
+
+    has_ele_peak_flag = True
+    if "toppeaks" not in reporting_period_data.keys() or \
+            reporting_period_data['toppeaks'] is None or \
+            len(reporting_period_data['toppeaks']) == 0:
+        has_ele_peak_flag = False
+
+    if has_ele_peak_flag:
+        ws['B12'].font = title_font
+        ws['B12'] = name+' 分时电耗'
+
+        ws['B13'].fill = table_fill
+        ws['B13'].font = name_font
+        ws['B13'].alignment = c_c_alignment
+        ws['B13'].border = f_border
+
+        ws['C13'].fill = table_fill
+        ws['C13'].font = name_font
+        ws['C13'].alignment = c_c_alignment
+        ws['C13'].border = f_border
+        ws['C13'] = '分时电耗'
+
+        ws['B14'].font = title_font
+        ws['B14'].alignment = c_c_alignment
+        ws['B14'] = '尖'
+        ws['B14'].border = f_border
+
+        ws['C14'].font = title_font
+        ws['C14'].alignment = c_c_alignment
+        ws['C14'].border = f_border
+        ws['C14'] = round(reporting_period_data['toppeaks'][0], 2)
+
+        ws['B15'].font = title_font
+        ws['B15'].alignment = c_c_alignment
+        ws['B15'] = '峰'
+        ws['B15'].border = f_border
+
+        ws['C15'].font = title_font
+        ws['C15'].alignment = c_c_alignment
+        ws['C15'].border = f_border
+        ws['C15'] = round(reporting_period_data['onpeaks'][0], 2)
+
+        ws['B16'].font = title_font
+        ws['B16'].alignment = c_c_alignment
+        ws['B16'] = '平'
+        ws['B16'].border = f_border
+
+        ws['C16'].font = title_font
+        ws['C16'].alignment = c_c_alignment
+        ws['C16'].border = f_border
+        ws['C16'] = round(reporting_period_data['midpeaks'][0], 2)
+
+        ws['B17'].font = title_font
+        ws['B17'].alignment = c_c_alignment
+        ws['B17'] = '谷'
+        ws['B17'].border = f_border
+
+        ws['C17'].font = title_font
+        ws['C17'].alignment = c_c_alignment
+        ws['C17'].border = f_border
+        ws['C17'] = round(reporting_period_data['offpeaks'][0], 2)
+
+        pie = PieChart()
+        pie.title = name+' 分时电耗'
+        labels = Reference(ws, min_col=2, min_row=14, max_row=17)
+        pie_data = Reference(ws, min_col=3, min_row=13, max_row=17)
+        pie.add_data(pie_data, titles_from_data=True)
+        pie.set_categories(labels)
+        pie.height = 6.6
+        pie.width = 9
+        s1 = pie.series[0]
+        s1.dLbls = DataLabelList()
+        s1.dLbls.showCatName = False
+        s1.dLbls.showVal = True
+        s1.dLbls.showPercent = True
+        ws.add_chart(pie, "D13")
+
+    else:
+        for i in range(12, 18 + 1):
+            ws.row_dimensions[i].height = 0.1
+
+    ################################################
+
+    current_row_number = 19
+
+    has_subtotals_data_flag = True
+    if "subtotals" not in reporting_period_data.keys() or \
+            reporting_period_data['subtotals'] is None or \
+            len(reporting_period_data['subtotals']) == 0:
+        has_subtotals_data_flag = False
+
+    if has_subtotals_data_flag:
+        ws['B' + str(current_row_number)].font = title_font
+        ws['B' + str(current_row_number)] = name + ' 成本占比'
+
+        current_row_number += 1
+
+        table_start_row_number = current_row_number
+
+        ws['B' + str(current_row_number)].fill = table_fill
+        ws['B' + str(current_row_number)].font = name_font
+        ws['B' + str(current_row_number)].alignment = c_c_alignment
+        ws['B' + str(current_row_number)].border = f_border
+
+        ws['C' + str(current_row_number)].fill = table_fill
+        ws['C' + str(current_row_number)].font = name_font
+        ws['C' + str(current_row_number)].alignment = c_c_alignment
+        ws['C' + str(current_row_number)].border = f_border
+        ws['C' + str(current_row_number)] = '成本占比'
+
+        current_row_number += 1
+
+        ca_len = len(reporting_period_data['names'])
+
+        for i in range(0, ca_len):
+            ws['B' + str(current_row_number)].font = title_font
+            ws['B' + str(current_row_number)].alignment = c_c_alignment
+            ws['B' + str(current_row_number)] = reporting_period_data['names'][i]
+            ws['B' + str(current_row_number)].border = f_border
+
+            ws['C' + str(current_row_number)].font = title_font
+            ws['C' + str(current_row_number)].alignment = c_c_alignment
+            ws['C' + str(current_row_number)].border = f_border
+            ws['C' + str(current_row_number)] = round(reporting_period_data['subtotals'][i], 2)
+
+            current_row_number += 1
+
+        table_end_row_number = current_row_number - 1
+
+        pie = PieChart()
+        pie.title = name + ' 成本占比'
+        labels = Reference(ws, min_col=2, min_row=table_start_row_number + 1, max_row=table_end_row_number)
+        pie_data = Reference(ws, min_col=3, min_row=table_start_row_number, max_row=table_end_row_number)
+        pie.add_data(pie_data, titles_from_data=True)
+        pie.set_categories(labels)
+        pie.height = 6.6
+        pie.width = 9
+        s1 = pie.series[0]
+        s1.dLbls = DataLabelList()
+        s1.dLbls.showCatName = False
+        s1.dLbls.showVal = True
+        s1.dLbls.showPercent = True
+        table_cell = 'D' + str(table_start_row_number)
+        ws.add_chart(pie, table_cell)
+
+        if ca_len < 4:
+            current_row_number = current_row_number - ca_len + 4
+
+    else:
+        for i in range(21, 29 + 1):
+            current_row_number = 30
+            ws.row_dimensions[i].height = 0.1
+
+    ###############################################
+
+    current_row_number += 1
+
+    has_detail_data_flag = True
+
+    table_start_draw_flag = current_row_number + 1
+
+    if "timestamps" not in reporting_period_data.keys() or \
+            reporting_period_data['timestamps'] is None or \
+            len(reporting_period_data['timestamps']) == 0:
+        has_detail_data_flag = False
+
+    if has_detail_data_flag:
+        reporting_period_data = report['reporting_period']
+        times = reporting_period_data['timestamps']
+        ca_len = len(report['reporting_period']['names'])
+
+        ws['B' + str(current_row_number)].font = title_font
+        ws['B' + str(current_row_number)] = name+' 详细数据'
+
+        table_start_row_number = (current_row_number + 1) + ca_len * 6
+        current_row_number = table_start_row_number
+
+        time = times[0]
+        has_data = False
+
+        if len(time) > 0:
+            has_data = True
+
+        if has_data:
+
+            ws.row_dimensions[current_row_number].height = 60
+            ws['B' + str(current_row_number)].fill = table_fill
+            ws['B' + str(current_row_number)].border = f_border
+            ws['B' + str(current_row_number)].font = title_font
+            ws['B' + str(current_row_number)].alignment = c_c_alignment
+            ws['B' + str(current_row_number)] = '日期时间'
+
+            col = 'B'
+
+            for i in range(0, ca_len):
+                col = chr(ord('C') + i)
+
+                ws[col + str(current_row_number)].fill = table_fill
+                ws[col + str(current_row_number)].font = title_font
+                ws[col + str(current_row_number)].alignment = c_c_alignment
+                ws[col + str(current_row_number)] = reporting_period_data['names'][i] + \
+                    " (" + reporting_period_data['units'][i] + ")"
+                ws[col + str(current_row_number)].border = f_border
+
+            end_col = chr(ord(col) + 1)
+
+            ws[end_col + str(current_row_number)].fill = table_fill
+            ws[end_col + str(current_row_number)].font = title_font
+            ws[end_col + str(current_row_number)].alignment = c_c_alignment
+            ws[end_col + str(current_row_number)] = "总计 (" + reporting_period_data['total_unit'] + ")"
+            ws[end_col + str(current_row_number)].border = f_border
+
+            current_row_number += 1
+
+            for i in range(0, len(time)):
+                ws['B' + str(current_row_number)].font = title_font
+                ws['B' + str(current_row_number)].alignment = c_c_alignment
+                ws['B' + str(current_row_number)] = time[i]
+                ws['B' + str(current_row_number)].border = f_border
+
+                col = 'B'
+
+                every_day_total = 0
+
+                for j in range(0, ca_len):
+                    col = chr(ord('C') + j)
+
+                    ws[col + str(current_row_number)].font = title_font
+                    ws[col + str(current_row_number)].alignment = c_c_alignment
+                    value = round(reporting_period_data['values'][j][i], 2)
+                    every_day_total += value
+                    ws[col + str(current_row_number)] = value
+                    ws[col + str(current_row_number)].border = f_border
+
+                end_col = chr(ord(col) + 1)
+                ws[end_col + str(current_row_number)].font = title_font
+                ws[end_col + str(current_row_number)].alignment = c_c_alignment
+                ws[end_col + str(current_row_number)] = round(every_day_total, 2)
+                ws[end_col + str(current_row_number)].border = f_border
+
+                current_row_number += 1
+
+            table_end_row_number = current_row_number - 1
+
+            ws['B' + str(current_row_number)].font = title_font
+            ws['B' + str(current_row_number)].alignment = c_c_alignment
+            ws['B' + str(current_row_number)] = '小计'
+            ws['B' + str(current_row_number)].border = f_border
+
+            col = 'B'
+
+            for i in range(0, ca_len):
+                col = chr(ord('C') + i)
+                ws[col + str(current_row_number)].font = title_font
+                ws[col + str(current_row_number)].alignment = c_c_alignment
+                ws[col + str(current_row_number)] = round(reporting_period_data['subtotals'][i], 2)
+                ws[col + str(current_row_number)].border = f_border
+
+                # line
+                line = LineChart()
+                line.title = '报告期成本 - ' + ws.cell(column=3+i, row=table_start_row_number).value
+                labels = Reference(ws, min_col=2, min_row=table_start_row_number + 1, max_row=table_end_row_number)
+                line_data = Reference(ws, min_col=3 + i, min_row=table_start_row_number, max_row=table_end_row_number)
+                line.add_data(line_data, titles_from_data=True)
+                line.set_categories(labels)
+                line_data = line.series[0]
+                line_data.marker.symbol = "circle"
+                line_data.smooth = True
+                line.x_axis.crosses = 'min'
+                line.height = 8.25
+                line.width = 24
+                line.dLbls = DataLabelList()
+                line.dLbls.dLblPos = 't'
+                line.dLbls.showVal = True
+                line.dLbls.showPercent = False
+                chart_col = 'B'
+                chart_cell = chart_col + str(table_start_draw_flag + 6 * i)
+                ws.add_chart(line, chart_cell)
+
+            end_col = chr(ord(col) + 1)
+            ws[end_col + str(current_row_number)].font = title_font
+            ws[end_col + str(current_row_number)].alignment = c_c_alignment
+            ws[end_col + str(current_row_number)] = round(reporting_period_data['total'], 2)
+            ws[end_col + str(current_row_number)].border = f_border
+
+            current_row_number += 1
+
+    else:
+        for i in range(30, 69 + 1):
+            current_row_number = 70
+            ws.row_dimensions[i].height = 0.1
+
+    filename = str(uuid.uuid4()) + '.xlsx'
+    wb.save(filename)
+
+    return filename
diff --git a/myems-api/reports/shopfloorcost.py b/myems-api/reports/shopfloorcost.py
index ca169a6c..374ac1d1 100644
--- a/myems-api/reports/shopfloorcost.py
+++ b/myems-api/reports/shopfloorcost.py
@@ -5,6 +5,7 @@ import config
 from datetime import datetime, timedelta, timezone
 from core import utilities
 from decimal import Decimal
+import excelexporters.shopfloorcost
 
 
 class Reporting:
@@ -529,5 +530,10 @@ class Reporting:
             "timestamps": parameters_data['timestamps'],
             "values": parameters_data['values']
         }
-
+        # export result to Excel file and then encode the file to base64 string
+        result['excel_bytes_base64'] = excelexporters.shopfloorcost.export(result,
+                                                                           shopfloor['name'],
+                                                                           reporting_start_datetime_local,
+                                                                           reporting_end_datetime_local,
+                                                                           period_type)
         resp.body = json.dumps(result)