From 446078f55852de4898f384561041ee307ddfce87 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Tue, 14 Apr 2026 13:54:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operatingLineBarSale.vue                  | 12 -----
 src/views/home/components/baseTable.vue       |  7 ---
 src/views/home/components/budgetDetails.vue   |  2 +-
 .../home/components/core-bottom-leftItem.vue  | 12 ++---
 src/views/home/components/coreSalesKPIs.vue   |  4 --
 src/views/home/components/financeCosts.vue    |  3 --
 .../home/components/indicatorDetails.vue      |  2 +-
 .../home/components/order-bottom-leftItem.vue |  8 +--
 src/views/home/components/purchase-Item.vue   | 54 ++++++++-----------
 src/views/home/components/top-item.vue        | 18 +++----
 .../home/components/top-product-item.vue      |  6 +--
 .../operatingLineBarSale.vue                  | 12 -----
 src/views/home/index.vue                      |  6 ---
 src/views/home/indicatorSubmissionDetails.vue | 48 +----------------
 .../operatingLineBarSale.vue                  | 12 -----
 .../operatingSingleBar.vue                    |  3 --
 .../relatedIndicatorsAnalysis.vue             |  5 +-
 17 files changed, 50 insertions(+), 164 deletions(-)

diff --git a/src/views/home/accountsReceivableComponents/operatingLineBarSale.vue b/src/views/home/accountsReceivableComponents/operatingLineBarSale.vue
index 5c46ad38..8bcaeacd 100644
--- a/src/views/home/accountsReceivableComponents/operatingLineBarSale.vue
+++ b/src/views/home/accountsReceivableComponents/operatingLineBarSale.vue
@@ -94,18 +94,6 @@ export default {
         if (itemName === undefined) {
           return;
         }
-        // 路由跳转时携带序号（或名称+序号）
-        this.$router.push({
-          path: 'operatingRevenueBase',
-          query: { // 使用query传递参数（推荐），也可使用params
-            // baseName: itemName,
-            factory: baseIndex,
-            dateData: this.dateData
-          }
-          // 若仍需用base作为参数：
-          // base: itemName,
-          // params: { baseIndex: baseIndex }
-        });
       });
 
       // 定义resize处理函数（命名函数，方便移除）
diff --git a/src/views/home/components/baseTable.vue b/src/views/home/components/baseTable.vue
index 28df4767..d9f7948c 100644
--- a/src/views/home/components/baseTable.vue
+++ b/src/views/home/components/baseTable.vue
@@ -1,10 +1,3 @@
-<!--
- * @Date: 2020-12-14 09:07:03
- * @LastEditors: zhp
- * @LastEditTime: 2024-09-05 09:50:14
- * @FilePath: \mt-bus-fe\src\views\OperationalOverview\components\baseTable.vue
- * @Description:
--->
 <template>
   <div class="visual-base-table-container">
     <el-table :max-height="maxHeight" ref="scroll_Table" @mouseenter.native="autoScroll(true)"
