Merge branch 'develop' into single-develop

src/views/ems/dzjk/tjbb/dbbb/index.vue

@@ -1,4 +1,3 @@
-
 <template>
   <div style="width:100%" v-loading="loading">
     <!--    搜索栏-->
@@ -22,172 +21,185 @@
       <el-form-item>
         <el-button @click="onReset" native-type="button">重置</el-button>
       </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="exportTable" native-type="button">导出</el-button>
+      </el-form-item>
     </el-form>
     <!--表格-->
     <el-table
-          class="common-table"
+        class="common-table"
-          :data="tableData"
+        :data="tableData"
-          stripe
+        stripe
-          style="width: 100%;margin-top:25px;">
+        style="width: 100%;margin-top:25px;">
-<!--        汇总列-->
+      <!--        汇总列-->
-          <el-table-column label="汇总">
+      <el-table-column label="汇总">
-            <el-table-column
+        <el-table-column
-              prop="dataTime"
+            prop="dataTime"
-              label="日期"
+            label="日期"
-              width="120">
+            width="120">
-            </el-table-column>
+        </el-table-column>
-          </el-table-column>
+      </el-table-column>
-<!--充电量列-->
+      <!--充电量列-->
-          <el-table-column  label="充电量" align="center">
+      <el-table-column label="充电量" align="center">
-            <el-table-column
+        <el-table-column
-              align="center"
+            align="center"
-              prop="activePeakKwh"
+            prop="activePeakKwh"
-              label="尖">
+            label="尖">
-            </el-table-column>
+        </el-table-column>
-            <el-table-column
+        <el-table-column
-              align="center"
+            align="center"
-              prop="activeHighKwh"
+            prop="activeHighKwh"
-              label="峰">
+            label="峰">
-            </el-table-column>
+        </el-table-column>
-            <el-table-column
+        <el-table-column
-                align="center"
+            align="center"
-              prop="activeFlatKwh"
+            prop="activeFlatKwh"
-              label="平">
+            label="平">
-            </el-table-column>
+        </el-table-column>
-            <el-table-column
+        <el-table-column
-                align="center"
+            align="center"
-              prop="activeValleyKwh"
+            prop="activeValleyKwh"
-              label="谷">
+            label="谷">
-            </el-table-column>
+        </el-table-column>
-            <el-table-column
+        <el-table-column
-                align="center"
+            align="center"
-              prop="activeTotalKwh"
+            prop="activeTotalKwh"
-              label="总">
+            label="总">
-            </el-table-column>
+        </el-table-column>
-          </el-table-column>
+      </el-table-column>
-        <!--充电量列-->
+      <!--充电量列-->
-          <el-table-column  label="放电量" align="center">
+      <el-table-column label="放电量" align="center">
-            <el-table-column
+        <el-table-column
-                align="center"
+            align="center"
-              prop="reActivePeakKwh"
+            prop="reActivePeakKwh"
-              label="尖">
+            label="尖">
-            </el-table-column>
+        </el-table-column>
-            <el-table-column
+        <el-table-column
-                align="center"
+            align="center"
-              prop="reActiveHighKwh"
+            prop="reActiveHighKwh"
-              label="峰">
+            label="峰">
-            </el-table-column>
+        </el-table-column>
-            <el-table-column
+        <el-table-column
-                align="center"
+            align="center"
-              prop="reActiveFlatKwh"
+            prop="reActiveFlatKwh"
-              label="平">
+            label="平">
-            </el-table-column>
+        </el-table-column>
-            <el-table-column
+        <el-table-column
-                align="center"
+            align="center"
-              prop="reActiveValleyKwh"
+            prop="reActiveValleyKwh"
-              label="谷">
+            label="谷">
-            </el-table-column>
+        </el-table-column>
-            <el-table-column
+        <el-table-column
-                align="center"
+            align="center"
-              prop="reActiveTotalKwh"
+            prop="reActiveTotalKwh"
-              label="总">
+            label="总">
-            </el-table-column>
+        </el-table-column>
-          </el-table-column>
+      </el-table-column>
-<!--        效率-->
+      <!--        效率-->
-          <el-table-column label="效率(%)" align="center">
+      <el-table-column label="效率(%)" align="center">
-            <el-table-column
+        <el-table-column
-                align="center"
+            align="center"
-              prop="effect">
+            prop="effect">
-            </el-table-column>
+        </el-table-column>
-          </el-table-column>
+      </el-table-column>
-        </el-table>
+    </el-table>
-        <el-pagination
+    <el-pagination
-            v-show="tableData.length>0"
+        v-show="tableData.length>0"
-            background
+        background
-            @size-change="handleSizeChange"
+        @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
+        @current-change="handleCurrentChange"
-            :current-page="pageNum"
+        :current-page="pageNum"
-            :page-size="pageSize"
+        :page-size="pageSize"
-            :page-sizes="[10, 20, 30, 40]"
+        :page-sizes="[10, 20, 30, 40]"
-            layout="total, sizes, prev, pager, next, jumper"
+        layout="total, sizes, prev, pager, next, jumper"
-            :total="totalSize"
+        :total="totalSize"
-            style="margin-top:15px;text-align: center"
+        style="margin-top:15px;text-align: center"
-        >
+    >
-        </el-pagination>
+    </el-pagination>
   </div>
 </template>
 
 
 <script>
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import { getAmmeterData} from '@/api/ems/dzjk'
+import {getAmmeterData} from '@/api/ems/dzjk'
 import {formatDate} from "@/filters/ems";
