From 58db45c341547380509907635ebcc7615e139ef5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Thu, 28 Nov 2024 13:44:40 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=9C=8B=E6=9D=BF=E6=96=87=E6=9C=AC=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/amphiPosition.js                   |  4 ++--
 src/api/forwardDemand.js                   |  4 ++--
 src/api/lineTableAnalysis.js               |  2 +-
 src/api/monthPlan.js                       |  2 +-
 src/components/AmphiPosition/index.vue     | 12 +++++-----
 src/components/ForwardDemand/index.vue     | 12 +++++-----
 src/components/Integration/index.vue       | 24 +++++++++----------
 src/components/LineTableAnalysis/index.vue | 26 ++++++++++----------
 src/components/MonthPlan/index.vue         | 28 +++++++++++-----------
 src/views/home/index.vue                   | 10 ++++----
 10 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/src/api/amphiPosition.js b/src/api/amphiPosition.js
index 0fe87d0..98503d7 100644
--- a/src/api/amphiPosition.js
+++ b/src/api/amphiPosition.js
@@ -1,6 +1,6 @@
 import request from "@/utils/request";
 
-// 跨为分析
+// 跨为情况
 
 //1.跨位汇总表
 export function zyjhzxTable(params) {
@@ -27,4 +27,4 @@ export function today_zyjhzx(params) {
     method: "get",
     params,
   });
-}
\ No newline at end of file
+}
diff --git a/src/api/forwardDemand.js b/src/api/forwardDemand.js
index e49139c..05497e7 100644
--- a/src/api/forwardDemand.js
+++ b/src/api/forwardDemand.js
@@ -1,8 +1,8 @@
 import request from "@/utils/request";
 
-// 前方需求分析
+// 前方需求情况
 