diff --git a/src/views/home/components/budgetDetails.vue b/src/views/home/components/budgetDetails.vue
index f2a60895..566fc0d5 100644
--- a/src/views/home/components/budgetDetails.vue
+++ b/src/views/home/components/budgetDetails.vue
@@ -399,7 +399,7 @@ export default {
       console.log('当前编辑状态：', isEdit, '当前时间维度：', this.timeType);
       // 基础表格列配置（只读模式使用）
       const baseTableProps = [
-        // { prop: 'type', label: '指标类型', align: 'center' },
+        { prop: 'type', label: '指标类型', align: 'center' },
         { prop: 'name', label: '指标名称', align: 'center' },
         { prop: 'unit', label: '单位', align: 'center', filter: publicFormatter('lb_dw') },
         { prop: 'target', label: '预算值', align: 'center' },
diff --git a/src/views/home/components/core-bottom-leftItem.vue b/src/views/home/components/core-bottom-leftItem.vue
index 81f4d777..911820ee 100644
--- a/src/views/home/components/core-bottom-leftItem.vue
+++ b/src/views/home/components/core-bottom-leftItem.vue
@@ -10,7 +10,7 @@
           </div>
           <div class="line"></div>
           <div class="right">
-            <div class="number" :style="{ color: getTargetColor(item.currentValue, item.targetValue) }">
+            <div class="number" :style="{ color: getTargetColor(item.progress) }">
               {{ item.currentValue }}
             </div>
             <div class="title">实际值</div>
@@ -21,15 +21,15 @@
           <div class="progress-container">
             <div class="progress-bar" :style="{
               width: item.progress + '%',
-              background: getTargetColor(item.currentValue, item.targetValue)
+              background: getTargetColor(item.progress)
             }"></div>
           </div>
         </div>
 
         <div class="yield" style="display: flex;justify-content: space-between;">
-          <div class="progress-percent" :style="{ color: getTargetColor(item.currentValue, item.targetValue) }">完成率
+          <div class="progress-percent" :style="{ color: getTargetColor(item.progress) }">完成率
           </div>
-          <div class="progress-percent" :style="{ color: getTargetColor(item.currentValue, item.targetValue) }">
+          <div class="progress-percent" :style="{ color: getTargetColor(item.progress) }">
             {{ item.progress }}%
           </div>
         </div>
@@ -95,8 +95,8 @@ export default {
         };
       });
     },
-    getTargetColor(currentValue, targetValue) {
-      return currentValue >= targetValue
+    getTargetColor(progress) {
+      return progress >= 100
         ? "rgba(98, 213, 180, 1)"
         : "rgba(249, 164, 74, 1)";
     }
diff --git a/src/views/home/components/coreSalesKPIs.vue b/src/views/home/components/coreSalesKPIs.vue
index 5d48b134..75a296fa 100644
--- a/src/views/home/components/coreSalesKPIs.vue
+++ b/src/views/home/components/coreSalesKPIs.vue
@@ -9,7 +9,6 @@
         </div>
         <div class="bottom"
           style="display: flex; width: 100%;margin-top: 8px;background-color: rgba(249, 252, 255, 1);">
-          <!-- <top-item /> -->
           <coreBottomBar :line="sale.line" :dateData="dateData" />
 
         </div>
@@ -19,7 +18,6 @@
 </template>
 <script>
 import Container from './container.vue'
-// import * as echarts from 'echarts'
 import topItem from './top-item.vue'
 import coreBottomBar from './coreBottomBar.vue'
 
@@ -57,8 +55,6 @@ export default {
     }
   },
   mounted() {
-    // 初始化图表（若需展示图表，需在模板中添加对应 DOM）
-    // this.$nextTick(() => this.updateChart())
     this.saleData = this.sale.month
   },
   methods: {
diff --git a/src/views/home/components/financeCosts.vue b/src/views/home/components/financeCosts.vue
index 3be0c31c..ca0632c0 100644
--- a/src/views/home/components/financeCosts.vue
+++ b/src/views/home/components/financeCosts.vue
@@ -21,9 +21,6 @@
             </CostsBottomBar>
           </div>
         </template>
-
-        <!-- 图表容器：根据状态控制显示（若需展示图表） -->
-        <!-- <div id="productionStatusChart" style="height: 200px; margin-top: 12px;" v-if="showChart"></div> -->
       </div>
     </Container>
   </div>
diff --git a/src/views/home/components/indicatorDetails.vue b/src/views/home/components/indicatorDetails.vue
index 283d8cfd..98a6e764 100644
--- a/src/views/home/components/indicatorDetails.vue
+++ b/src/views/home/components/indicatorDetails.vue
@@ -178,7 +178,7 @@ export default {
 
       // 基础表格列配置（只读模式使用）
       const baseTableProps = [
-        // { prop: 'type', label: '指标类型', align: 'center' },
+        { prop: 'type', label: '指标类型', align: 'center' },
         { prop: 'name', label: '指标名称', align: 'center' },
         { prop: 'unitLabel', label: '单位', align: 'center' },
         { prop: 'value', label: '实际值', align: 'center' },
diff --git a/src/views/home/components/order-bottom-leftItem.vue b/src/views/home/components/order-bottom-leftItem.vue
index 19a73a33..c850dd67 100644
--- a/src/views/home/components/order-bottom-leftItem.vue
+++ b/src/views/home/components/order-bottom-leftItem.vue
@@ -23,7 +23,7 @@
             <!-- 进度条颜色和宽度动态绑定 -->
             <div class="progress-bar" :style="{
               width: itemList[0].progress + '%',
-              background: getColor(item.currentValue, item.targetValue)
+              background: getColor(item.progress)
             }"></div>
           </div>
         </div>
@@ -32,7 +32,7 @@
           <div class="progress-percent">完成率</div>
           <!-- 百分比颜色动态绑定 -->
           <div class="progress-percent" :style="{
-            color: getColor(item.currentValue, item.targetValue)
+            color: getColor(item.progress)
           }">
             {{ item.progress }}%
           </div>
@@ -103,8 +103,8 @@ export default {
       ]
     },
     // 颜色判断核心方法：实际值≥预算值返回绿色，否则返回橙色
