xiugai

2026-01-06 13:48:11 +08:00
parent 20ef2b9763
commit 5605eeab06
287 changed files with 1890 additions and 1381 deletions
--- a/src/views/home/operatingComponents/dataTrend.vue
+++ b/src/views/home/operatingComponents/dataTrend.vue
@@ -76,9 +76,9 @@ export default {
     */
    processTrendData(trendData) {
      // 数据兜底：确保是数组且长度为12
-      const validTrend = Array.isArray(trendData) && trendData.length === 12
+      const validTrend = Array.isArray(trendData)
        ? trendData
-        : this.$props.trend.default();
+        : []

      // 初始化空数组
      const months = [];
@@ -129,10 +129,8 @@ export default {
     */
    getRateFlag(rate) {
      if (isNaN(rate) || rate === null || rate === undefined) return 0;
-      // 原始rate若为小数（如0.8 → 80%，1.1 → 110%），则*100后判断
-      const ratePercent =  rate;
-      return ratePercent >= 100 ? 1 : 0;
-    }
+      return +(rate >= 100 || rate === 0); // + 号将布尔值转为数字（true→1，false→0）
+    },
  },
 };
 </script>
--- a/src/views/home/operatingComponents/dataTrendBar.vue
+++ b/src/views/home/operatingComponents/dataTrendBar.vue
@@ -2,9 +2,6 @@
  <div class="coreBar">
    <!-- 新增行容器：包裹“各基地情况”和barTop -->
    <div class="header-row">
-      <div class="base-title">
-        各基地情况
-      </div>
      <div class="barTop">
        <!-- 关键：新增右侧容器，包裹图例和按钮组，实现整体靠右 -->
        <div class="right-container">
@@ -260,10 +257,10 @@ export default {

  // 新增：头部行容器，实现一行排列
  .header-row {
-    display: flex;
-    justify-content: space-between; // 左右两端对齐
+  display: flex;
+    justify-content: flex-end; // 左右两端对齐
    align-items: center; // 垂直居中
-    width: 100%;
+    // width: 100%;
    margin-bottom: 8px; // 与下方图表区保留间距（可根据需求调整）
  }

--- a/src/views/home/operatingComponents/monthlyRelatedMetrics.vue
+++ b/src/views/home/operatingComponents/monthlyRelatedMetrics.vue
@@ -6,16 +6,16 @@
          <!-- 销量模块（直接传递整合了flag的salesData） -->
          <div class="dashboard left" @click="handleDashboardClick('/salesVolumeAnalysis/salesVolumeAnalysisBase')">
            <div class="title">
-              销量·单位/万元
+              销量·万㎡
            </div>
            <div class="chart-wrap">
              <operatingSingleBar :detailData="salesData"></operatingSingleBar>
            </div>
          </div>
          <!-- 单价模块（直接传递整合了flag的unitPriceData） -->
-          <div class="dashboard right" @click="handleDashboardClick('unitPriceAnalysis/unitPriceAnalysisBase')">
+          <div class="dashboard right" @click="handleDashboardClick('/unitPriceAnalysis/unitPriceAnalysisBase')">
            <div class="title">
-              单价·单位/万元
+              单价·万㎡
            </div>
            <div class="chart-wrap">
              <operatingSingleBar :detailData="unitPriceData"></operatingSingleBar>
@@ -42,6 +42,10 @@ export default {
        { title: "单价", budget: 0, real: 0, rate: 0, diff: 0 }
      ]
    },