-// 1.需求计划与分析
+// 1.需求计划与情况
 export function qfxqTable(params) {
   return request({
     url: "/kban/qfxqTable",
diff --git a/src/api/lineTableAnalysis.js b/src/api/lineTableAnalysis.js
index 606e384..2f5d3a8 100644
--- a/src/api/lineTableAnalysis.js
+++ b/src/api/lineTableAnalysis.js
@@ -1,6 +1,6 @@
 import request from "@/utils/request";
 
-// 线表分析
+// 线表情况
 
 // 柱状图、折线图
 export function kbanXbjh(params) {
diff --git a/src/api/monthPlan.js b/src/api/monthPlan.js
index fab9319..12ba4a2 100644
--- a/src/api/monthPlan.js
+++ b/src/api/monthPlan.js
@@ -1,6 +1,6 @@
 import request from "@/utils/request";
 
-// 月度计划分析
+// 月度计划情况
 
 // 汇总表
 export function zrcTable(params) {
diff --git a/src/components/AmphiPosition/index.vue b/src/components/AmphiPosition/index.vue
index 8122fc8..c08d572 100644
--- a/src/components/AmphiPosition/index.vue
+++ b/src/components/AmphiPosition/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <!-- 垮位分析 -->
+  <!-- 垮位情况 -->
   <div class="amphiPosition-container">
     <!-- 筛选 -->
 <!--    <div class="formData-box">
@@ -55,7 +55,7 @@
             <!-- 上料及各做业务区柱状图 -->
             <div class="left-bottom-box">
               <div id="loaderBar" class="loaderBar"></div>
-              <div class="desc-title">各工作区完成计划工张数数据分析</div>
+              <div class="desc-title">各工作区完成计划工张数数据情况</div>
             </div>
           </div>
         </div>
@@ -272,7 +272,7 @@ export default {
       var myChart = this.$echarts.init(document.getElementById("loaderPie"));
       var option = {
         title: {
-          text: "上料分析",
+          text: "上料情况",
           left: "center",
           bottom: 0,
           textStyle: {
@@ -324,7 +324,7 @@ export default {
 
       var option = {
         title: {
-          text: "一垮分析",
+          text: "一垮情况",
           left: "center",
           bottom: 0,
           textStyle: {
@@ -379,7 +379,7 @@ export default {
 
       var option = {
         title: {
-          text: "二垮分析",
+          text: "二垮情况",
           left: "center",
           bottom: 0,
           textStyle: {
@@ -434,7 +434,7 @@ export default {
 
       var option = {
         title: {
-          text: "三垮分析",
+          text: "三垮情况",
           left: "center",
           bottom: 0,
           textStyle: {
diff --git a/src/components/ForwardDemand/index.vue b/src/components/ForwardDemand/index.vue
index 6391bdd..39be299 100644
--- a/src/components/ForwardDemand/index.vue
+++ b/src/components/ForwardDemand/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <!-- 前方需求分析 -->
+  <!-- 前方需求情况 -->
   <div class="forwardDemand-container">
     <!-- 筛选 -->
 <!--    <div class="formData-box">
@@ -69,7 +69,7 @@
       <div class="right-box">
         <div class="border-out">
           <div class="border-inner">
-            <div class="right-top-title">需求与生产分析</div>
+            <div class="right-top-title">需求与生产情况</div>
             <div class="right-top-box">
               <div class="table-text">
                 <div>
@@ -134,7 +134,7 @@ export default {
         singleHeight: 0,
         waitTime: 500,
       },
-      // 3.	需求与生产分析文本
+      // 3.	需求与生产情况文本
       rowObj: {},
       xqzlSum: 0,
       jhzlSum: 0,
@@ -272,7 +272,7 @@ export default {
 
       var option = {
         title: {
-          text: "需求和计划以及完工重量分析",
+          text: "需求和计划以及完工重量情况",
           left: "center",
           textStyle: {
             color: "#fff",
@@ -447,7 +447,7 @@ export default {
     display: flex;
     align-items: stretch;
     height: calc(100vh - 105px);
-    // 需求计划分析
+    // 需求计划情况
     .left-box {
       width: 30%;
       height: 100%;
@@ -551,7 +551,7 @@ export default {
         text-align: center;
         margin: 0 auto;
       }
-      // 需求与生产分析
+      // 需求与生产情况
       .right-top-box {
         height: 8%;
         padding: 1% 1% 2% 1%;
diff --git a/src/components/Integration/index.vue b/src/components/Integration/index.vue
index 7fec3fc..d88f44f 100644
--- a/src/components/Integration/index.vue
+++ b/src/components/Integration/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <!-- 小池集成分析 -->
+  <!-- 小池集成情况 -->
   <div class="integration-container">
     <!-- 筛选 -->
     <div class="formData-box">
@@ -76,11 +76,11 @@ export default {
       deviceLeftList: [
         {
           status:'00',
-          dcCh:'',
-          dcPl:'',
-          tzbh:'',
-          beginAt:'',
-          overAt:'',
+          dcCh:'G175K-12',
+          dcPl:'119',
+          tzbh:'B119N4PX011',
+          beginAt:'2024/11/27 13:01',
+          overAt:'2024/11/27 14:01',
           img: require("@/assets/image/xc1.png"),
         },
         {
@@ -88,7 +88,7 @@ export default {
           dcCh:'G175K-12',
           dcPl:'119',
           tzbh:'B119N4PX011',
-          beginAt:'2024/11/27 7:27',
+          beginAt:'2024/11/27 07:27',
           overAt:'',
           img: require("@/assets/image/xc1.png"),
         },
@@ -99,7 +99,7 @@ export default {
           dcCh:'G175K-12',
           dcPl:'119',
           tzbh:'B119N4PX007',
-          beginAt:'2024/11/27 7:27',
+          beginAt:'2024/11/27 07:27',
           overAt:'',
           img: require("@/assets/image/xc2.png"),
         },
@@ -108,7 +108,7 @@ export default {
           dcCh:"G175K-12",
           dcPl:'119',
           tzbh:'B119N4PX016',
-          beginAt:'2024/11/27 7:27',
+          beginAt:'2024/11/27 07:27',
           overAt:'',
           img: require("@/assets/image/xc2.png"),
         },
@@ -117,7 +117,7 @@ export default {
           dcCh:"G175K-12",
           dcPl:'119',
           tzbh:'B119N4PX021',
-          beginAt:'2024/11/27 7:27',
+          beginAt:'2024/11/27 07:27',
           overAt:'',
           img: require("@/assets/image/xc2.png"),
         },
@@ -126,8 +126,8 @@ export default {
           dcCh:"G175K-12",
           dcPl:'119',
           tzbh:'B119N4PX020',
-          beginAt:'2024/11/27 7:27',
-          overAt:'2024/11/27 8:15',
+          beginAt:'2024/11/27 07:27',
+          overAt:'2024/11/27 08:15',
           img: require("@/assets/image/xc2.png"),
         },
       ],
diff --git a/src/components/LineTableAnalysis/index.vue b/src/components/LineTableAnalysis/index.vue
index 90df075..da3567a 100644
--- a/src/components/LineTableAnalysis/index.vue
+++ b/src/components/LineTableAnalysis/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <!-- 线表分析 -->
+  <!-- 线表情况 -->
   <div class="lineTableAnalysis-container">
     <!-- 筛选 -->
     <div class="formData-box">
@@ -17,7 +17,7 @@
       <div class="left-box">
         <div class="border-out">
           <div class="border-inner">
-            <!-- 线标分析-折线图 -->
+            <!-- 线标情况-折线图 -->
             <div class="left-top-box">
               <div class="left-top-title">线表情况</div>
               <div id="TableLine" class="TableLine"></div>
@@ -26,7 +26,7 @@
         </div>
         <div class="border-out box-top">
           <div class="border-inner">
-            <!-- 线标分析 -柱状图 -->
+            <!-- 线标情况 -柱状图 -->
             <div class="left-bottom-box">
               <div class="left-bottom-title">线表与月度计划</div>
               <div id="TableBar" class="TableBar"></div>
@@ -39,7 +39,7 @@
           <div class="border-inner">
             <!-- 完成量-与未完成量 -->
             <div class="right-top-box">
-              <div class="right-top-title">线表分析</div>
+              <div class="right-top-title">线表情况</div>
               <div id="ShipBar" class="ShipBar"></div>
             </div>
           </div>
@@ -94,9 +94,9 @@ export default {
         });
         this.xbjhList = res.data.xbjh;
         this.ydjhList = ydjhList;
-        // 线表分析折线图
+        // 线表情况折线图
         this.TableLine();
-        // 线表分析柱状图
+        // 线表情况柱状图
         this.TableBar();
       });
     },
@@ -127,14 +127,14 @@ export default {
 
         dataY.forEach((item) => {
           xbListCopy[item] = xbListCopy[item].filter((em) => {
-            return em.zl >= 0;
+            return em.zl > 0;
           });
           ydListCopy[item] = ydListCopy[item].filter((em) => {
-            return em.jhzl >= 0;
+            return em.jhzl > 0;
           });
 
           xbStartData.push(
-            xbListCopy[item] && xbListCopy[item][0].yf
+            xbListCopy[item] && xbListCopy[item][0]?.yf
               ? new Date(
                   this.$moment().format("yyyy") +
                     "/" +
@@ -177,7 +177,7 @@ export default {
               : ""
           );
         });
-        // 船只分析甘特图
+        // 船只情况甘特图
         this.ShipBar(dataY, xbStartData, xbEndData, ydStartData, ydEndData);
       });
     },
@@ -566,7 +566,7 @@ export default {
       display: flex;
       flex-direction: column;
       justify-content: space-between;
-      //   线表分析折线图
+      //   线表情况折线图
       .left-top-box {
         height: 100%;
         .left-top-title {
@@ -586,7 +586,7 @@ export default {
           height: calc(100% - 24px);
         }
       }
-      //   线表分析柱状图
+      //   线表情况柱状图
       .left-bottom-box {
         height: 100%;
         .left-bottom-title {
@@ -611,7 +611,7 @@ export default {
       width: 50%;
       height: 100%;
       margin-left: 5px;
-      //   线表分析甘特图
+      //   线表情况甘特图
       .right-top-box {
         height: 100%;
         .right-top-title {
diff --git a/src/components/MonthPlan/index.vue b/src/components/MonthPlan/index.vue
index b590297..ac10a6c 100644
--- a/src/components/MonthPlan/index.vue
+++ b/src/components/MonthPlan/index.vue
@@ -1,11 +1,11 @@
 <template>
-  <!-- 月度计划分析 -->
+  <!-- 月度计划情况 -->
   <div class="monthPlan-container">
     <div class="monthPlan-box">
       <div class="left-box">
         <div class="border-out">
           <div class="border-inner">
-            <!-- 线标分析-折线图 -->
+            <!-- 线标情况-折线图 -->
             <div class="left-top-box">
               <div class="left-top-title">月度计划汇总表</div>
               <table class="table-sum">
@@ -63,7 +63,7 @@
           <div class="border-out">
             <div class="border-inner">
               <!-- 柱状图 -->
-              <div class="right-top-title">月度计划数据分析</div>
+              <div class="right-top-title">月度计划数据情况</div>
               <el-row class="row">
                 <el-col :span="24">
                   <div id="DrawingBar" class="drawingBar"></div>
@@ -87,7 +87,7 @@
           <div class="border-out">
             <div class="border-inner">
               <!-- 饼图 -->
-              <div class="right-bottom-title">月度计划数据分析</div>
+              <div class="right-bottom-title">月度计划数据情况</div>
               <el-row class="row">
                 <el-col :span="4">
                   <div id="DrawingPie" class="drawingPie"></div>
@@ -601,7 +601,7 @@ export default {
       var myChart = this.$echarts.init(document.getElementById("DrawingPie"));
       var option = {
         title: {
-          text: "来图与图纸分析",
+          text: "来图与图纸情况",
           left: "center",
           bottom: "10%",
           textStyle: {
@@ -627,7 +627,7 @@ export default {
         },
         series: [
           {
-            name: "来图与图纸分析",
+            name: "来图与图纸情况",
             type: "pie",
             radius: "50%",
             center: ["50%", "50%"],
@@ -652,7 +652,7 @@ export default {
 
       var option = {
         title: {
-          text: "计划与完成分析",
+          text: "计划与完成情况",
           left: "center",
           bottom: "10%",
           textStyle: {
@@ -678,7 +678,7 @@ export default {
         },
         series: [
           {
-            name: "计划与完成分析",
+            name: "计划与完成情况",
             type: "pie",
             radius: "50%",
             center: ["50%", "50%"],
@@ -703,7 +703,7 @@ export default {
 
       var option = {
         title: {
-          text: "需求与订货分析",
+          text: "需求与订货情况",
           left: "center",
           bottom: "10%",
           textStyle: {
@@ -729,7 +729,7 @@ export default {
         },
         series: [
           {
-            name: "需求与订货分析",
+            name: "需求与订货情况",
             type: "pie",
             radius: "50%",
             center: ["50%", "50%"],
@@ -754,7 +754,7 @@ export default {
 
       var option = {
         title: {
-          text: "需求与月度计划分析",
+          text: "需求与月度计划情况",
           left: "center",
           bottom: "10%",
           textStyle: {
@@ -780,7 +780,7 @@ export default {
         },
         series: [
           {
-            name: "需求与月度计划分析",
+            name: "需求与月度计划情况",
             type: "pie",
             radius: "50%",
             center: ["50%", "50%"],
@@ -802,7 +802,7 @@ export default {
       var myChart = this.$echarts.init(document.getElementById("FinishPie"));
       var option = {
         title: {
-          text: "需求与完成分析",
+          text: "需求与完成情况",
           left: "center",
           // left:"center",
           bottom: "10%",
@@ -830,7 +830,7 @@ export default {
         },
         series: [
           {
-            name: "需求与完成分析",
+            name: "需求与完成情况",
             type: "pie",
             radius: "50%",
             center: ["50%", "50%"],
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 80aede0..78aeafb 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -39,31 +39,31 @@
     </transition>
     <transition name="fade">
       <div v-if="leftActiveIndex == 1">
-        <!-- 线表分析 -->
+        <!-- 线表情况 -->
         <line-table-analysis />
       </div>
     </transition>
     <transition name="fade">
       <div v-if="leftActiveIndex == 2">
-        <!-- 前方需求分析 -->
+        <!-- 前方需求情况 -->
         <forward-demand />
       </div>
     </transition>
     <transition name="fade">
       <div v-if="rightActiveIndex == 0">
-        <!-- 月度计划分析 -->
+        <!-- 月度计划情况 -->
         <month-plan />
       </div>
     </transition>
     <transition name="fade">
       <div v-if="rightActiveIndex == 1">
-        <!-- 跨位分析 -->
+        <!-- 跨位情况 -->
         <amphi-position />
       </div>
     </transition>
     <transition name="fade">
       <div v-if="rightActiveIndex == 2">
-        <!-- 小池集成分析 -->
+        <!-- 小池集成情况 -->
         <integration />
       </div>
     </transition>