-    getColor(currentValue, targetValue) {
-      return currentValue >= targetValue
+    getColor(progress) {
+      return progress >= 100
         ? "rgba(98, 213, 180, 1)"
         : "rgba(249, 164, 74, 1)";
     },
diff --git a/src/views/home/components/purchase-Item.vue b/src/views/home/components/purchase-Item.vue
index 725e9ee8..ddcda0d2 100644
--- a/src/views/home/components/purchase-Item.vue
+++ b/src/views/home/components/purchase-Item.vue
@@ -13,8 +13,8 @@
             <!-- 实际值：根据 实际值≥目标值 动态绑定类名 -->
             <div class="right">
               <div class="number" :class="{
-                'number-exceed': item.currentValue >= item.targetValue,
-                'number-below': item.currentValue < item.targetValue
+                'number-exceed': item.progress >= 100,
+                'number-below': item.progress < 100
               }">
                 {{ item.currentValue }}
               </div>
@@ -27,8 +27,8 @@
           <div class="progress-group">
             <div class="progress-container">
               <div class="progress-bar" :style="{ width: item.progressWidth + '%' }" :class="{
-                'bar-exceed': item.currentValue >= item.targetValue,
-                'bar-below': item.currentValue < item.targetValue
+                'bar-exceed': item.progress >= 100,
+                'bar-below': item.progress < 100
               }"></div>
             </div>
           </div>
@@ -36,14 +36,14 @@
           <!-- 完成率：同步绑定类名 -->
           <div class="yield" style="display: flex;justify-content: space-between;">
             <div class="progress-percent" :class="{
-              'percent-exceed': item.currentValue >= item.targetValue,
-              'percent-below': item.currentValue < item.targetValue
+              'percent-exceed': item.progress >= 100,
+              'percent-below': item.progress < 100
             }">完成率</div>
             <div class="progress-percent" :class="{
-              'percent-exceed': item.currentValue >= item.targetValue,
-              'percent-below': item.currentValue < item.targetValue
+              'percent-exceed': item.progress >= 100,
+              'percent-below': item.progress < 100
             }">
-              {{ item.progressDisplay }}
+              {{ item.progress }}%
             </div>
           </div>
         </div>
@@ -62,9 +62,9 @@
               <!-- 实际值：根据与目标值的比较动态变色 -->
               <div class="right">
                 <div class="number" :class="{
-                  'exceed-target': item.currentValue > item.targetValue,
-                  'below-target': item.currentValue < item.targetValue,
-                  'equal-target': item.currentValue === item.targetValue
+                  'exceed-target': item.progress > 100,
+                  'below-target': item.progress < 100,
+                  'equal-target': item.progress == 100
                 }">
                   {{ item.currentValue }}
                 </div>
@@ -75,17 +75,17 @@
             <div class="progress-group">
               <div class="progress-container">
                 <div class="progress-bar" :style="{ width: item.progress + '%' }" :class="{
-                  'exceed-pro-target': item.currentValue > item.targetValue,
-                  'below-pro-target': item.currentValue < item.targetValue,
-                  'equal-pro-target': item.currentValue === item.targetValue
+                  'exceed-pro-target': item.progress > 100,
+                  'below-pro-target': item.progress < 100,
+                  'equal-pro-target': item.progress == 100
                 }"></div>
               </div>
               <div class="progress-percent" :class="{
