Merge remote-tracking branch 'origin/master'

jiangping

2025-05-09 0c045df28935e21879b8c0b58b58311c011294c5

 admin/src/views/business/admissionStatistics.vue

@@ -83,14 +83,17 @@
                    </div>
                    <el-button type="primary" icon="el-icon-upload2" style="margin-left: 20px;" @click="daochu">导出</el-button>
                </div>
                <div class="list_head">
                    <div class="list_head_item" v-for="(item, index) in column" :key="index">{{item}}</div>
                </div>
                <div class="table_box">
                    <div class="list_content" v-for="(item, index) in list" :key="index">
                        <div class="list_head_item" v-for="(child, i) in item" :key="i">{{child}}</div>
                <template v-if="column.length > 0">
                    <div class="list_head">
                        <div class="list_head_item" v-for="(item, index) in column" :key="index">{{item}}</div>
                    </div>
                </div>
                    <div class="table_box">
                        <div class="list_content" v-for="(item, index) in list" :key="index">
                            <div class="list_head_item" v-for="(child, i) in item" :key="i">{{child}}</div>
                        </div>
                    </div>
                </template>
                <div class="list_wu" v-else>暂无数据</div>
            </div>
            <div class="main_table_list1">
                <div class="title">
@@ -165,7 +168,11 @@
      getReportLists() {
        getReportList({ dateStr: this.date1, isGroupBy: this.isGroupBy, type: 1 })
          .then(res => {
            if (res.length === 0) return
            if (res.length === 0) {
              this.column = []
              this.list = []
              return
            }

            this.column = res[0]
            this.list = res.slice(1, res.length);
@@ -227,7 +234,10 @@
            containLabel: true
          },
          tooltip: {
            trigger: 'item'
            trigger: 'axis',
            axisPointer: {
              type: 'line'
            }
          },
          xAxis: {
            type: 'category',
@@ -237,6 +247,12 @@
            type: 'value',
            axisLine: {
              show: true
            },
            axisLabel: {
              formatter: function (value) {
                // 四舍五入到最近的整数
                return Math.round(value);
              }
            }
          },
          graphic: {
@@ -323,7 +339,7 @@

        let option = {
          tooltip: {
            trigger: 'item'
            trigger: 'item',
          },
          legend: {
            show: false,
@@ -338,7 +354,7 @@
              labelLine: {
                normal: {
                  length: 30,
                  length2: 100,
                  length2: 70,
                }
              },
              label: {
@@ -490,6 +506,14 @@
                        color: #222222;
                    }
                }
                .list_wu {
                    width: 100%;
                    height: 100px;
                    line-height: 100px;
                    text-align: center;
                    font-size: 16px;
                    color: #222222;
                }
                .list_head {
                    width: 100%;
                    height: 50px;
@@ -546,6 +570,14 @@
                    font-size: 18px;
                    color: #222222;
                }
                .list_wu {
                    width: 100%;
                    height: 100px;
                    line-height: 100px;
                    text-align: center;
                    font-size: 16px;
                    color: #222222;
                }
                .list_head {
                    width: 100%;
                    height: 50px;