修改

src/views/home/totalProfit/totalProfit.vue

@@ -16,7 +16,7 @@
             gap: 12px;
             grid-template-columns:1624px;
           ">
-          <operatingLineChart :salesTrendMap="salesTrendMap" :grossMarginTrendMap="grossMarginTrendMap" />
+          <operatingLineChart :monData="monData" />
         </div>
       </div>
       <div class="top" style="display: flex; gap: 16px;margin-top: 6px;">
@@ -25,7 +25,7 @@
             gap: 12px;
             grid-template-columns: 1624px;
           ">
-          <operatingLineChartCumulative :salesTrendMap="salesTrendMap" :grossMarginTrendMap="grossMarginTrendMap" />
+          <operatingLineChartCumulative :totalData="totalData" />
           <!-- <keyWork /> -->
         </div>
       </div>
@@ -50,7 +50,7 @@ import { mapState } from "vuex";
 import operatingLineChart from "../totalProfitComponents/operatingLineChart";
 import operatingLineChartCumulative from "../totalProfitComponents/operatingLineChartCumulative.vue";
 
-import { getSalesRevenueData } from '@/api/cockpit'
+import { getProfitAnalysisTotalList } from '@/api/cockpit'
 import moment from "moment";
 export default {
   name: "DayReport",
@@ -68,11 +68,9 @@ export default {
       timer: null,
       beilv: 1,
       value: 100,
-      saleData: {},
-      premiumProduct: {},
-      salesTrendMap: {},
-      grossMarginTrendMap: {},
-      salesProportion:{},
+      selectDate: {},
+      monData: [],
+      totalData: [],
     };
   },
 