-                'exceed-target': item.currentValue > item.targetValue,
-                'below-target': item.currentValue < item.targetValue,
-                'equal-target': item.currentValue === item.targetValue
+                'exceed-target': item.progress > 100,
+                'below-target': item.progress < 100,
+                'equal-target': item.progress == 100
               }">
-                {{ item.progressDisplay }}
+                {{ item.progress }}%
               </div>
             </div>
           </div>
@@ -226,7 +226,7 @@ export default {
         // 额外兜底：避免data中的属性为undefined
         const target = data.target || 0;
         const real = data.real || 0;
-        const rate = data.rate || '0%';
+        const rate = data.rate || 0;
 
         // 解析rate字符串
         const parsedRate = this.parseRateString(rate);
@@ -234,24 +234,12 @@ export default {
         // 进度条宽度：限制在0-100之间
         const progressWidth = Math.min(Math.max(parsedRate.progressValue, 0), 100);
 
-        // 显示文本处理
-        let progressDisplay;
-        if (mappingItem.isPercentage) {
-          // 对于需要加%的指标，确保有%符号
-          progressDisplay = parsedRate.displayText.includes('%')
-            ? parsedRate.displayText
-            : `${parsedRate.displayText}%`;
-        } else {
-          // 对于经营性利润和利润总额，直接使用原始rate字符串
-          progressDisplay = parsedRate.displayText;
-        }
-
         return {
           name: mappingItem.name,
           targetValue: target,
           currentValue: real,
           progressWidth: progressWidth, // 用于进度条宽度
-          progressDisplay: progressDisplay, // 用于显示文本
+          progress: rate, // 用于显示文本
           route: mappingItem.route
         };
       });
diff --git a/src/views/home/components/top-item.vue b/src/views/home/components/top-item.vue
index d0828aa5..f7180e58 100644
--- a/src/views/home/components/top-item.vue
+++ b/src/views/home/components/top-item.vue
@@ -12,9 +12,9 @@
           <!-- 实际值：根据与目标值的比较动态变色 -->
           <div class="right">
             <div class="number" :class="{
-              'exceed-target': item.currentValue > item.targetValue,
-              'below-target': item.currentValue < item.targetValue,
-              'equal-target': item.currentValue === item.targetValue
+              'exceed-target': item.progress > 100,
+              'below-target': item.progress < 100,
+              'equal-target': item.progress === 100
             }">
               {{ item.currentValue }}
             </div>
@@ -25,15 +25,15 @@
         <div class="progress-group">
           <div class="progress-container">
             <div class="progress-bar" :style="{ width: item.progress + '%' }" :class="{
-              'exceed-pro-target': item.currentValue > item.targetValue,
-              'below-pro-target': item.currentValue < item.targetValue,
-              'equal-pro-target': item.currentValue === item.targetValue
+              'exceed-pro-target': item.progress > 100,
+              'below-pro-target': item.progress < 100,
+              'equal-pro-target': item.progress === 100
             }"></div>
           </div>
           <div class="progress-percent" :class="{
-            'exceed-target': item.currentValue > item.targetValue,
-            'below-target': item.currentValue < item.targetValue,
-            'equal-target': item.currentValue === item.targetValue
+            'exceed-target': item.progress > 100,
+            'below-target': item.progress < 100,
+            'equal-target': item.progress === 100
           }">
             {{ item.progress }}%
           </div>
