From b05d42cfc88ec11f4cc8d6b36b965ca4f3dac808 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Mon, 30 Mar 2026 08:49:16 +0800
Subject: [PATCH] =?UTF-8?q?3.27=E4=BF=AE=E6=94=B9=E5=85=A5=E5=8F=82?=
 =?UTF-8?q?=E5=8F=8A=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |  4 +--
 src/views/home/components/budgetDetails.vue   |  6 +++-
 .../home/components/indicatorDetails.vue      |  6 +++-
 .../SIMFRMCostAnalysis.vue                    | 10 +++---
 .../fuelCostAnalysis.vue                      |  2 +-
 .../singleCombustible.vue                     |  4 +--
 .../singleProcessingFuel.vue                  |  2 +-
 .../dataTrendBar.vue                          |  1 +
 .../dataTrendBarCombustible.vue               | 30 ++++++++++++------
 .../dataTrendBarFuel.vue                      |  5 +--
 .../dataTrendBarProduct.vue                   |  1 +
 .../dataTrendBarSingleFuel.vue                | 31 +++++++++++++------
 .../monthlyThreeRelatedMetricsPro.vue         |  4 +--
 .../relateCombustibleCostAnalysis.vue         |  8 ++---
 .../relateFactoryBurdenCostAnalysis.vue       |  2 +-
 .../relateSingleCombustible.vue               |  6 +++-
 .../relateSingleFuelCostAnalysis.vue          |  2 +-
 .../yearThreeRelatedMetricsPro.vue            |  4 +--
 18 files changed, 84 insertions(+), 44 deletions(-)

diff --git a/.env.dev b/.env.dev
index 7c7b6af3..7c750412 100644
--- a/.env.dev
+++ b/.env.dev
@@ -12,9 +12,9 @@ VUE_APP_TITLE = 洛玻集团驾驶舱
 # 杨姗姗
 # VUE_APP_BASE_API = 'http://172.16.20.218:7070'
 # 小田
-# VUE_APP_BASE_API = 'http://172.16.19.232:7070'
+VUE_APP_BASE_API = 'http://172.16.19.232:7070'
 # 测试
-VUE_APP_BASE_API = 'http://192.168.0.35:8080'
+# VUE_APP_BASE_API = 'http://192.168.0.35:8080'
 
 
 # 路由懒加载
diff --git a/src/views/home/components/budgetDetails.vue b/src/views/home/components/budgetDetails.vue
index c26983d9..3b895579 100644
--- a/src/views/home/components/budgetDetails.vue
+++ b/src/views/home/components/budgetDetails.vue
@@ -90,7 +90,7 @@
         </el-upload>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitFileForm">确 定</el-button>
-          <el-button @click="upload.open = false">取 消</el-button>
+          <el-button @click="cancelBtn">取 消</el-button>
         </div>
       </el-dialog>
     </Container>
@@ -512,6 +512,10 @@ export default {
         this.$message.error('上传失败！')
       }
     },
+    cancelBtn() {
+      this.upload.open = false
+      this.$refs.upload.clearFiles();
+    }
   }
 }
 </script>
diff --git a/src/views/home/components/indicatorDetails.vue b/src/views/home/components/indicatorDetails.vue
index 563bda2d..c501ca4d 100644
--- a/src/views/home/components/indicatorDetails.vue
+++ b/src/views/home/components/indicatorDetails.vue
@@ -77,7 +77,7 @@ font-style: normal;">指标详情</div>
         </el-upload>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitFileForm">确 定</el-button>
-          <el-button @click="upload.open = false">取 消</el-button>
+          <el-button @click="cancelBtn">取 消</el-button>
         </div>
       </el-dialog>
     </Container>
@@ -387,6 +387,10 @@ export default {
         console.error('文件上传出错：', error)
         this.$message.error('上传失败！')
       }
+    },
+    cancelBtn(){
+      this.upload.open = false
+      this.$refs.upload.clearFiles();
     }
   }
 }
