From 835d4efd5b46dbd75e171d3009a8eaf7bf4cbeeb Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Mon, 20 Apr 2026 13:02:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E9=80=A0=E6=88=90=E6=9C=AC=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E9=85=8D=E5=90=88=E5=90=8E=E7=AB=AF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?&=E6=B7=BB=E5=8A=A0=E9=A1=B6=E9=83=A8=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |  4 +-
 src/layout/components/Navbar.vue              | 14 +++--
 src/views/home/components/Header.vue          | 55 ++++++++++++++-----
 src/views/home/components/budgetHeader.vue    | 55 +++++++++++++++----
 src/views/home/components/noRouterHeader.vue  | 55 +++++++++++++++----
 .../operatingLineBarSale.vue                  |  2 +-
 .../operatingLineBarSaleGroup.vue             |  2 +-
 .../SIMFRMCostAnalysis.vue                    |  3 +-
 .../productionCostAnalysis/combustible.vue    |  7 +--
 .../fuelCostAnalysis.vue                      |  3 +-
 .../mfgOverheadCostAnalysis.vue               |  1 +
 .../mfgOverheadSingleCostAnalysis.vue         |  3 +-
 .../originalSheetCostBase.vue                 |  3 +-
 .../originalSheetLabor.vue                    |  5 +-
 .../osElectricityCostAnalysis.vue             |  1 +
 .../productionCostAnalysis/procAuxMatCost.vue |  1 +
 .../procMfgOverheadCost.vue                   |  1 +
 .../procPackMatCost.vue                       |  1 +
 .../processingCostAnalysisBase.vue            |  1 +
 .../productionCostAnalysis/processingFuel.vue |  1 +
 .../processingLabor.vue                       |  1 +
 .../singleCombustible.vue                     |  3 +-
 .../singleProcAuxMatCost.vue                  |  5 +-
 .../singleProcMfgOverheadCost.vue             |  9 +--
 .../singleProcessingFuel.vue                  |  1 +
 .../dataTrendBarSingleFuelDian.vue            | 53 +++++++++++-------
 .../noRouterHeader.vue                        | 55 +++++++++++++++----
 .../relateCombustibleCostAnalysis.vue         | 12 ++--
 .../relatedIndicatorsAnalysis.vue             | 12 ++--
 29 files changed, 258 insertions(+), 111 deletions(-)

diff --git a/.env.dev b/.env.dev
index e0b89faf..526323a3 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'
 # 闫阳
 # VUE_APP_BASE_API = 'http://172.16.19.131:7070'
 
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 5ba38c1f..72fb52a9 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -14,15 +14,16 @@
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
-          <router-link to="/user/profile">
+          <!-- <router-link to="/user/profile">
             <el-dropdown-item>个人中心</el-dropdown-item>
-          </router-link>
+          </router-link> -->
           <!-- <el-dropdown-item @click.native="setting = true">
             <span>布局设置</span>
           </el-dropdown-item> -->
-          <el-dropdown-item divided @click.native="logout">
+          <el-dropdown-item @click.native="logout">
             <span>退出登录</span>
           </el-dropdown-item>
+           <el-dropdown-item divided  @click.native='handleToggle'>切换账号</el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
     </div>
@@ -97,7 +98,12 @@ export default {
     checkPermi(permissions) {
       return this.$auth.hasPermi(permissions)
       return true;
-    }
+    },
+    handleToggle() {
+      this.$store.dispatch('LogOut').then(() => {
+        location.href = getPath('/index');
+      })
+    },
   }
 }
 </script>
diff --git a/src/views/home/components/Header.vue b/src/views/home/components/Header.vue
index 48dc441f..735c55b0 100644
--- a/src/views/home/components/Header.vue
+++ b/src/views/home/components/Header.vue
@@ -8,13 +8,17 @@
 
     <!-- 右侧区域：全屏按钮 -->
     <div class="right-content">
-      <el-dropdown trigger="click">
-        <el-button type="text" class="logout-btn" :title="'退出'">
-          <svg-icon style="color: #0B58FF;" icon-class="logout" />
-        </el-button>
+      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
+        <div class="avatar-wrapper">
+          <img :src="require(`../../../assets/images/choicepart/avatar.png`)" class="user-avatar">
+          <span v-if="nickname" class="user-nickname">{{ nickname }}</span>
+          <i class="el-icon-caret-bottom" />
+        </div>
         <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item  @click.native='logout'>退出登录</el-dropdown-item>
-          <el-dropdown-item  @click.native='handleToggle'>切换账号</el-dropdown-item>
+          <el-dropdown-item @click.native="logout">
+            <span>退出登录</span>
+          </el-dropdown-item>
+           <el-dropdown-item divided  @click.native='handleToggle'>切换账号</el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
       <el-button type="text" class="screen-btn" @click="changeHomeSider">