diff --git a/src/views/home/components/top-product-item.vue b/src/views/home/components/top-product-item.vue
index 435c680e..3d8c54d3 100644
--- a/src/views/home/components/top-product-item.vue
+++ b/src/views/home/components/top-product-item.vue
@@ -138,9 +138,9 @@ export default {
       const { actual, target, progress } = this.itemList[index];
 
       // 新增条件：如果实际值、预算值和进度都为0，则显示绿色
-      if (actual === 0 && target === 0 && progress === 0) {
-        return "rgba(98, 213, 180, 1)"; // 绿色
-      }
+      // if (actual === 0 && target === 0 && progress === 0) {
+      //   return "rgba(98, 213, 180, 1)"; // 绿色
+      // }
 
       // 原有的通用判断逻辑
       return progress >= 100
diff --git a/src/views/home/depreciationAnalysisComponents/operatingLineBarSale.vue b/src/views/home/depreciationAnalysisComponents/operatingLineBarSale.vue
index d9fbbb95..08d2cb03 100644
--- a/src/views/home/depreciationAnalysisComponents/operatingLineBarSale.vue
+++ b/src/views/home/depreciationAnalysisComponents/operatingLineBarSale.vue
@@ -94,18 +94,6 @@ export default {
         if (itemName === undefined) {
           return;
         }
-        // 路由跳转时携带序号（或名称+序号）
-        this.$router.push({
-          path: 'operatingRevenueBase',
-          query: { // 使用query传递参数（推荐），也可使用params
-            // baseName: itemName,
-            factory: baseIndex,
-            dateData: this.dateData
-          }
-          // 若仍需用base作为参数：
-          // base: itemName,
-          // params: { baseIndex: baseIndex }
-        });
       });
 
       // 定义resize处理函数（命名函数，方便移除）
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index a42d2ab9..b1b6a843 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -1,6 +1,5 @@
 <template>
   <div id="dayReport" class="dayReport" :style="styles">
-    <!-- <div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside" /> -->
     <sidebar style="opacity: .9;" v-if="!sidebar.hide && openSider" class="sidebar-container" />
     <ReportHeader top-title="洛玻集团运营驾驶舱" :openSider="openSider" :is-full-screen="isFullScreen" @screenfullChange="screenfullChange"
       @siderOpenChange="siderOpenChange" @timeRangeChange="handleTimeChange" />
@@ -40,7 +39,6 @@ import keyProductionIndicators from './components/keyProductionIndicators.vue'
 import coreBottomLeft from './components/coreBottomLeft.vue'
 import orderProgress from './components/orderProgress.vue'
 import keyWork from './components/keyWork.vue'
-// import moment from 'moment'
 import { getOperateCockpit, getOrderDetail } from '@/api/cockpit'
 import { Sidebar } from "../../layout/components";
 import { mapState } from "vuex";
@@ -98,7 +96,6 @@ export default {
       return {
         transform: `scale(${v})`,
         transformOrigin: 'left top'
-        // overflow: hidden;
       }
     }
   },