diff --git a/src/views/home/productionCostAnalysis/SIMFRMCostAnalysis.vue b/src/views/home/productionCostAnalysis/SIMFRMCostAnalysis.vue
index 81ee86a6..fb89ba91 100644
--- a/src/views/home/productionCostAnalysis/SIMFRMCostAnalysis.vue
+++ b/src/views/home/productionCostAnalysis/SIMFRMCostAnalysis.vue
@@ -189,23 +189,23 @@ export default {
         startTime: this.dateData.startTime,
         endTime: this.dateData.endTime,
         trendName: '原料' + this.meterialName + this.trendName,
-        analysisObject: ['原料' + this.meterialName],
+        analysisObject: [this.meterialName],
         levelId: this.factory,
       };
       // 调用接口
       getSingleMaterialAnalysis(requestParams).then((res) => {
         this.monData = res.data.currentMonthData.find(item => {
-          return item.name === '原料' + this.meterialName;
+          return item.name === this.meterialName + '成本';
         });
         this.totalData = res.data.totalMonthData.find(item => {
-          return item.name === '原料' + this.meterialName;
+          return item.name === this.meterialName + '成本';
         });
         this.relatedData = {
           relatedMon: res.data.currentMonthData.filter(item => {
-            return item.name !== '原料' + this.meterialName;
+            return item.name !== this.meterialName + '成本';
           }), // 兜底月度数据
           relatedTotal: res.data.totalMonthData.filter(item => {
-            return item.name !== '原料' + this.meterialName;
+            return item.name !== this.meterialName + '成本';
           }) // 兜底累计数据
         }
         this.trend = res.data.dataTrend
diff --git a/src/views/home/productionCostAnalysis/fuelCostAnalysis.vue b/src/views/home/productionCostAnalysis/fuelCostAnalysis.vue
index ff3b4e91..271ab6de 100644
--- a/src/views/home/productionCostAnalysis/fuelCostAnalysis.vue
+++ b/src/views/home/productionCostAnalysis/fuelCostAnalysis.vue
@@ -108,7 +108,7 @@ export default {
       totalData: {},
       trend: [],
       relatedData: {},
-      trendName: '原片原料成本',
+      trendName: '原片原料',
       // monthRelatedData: [],
       // totalRelatedData: [],
     };
diff --git a/src/views/home/productionCostAnalysis/singleCombustible.vue b/src/views/home/productionCostAnalysis/singleCombustible.vue
index f7a76e7f..9aeceeb7 100644
--- a/src/views/home/productionCostAnalysis/singleCombustible.vue
+++ b/src/views/home/productionCostAnalysis/singleCombustible.vue
@@ -39,7 +39,7 @@
             grid-template-columns: 1624px;
           ">
           <!-- <monthlyRelatedMetrics :itemData="renderList" :title="'月度·相关指标分析'" /> -->
-          <relateSingleFuelCostAnalysis :relatedData="relatedData" :title="'相关指标分析'" />
+          <relateSingleFuelCostAnalysis :fuelName='fuelName' :relatedData="relatedData" :title="'相关指标分析'" />
 
         </div>
       </div>
@@ -213,7 +213,7 @@ export default {
         // index: this.index,
         // sort: 1,
         trendName: this.trendName,
-        analysisObject: [this.fuelName + '成本'],
+        analysisObject: [this.fuelName],
         // paramList: ['制造成本', '财务费用', '销售费用', '管理费用', '运费'],
         levelId: this.factory,
         // baseId: Number(this.factory),
diff --git a/src/views/home/productionCostAnalysis/singleProcessingFuel.vue b/src/views/home/productionCostAnalysis/singleProcessingFuel.vue
index d19edb67..28bd5c03 100644
--- a/src/views/home/productionCostAnalysis/singleProcessingFuel.vue
+++ b/src/views/home/productionCostAnalysis/singleProcessingFuel.vue
@@ -211,7 +211,7 @@ export default {
         // index: this.index,
         // sort: 1,
         trendName: this.trendName,
-        analysisObject: [this.fuelName + '成本'],
+        analysisObject: [this.fuelName],
         // paramList: ['制造成本', '财务费用', '销售费用', '管理费用', '运费'],
         levelId: this.factory,
         // baseId: Number(this.factory),
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBar.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBar.vue
index 4fc8863e..0552515a 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendBar.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendBar.vue
@@ -90,6 +90,7 @@ export default {
 
       const salesData = {
         allPlaceNames: this.locations,
+        unit:'元/㎡',
         series: [
           // 1. 完成率（折线图）
           {
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarCombustible.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarCombustible.vue
index bd663193..f45e41f5 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendBarCombustible.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarCombustible.vue
@@ -35,7 +35,7 @@
               <div class="dropdown-options" v-if="isDropdownShow">
                 <div class="dropdown-option" v-for="(item, index) in profitOptions" :key="index"
                   @click.stop="selectProfit(item)">
-                  {{ item }}
+                  {{ item.name }}
                 </div>
               </div>
             </div>
@@ -61,12 +61,22 @@ export default {
     return {
       isDropdownShow: false,
       selectedProfit: '天然气', // 选中的名称，初始为null
-      profitOptions: [
-        '天然气',
-        'LNG液化天然气',
-        '重油',
-        '水',
-      ]
+      profitOptions: [{
+        name: '天然气',
+        unit:'元/㎡',
+      },
+      {
+        name: 'LNG液化天然气',
+        unit:'元/㎡',
+      },
+      {
+        name: '重油',
+        unit:'元/㎡',
+      },
+      {
+        name: '水',
+        unit:'元/㎡',
+      }],
     };
   },
   computed: {
@@ -88,6 +98,7 @@ export default {
 
       const salesData = {
         allPlaceNames: this.locations,
+        unit:'元/㎡',
         series: [
           // 1. 完成率（折线图）
           {
@@ -246,9 +257,10 @@ export default {
   },
   methods: {
     selectProfit(item) {
-      this.selectedProfit = item;
+      this.selectedProfit = item.name;
+      this.unit = item.unit;
       this.isDropdownShow = false;
-      this.$emit('handleGetItemData', item)
+      this.$emit('handleGetItemData', item.name)
     }
   },
 };
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarFuel.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarFuel.vue
index 50594cbf..44c7919c 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendBarFuel.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarFuel.vue
@@ -60,9 +60,9 @@ export default {
   data() {
     return {
       isDropdownShow: false,
-      selectedProfit: '原片原料成本', // 选中的名称，初始为null
+      selectedProfit: '原片原料', // 选中的名称，初始为null
       profitOptions: [
-        '原片原料成本',
+        '原片原料',
         '硅砂',
         '海砂',
         '纯碱',
@@ -90,6 +90,7 @@ export default {
 
       const salesData = {
         allPlaceNames: this.locations,
+        unit:'元/㎡',
         series: [
           // 1. 完成率（折线图）
           {
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarProduct.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarProduct.vue
index 8b39615e..4377d587 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendBarProduct.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarProduct.vue
@@ -87,6 +87,7 @@ export default {
 
       const salesData = {
         allPlaceNames: this.locations,
+        unit:'元/㎡',
         series: [
           // 1. 完成率（折线图）
           {
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarSingleFuel.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarSingleFuel.vue
index c7d0c077..b0461af7 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendBarSingleFuel.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarSingleFuel.vue
@@ -35,7 +35,7 @@
               <div class="dropdown-options" v-if="isDropdownShow">
                 <div class="dropdown-option" v-for="(item, index) in profitOptions" :key="index"
                   @click.stop="selectProfit(item)">
-                  {{ item }}
+                  {{ item.name }}
                 </div>
               </div>
             </div>
@@ -61,12 +61,23 @@ export default {
     return {
       isDropdownShow: false,
       selectedProfit: '采购单价', // 选中的名称，初始为null
-      profitOptions: [
-        '采购单价',
-        '产量',
-        '单耗',
-        '消耗量',
-      ]
+      profitOptions: [{
+        name: '采购单价',
+        unit: '元/吨'
+      },
+      {
+        name: '产量',
+        unit: '吨'
+      },
+      {
+        name: '单耗',
+        unit: 'kg/㎡'
+      },
+      {
+        name: '消耗量',
+        unit: '吨'
+      }],
+      unit:'元/吨',
     };
   },
   computed: {
@@ -88,6 +99,7 @@ export default {
 
       const salesData = {
         allPlaceNames: this.locations,
+        unit:this.unit,
         series: [
           // 1. 完成率（折线图）
           {
@@ -247,9 +259,10 @@ export default {
   methods: {
     selectProfit(item) {
       console.log('aaaaaa',item)
-      this.selectedProfit = item;
+      this.selectedProfit = item.name;
       this.isDropdownShow = false;
-      this.$emit('handleGetItemData', item)
+      this.$emit('handleGetItemData', item.name)
+      this.unit = item.unit;
     }
   },
 };
diff --git a/src/views/home/productionCostAnalysisComponents/monthlyThreeRelatedMetricsPro.vue b/src/views/home/productionCostAnalysisComponents/monthlyThreeRelatedMetricsPro.vue
index 3c986613..12302a20 100644
--- a/src/views/home/productionCostAnalysisComponents/monthlyThreeRelatedMetricsPro.vue
+++ b/src/views/home/productionCostAnalysisComponents/monthlyThreeRelatedMetricsPro.vue
@@ -5,7 +5,7 @@
       <div class="kpi-content" style="padding: 14px 16px; display: flex; width: 100%;">
         <!-- 新增：topItem 专属包裹容器，统一控制样式和布局（原有行内样式不变） -->
         <div class="topItem-container" style="display: flex; gap: 8px;">
-          <div class="dashboard left" @click="handleDashboardClick('备品丶机物料')">
+          <div class="dashboard left" @click="handleDashboardClick('备件、机物料')">
             <div class="title">
               备件、机物料·元/㎡
             </div>
@@ -76,7 +76,7 @@ export default {
   computed: {
     // 1. 备件丶机物料数据：精准筛选对应名称数据，兜底值统一
     sparePartsData() {
-      return this.relatedData.find(item => (item.name || '').includes('备品丶机物料')) || {
+      return this.relatedData.find(item => (item.name || '').includes('备件、机物料')) || {
         targetValue: 0,
         value: 0,
         completed: 0,
diff --git a/src/views/home/productionCostAnalysisComponents/relateCombustibleCostAnalysis.vue b/src/views/home/productionCostAnalysisComponents/relateCombustibleCostAnalysis.vue
index 81bf6545..aec454c2 100644
--- a/src/views/home/productionCostAnalysisComponents/relateCombustibleCostAnalysis.vue
+++ b/src/views/home/productionCostAnalysisComponents/relateCombustibleCostAnalysis.vue
@@ -7,28 +7,28 @@
         <div class="topItem-container" style="display: flex; gap: 8px;">
           <!-- 天然气组件：绑定对应筛选数据，点击传递物料名和路由 -->
           <div class="dashboard left" @click="handleDashboardClick('天然气', 'singleCombustible')">
-            <div class="title">天然气·元/吨</div>
+            <div class="title">天然气·元/㎡</div>
             <div class="line">
               <operatingSingleBar :detailData="naturalGasData"></operatingSingleBar>
             </div>
           </div>
           <!-- LNG液化天然气组件：绑定对应筛选数据 -->
           <div class="dashboard right" @click="handleDashboardClick('LNG液化天然气', 'singleCombustible')">
-            <div class="title">LNG液化天然气·元/吨</div>
+            <div class="title">LNG液化天然气·元/㎡</div>
             <div class="line">
               <operatingSingleBar :detailData="lngData"></operatingSingleBar>
             </div>
           </div>
           <!-- 重油组件：绑定对应筛选数据 -->
           <div class="dashboard right" @click="handleDashboardClick('重油', 'singleCombustible')">
-            <div class="title">重油·元/吨</div>
+            <div class="title">重油·元/㎡</div>
             <div class="line">
               <operatingSingleBar :detailData="heavyOilData"></operatingSingleBar>
             </div>
           </div>
           <!-- 水组件：绑定对应筛选数据 -->
           <div class="dashboard right" @click="handleDashboardClick('水', 'singleCombustible')">
-            <div class="title">水·元/吨</div>
+            <div class="title">水·元/㎡</div>
             <div class="line">
               <operatingSingleBar :detailData="waterData"></operatingSingleBar>
             </div>
diff --git a/src/views/home/productionCostAnalysisComponents/relateFactoryBurdenCostAnalysis.vue b/src/views/home/productionCostAnalysisComponents/relateFactoryBurdenCostAnalysis.vue
index 69affe4c..9530ddef 100644
--- a/src/views/home/productionCostAnalysisComponents/relateFactoryBurdenCostAnalysis.vue
+++ b/src/views/home/productionCostAnalysisComponents/relateFactoryBurdenCostAnalysis.vue
@@ -110,7 +110,7 @@ export default {
     },
     // 2. 备件丶机物料数据：精准筛选
     sparePartsData() {
-      return this.activeData.find(item => (item.name || '').includes('备品丶机物料')) || {
+      return this.activeData.find(item => (item.name || '').includes('备件、机物料')) || {
         targetValue: 0,
         value: 0,
         completed: 0,
diff --git a/src/views/home/productionCostAnalysisComponents/relateSingleCombustible.vue b/src/views/home/productionCostAnalysisComponents/relateSingleCombustible.vue
index 95122a81..2131fa13 100644
--- a/src/views/home/productionCostAnalysisComponents/relateSingleCombustible.vue
+++ b/src/views/home/productionCostAnalysisComponents/relateSingleCombustible.vue
@@ -8,7 +8,7 @@
         <div class="topItem-container" style="display: flex; gap: 8px;">
           <div class="dashboard left">
             <div class="title">
-              采购单价·元/m³
+              采购单价·{{fuelName=='天然气'||fuelName=='LNG液化天然气'||fuelName=='水'?'元/m³':'万元'}}
             </div>
             <div class="line">
               <!-- 绑定对应数据：新增数据绑定，样式不变 -->
@@ -83,6 +83,10 @@ export default {
       type: String,
       default: ''  // 默认空字符串，保持原有配置
     },
+    fuelName:{
+      type: String,
+      default: ''
+    }
   },
   data() {
     return {
diff --git a/src/views/home/productionCostAnalysisComponents/relateSingleFuelCostAnalysis.vue b/src/views/home/productionCostAnalysisComponents/relateSingleFuelCostAnalysis.vue
index 1358d092..8524b147 100644
--- a/src/views/home/productionCostAnalysisComponents/relateSingleFuelCostAnalysis.vue
+++ b/src/views/home/productionCostAnalysisComponents/relateSingleFuelCostAnalysis.vue
@@ -24,7 +24,7 @@
           </div>
           <div class="dashboard right">
             <div class="title">
-              单耗·吨
+              单耗·kg/㎡
             </div>
             <div class="line">
               <operatingSingleBar :detailData="unitHaoData"></operatingSingleBar>
diff --git a/src/views/home/productionCostAnalysisComponents/yearThreeRelatedMetricsPro.vue b/src/views/home/productionCostAnalysisComponents/yearThreeRelatedMetricsPro.vue
index 3b86e28f..82a039b6 100644
--- a/src/views/home/productionCostAnalysisComponents/yearThreeRelatedMetricsPro.vue
+++ b/src/views/home/productionCostAnalysisComponents/yearThreeRelatedMetricsPro.vue
@@ -5,7 +5,7 @@
       <div class="kpi-content" style="padding: 14px 16px; display: flex; width: 100%;">
         <!-- 新增：topItem 专属包裹容器，统一控制样式和布局（原有行内样式不变） -->
         <div class="topItem-container" style="display: flex; gap: 8px;">
-          <div class="dashboard left" @click="handleDashboardClick('备品丶机物料')">
+          <div class="dashboard left" @click="handleDashboardClick('备件、机物料')">
             <div class="title">
               备件、机物料·元/㎡
             </div>
@@ -76,7 +76,7 @@ export default {
   computed: {
     // 1. 备件丶机物料数据：精准筛选对应名称数据，兜底值统一
     sparePartsData() {
-      return this.relatedData.find(item => (item.name || '').includes('备品丶机物料')) || {
+      return this.relatedData.find(item => (item.name || '').includes('备件、机物料')) || {
         targetValue: 0,
         value: 0,
         completed: 0,