@@ -140,23 +138,31 @@ export default {
     };
   },
   methods: {
-    getData(obj) {
-      getSalesRevenueData({
-        startTime: obj.startTime,
-        endTime: obj.endTime,
-        timeDim: obj.mode
+    getData() {
+      getProfitAnalysisTotalList({
+        startTime: this.selectDate.startTime,
+        endTime: this.selectDate.endTime,
+        analysisObject: [
+          "利润总额"
+        ],
+        levelId: 1,
+        // timeDim: this.selectDate.mode
       }).then((res) => {
         console.log(res);
-        this.saleData = res.data.SaleData
-        this.premiumProduct = res.data.premiumProduct
-        this.salesTrendMap = res.data.salesTrendMap
-        this.grossMarginTrendMap = res.data.grossMarginTrendMap
-        this.salesProportion = res.data.salesProportion ? res.data.salesProportion : {}
+        this.monData = res.data.currentMonthData
+        this.totalData = res.data.totalMonthData
+        // this.totalData = res.data.totalData
+        // this.saleData = res.data.SaleData
+        // this.premiumProduct = res.data.premiumProduct
+        // this.salesTrendMap = res.data.salesTrendMap
+        // this.grossMarginTrendMap = res.data.grossMarginTrendMap
+        // this.salesProportion = res.data.salesProportion ? res.data.salesProportion : {}
       })
     },
     handleTimeChange(obj) {
-      console.log(obj, 'obj');
-      this.getData(obj)
+      // console.log(obj, 'obj');
+      this.selectDate = obj
+      this.getData()
     },
     handleClickOutside() {
       this.$store.dispatch("app/closeSideBar", { withoutAnimation: false });
@@ -228,12 +234,14 @@ export default {
 <style scoped lang="scss">
 @import "~@/assets/styles/mixin.scss";
 @import "~@/assets/styles/variables.scss";
+
 .dayReport {
   width: 1920px;
   height: 1080px;
   background: url("../../../assets/img/backp.png") no-repeat;
   background-size: cover;
 }
+
 .hideSidebar .fixed-header {
   width: calc(100% - 54px);
 }

src/views/home/totalProfit/totalProfitBase.vue

@@ -17,7 +17,7 @@
             gap: 12px;
             grid-template-columns: 1624px;
           ">
-          <changeBase @selectChange="selectChange" />
+          <changeBase :factory="factory" @baseChange="selectChange" />
         </div>
       </div>
       <div class="top" style="display: flex; gap: 16px;margin-top: -20px;">
@@ -26,8 +26,8 @@
             gap: 12px;
             grid-template-columns: 804px 804px;
           ">
-          <monthlyOverview :month="month" :itemData="renderList" :title="'月度概览'" />
-          <totalOverview :itemData="renderList" :title="'累计概览'" />
+          <monthlyOverview :month="month" :monData="monData" :title="'月度概览'" />
+          <totalOverview :totalData="totalData" :title="'累计概览'" />
 
         </div>
       </div>
@@ -37,7 +37,8 @@
             gap: 12px;
             grid-template-columns: 1624px;
           ">
-          <relatedIndicatorsAnalysis :itemData="renderList" :title="'相关指标分析/万元'" />
+          <relatedIndicatorsAnalysis :relatedData="relatedData" :title="'相关指标分析·单位/万元'" />
+
         </div>
       </div>
       <div class="bottom" style="display: flex; gap: 16px;margin-top: 6px;">
@@ -46,7 +47,7 @@
             gap: 12px;
             grid-template-columns: 1624px;
           ">
-          <dataTrend :itemData="renderList" :title="'数据趋势'" />
+          <dataTrend @getData="changeItem" :trendData="trend" :title="'数据趋势'" />
         </div>
       </div>
     </div>
@@ -68,15 +69,10 @@ import changeBase from "../components/changeBase.vue";
 import monthlyOverview from "../totalProfitComponents/monthlyOverview.vue";
 import totalOverview from "../totalProfitComponents/totalOverview.vue";
 // import totalOverview from "../operatingComponents/totalOverview.vue";
-// import monthlyRelatedMetrics from "../totalProfitComponents/monthlyRelatedMetrics.vue";
-// import yearRelatedMetrics from "../totalProfitComponents/yearRelatedMetrics.vue";
-import relatedIndicatorsAnalysis  from "../totalProfitComponents/relatedIndicatorsAnalysis";
-
+import relatedIndicatorsAnalysis from "../totalProfitComponents/relatedIndicatorsAnalysis.vue";
 import dataTrend from "../totalProfitComponents/dataTrend.vue";
-
-import profitLineChart from "../costComponents/profitLineChart.vue";
 import { mapState } from "vuex";
-import { getCostAnalysisXXCostList } from '@/api/cockpit'
+import { getProfitAnalysisTotalList } from '@/api/cockpit'
 // import PSDO from "./components/PSDO.vue";
 // import psiLineChart from "./components/psiLineChart.vue";
 
@@ -91,12 +87,11 @@ export default {
   components: {
     ReportHeader,
     changeBase,
-    profitLineChart,
     monthlyOverview,
     Sidebar,
     totalOverview,
-    relatedIndicatorsAnalysis,
-    dataTrend
+    dataTrend,
+    relatedIndicatorsAnalysis
     // psiLineChart
   },
   data() {
@@ -104,16 +99,16 @@ export default {
       isFullScreen: false,
       timer: null,
       beilv: 1,
-      month:'',
+      month: '',
       value: 100,
-      dateData:{},
-      levelId:undefined,
-      itemData: [],
-      trendData: [],
-      parentItemList: [
-        { name: "燃料成本", target: 0, value: 0, proportion: 0, flag: 1 },
-        { name: "天然气", target: 0, value: 0, proportion: 0, flag: 1 }
-      ],
+      factory: 5,
+      dateData: {},
+      monData: {},
+      totalData: {},
+      trend: [],
+      relatedData: [],
+      trendName: '利润总额',
+      // cusProData: {},
     };
   },
 
@@ -130,12 +125,6 @@ export default {
       needTagsView: (state) => state.settings.tagsView,
       fixedHeader: (state) => state.settings.fixedHeader,
     }),
-    renderList() {
-      if (this.itemData && this.itemData.length > 0) {
-        return this.itemData;
-      }
-      return this.parentItemList;
-    },
     classObj() {
       return {
         hideSidebar: !this.sidebar.opened,
@@ -185,28 +174,53 @@ export default {
         this.beilv = _this.clientWidth / 1920;
       })();
     };
+    this.factory = this.$route.query.factory ? Number(this.$route.query.factory) : this.factory
   },
   methods: {
+    handleChange(value) {
+      this.index = value
+      this.getData()
+    },
+    changeItem(item) {
+      console.log('item', item);
+
+      this.trendName = item
+      this.getData()
+    },
     getData() {
       const requestParams = {
-        // startTime: this.startTime,
-        // endTime: this.endTime,
-        // mode: this.mode,
         startTime: this.dateData.startTime,
         endTime: this.dateData.endTime,
-        mode: this.dateData.mode,
-        trendName: "燃料成本",
-        levelId: this.levelId ? this.levelId :1
+        // index: this.index,
+        // sort: 1,
+        trendName: this.trendName,
+        analysisObject: [
+          "利润总额",
+        ],
+        // paramList: ['制造成本', '财务费用', '销售费用', '管理费用', '运费'],
+        levelId: this.factory,
+        // baseId: Number(this.factory),
       };
       // 调用接口
-      getCostAnalysisXXCostList(requestParams).then((res) => {
-        this.itemData = res.data[0].map((item) => {
-          return {
-            ...item,
-            route: 'singleFuelAnalysis'
-          }
-        })
-        this.trendData= res.data[1]
+      getProfitAnalysisTotalList(requestParams).then((res) => {
+        this.monData = res.data.currentMonthData.find(item => {
+          return item.name === "利润总额";
+        });
+        console.log('this.monData', this.monData);
+
+        this.totalData = res.data.totalMonthData.find(item => {
+          return item.name === "利润总额";
+        });
+        // this.relatedMon = res.data.relatedMon
+        this.relatedData = {
+          relatedMon: res.data.currentMonthData.filter(item => {
+            return item.name !== "利润总额";
+          }), // 兜底月度数据
+          relatedTotal: res.data.totalMonthData.filter(item => {
+            return item.name !== "利润总额";
+          }) // 兜底累计数据
+        }
+        this.trend = res.data.dataTrend
       });
     },
 
@@ -215,14 +229,14 @@ export default {
       this.dateData = {
         startTime: obj.startTime,
         endTime: obj.endTime,
-        mode: obj.mode,
+        // mode: obj.mode,
       }
 
       this.getData()
     },
     selectChange(data) {
       console.log('选中的数据：', data);
-      this.levelId = data
+      this.factory = data
       if (this.dateData.startTime && this.dateData.endTime) {
         this.getData();
       }
@@ -307,12 +321,14 @@ export default {
 <style scoped lang="scss">
 @import "~@/assets/styles/mixin.scss";
 @import "~@/assets/styles/variables.scss";
+
 .dayReport {
   width: 1920px;
   height: 1080px;
   background: url("../../../assets/img/backp.png") no-repeat;
   background-size: cover;
 }
+
 .hideSidebar .fixed-header {
   width: calc(100% - 54px);
 }