@@ -44,6 +48,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 import moment from 'moment'
 import {getPath} from "@/utils/ruoyi";
 export default {
@@ -57,6 +62,9 @@ export default {
       default: () => ({})
     },
   },
+  computed:{
+    ...mapGetters(['nickname']),
+  },
   data() {
     return {
       currentTime: '',
@@ -371,14 +379,35 @@ export default {
     padding: 0;
     margin: 0;
   }
+  .avatar-container {
+      margin-right: 30px;
 
-  .logout-btn {
-    width: 30px;
-    height: 30px;
-    font-size: 30px;
-    padding: 0;
-    margin-top: 2px;
-  }
+      .avatar-wrapper {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        position: relative;
+
+        .user-avatar {
+          cursor: pointer;
+          width: 32px;
+          height: 32px;
+          border-radius: 50%;
+        }
+        .user-nickname{
+          margin-left: 5px;
+          font-size: 14px;
+        }
+
+        .el-icon-caret-bottom {
+          cursor: pointer;
+          position: absolute;
+          right: -20px;
+          top: 10px;
+          font-size: 12px;
+        }
+      }
+    }
 }
 
 /* 日期选择器样式保持不变 */
diff --git a/src/views/home/components/budgetHeader.vue b/src/views/home/components/budgetHeader.vue
index b70667f8..3f8e690b 100644
--- a/src/views/home/components/budgetHeader.vue
+++ b/src/views/home/components/budgetHeader.vue
@@ -7,13 +7,17 @@
 
     <!-- 右侧区域：全屏按钮 -->
     <div class="right-content">
-      <el-dropdown trigger="click">
-        <el-button type="text" class="logout-btn" :title="'退出'">
-          <svg-icon style="color: #0B58FF;" icon-class="logout" />
-        </el-button>
+      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
+        <div class="avatar-wrapper">
+          <img :src="require(`../../../assets/images/choicepart/avatar.png`)" class="user-avatar">
+          <span v-if="nickname" class="user-nickname">{{ nickname }}</span>
+          <i class="el-icon-caret-bottom" />
+        </div>
         <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item  @click.native='logout'>退出登录</el-dropdown-item>
-          <el-dropdown-item  @click.native='handleToggle'>切换账号</el-dropdown-item>
+          <el-dropdown-item @click.native="logout">
+            <span>退出登录</span>
+          </el-dropdown-item>
+           <el-dropdown-item divided  @click.native='handleToggle'>切换账号</el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
       <el-button type="text" class="return-btn" :title="'返回'" @click="handleReturn">
@@ -43,6 +47,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 import moment from 'moment'; // 引入moment
 import {getPath} from "@/utils/ruoyi";
 export default {
@@ -57,6 +62,9 @@ export default {
     },
     isBudget: { type: Boolean, default: false },
   },
+  computed:{
+    ...mapGetters(['nickname']),
+  },
   data() {
     return {
       currentTime: '',
@@ -360,12 +368,35 @@ export default {
     padding: 0;
   }
 
-  .logout-btn {
-    width: 28px;
-    height: 28px;
-    font-size: 28px;
-    padding: 0;
-  }
+  .avatar-container {
+      margin-right: 30px;
+
+      .avatar-wrapper {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        position: relative;
+
+        .user-avatar {
+          cursor: pointer;
+          width: 32px;
+          height: 32px;
+          border-radius: 50%;
+        }
+        .user-nickname{
+          margin-left: 5px;
+          font-size: 14px;
+        }
+
+        .el-icon-caret-bottom {
+          cursor: pointer;
+          position: absolute;
+          right: -20px;
+          top: 10px;
+          font-size: 12px;
+        }
+      }
+    }
 }
 
 /* 自定义下拉框样式（替换原有日期选择器样式） */
diff --git a/src/views/home/components/noRouterHeader.vue b/src/views/home/components/noRouterHeader.vue
index 136d8e2d..16f5b4c0 100644
--- a/src/views/home/components/noRouterHeader.vue
+++ b/src/views/home/components/noRouterHeader.vue
@@ -7,13 +7,17 @@
 
     <!-- 右侧区域：全屏按钮 -->
     <div class="right-content">
-      <el-dropdown trigger="click">
-        <el-button type="text" class="logout-btn" :title="'退出'">
-          <svg-icon style="color: #0B58FF;" icon-class="logout" />
-        </el-button>
+      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
+        <div class="avatar-wrapper">
+          <img :src="require(`../../../assets/images/choicepart/avatar.png`)" class="user-avatar">
+          <span v-if="nickname" class="user-nickname">{{ nickname }}</span>
+          <i class="el-icon-caret-bottom" />
+        </div>
         <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item  @click.native='logout'>退出登录</el-dropdown-item>
-          <el-dropdown-item  @click.native='handleToggle'>切换账号</el-dropdown-item>
+          <el-dropdown-item @click.native="logout">
+            <span>退出登录</span>
+          </el-dropdown-item>
+           <el-dropdown-item divided  @click.native='handleToggle'>切换账号</el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
       <el-button type="text" class="return-btn" :title="'返回'" @click="handleReturn">
@@ -39,6 +43,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 import moment from 'moment'; // 引入moment
 import {getPath} from "@/utils/ruoyi";
 export default {
@@ -64,6 +69,9 @@ export default {
       activeTime: 1, // 默认月维度（0=日，1=月，2=年）
     }
   },
+  computed:{
+    ...mapGetters(['nickname']),
+  },
   watch: {
     activeTime(newVal, oldVal) {
       if (newVal !== oldVal) {
@@ -346,12 +354,35 @@ export default {
     padding: 0;
   }
 
-  .logout-btn {
-    width: 28px;
-    height: 28px;
-    font-size: 28px;
-    padding: 0;
-  }
+  .avatar-container {
+      margin-right: 30px;
+
+      .avatar-wrapper {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        position: relative;
+
+        .user-avatar {
+          cursor: pointer;
+          width: 32px;
+          height: 32px;
+          border-radius: 50%;
+        }
+        .user-nickname{
+          margin-left: 5px;
+          font-size: 14px;
+        }
+
+        .el-icon-caret-bottom {
+          cursor: pointer;
+          position: absolute;
+          right: -20px;
+          top: 10px;
+          font-size: 12px;
+        }
+      }
+    }
 
 }
 
diff --git a/src/views/home/depreciationAnalysisComponents/operatingLineBarSale.vue b/src/views/home/depreciationAnalysisComponents/operatingLineBarSale.vue
index f9b98cf1..a1485463 100644
--- a/src/views/home/depreciationAnalysisComponents/operatingLineBarSale.vue
+++ b/src/views/home/depreciationAnalysisComponents/operatingLineBarSale.vue
@@ -152,7 +152,7 @@ export default {
         yAxis: [
           {
             type: 'value',
-            name: '元',
+            name: '万元',
             nameTextStyle: {
               color: 'rgba(0, 0, 0, 0.45)',
               fontSize: 12,
diff --git a/src/views/home/depreciationAnalysisComponents/operatingLineBarSaleGroup.vue b/src/views/home/depreciationAnalysisComponents/operatingLineBarSaleGroup.vue
index 41f597ea..5a2f80fa 100644
--- a/src/views/home/depreciationAnalysisComponents/operatingLineBarSaleGroup.vue
+++ b/src/views/home/depreciationAnalysisComponents/operatingLineBarSaleGroup.vue
@@ -98,7 +98,7 @@ export default {
           // 左侧Y轴：营业收入、成本（单位万元）
           {
             type: 'value',
-            name: '元',
+            name: '万元',
             nameTextStyle: {
               color: 'rgba(0, 0, 0, 0.45)',
               fontSize: 12,
diff --git a/src/views/home/productionCostAnalysis/SIMFRMCostAnalysis.vue b/src/views/home/productionCostAnalysis/SIMFRMCostAnalysis.vue
index 3c1c6858..1aa6ba5a 100644
--- a/src/views/home/productionCostAnalysis/SIMFRMCostAnalysis.vue
+++ b/src/views/home/productionCostAnalysis/SIMFRMCostAnalysis.vue
@@ -95,7 +95,7 @@ export default {
       meterialName:'',
       materialOptions: [
         {value:'氢氧化铝',label:'氢氧化铝'},
-        {value:'碎玻璃',label:'碎玻璃'},
+        {value:'碎玻璃(外购)',label:'碎玻璃'},
         {value:'助熔剂',label:'助熔剂'},
         {value:'白云石',label:'白云石'},
         {value:'石灰石',label:'石灰石'},
@@ -196,6 +196,7 @@ export default {
         trendName: '原料' + this.meterialName + this.trendName,
         analysisObject: [this.meterialName],
         levelId: this.factory,
+        isOriginal:0,//0:原片 1:加工
       };
       // 调用接口
       getSingleMaterialAnalysis(requestParams).then((res) => {
diff --git a/src/views/home/productionCostAnalysis/combustible.vue b/src/views/home/productionCostAnalysis/combustible.vue
index 4a8bb6e0..4ecd984f 100644
--- a/src/views/home/productionCostAnalysis/combustible.vue
+++ b/src/views/home/productionCostAnalysis/combustible.vue
@@ -89,9 +89,7 @@ export default {
       totalData: {},
       trend: [],
       relatedData: {},
-      trendName: '天然气',
-      // monthRelatedData: [],
-      // totalRelatedData: [],
+      trendName: '原片燃料成本'
     };
   },
 
@@ -183,8 +181,7 @@ export default {
       const requestParams = {
         startTime: this.dateData.startTime,
         endTime: this.dateData.endTime,
-        // index: this.index,
-        // sort: 1,
+        isOriginal:0,//0:原片 1:加工
         trendName: this.trendName +'成本',
         analysisObject: [
           "原片燃料成本",
diff --git a/src/views/home/productionCostAnalysis/fuelCostAnalysis.vue b/src/views/home/productionCostAnalysis/fuelCostAnalysis.vue
index 39a6e932..64166470 100644
--- a/src/views/home/productionCostAnalysis/fuelCostAnalysis.vue
+++ b/src/views/home/productionCostAnalysis/fuelCostAnalysis.vue
@@ -181,8 +181,7 @@ export default {
       const requestParams = {
         startTime: this.dateData.startTime,
         endTime: this.dateData.endTime,
-        // index: this.index,
-        // sort: 1,
+        isOriginal:0,//0:原片 1:加工
         trendName: this.trendName,
         analysisObject: [
           "原片原料成本",
diff --git a/src/views/home/productionCostAnalysis/mfgOverheadCostAnalysis.vue b/src/views/home/productionCostAnalysis/mfgOverheadCostAnalysis.vue
index 7fd51385..c2817bc7 100644
--- a/src/views/home/productionCostAnalysis/mfgOverheadCostAnalysis.vue
+++ b/src/views/home/productionCostAnalysis/mfgOverheadCostAnalysis.vue
@@ -183,6 +183,7 @@ export default {
         startTime: this.dateData.startTime,
         endTime: this.dateData.endTime,
         trendName: this.trendName,
+        isOriginal:0,//0:原片 1:加工
         analysisObject: [
           "原片制造费用成本",
         ],
diff --git a/src/views/home/productionCostAnalysis/mfgOverheadSingleCostAnalysis.vue b/src/views/home/productionCostAnalysis/mfgOverheadSingleCostAnalysis.vue
index 6bd8d743..21faba80 100644
--- a/src/views/home/productionCostAnalysis/mfgOverheadSingleCostAnalysis.vue
+++ b/src/views/home/productionCostAnalysis/mfgOverheadSingleCostAnalysis.vue
@@ -180,8 +180,9 @@ export default {
         startTime: this.dateData.startTime,
         endTime: this.dateData.endTime,
         trendName: this.trendName,
-        analysisObject: [this.overheadName + '成本'],
+        analysisObject: [this.overheadName],
         levelId: this.factory,
+        isOriginal:0,//0:原片 1:加工
       };
       // 调用接口
       getSingleMaterialCostAnalysis(requestParams).then((res) => {
diff --git a/src/views/home/productionCostAnalysis/originalSheetCostBase.vue b/src/views/home/productionCostAnalysis/originalSheetCostBase.vue
index 9672d6bf..df15a9cd 100644
--- a/src/views/home/productionCostAnalysis/originalSheetCostBase.vue
+++ b/src/views/home/productionCostAnalysis/originalSheetCostBase.vue
@@ -183,8 +183,7 @@ export default {
       const requestParams = {
         startTime: this.dateData.startTime,
         endTime: this.dateData.endTime,
-        // index: this.index,
-        // sort: 1,
+        isOriginal:0,//0:原片 1:加工
         trendName: this.trendName,
         analysisObject: [
           "原片成本",
diff --git a/src/views/home/productionCostAnalysis/originalSheetLabor.vue b/src/views/home/productionCostAnalysis/originalSheetLabor.vue
index 7675380d..1c95ecad 100644
--- a/src/views/home/productionCostAnalysis/originalSheetLabor.vue
+++ b/src/views/home/productionCostAnalysis/originalSheetLabor.vue
@@ -77,7 +77,7 @@ export default {
       totalData: {},
       trend: [],
       relatedData: {},
-      trendName: '人工成本',
+      trendName: '原片人工成本',
     };
   },
 
@@ -170,8 +170,9 @@ export default {
         startTime: this.dateData.startTime,
         endTime: this.dateData.endTime,
         trendName: this.trendName,
+        isOriginal:0,//0:原片 1:加工
         analysisObject: [
-          '人工成本'
+          '原片人工成本'
         ],
         levelId: this.factory,
       };
diff --git a/src/views/home/productionCostAnalysis/osElectricityCostAnalysis.vue b/src/views/home/productionCostAnalysis/osElectricityCostAnalysis.vue
index 4d182f9d..47e7de2c 100644
--- a/src/views/home/productionCostAnalysis/osElectricityCostAnalysis.vue
+++ b/src/views/home/productionCostAnalysis/osElectricityCostAnalysis.vue
@@ -181,6 +181,7 @@ export default {
         startTime: this.dateData.startTime,
         endTime: this.dateData.endTime,
         trendName: this.trendName,
+        isOriginal:0,//0:原片 1:加工
         analysisObject: [
           "原片电成本",
         ],
diff --git a/src/views/home/productionCostAnalysis/procAuxMatCost.vue b/src/views/home/productionCostAnalysis/procAuxMatCost.vue
index 481a7a31..e22e063a 100644
--- a/src/views/home/productionCostAnalysis/procAuxMatCost.vue
+++ b/src/views/home/productionCostAnalysis/procAuxMatCost.vue
@@ -183,6 +183,7 @@ export default {
         startTime: this.dateData.startTime,
         endTime: this.dateData.endTime,
         trendName: this.trendName,
+        isOriginal:1,//0:原片 1:加工
         analysisObject: [
           "加工辅料成本",
         ],
diff --git a/src/views/home/productionCostAnalysis/procMfgOverheadCost.vue b/src/views/home/productionCostAnalysis/procMfgOverheadCost.vue
index 9a4a8a27..e5dc7523 100644
--- a/src/views/home/productionCostAnalysis/procMfgOverheadCost.vue
+++ b/src/views/home/productionCostAnalysis/procMfgOverheadCost.vue
@@ -186,6 +186,7 @@ export default {
           "加工制造费用成本",
         ],
         levelId: this.factory,
+        isOriginal:1,//0:原片 1:加工
       };
       // 调用接口
       getCostAnalysisData(requestParams).then((res) => {
diff --git a/src/views/home/productionCostAnalysis/procPackMatCost.vue b/src/views/home/productionCostAnalysis/procPackMatCost.vue
index 9f746a18..8fd36491 100644
--- a/src/views/home/productionCostAnalysis/procPackMatCost.vue
+++ b/src/views/home/productionCostAnalysis/procPackMatCost.vue
@@ -175,6 +175,7 @@ export default {
           '包材成本'
         ],
         levelId: this.factory,
+        isOriginal:1,//0:原片 1:加工
       };
       // 调用接口
       getSingleMaterialCostAnalysis(requestParams).then((res) => {
diff --git a/src/views/home/productionCostAnalysis/processingCostAnalysisBase.vue b/src/views/home/productionCostAnalysis/processingCostAnalysisBase.vue
index ffb27dfa..4c3b0019 100644
--- a/src/views/home/productionCostAnalysis/processingCostAnalysisBase.vue
+++ b/src/views/home/productionCostAnalysis/processingCostAnalysisBase.vue
@@ -184,6 +184,7 @@ export default {
         startTime: this.dateData.startTime,
         endTime: this.dateData.endTime,
         trendName: this.trendName,
+        isOriginal:1,//0:原片 1:加工
         analysisObject: [
           "加工成本",
         ],
diff --git a/src/views/home/productionCostAnalysis/processingFuel.vue b/src/views/home/productionCostAnalysis/processingFuel.vue
index 0bc3413c..766ec2ce 100644
--- a/src/views/home/productionCostAnalysis/processingFuel.vue
+++ b/src/views/home/productionCostAnalysis/processingFuel.vue
@@ -182,6 +182,7 @@ export default {
         startTime: this.dateData.startTime,
         endTime: this.dateData.endTime,
         trendName: this.trendName,
+        isOriginal:1,//0:原片 1:加工
         analysisObject: [
           "加工燃料成本",
         ],
diff --git a/src/views/home/productionCostAnalysis/processingLabor.vue b/src/views/home/productionCostAnalysis/processingLabor.vue
index 9b7fb042..22edeebe 100644
--- a/src/views/home/productionCostAnalysis/processingLabor.vue
+++ b/src/views/home/productionCostAnalysis/processingLabor.vue
@@ -170,6 +170,7 @@ export default {
         startTime: this.dateData.startTime,
         endTime: this.dateData.endTime,
         trendName: this.trendName,
+        isOriginal:1,//0:原片 1:加工
         analysisObject: [
           '加工人工成本'
         ],
diff --git a/src/views/home/productionCostAnalysis/singleCombustible.vue b/src/views/home/productionCostAnalysis/singleCombustible.vue
index 6ad33d64..dc180311 100644
--- a/src/views/home/productionCostAnalysis/singleCombustible.vue
+++ b/src/views/home/productionCostAnalysis/singleCombustible.vue
@@ -221,8 +221,7 @@ export default {
       const requestParams = {
         startTime: this.dateData.startTime,
         endTime: this.dateData.endTime,
-        // index: this.index,
-        // sort: 1,
+        isOriginal:0,//0:原片 1:加工
         trendName: this.trendName,
         analysisObject: [this.fuelName],
         // paramList: ['制造成本', '财务费用', '销售费用', '管理费用', '运费'],
diff --git a/src/views/home/productionCostAnalysis/singleProcAuxMatCost.vue b/src/views/home/productionCostAnalysis/singleProcAuxMatCost.vue
index 198157e2..b6632097 100644
--- a/src/views/home/productionCostAnalysis/singleProcAuxMatCost.vue
+++ b/src/views/home/productionCostAnalysis/singleProcAuxMatCost.vue
@@ -190,9 +190,10 @@ export default {
       const requestParams = {
         startTime: this.dateData.startTime,
         endTime: this.dateData.endTime,
-        trendName: this.auxMatName + '成本' + this.trendName,
-        analysisObject: [this.auxMatName + '成本'],
+        trendName: this.auxMatName + this.trendName,
+        analysisObject: [this.auxMatName],
         levelId: this.factory,
+        isOriginal:1,//0:原片 1:加工
       };
       // 调用接口
        getSingleMaterialAnalysis(requestParams).then((res) => {
diff --git a/src/views/home/productionCostAnalysis/singleProcMfgOverheadCost.vue b/src/views/home/productionCostAnalysis/singleProcMfgOverheadCost.vue
index bd1676c4..bb2c65f0 100644
--- a/src/views/home/productionCostAnalysis/singleProcMfgOverheadCost.vue
+++ b/src/views/home/productionCostAnalysis/singleProcMfgOverheadCost.vue
@@ -82,7 +82,7 @@ export default {
       trendName: '',
       overheadName:'',
       overheadOptions: [
-        {value:'备件丶机物料',label:'备件丶机物料'},
+        {value:'备件、机物料',label:'备件、机物料'},
         {value:'折旧',label:'折旧'},
         {value:'其他',label:'其他'}
       ]
@@ -151,7 +151,7 @@ export default {
         this.beilv = _this.clientWidth / 1920;
       })();
     };
-    this.overheadName = this.$route.query.name ? this.$route.query.name : '备件丶机物料'
+    this.overheadName = this.$route.query.name ? this.$route.query.name : '备件、机物料'
     if(this.$route.query.factory){
       this.factory =Number(this.$route.query.factory)
     }else if(this.$store.getters.levelList.length > 0 && this.$store.getters.levelList[0].id !== 1) {
@@ -169,15 +169,16 @@ export default {
         trendName: this.overheadName+'成本',
         analysisObject: ['加工制造费用成本'],
         levelId: this.factory,
+        isOriginal:1,//0:原片 1:加工
       };
       // 调用接口
       getSingleMaterialCostAnalysis(requestParams).then((res) => {
         this.monData = res.data.currentMonthData.find(item => {
-          return item.name === "加工制造费用成本";
+          return item.name === this.overheadName+'成本';
         });
 
         this.totalData = res.data.totalMonthData.find(item => {
-          return item.name === "加工制造费用成本";
+          return item.name === this.overheadName+'成本';
         });
         this.trend = res.data.dataTrend
       });
diff --git a/src/views/home/productionCostAnalysis/singleProcessingFuel.vue b/src/views/home/productionCostAnalysis/singleProcessingFuel.vue
index f898cb4c..78103f90 100644
--- a/src/views/home/productionCostAnalysis/singleProcessingFuel.vue
+++ b/src/views/home/productionCostAnalysis/singleProcessingFuel.vue
@@ -191,6 +191,7 @@ export default {
         trendName: this.trendName,
         analysisObject: [this.fuelName],
         levelId: this.factory,
+        isOriginal:1,//0:原片 1:加工
       };
       // 调用接口
       getSingleMaterialAnalysis(requestParams).then((res) => {
diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendBarSingleFuelDian.vue b/src/views/home/productionCostAnalysisComponents/dataTrendBarSingleFuelDian.vue
index 0a653ac6..61784400 100644
--- a/src/views/home/productionCostAnalysisComponents/dataTrendBarSingleFuelDian.vue
+++ b/src/views/home/productionCostAnalysisComponents/dataTrendBarSingleFuelDian.vue
@@ -56,41 +56,52 @@ import * as echarts from 'echarts';
 export default {
   name: "Container",
   components: { operatingLineBar },
-  props: ["chartData","fuelName"],
+  props: ["chartData", "fuelName"],
   data() {
     return {
       isDropdownShow: false,
-      selectedProfit: '采购单价', // 选中的名称，初始为null
-      unit:'元/度'
+      selectedProfit: '', // 初始化为空，由 watch 填充
+      unit: ''            // 初始化为空，由 watch 填充
     };
   },
   watch: {
+    // 监听 fuelName 变化，动态设置默认选中项和单位
     fuelName: {
       handler(newVal) {
-        this.profitOptions.forEach(item => {
-          if (item.name === this.selectedProfit) {
-            this.unit = item.unit
+        if (newVal === '电') {
+          this.selectedProfit = '原片电成本';
+          this.unit = '元/㎡';
+        } else {
+          this.selectedProfit = '采购单价';
+          this.unit = '元/m³'; // 注意：原代码非电情况下单位逻辑可能需要确认，这里暂定为 m³ 或根据 profitOptions 动态获取
+          
+          // 更严谨的做法是根据 profitOptions 查找默认项的单位
+          const defaultOption = this.profitOptions.find(item => item.name === this.selectedProfit);
+          if (defaultOption) {
+            this.unit = defaultOption.unit;
           }
-        })
-      }
+        }
+      },
+      immediate: true // 组件创建时立即执行一次，解决初始化取值问题
     }
   },
   computed: {
     profitOptions() {
-      if (this.fuelName==='电') {
+      if (this.fuelName === '电') {
         return [
-        {name:'采购单价',unit:'元/度'},
-        {name:'产量',unit:'㎡'},
-        {name:'单耗',unit:'度/㎡'},
-        {name:'消耗量',unit:'度'}
-      ]
-      }else{
+          { name: '原片电成本', unit: '元/㎡' },
+          { name: '采购单价', unit: '元/度' },
+          { name: '产量', unit: '㎡' },
+          { name: '单耗', unit: '度/㎡' },
+          { name: '消耗量', unit: '度' }
+        ]
+      } else {
         return [
-        {name:'采购单价',unit:'元/m³'},
-        {name:'产量',unit:'㎡'},
-        {name:'单耗',unit:'m³/㎡'},
-        {name:'消耗量',unit:'m³'}
-      ]
+          { name: '采购单价', unit: '元/m³' },
+          { name: '产量', unit: '㎡' },
+          { name: '单耗', unit: 'm³/㎡' },
+          { name: '消耗量', unit: 'm³' }
+        ]
       }
     },
     currentDataSource() {
@@ -108,7 +119,7 @@ export default {
 
       const salesData = {
         allPlaceNames: this.locations,
-        unit:this.unit,
+        unit: this.unit,
         series: [
           // 1. 完成率（折线图）
           {
diff --git a/src/views/home/productionCostAnalysisComponents/noRouterHeader.vue b/src/views/home/productionCostAnalysisComponents/noRouterHeader.vue
index 316e557c..8aa7a3f8 100644
--- a/src/views/home/productionCostAnalysisComponents/noRouterHeader.vue
+++ b/src/views/home/productionCostAnalysisComponents/noRouterHeader.vue
@@ -7,13 +7,17 @@
 
     <!-- 右侧区域：全屏按钮 -->
     <div class="right-content">
-      <el-dropdown trigger="click">
-        <el-button type="text" class="logout-btn" :title="'退出'">
-          <svg-icon style="color: #0B58FF;" icon-class="logout" />
-        </el-button>
+      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
+        <div class="avatar-wrapper">
+          <img :src="require(`../../../assets/images/choicepart/avatar.png`)" class="user-avatar">
+          <span v-if="nickname" class="user-nickname">{{ nickname }}</span>
+          <i class="el-icon-caret-bottom" />
+        </div>
         <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item  @click.native='logout'>退出登录</el-dropdown-item>
-          <el-dropdown-item  @click.native='handleToggle'>切换账号</el-dropdown-item>
+          <el-dropdown-item @click.native="logout">
+            <span>退出登录</span>
+          </el-dropdown-item>
+           <el-dropdown-item divided  @click.native='handleToggle'>切换账号</el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
       <el-button type="text" class="return-btn" :title="'返回'" @click="handleReturn">
@@ -51,6 +55,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 import moment from 'moment'; // 引入moment
 import {getPath} from "@/utils/ruoyi";
 export default {
@@ -76,6 +81,9 @@ export default {
       default: () => []
     }
   },
+  computed:{
+    ...mapGetters(['nickname']),
+  },
   data() {
     return {
       currentTime: '',
@@ -414,12 +422,35 @@ export default {
     padding: 0;
   }
 
-  .logout-btn {
-    width: 28px;
-    height: 28px;
-    font-size: 28px;
-    padding: 0;
-  }
+  .avatar-container {
+      margin-right: 30px;
+
+      .avatar-wrapper {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        position: relative;
+
+        .user-avatar {
+          cursor: pointer;
+          width: 32px;
+          height: 32px;
+          border-radius: 50%;
+        }
+        .user-nickname{
+          margin-left: 5px;
+          font-size: 14px;
+        }
+
+        .el-icon-caret-bottom {
+          cursor: pointer;
+          position: absolute;
+          right: -20px;
+          top: 10px;
+          font-size: 12px;
+        }
+      }
+    }
 
 }
 
diff --git a/src/views/home/productionCostAnalysisComponents/relateCombustibleCostAnalysis.vue b/src/views/home/productionCostAnalysisComponents/relateCombustibleCostAnalysis.vue
index 35fe3056..96422f79 100644
--- a/src/views/home/productionCostAnalysisComponents/relateCombustibleCostAnalysis.vue
+++ b/src/views/home/productionCostAnalysisComponents/relateCombustibleCostAnalysis.vue
@@ -67,18 +67,18 @@ export default {
   computed: {
     indicatorDefs() {
       return [
-        { key: 'naturalGas', name: '天然气', unit: '元/㎡',route:'singleCombustible'},
-        { key: 'lng', name: 'LNG液化天然气', unit: '元/㎡',route:'singleCombustible'},
-        { key: 'heavyOil', name: '重油', unit: '元/㎡',route:'singleCombustible'},
-        { key: 'water', name: '水', unit: '元/m³',route:'singleCombustible'}
+        { key: 'naturalGas', name: '天然气', label:'天然气成本',unit: '元/㎡',route:'singleCombustible'},
+        { key: 'lng', name: 'LNG液化天然气', label:'LNG液化天然气成本', unit: '元/㎡',route:'singleCombustible'},
+        { key: 'heavyOil', name: '重油', label:'重油成本', unit: '元/㎡',route:'singleCombustible'},
+        { key: 'water', name: '水', label:'水成本', unit: '元/m³',route:'singleCombustible'}
       ]
     },
     indicators() {
       const fallback = { targetValue: 0, value: 0, completed: 0, diffValue: 0 }
       const list = (Array.isArray(this.activeData) ? this.activeData : [])
-
+      console.log('数据集：', list);
       return this.indicatorDefs.map(def => {
-        const data = list.find(item => item && item.name.includes(def.name)) || fallback
+        const data = list.find(item => item.name === def.label) || fallback;
         return {
           ...def,
           data,
diff --git a/src/views/home/productionCostAnalysisComponents/relatedIndicatorsAnalysis.vue b/src/views/home/productionCostAnalysisComponents/relatedIndicatorsAnalysis.vue
index 26ad8e5b..e4d103b9 100644
--- a/src/views/home/productionCostAnalysisComponents/relatedIndicatorsAnalysis.vue
+++ b/src/views/home/productionCostAnalysisComponents/relatedIndicatorsAnalysis.vue
@@ -68,11 +68,11 @@ export default {
   computed: {
     indicatorDefs() {
       return [
-        { key: 'rawMaterialCost', name: '原料成本', unit: '元/㎡', route: 'fuelCostAnalysis/fuelCostAnalysis'},
-        { key: 'fuelCost', name: '燃料成本', unit: '元/㎡', route: 'combustible/combustible'},
-        { key: 'electricityCost', name: '电成本', unit: '元/㎡', route: 'osElectricityCostAnalysis'},
-        { key: 'laborCost', name: '人工成本', unit: '元/㎡', route: 'originalSheetLabor'},
-        { key: 'manufacturingCost', name: '制造成本', unit: '元/㎡', route: 'mfgOverheadCostAnalysis/mfgOverheadCostAnalysis'},
+        { key: 'rawMaterialCost', name: '原料成本',label:'原料成本', unit: '元/㎡', route: 'fuelCostAnalysis/fuelCostAnalysis'},
+        { key: 'fuelCost', name: '燃料成本',label:'原片燃料成本', unit: '元/㎡', route: 'combustible/combustible'},
+        { key: 'electricityCost', name: '电成本',label:'原片电成本', unit: '元/㎡', route: 'osElectricityCostAnalysis'},
+        { key: 'laborCost', name: '人工成本',label:'人工成本', unit: '元/㎡', route: 'originalSheetLabor'},
+        { key: 'manufacturingCost', name: '制造成本',label:'制造成本', unit: '元/㎡', route: 'mfgOverheadCostAnalysis/mfgOverheadCostAnalysis'},
       ]
     },
     indicators() {
@@ -80,7 +80,7 @@ export default {
       const list = (Array.isArray(this.activeData) ? this.activeData : [])
 
       return this.indicatorDefs.map(def => {
-        const data = list.find(item => item && item.name === def.name) || fallback
+        const data = list.find(item => item && item.name === def.label) || fallback
         return {
           ...def,
           data,