Merge branch 'dev_银川_中盛建材' of http://114.132.189.42:9002/r/product-inventor...

zhangwencui

昨天 40fcbc098bef825840cc485c82701c531a4cc583

Merge branch 'dev_银川_中盛建材' of http://114.132.189.42:9002/r/product-inventory-management into dev_银川_中盛建材

 src/views/energyManagement/energyConsumptionStatistical/index.vue

@@ -180,9 +180,13 @@
                         label="序号"
                         width="60"
                         align="center" />
        <el-table-column prop="timePeriod"
                         :label="timeColumnLabel"
                         align="center" />
        <el-table-column prop="meterReadingDate"
                         label="日期"
                         align="right">
          <template #default="scope">
            <span class="consumption-value">{{ scope.row.meterReadingDate }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="waterConsumption"
                         label="用水量(吨)"
                         align="right">
@@ -190,11 +194,11 @@
            <span class="consumption-value">{{ scope.row.waterConsumption }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="waterAmount"
        <el-table-column prop="waterCost"
                         label="水费(元)"
                         align="right">
          <template #default="scope">
            <span class="amount-value">{{ scope.row.waterAmount }}</span>
            <span class="amount-value">{{ scope.row.waterCost }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="electricityConsumption"
@@ -204,11 +208,11 @@
            <span class="consumption-value">{{ scope.row.electricityConsumption }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="electricityAmount"
        <el-table-column prop="electricityCost"
                         label="电费(元)"
                         align="right">
          <template #default="scope">
            <span class="amount-value">{{ scope.row.electricityAmount }}</span>
            <span class="amount-value">{{ scope.row.electricityCost }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="gasConsumption"
@@ -218,11 +222,11 @@
            <span class="consumption-value">{{ scope.row.gasConsumption }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="gasAmount"
        <el-table-column prop="gasCost"
                         label="气费(元)"
                         align="right">
          <template #default="scope">
            <span class="amount-value">{{ scope.row.gasAmount }}</span>
            <span class="amount-value">{{ scope.row.gasCost }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="totalConsumption"
@@ -237,7 +241,7 @@
                         align="right"
                         fixed="right">
          <template #default="scope">
            <span class="total-amount-value">¥{{ scope.row.totalAmount }}</span>
            <span class="total-amount-value">¥{{ scope.row.totalCost }}</span>
          </template>
        </el-table-column>
      </el-table>
@@ -443,7 +447,7 @@
      },
      xAxis: {
        type: "category",
        data: data.map(item => item.timePeriod),
        data: data.map(item => item.meterReadingDate),
        axisLabel: { rotate: statisticsType.value === "day" ? 45 : 0 },
      },
      yAxis: {
@@ -494,7 +498,7 @@
      },
      xAxis: {
        type: "category",
        data: data.map(item => item.timePeriod),
        data: data.map(item => item.meterReadingDate),
        axisLabel: { rotate: statisticsType.value === "day" ? 45 : 0 },
      },
      yAxis: {
@@ -505,21 +509,21 @@
        {
          name: "水费",
          type: "line",
          data: data.map(item => item.waterAmount),
          data: data.map(item => item.waterCost),
          smooth: true,
          itemStyle: { color: "#409EFF" },
        },
        {
          name: "电费",
          type: "line",
          data: data.map(item => item.electricityAmount),
          data: data.map(item => item.electricityCost),
          smooth: true,
          itemStyle: { color: "#E6A23C" },
        },
        {
          name: "气费",
          type: "line",
          data: data.map(item => item.gasAmount),
          data: data.map(item => item.gasCost),
          smooth: true,
          itemStyle: { color: "#67C23A" },
        },
@@ -595,15 +599,15 @@
  const updateAmountTypeChart = () => {
    const data = tableData.value;
    const totalWaterAmount = data.reduce(
      (sum, item) => sum + parseFloat(item.waterAmount),
      (sum, item) => sum + parseFloat(item.waterCost),
      0
    );
    const totalElectricityAmount = data.reduce(
      (sum, item) => sum + parseFloat(item.electricityAmount),
      (sum, item) => sum + parseFloat(item.electricityCost),
      0
    );
    const totalGasAmount = data.reduce(
      (sum, item) => sum + parseFloat(item.gasAmount),
      (sum, item) => sum + parseFloat(item.gasCost),
      0
    );