@@ -134,9 +131,6 @@ export default {
   methods: {
    async getOrderData(num) {
       const res = await getOrderDetail({
-        // startTime: this.dateData.startTime,
-        // endTime: this.dateData.endTime,
-        // timeDim: this.dateData.mode,
         baseId: num
       })
       this.orderTableData = res.data
diff --git a/src/views/home/indicatorSubmissionDetails.vue b/src/views/home/indicatorSubmissionDetails.vue
index 3d8d3976..5ce1edce 100644
--- a/src/views/home/indicatorSubmissionDetails.vue
+++ b/src/views/home/indicatorSubmissionDetails.vue
@@ -20,23 +20,6 @@
           <indicatorDetails @updateLeft='getData' @updateLevel='getLevel'/>
         </div>
       </div>
-      <!-- <div class="top" style="margin-top: -20px;  display: flex; gap: 16px">
-        <div class="top-three" style="
-            display: grid;
-            gap: 12px;
-            grid-template-columns:416px 1192px;
-          ">
-
-        </div>
-      </div> -->
-      <!-- <div class="centerImg" style="
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        z-index: 1; /* 确保在 backp 之上、内容之下 */
-      "></div> -->
     </div>
   </div>
 
@@ -47,23 +30,15 @@ import { Sidebar } from "../../layout/components";
 import screenfull from "screenfull";
 import indicatorCalendar from "./components/indicatorCalendar.vue";
 import indicatorDetails from "./components/indicatorDetails.vue";
-
-// import premProdStatus from "./components/premProdStatus.vue";
 import { mapState } from "vuex";
-// import operatingLineChart from "../operatingComponents/operatingLineChart";
-// import operatingLineChartCumulative from "../operatingComponents/operatingLineChartCumulative.vue";
 
 import { getRealMonthCalendar } from '@/api/cockpit'
-import moment from "moment";
 export default {
   name: "DayReport",
   components: {
     ReportHeader,
     indicatorCalendar,
     indicatorDetails,
-    // operatingLineChartCumulative,
-    // operatingLineChart,
-    // premProdStatus,
     Sidebar,
   },
   data() {
@@ -201,28 +176,7 @@ export default {
         return false;
       }
       screenfull.toggle(this.$refs.dayReportB);
-    },
-    // 导出
-    // exportPDF() {
-    //   this.$message.success('正在导出，请稍等！')
-    //   const element = document.getElementById('dayRepDom')
-    //   element.style.display = 'block'
-    //   const fileName = '株洲碲化镉生产日报' + moment().format('yyMMDD') + '.pdf'
-    //   html2canvas(element, {
-    //     dpi: 300, // Set to 300 DPI
-    //     scale: 3 // Adjusts your resolution
-    //   }).then(function(canvas) {
-    //     const imgWidth = 595.28
-    //     const imgHeight = 841.89
-    //     const pageData = canvas.toDataURL('image/jpeg', 1.0)
-    //     const PDF = new JsPDF('', 'pt', [imgWidth, imgHeight])
-    //     PDF.addImage(pageData, 'JPEG', 0, 0, imgWidth, imgHeight)
-    //     setTimeout(() => {
-    //       PDF.save(fileName) // 导出文件名
-    //     }, 1000)
-    //   })
-    //   element.style.display = 'none'
-    // }
+    }
   },
 };
 </script>
diff --git a/src/views/home/inventoryAnalysisComponents/operatingLineBarSale.vue b/src/views/home/inventoryAnalysisComponents/operatingLineBarSale.vue
index 5c46ad38..8bcaeacd 100644
--- a/src/views/home/inventoryAnalysisComponents/operatingLineBarSale.vue
+++ b/src/views/home/inventoryAnalysisComponents/operatingLineBarSale.vue
@@ -94,18 +94,6 @@ export default {
         if (itemName === undefined) {
           return;
         }
-        // 路由跳转时携带序号（或名称+序号）
-        this.$router.push({
-          path: 'operatingRevenueBase',
-          query: { // 使用query传递参数（推荐），也可使用params
-            // baseName: itemName,
-            factory: baseIndex,
-            dateData: this.dateData
-          }
-          // 若仍需用base作为参数：
-          // base: itemName,
-          // params: { baseIndex: baseIndex }
-        });
       });
 
       // 定义resize处理函数（命名函数，方便移除）
diff --git a/src/views/home/rawSheetYieldComponents/operatingSingleBar.vue b/src/views/home/rawSheetYieldComponents/operatingSingleBar.vue
index 4bbf7a44..d896ce2f 100644
--- a/src/views/home/rawSheetYieldComponents/operatingSingleBar.vue
+++ b/src/views/home/rawSheetYieldComponents/operatingSingleBar.vue
@@ -20,9 +20,6 @@ export default {
       return ['预算', '实际'];
     },
     chartD() {
-      // 背景图片路径（若不需要可注释）
-      // const bgImageUrl = require('@/assets/img/labelBg.png');
-      console.log('detailData++++++++++++++++++++++', this.detailData);
       const rate = this.detailData?.rate || 0
       const diff = this.detailData?.diff || 0
       console.log('diff', diff);
diff --git a/src/views/home/rawSheetYieldComponents/relatedIndicatorsAnalysis.vue b/src/views/home/rawSheetYieldComponents/relatedIndicatorsAnalysis.vue
index 6d65a8d9..caa95df7 100644
--- a/src/views/home/rawSheetYieldComponents/relatedIndicatorsAnalysis.vue
+++ b/src/views/home/rawSheetYieldComponents/relatedIndicatorsAnalysis.vue
@@ -81,7 +81,10 @@ export default {
         const data = list.find(item => item && item.title === def.name) || fallback
         return {
           ...def,
-          data,
+          data: {
+            ...data,
+            flag: data.rate >= 100 ? 1 : 0,
+          },
           sortValue: Number((data && data.real) ?? 0)
         }
       })