堆叠折线图 主数据导出加入Loading

 Source/UBCS-WEB/src/components/Master/MasterTransfer.vue

@@ -14,7 +14,7 @@
                                                                      style="width: 150px"></el-input> （输入页码或者页面范围，如：1-10）</span>
      </div>
    </div>
    <div style="text-align: center">
    <div v-loading="isLoading" style="text-align: center">
      <el-transfer
        v-model="value"
        :data="data"
@@ -44,6 +44,7 @@
      pageExport: "",
      data: [],
      value: [],
      isLoading: false,
      filterMethod(query, item) {
        return item.label.indexOf(query) > -1;
      },
@@ -156,6 +157,7 @@
        if (this.selectRow.length <= 0) {
          this.$message.warning('请选择要导出的模板')
        } else {
          this.isLoading = true;
          //已选择多选
          const selectList = []
          //已选择属性
@@ -178,6 +180,9 @@
            }).then(res => {
              this.handlerFile(res);
              this.escHandler();
              this.isLoading = false;
            }).catch(error => {
              this.isLoading = false;
            })
          } else {

@@ -188,12 +193,15 @@
              // console.log('res',res)
              this.handlerFile(res);
              this.escHandler();

              this.isLoading = false;
            }).catch(error => {
              this.isLoading = false;
            })

          }
        }
      } else if (this.radio === 1) {
        this.isLoading = true;
        if (this.value <= 0) {
          this.tableHeadData.map(item => item.prop)
            .forEach((prop, index) => {
@@ -203,12 +211,18 @@
            if (res) {
              func.downloadFileByBlobHandler(res);
              this.escHandler();
              this.isLoading = false;
            }
          }).catch(error => {
            this.isLoading = false;
          })
        } else {
          exportCode({codeClassifyOid: this.codeClassifyOid, ...this.exportArr, limit: -1}).then(res => {
            this.handlerFile(res);
            this.escHandler();
            this.isLoading = false;
          }).catch(error => {
            this.isLoading = false;
          })
        }
      } else if (this.radio === 2) {
@@ -237,6 +251,7 @@
          }
        }
        if (this.value >= 1) {
          this.isLoading = true;
          exportCode({
            codeClassifyOid: this.codeClassifyOid, ...this.exportArr,
            limit: this.limit,
@@ -246,9 +261,12 @@
            // console.log('res',res)
            this.handlerFile(res);
            this.escHandler();

            this.isLoading = false;
          }).catch(error => {
            this.isLoading = false;
          });
        } else {
          this.isLoading = true;
          this.tableHeadData.map(item => item.prop)
            .forEach((prop, index) => {
              this.exportArrTwo[`attrIdIndexMap[${index}]`] = prop;
@@ -259,10 +277,12 @@
            page: start,
            endPage: end
          }).then(res => {
            // console.log('res', res)
            this.isLoading = false;
            this.handlerFile(res);
            this.escHandler();
          })
          }).catch(error => {
            this.isLoading = false;
          });
        }
      }
    },

 Source/UBCS-WEB/src/components/StatisticsComponent/ColumnarChart.vue

@@ -36,7 +36,7 @@
            );
          });

          let colors = ['#2eadd6', '#FFA500'];
          let colors = ['#84C9E5', '#F68686'];

          const seriesData = [];
          for (let i = 0; i < newval.length; i++) {

 Source/UBCS-WEB/src/components/StatisticsComponent/mixCart.vue

@@ -5,16 +5,14 @@
</template>

<script>
import 'echarts'
import echarts from'echarts'
import 'echarts/lib/chart/line'
import 'echarts/lib/chart/pie'
import 'echarts/lib/chart/bar'
import 'echarts/lib/component/tooltip'
import 'echarts/lib/component/title'
import 'echarts/lib/component/legend'

export default {
  name: "mixCart",
  name: "stackedAreaChart",
  props: {
    mixData: {
      type: Array,
@@ -28,8 +26,9 @@
  data() {
    return {
      chartOptions: {
        color: ['#84C9E5', '#F68686'],
        title: {
          text: "",
          text: '',
        },
        grid: {
          left: "3%",
@@ -40,18 +39,15 @@
        tooltip: {
          trigger: "axis",
          axisPointer: {
            type: "shadow",
          },
            type: "cross"
          }
        },
        legend: {
          data: ["总量", "新增"],
          left: "center",
          textStyle: {
            fontSize: 14 // 调整字体大小
          }
          data: ['总量', '新增']
        },
        xAxis: {
          type: "category",
          boundaryGap: false,
          data: [
            "一月",
            "二月",
@@ -70,8 +66,10 @@
        yAxis: {
          type: "value",
        },
        series: [],
      },
        series: [

        ]
      }
    };
  },
  watch: {
@@ -79,40 +77,39 @@
      immediate: true,
      handler(newval, oldval) {
        if (newval) {
          const colors = ["#2eadd6", "#db3c3c"];

          const seriesData = newval.map((data, index) => ({
            name: index === 0 ? "总量" : "新增",
            type: index === 0 ? "bar" : "line",
            stack: index === 0 ? "总量" : null,
            data: data.map(value => ({value})),
            barWidth: 68,
            label: {
              show: true,
              position: "top"
            },
            itemStyle: {
              color: colors[index]
          const series = newval.map((data, index) => ({
            name: index === 0 ? '总量' : '新增',
            type: 'line',
            showSymbol: false,//是否显示折线上的标记点
            smooth: true,//平滑度
            areaStyle: {
              opacity: 1, //透明度
            },
            emphasis: {
              focus: "series"
            }
              focus: 'series'
            },
            stack: index === 0 ? '总量' : '新增', // 根据 index 区分总量和新增的堆叠情况
            data: data.map(value => ({value})),
            label: {
              show: true,
              position: 'top'
            },
          }));

          this.chartOptions.series = seriesData;
          this.chartOptions.series = series;
        }
      },
      }
    },
    chartName:{
      handler(newval,oldval){
        if(newval){
    chartName: {
      handler(newval, oldval) {
        if (newval) {
          this.chartOptions.title.text = newval + "数据统计"
        }
      },
      immediate:true,
      deep:true
      immediate: true,
      deep: true
    }
  },
  }
};
</script>


 Source/UBCS-WEB/src/views/statistic/statisticPage.vue

@@ -37,7 +37,7 @@
              <el-option label="折线图" value="0"></el-option>
              <el-option label="饼状图" value="1"></el-option>
              <el-option label="柱状图" value="2"></el-option>
              <el-option label="柱状折线图" value="3"></el-option>
              <el-option label="堆叠折线图" value="3"></el-option>
            </el-select>
          </template>
        </el-table-column>