+    dateData: {
+      type: Object,
+      default: () => {}
+    },
    title: {
      type: String,
      default: ''
@@ -80,7 +84,8 @@ export default {
      this.$router.push({
        path: path,
        query: {
-          factory: this.$route.query.factory ? this.$route.query.factory : this.factory
+          factory: this.$route.query.factory ? this.$route.query.factory : this.factory,
+          dateData: this.dateData
        }
      })
    },
--- a/src/views/home/operatingComponents/operatingBar.vue
+++ b/src/views/home/operatingComponents/operatingBar.vue
@@ -39,7 +39,7 @@
      </div>
    </div>
    <div class="lineBottom" style="height: 100%; width: 100%">
-      <operatingLineBar :chartData="chartD" style="height: 99%; width: 100%" />
+      <operatingLineBar :dateData="dateData" :chartData="chartD" style="height: 99%; width: 100%" />
    </div>
  </div>
 </template>
@@ -51,7 +51,7 @@ import * as echarts from 'echarts';
 export default {
  name: "Container",
  components: { operatingLineBar },
-  props: ["chartData"],
+  props: ["chartData",'dateData'],
  emits: ['sort-change'], // 声明事件（Vue3 推荐）
  data() {
    return {
--- a/src/views/home/operatingComponents/operatingBottomLineBar.vue
+++ b/src/views/home/operatingComponents/operatingBottomLineBar.vue
@@ -120,7 +120,7 @@ export default {
            },
            // min: 0,
            // max: (value) => Math.ceil((value.max || 0) * 1.1),
-            scale: true,
+
            axisTick: { show: false },
            axisLabel: {
              color: 'rgba(0, 0, 0, 0.45)',
--- a/src/views/home/operatingComponents/operatingLineBar.vue
+++ b/src/views/home/operatingComponents/operatingLineBar.vue
@@ -117,7 +117,7 @@ export default {
              fontSize: 12,
              align: 'right'
            },
-            scale: true,
+
            splitNumber: 4,
            axisTick: { show: false },
            axisLabel: {
--- a/src/views/home/operatingComponents/operatingLineBarSale.vue
+++ b/src/views/home/operatingComponents/operatingLineBarSale.vue
@@ -28,7 +28,11 @@ export default {
    chartData: {
      type: Object,
      default: () => ({}),
-    }
+    },
+    dateData: {
+      type: Object,
+      default: () => ({}),
+    },
  },
  mounted() {
    this.$nextTick(() => {
@@ -44,7 +48,7 @@ export default {
      },
      deep: true,
      immediate: true
-    }
+    },
  },
  beforeDestroy() {
    // 组件销毁时清理资源
@@ -80,7 +84,8 @@ export default {
          path: 'operatingRevenueBase',
          query: { // 使用query传递参数（推荐），也可使用params
            // baseName: itemName,
-            factory: baseIndex
+            factory: baseIndex,
+            dateData: this.dateData
          }
          // 若仍需用base作为参数：
          // base: itemName,
@@ -116,11 +121,11 @@ export default {
            }
          }
        },
-        grid: {
+          grid: {
          top: 30,
          bottom: 30,
          right: 70,
-          left: 40
+          left: 60
        },
        xAxis: [
          {
@@ -154,7 +159,7 @@ export default {
              fontSize: 12,
              align: 'right'
            },
-            scale: true,
+
            splitNumber: 4,
            axisTick: { show: false },
            axisLabel: {
--- a/src/views/home/operatingComponents/operatingLineBarSaleGroup.vue
+++ b/src/views/home/operatingComponents/operatingLineBarSaleGroup.vue
@@ -117,7 +117,7 @@ export default {
              fontSize: 12,
              align: 'right'
            },
-            scale: true,
+
            splitNumber: 4,
            axisTick: { show: false },
            axisLabel: {
@@ -146,7 +146,7 @@ export default {
            },
            splitLine: { show: false },
            axisLine: { lineStyle: { color: 'rgba(0, 0, 0, 0.15)' } },
-            // scale: true,
+            //
            splitNumber: 4,
          }
        ],
--- a/src/views/home/operatingComponents/operatingLineBarSaleSingle.vue
+++ b/src/views/home/operatingComponents/operatingLineBarSaleSingle.vue
@@ -131,7 +131,7 @@ export default {
              type: 'solid' // 实线（可选：dashed虚线、dotted点线）
            }
          },
-          scale: true,
+
          splitNumber: 2,
          axisTick: { show: false },
          axisLabel: {
--- a/src/views/home/operatingComponents/operatingLineChart.vue
+++ b/src/views/home/operatingComponents/operatingLineChart.vue
@@ -21,7 +21,7 @@
            ">
            集团情况
          </div>
-          <operatingTopBar :chartData="chartData" />
+          <operatingTopBar  :chartData="chartData" />
        </div>
        <div class="right" style="
            height: 380px;
@@ -30,7 +30,7 @@
            background-color: rgba(249, 252, 255, 1);
          ">
          <!-- <top-item /> -->
-          <operatingBar :chartData="chartData" @sort-change="sortChange" />
+          <operatingBar :dateData="dateData" :chartData="chartData" @sort-change="sortChange" />
        </div>
      </div>
    </Container>
@@ -59,6 +59,11 @@ export default {
      }),
      required: true
    },
+    dateData: {
+      type: Object,
+      default: () => ({
+      }),
+    },
  },
  data() {
    return {
@@ -86,10 +91,8 @@ export default {
     * @returns {0|1} flag值
     */
    getRateFlag(rate) {
-      // 处理非数字/空值，默认返回 0
      if (isNaN(rate) || rate === null || rate === undefined) return 0;
-      // 核心逻辑：≥100 → 1；<100 → 0
-      return rate >= 100 ? 1 : 0;
+      return +(rate >= 100 || rate === 0); // + 号将布尔值转为数字（true→1，false→0）
    },
    /**
     * 核心处理函数：在所有数据都准备好后，才组装 chartData
--- a/src/views/home/operatingComponents/operatingLineChartCumulative.vue
+++ b/src/views/home/operatingComponents/operatingLineChartCumulative.vue
@@ -30,7 +30,7 @@
            background-color: rgba(249, 252, 255, 1);
          ">
          <!-- <top-item /> -->
-          <operatingBar @sort-change="sortChange" :chartData="chartData" />
+          <operatingBar :dateData="dateData" @sort-change="sortChange" :chartData="chartData" />
        </div>
      </div>
    </Container>
@@ -53,7 +53,13 @@ export default {
      type: Object,
      default: () => ({}),
    },
+    dateData: {
+      type: Object,
+      default: () => ({
+      }),
+    },
  },
+
  data() {
    return {
      chartData: null, // 初始化 chartData 为 null
@@ -79,12 +85,10 @@ export default {
     * @param {number} rate 处理后的rate值（已*100）
     * @returns {0|1} flag值
     */
-getRateFlag(rate) {
-  // 处理非数字/空值，默认返回 0
-  if (isNaN(rate) || rate === null || rate === undefined) return 0;
-  // 核心逻辑：≥100 → 1；<100 → 0
-  return rate >= 100 ? 1 : 0;
-},
+    getRateFlag(rate) {
+      if (isNaN(rate) || rate === null || rate === undefined) return 0;
+      return +(rate >= 100 || rate === 0); // + 号将布尔值转为数字（true→1，false→0）
+    },

    /**
     * 核心处理函数：在所有数据都准备好后，才组装 chartData
--- a/src/views/home/operatingComponents/totalOverview.vue
+++ b/src/views/home/operatingComponents/totalOverview.vue
@@ -14,7 +14,7 @@
                {{ ytdData?.rate || 0}}%
              </div>
              <div class="mom">
-                环比{{ ytdData?.yoyRate || 0}}%
+                同比{{ ytdData?.yoyRate || 0}}%
                <img v-if="ytdData?.yoyRate >= 0" class="arrow" src="../../../assets/img/topArrow.png" alt="">
                <img v-else class="arrow" src="../../../assets/img/downArrow.png" alt="">
              </div>
--- a/src/views/home/operatingComponents/verticalBarChart.vue
+++ b/src/views/home/operatingComponents/verticalBarChart.vue
@@ -99,7 +99,7 @@ export default {
          // boundaryGap: [10, 0], // 可根据需要开启，控制轴的留白
          axisTick: { show: false },
          min: 0,
-          // scale: true,
+          //
          splitNumber: 4,
          axisLine: {
            show: true,
--- a/src/views/home/operatingComponents/yearRelatedMetrics.vue
+++ b/src/views/home/operatingComponents/yearRelatedMetrics.vue
@@ -6,16 +6,16 @@
          <!-- 销量模块（直接传递整合了flag的salesData） -->
          <div class="dashboard left" @click="handleDashboardClick('/salesVolumeAnalysis/salesVolumeAnalysisBase')">
            <div class="title">
-              销量·单位/万元
+              销量·万㎡
            </div>
            <div class="chart-wrap">
              <operatingSingleBar :detailData="salesData"></operatingSingleBar>
            </div>
          </div>
          <!-- 单价模块（直接传递整合了flag的unitPriceData） -->
-          <div class="dashboard right" @click="handleDashboardClick('unitPriceAnalysis/unitPriceAnalysisBase')">
+          <div class="dashboard right" @click="handleDashboardClick('/unitPriceAnalysis/unitPriceAnalysisBase')">
            <div class="title">
-              单价·单位/万元
+              单价·万㎡
            </div>
            <div class="chart-wrap">
              <operatingSingleBar :detailData="unitPriceData"></operatingSingleBar>
@@ -42,6 +42,10 @@ export default {
        { title: "单价", budget: 0, real: 0, rate: 0, diff: 0 }
      ]
    },
+    dateData: {
+      type: Object,
+      default: () => {}
+    },
    title: {
      type: String,
      default: ''
@@ -76,7 +80,8 @@ export default {
      this.$router.push({
        path: path,
        query: {
-          factory: this.$route.query.factory ? this.$route.query.factory : 5
+          factory: this.$route.query.factory ? this.$route.query.factory : 5,
+          dateData: this.dateData
        }
      })
    },