+
 export default {
-  name:'DzjkTjbbDbbb',
+  name: 'DzjkTjbbDbbb',
   mixins: [getQuerySiteId],
   data() {
     return {
-      loading:false,
+      loading: false,
-      pickerOptions:{
+      pickerOptions: {
         disabledDate(time) {
           return time.getTime() > Date.now();
         },
       },
-      defaultDateRange:[],//默认展示的时间
+      defaultDateRange: [],//默认展示的时间
-      dateRange:[],
+      dateRange: [],
-      tableData:[],
+      tableData: [],
-      pageSize:10,//分页栏当前每个数据总数
+      pageSize: 10,//分页栏当前每个数据总数
-      pageNum:1,//分页栏当前页数
+      pageNum: 1,//分页栏当前页数
-      totalSize:0,//table表格数据总数
+      totalSize: 0,//table表格数据总数
     }
   },
-  methods:{
+  methods: {
+    // 导出表格
+    exportTable() {
+      if (!this.dateRange?.length) return
+      const [startTime, endTime] = this.dateRange
+      this.download('ems/statsReport/exportAmmeterData', {
+        siteId: this.siteId,
+        startTime,
+        endTime,
+      }, `电表报表_${startTime}-${endTime}.xlsx`)
+    },
     // 搜索
-    onSearch(){
+    onSearch() {
-      this.pageNum =1//每次搜索从1开始搜索
+      this.pageNum = 1//每次搜索从1开始搜索
       this.getData()
     },
     // 重置
-    onReset(){
+    onReset() {
-      this.dateRange=this.defaultDateRange
+      this.dateRange = this.defaultDateRange
-      this.pageNum =1//每次搜索从1开始搜索
+      this.pageNum = 1//每次搜索从1开始搜索
       this.getData()
     },
     // 分页
     handleSizeChange(val) {
       this.pageSize = val;
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         this.getData()
       })
     },
     handleCurrentChange(val) {
       this.pageNum = val
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         this.getData()
       })
     },
     // 获取数据
-    getData(){
+    getData() {
-      this.loading=true
+      this.loading = true
-      const {siteId,pageNum,pageSize} =this
+      const {siteId, pageNum, pageSize} = this
-      const [startTime='',endTime='']=(this.dateRange || [])
+      const [startTime = '', endTime = ''] = (this.dateRange || [])
-      getAmmeterData({siteId:siteId,startTime,endTime,pageSize,pageNum}).then(response=>{
+      getAmmeterData({siteId: siteId, startTime, endTime, pageSize, pageNum}).then(response => {
-        this.tableData=response?.rows || [];
+        this.tableData = response?.rows || [];
         this.totalSize = response?.total || 0
-      }).finally(()=> {
+      }).finally(() => {
         this.loading = false
       })
     },
-    init(){
+    init() {
-      this.dateRange=[]
+      this.dateRange = []
-      this.tableData=[]
+      this.tableData = []
-      this.totalSize=0
+      this.totalSize = 0
-      this.pageSize=10
+      this.pageSize = 10
       this.pageNum = 1
-      const now = new Date().getTime();
+      let now = new Date(), lastDay = now.getTime(), firstDay = new Date(now.setDate(1)).getTime();
-      const lastMonth = new Date(now-30 * 24 * 60 * 60 * 1000).getTime();
+      this.defaultDateRange = [formatDate(firstDay), formatDate(lastDay)];
-      this.defaultDateRange = [formatDate(lastMonth), formatDate(now)];
+      this.dateRange = [formatDate(firstDay), formatDate(lastDay)];
-      this.dateRange=[formatDate(lastMonth), formatDate(now)];
       this.getData()
     },
   },
@@ -195,8 +207,8 @@ export default {
 </script>
 
 <style scoped lang="scss">
-::v-deep{
+::v-deep {
-  .common-table.el-table .el-table__header-wrapper th, .common-table.el-table .el-table__fixed-header-wrapper th{
+  .common-table.el-table .el-table__header-wrapper th, .common-table.el-table .el-table__fixed-header-wrapper th {
     border-bottom: 1px solid #dfe6ec;
   }
 }

src/views/ems/dzjk/tjbb/dcdqx/index.vue

@@ -1,22 +1,23 @@
 <template>
   <el-card
-    shadow="always"
+      shadow="always"
-    class="common-card-container time-range-card"
+      class="common-card-container time-range-card"
-    style="margin-top: 20px"
+      style="margin-top: 20px"
   >
     <div slot="header" class="time-range-header">
       <span class="card-title"> </span>
-      <date-range-select ref="dateRangeSelect" @updateDate="updateDate" />
+      <date-range-select ref="dateRangeSelect" @updateDate="updateDate"/>
     </div>
     <div class="card-main" v-loading="loading">
       <el-button-group class="ems-btns-group">
         <el-button
-          v-for="(item, index) in btnList"
+            v-for="(item, index) in btnList"
-          :key="index + 'dcdqxBtns'"
+            :key="index + 'dcdqxBtns'"
-          size="mini"
+            size="mini"
-          :class="{ activeBtn: activeBtn === item.id }"
+            :class="{ activeBtn: activeBtn === item.id }"
-          @click="changeDataType(item.id)"
+            @click="changeDataType(item.id)"
-          >{{ item.name }}</el-button
+        >{{ item.name }}
+        </el-button
         >
       </el-button-group>
       <div id="dcdEchart" style="height: 310px"></div>
@@ -28,12 +29,13 @@
 import * as echarts from "echarts";
 import resize from "@/mixins/ems/resize";
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import { getStackData, getStackNameList } from "@/api/ems/dzjk";
+import {getStackData} from "@/api/ems/dzjk";
-import { formatDate } from "@/filters/ems";
+import {formatDate} from "@/filters/ems";
 import DateRangeSelect from "@/components/Ems/DateRangeSelect/index.vue";
+
 export default {
   name: "DzjkTjbbDcdqx",
-  components: { DateRangeSelect },
+  components: {DateRangeSelect},
   mixins: [resize, getQuerySiteId],
   data() {
     return {
@@ -46,10 +48,10 @@ export default {
       loading: false,
       activeBtn: "1",
       btnList: [
-        { name: "堆平均维度", id: "1", attr: ["temp"], source: ["有功功率"] },
+        {name: "堆平均维度", id: "1", attr: ["temp"], source: ["有功功率"]},
-        { name: "堆电压", id: "2", attr: ["voltage"], source: ["堆电压"] },
+        {name: "堆电压", id: "2", attr: ["voltage"], source: ["堆电压"]},
-        { name: "堆电流", id: "3", attr: ["current"], source: ["堆电流"] },
+        {name: "堆电流", id: "3", attr: ["current"], source: ["堆电流"]},
-        { name: "堆soc", id: "4", attr: ["soc"], source: ["堆soc"] },
+        {name: "堆soc", id: "4", attr: ["soc"], source: ["堆soc"]},
       ],
     };
   },
@@ -66,7 +68,7 @@ export default {
       this.getData();
     },
     getData() {
-      const { siteId, activeBtn } = this;
+      const {siteId, activeBtn} = this;
       const [start = "", end = ""] = this.dateRange || [];
       //接口调用完成之后 设置图表、结束loading
       this.loading = true;
@@ -76,12 +78,12 @@ export default {
         endTime: formatDate(end),
         dataType: activeBtn,
       })
-        .then((response) => {
+          .then((response) => {
-          this.setOption(response?.data || []);
+            this.setOption(response?.data || []);
-        })
+          })
-        .finally(() => {
+          .finally(() => {
-          this.loading = false;
+            this.loading = false;
-        });
+          });
     },
     compareDate(date1, date2) {
       console.log("比较时间", date1, date2);
@@ -92,9 +94,9 @@ export default {
       const [date1_Y = "", date1_M = "", date1_D = ""] = date1.split("-"); //根据空格区分[年月日,小时]
       const [date2_Y = "", date2_M = "", date2_D = ""] = date2.split("-"); //根据空格区分[年月日,小时]
       return (
-        (date1_Y === date2_Y && date1_M === date2_M && date1_D - date2_D) ||
+          (date1_Y === date2_Y && date1_M === date2_M && date1_D - date2_D) ||
-        (date1_Y === date2_Y && date1_M - date2_M) ||
+          (date1_Y === date2_Y && date1_M - date2_M) ||
-        date1_Y - date2_Y
+          date1_Y - date2_Y
       );
     },
     setOption(data) {
@@ -106,7 +108,7 @@ export default {
       const source = [];
       const sourceTop = ["日期"];
       let map = {},
-        mapArr = [];
+          mapArr = [];
       // 生成所有{日期:[],日期:[]}格式的对象和所有包含所有日期的[日期1,日期2...]
       data.forEach((item) => {
         item.dataList.forEach((inner) => {
@@ -136,38 +138,53 @@ export default {
       });
       source.unshift(sourceTop);
       this.chart.setOption(
-        {
+          {
-          grid: {
+            grid: {
-            containLabel: true,
+              containLabel: true,
-          },
-          legend: {
-            left: "center",
-            bottom: "15",
-          },
-          tooltip: {
-            trigger: "axis",
-            axisPointer: {
-              // 坐标轴指示器，坐标轴触发有效
-              type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
             },
+            legend: {
+              left: "center",
+              top: "10",
+            },
+            tooltip: {
+              trigger: "axis",
+              axisPointer: {
+                // 坐标轴指示器，坐标轴触发有效
+                type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+              },
+            },
+            textStyle: {
+              color: "#333333",
+            },
+            xAxis: {
+              type: "category",
+            },
+            yAxis: {
+              type: "value",
+            },
+            dataZoom: [
+              {
+                type: "inside",
+                start: 0,
+                end: 100,
+              },
+              {
+                start: 0,
+                end: 100,
+              },
+            ],
+            dataset: {source},
+            series: source[0].slice(1).map((item) => {
+              return {
+                type: "line",
+                smooth: true,
+                areaStyle: {
+                  opacity: 0.7,
+                },
+              };
+            }),
           },
-          textStyle: {
+          true
-            color: "#333333",
-          },
-          xAxis: {
-            type: "category",
-          },
-          yAxis: {
-            type: "value",
-          },
-          dataset: { source },
-          series: source[0].slice(1).map((item) => {
-            return {
-              type: "line",
-            };
-          }),
-        },
-        true
       );
     },
     initChart() {
@@ -176,7 +193,7 @@ export default {
     init() {
       this.$nextTick(() => {
         this.initChart();
-        this.$refs.dateRangeSelect.init();
+        this.$refs.dateRangeSelect.init(true);
       });
     },
   },

src/views/ems/dzjk/tjbb/glqx/index.vue

@@ -1,15 +1,14 @@
 <template>
   <el-card
-    shadow="always"
+      shadow="always"
-    class="common-card-container time-range-card"
+      class="common-card-container time-range-card"
-    style="margin-top: 20px"
+      style="margin-top: 20px"
   >
     <div slot="header" class="time-range-header">
       <span class="card-title">功率曲线</span>
       <date-range-select
-        ref="dateRangeSelect"
+          ref="dateRangeSelect"
-        @reset="resetTime"
+          @updateDate="updateDate"
-        @updateDate="updateDate"
       />
     </div>
     <div class="card-main" v-loading="loading">
@@ -22,12 +21,13 @@
 import * as echarts from "echarts";
 import resize from "@/mixins/ems/resize";
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import { getPcsNameList, getPowerData } from "@/api/ems/dzjk";
+import {getPowerData} from "@/api/ems/dzjk";
-import { formatDate } from "@/filters/ems";
+import {formatDate} from "@/filters/ems";
 import DateRangeSelect from "@/components/Ems/DateRangeSelect/index.vue";
+
 export default {
   name: "DzjkTjbbGlqx",
-  components: { DateRangeSelect },
+  components: {DateRangeSelect},
   mixins: [resize, getQuerySiteId],
   data() {
     return {
@@ -38,7 +38,6 @@ export default {
       },
       dateRange: [],
       loading: false,
-      dateRangeInit: true,
     };
   },
   methods: {
@@ -47,30 +46,22 @@ export default {
       this.dateRange = data || [];
       this.getData();
     },
-    resetTime() {
-      this.dateRangeInit = true;
-    },
     getData() {
-      const { siteId } = this;
+      const {siteId} = this;
       let [start = "", end = ""] = this.dateRange || [];
       //接口调用完成之后 设置图表、结束loading
       this.loading = true;
-      if (this.dateRangeInit) {
-        start = "";
-        end = "";
-        this.dateRangeInit = false;
-      }
       getPowerData({
         siteId,
         startDate: formatDate(start),
         endDate: formatDate(end),
       })
-        .then((response) => {
+          .then((response) => {
-          this.setOption(response?.data || []);
+            this.setOption(response?.data || []);
-        })
+          })
-        .finally(() => {
+          .finally(() => {
-          this.loading = false;
+            this.loading = false;
-        });
+          });
     },
     setOption(data) {
       const source = [["日期", "电网功率", "负载功率", "储能功率", "光伏功率"]];
@@ -84,47 +75,74 @@ export default {
         ]);
       });
       this.chart.setOption(
-        {
+          {
-          grid: {
+            grid: {
-            containLabel: true,
+              containLabel: true,
-          },
-          legend: {
-            left: "center",
-            bottom: "15",
-          },
-          tooltip: {
-            trigger: "axis",
-            axisPointer: {
-              // 坐标轴指示器，坐标轴触发有效
-              type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
             },
-          },
+            legend: {
-          textStyle: {
+              left: "center",
-            color: "#333333",
+              top: "10",
-          },
-          xAxis: {
-            type: "category",
-          },
-          yAxis: {
-            type: "value",
-          },
-          dataset: { source },
-          series: [
-            {
-              type: "line",
             },
-            {
+            tooltip: {
-              type: "line",
+              trigger: "axis",
+              axisPointer: {
+                // 坐标轴指示器，坐标轴触发有效
+                type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+              },
             },
-            {
+            textStyle: {
-              type: "line",
+              color: "#333333",
             },
-            {
+            xAxis: {
-              type: "line",
+              type: "category",
             },
-          ],
+            yAxis: {
-        },
+              type: "value",
-        true
+            },
+            dataset: {source},
+            dataZoom: [
+              {
+                type: "inside",
+                start: 0,
+                end: 100,
+              },
+              {
+                start: 0,
+                end: 100,
+              },
+            ],
+            series: [
+              {
+                type: "line",
+                smooth: true,
+                areaStyle: {
+                  opacity: 0.7,
+                },
+              },
+              {
+                type: "line",
+                smooth: true,
+                areaStyle: {
+                  opacity: 0.7,
+                },
+              },
+              {
+                type: "line",
+                smooth: true,
+                areaStyle: {
+                  opacity: 0.7,
+                },
+              },
+              {
+                type: "line",
+                smooth: true,
+                areaStyle: {
+                  opacity: 0.7,
+                },
+              },
+            ],
+          },
+          true
       );
     },
     initChart() {
@@ -133,7 +151,6 @@ export default {
     },
     init() {
       this.$nextTick(() => {
-        this.dateRangeInit = true;
         this.initChart();
         this.$refs.dateRangeSelect.init();
       });

src/views/ems/dzjk/tjbb/pcsqx/index.vue

@@ -1,22 +1,23 @@
 <template>
   <el-card
-    shadow="always"
+      shadow="always"
-    class="common-card-container time-range-card"
+      class="common-card-container time-range-card"
-    style="margin-top: 20px"
+      style="margin-top: 20px"
   >
     <div slot="header" class="time-range-header">
       <span class="card-title"> </span>
-      <date-range-select ref="dateRangeSelect" @updateDate="updateDate" />
+      <date-range-select ref="dateRangeSelect" @updateDate="updateDate"/>
     </div>
     <div class="card-main" v-loading="loading">
       <el-button-group class="ems-btns-group">
         <el-button
-          v-for="(item, index) in btnList"
+            v-for="(item, index) in btnList"
-          :key="index + 'flqxcBtns'"
+            :key="index + 'flqxcBtns'"
-          size="mini"
+            size="mini"
-          :class="{ activeBtn: activeBtn === item.id }"
+            :class="{ activeBtn: activeBtn === item.id }"
-          @click="changeDataType(item.id)"
+            @click="changeDataType(item.id)"
-          >{{ item.name }}</el-button
+        >{{ item.name }}
+        </el-button
         >
       </el-button-group>
       <div id="pcsEchart" style="height: 310px"></div>
@@ -28,12 +29,13 @@
 import * as echarts from "echarts";
 import resize from "@/mixins/ems/resize";
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import { getPCSData, getPcsNameList } from "@/api/ems/dzjk";
+import {getPCSData} from "@/api/ems/dzjk";
-import { formatDate } from "@/filters/ems";
+import {formatDate} from "@/filters/ems";
 import DateRangeSelect from "@/components/Ems/DateRangeSelect/index.vue";
+
 export default {
   name: "DzjkTjbbPcsqx",
-  components: { DateRangeSelect },
+  components: {DateRangeSelect},
   mixins: [resize, getQuerySiteId],
   data() {
     return {
@@ -82,7 +84,7 @@ export default {
       this.getData();
     },
     getData() {
-      const { siteId, activeBtn } = this;
+      const {siteId, activeBtn} = this;
       const [start = "", end = ""] = this.dateRange || [];
       this.loading = true;
       //接口调用完成之后 设置图表、结束loading
@@ -92,12 +94,12 @@ export default {
         endTime: formatDate(end),
         dataType: activeBtn,
       })
-        .then((response) => {
+          .then((response) => {
-          this.setOption(response?.data || []);
+            this.setOption(response?.data || []);
-        })
+          })
-        .finally(() => {
+          .finally(() => {
-          this.loading = false;
+            this.loading = false;
-        });
+          });
     },
     compareDate(date1, date2) {
       console.log("比较时间", date1, date2);
@@ -108,9 +110,9 @@ export default {
       const [date1_Y = "", date1_M = "", date1_D = ""] = date1.split("-"); //根据空格区分[年月日,小时]
       const [date2_Y = "", date2_M = "", date2_D = ""] = date2.split("-"); //根据空格区分[年月日,小时]
       return (
-        (date1_Y === date2_Y && date1_M === date2_M && date1_D - date2_D) ||
+          (date1_Y === date2_Y && date1_M === date2_M && date1_D - date2_D) ||
-        (date1_Y === date2_Y && date1_M - date2_M) ||
+          (date1_Y === date2_Y && date1_M - date2_M) ||
-        date1_Y - date2_Y
+          date1_Y - date2_Y
       );
     },
     setOption(data) {
@@ -122,7 +124,7 @@ export default {
       const source = [];
       const sourceTop = ["日期"];
       let map = {},
-        mapArr = [];
+          mapArr = [];
       // 生成所有{日期:[],日期:[]}格式的对象和所有包含所有日期的[日期1,日期2...]
       data.forEach((item) => {
         item.dataList.forEach((inner) => {
@@ -152,38 +154,53 @@ export default {
       });
       source.unshift(sourceTop);
       this.chart.setOption(
-        {
+          {
-          grid: {
+            grid: {
-            containLabel: true,
+              containLabel: true,
-          },
-          legend: {
-            left: "center",
-            bottom: "15",
-          },
-          tooltip: {
-            trigger: "axis",
-            axisPointer: {
-              // 坐标轴指示器，坐标轴触发有效
-              type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
             },
+            legend: {
+              left: "center",
+              top: "10",
+            },
+            tooltip: {
+              trigger: "axis",
+              axisPointer: {
+                // 坐标轴指示器，坐标轴触发有效
+                type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+              },
+            },
+            textStyle: {
+              color: "#333333",
+            },
+            xAxis: {
+              type: "category",
+            },
+            yAxis: {
+              type: "value",
+            },
+            dataZoom: [
+              {
+                type: "inside",
+                start: 0,
+                end: 100,
+              },
+              {
+                start: 0,
+                end: 100,
+              },
+            ],
+            dataset: {source},
+            series: source[0].slice(1).map((item) => {
+              return {
+                type: "line",
+                smooth: true,
+                areaStyle: {
+                  opacity: 0.7,
+                },
+              };
+            }),
           },
-          textStyle: {
+          true
-            color: "#333333",
-          },
-          xAxis: {
-            type: "category",
-          },
-          yAxis: {
-            type: "value",
-          },
-          dataset: { source },
-          series: source[0].slice(1).map((item) => {
-            return {
-              type: "line",
-            };
-          }),
-        },
-        true
       );
     },
     initChart() {
@@ -192,7 +209,7 @@ export default {
     init() {
       this.$nextTick(() => {
         this.initChart();
-        this.$refs.dateRangeSelect.init();
+        this.$refs.dateRangeSelect.init(true);
       });
     },
   },

src/views/ems/dzjk/tjbb/sybb/index.vue

@@ -21,6 +21,9 @@
       <el-form-item>
         <el-button @click="onReset" native-type="button">重置</el-button>
       </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="exportTable" native-type="button">导出</el-button>
+      </el-form-item>
     </el-form>
     <!--表格-->
     <el-table
@@ -144,6 +147,16 @@ export default {
     }
   },
   methods: {
+    // 导出表格
+    exportTable() {
+      if (!this.dateRange?.length) return
+      const [startTime, endTime] = this.dateRange
+      this.download('ems/statsReport/exportAmmeterRevenueData', {
+        siteId: this.siteId,
+        startTime,
+        endTime,
+      }, `收益报表_${startTime}-${endTime}.xlsx`)
+    },
     // 搜索
     onSearch() {
       this.pageNum = 1//每次搜索从1开始搜索