From 5dce8ae662cdebbf2d3b267ca095f38966f2a842 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 9 Mar 2022 16:27:18 +0800
Subject: [PATCH] gantt

---
 hb_client/src/components/Gantt/dashGantt.vue | 21 +++++++++++++-----
 hb_client/src/components/Gantt/index.vue     | 23 +++++++++++++++-----
 hb_client/src/views/dashboard/index.vue      |  5 +++--
 hb_client/src/views/pm/management.vue        |  5 +++--
 4 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/hb_client/src/components/Gantt/dashGantt.vue b/hb_client/src/components/Gantt/dashGantt.vue
index 4100956..66c8ada 100644
--- a/hb_client/src/components/Gantt/dashGantt.vue
+++ b/hb_client/src/components/Gantt/dashGantt.vue
@@ -231,6 +231,15 @@
                   left: item.left + 'px',
                   width: item.widthMe + 'px'
                 }"
+                @mouseleave="lineMouseleave"
+                @mouseenter="
+                  lineMouseenter(
+                    `line${item.id}`,
+                    $event,
+                    item.id,
+                    item.parentId,
+                    index
+                  )"
               >
                 <div class="progress" :style="{ width: item.per + '%' }"></div>
               </div>
@@ -254,13 +263,15 @@
               <span class="title">工作周期：</span>
               <span>{{ currentProjectMsg.allTime }}天</span>
             </div>
-            <div class="lineMsg" v-if="currentProjectMsg.per1">
-              <span class="title">订单计划：</span>
-              <span>{{ currentProjectMsg.per }}</span>
+            <div class="lineMsg">
+              <span class="title">计划数量：</span>
+              <span v-if="currentProjectMsg.per">{{ currentProjectMsg.per }}</span>
+              <span v-else>0</span>
             </div>
-            <div class="lineMsg" v-if="currentProjectMsg.per1">
+            <div class="lineMsg">
               <span class="title">当前进度：</span>
-              <span>{{ currentProjectMsg.per1 }}</span>
+              <span v-if="currentProjectMsg.per1">{{ currentProjectMsg.per1 }}</span>
+              <span v-else>0</span>
             </div>
             <div class="lineMsg">
               <span class="title">开始时间：</span>
diff --git a/hb_client/src/components/Gantt/index.vue b/hb_client/src/components/Gantt/index.vue
index 94fb4e1..f78968b 100644
--- a/hb_client/src/components/Gantt/index.vue
+++ b/hb_client/src/components/Gantt/index.vue
@@ -231,6 +231,15 @@
                   left: item.left + 'px',
                   width: item.widthMe + 'px'
                 }"
+                @mouseleave="lineMouseleave"
+                @mouseenter="
+                  lineMouseenter(
+                    `line${item.id}`,
+                    $event,
+                    item.id,
+                    item.parentId,
+                    index
+                  )"
               >
                 <div class="progress" :style="{ width: item.per + '%' }"></div>
               </div>
@@ -254,13 +263,15 @@
               <span class="title">工作周期：</span>
               <span>{{ currentProjectMsg.allTime }}天</span>
             </div>
-            <div class="lineMsg" v-if="currentProjectMsg.per1">
-              <span class="title">当前进度：</span>
-              <span>{{ currentProjectMsg.per }}</span>
+            <div class="lineMsg">
+              <span class="title">计划数量：</span>
+              <span v-if="currentProjectMsg.per">{{ currentProjectMsg.per }}</span>
+              <span v-else>0</span>
             </div>
-            <div class="lineMsg" v-if="currentProjectMsg.per1">
-              <span class="title">合格数量：</span>
-              <span>{{ currentProjectMsg.per1 }}</span>
+            <div class="lineMsg">
+              <span class="title">当前进度：</span>
+              <span v-if="currentProjectMsg.per1">{{ currentProjectMsg.per1 }}</span>
+              <span v-else>0</span>
             </div>
             <div class="lineMsg">
               <span class="title">开始时间：</span>
diff --git a/hb_client/src/views/dashboard/index.vue b/hb_client/src/views/dashboard/index.vue
index c65e735..9103f1c 100644
--- a/hb_client/src/views/dashboard/index.vue
+++ b/hb_client/src/views/dashboard/index.vue
@@ -931,6 +931,7 @@
                 obj.endTime = endTime;
                 obj.planTime = [startTime, endTime];
                 obj.per = item.count;
+                obj.per1 = item.count_ok;
                 obj.type = 1;
                 obj.productName = item.product_.name;
                 obj.productNum = item.product_.specification;
@@ -954,7 +955,7 @@
                   objChild.endTime = end;
                   objChild.planTime = [start, end];
                   objChild.per = child.count;
-                  objChild.per1 = child.count_real;
+                  objChild.per1 = child.count_ok;
                   objChild.type = 1;
                   objChild.productName = child.product_.name;
                   objChild.productNum = child.product_.specification;
@@ -970,7 +971,7 @@
                 obj.endTime = endTime;
                 obj.planTime = [startTime, endTime];
                 obj.per = item.count;
-                obj.per1 = item.count_real;
+                obj.per1 = item.count_ok;
                 obj.type = 3;
                 obj.productName = item.product_.name;
                 obj.productNum = item.product_.specification;
diff --git a/hb_client/src/views/pm/management.vue b/hb_client/src/views/pm/management.vue
index b8b22cb..c672637 100644
--- a/hb_client/src/views/pm/management.vue
+++ b/hb_client/src/views/pm/management.vue
@@ -183,6 +183,7 @@
                 obj.endTime = endTime;
                 obj.planTime = [startTime, endTime];
                 obj.per = item.count;
+                obj.per1 = item.count_ok;
                 obj.type = 1;
                 obj.productName = item.product_.name;
                 obj.productNum = item.product_.specification;
@@ -206,7 +207,7 @@
                   objChild.endTime = end;
                   objChild.planTime = [start, end];
                   objChild.per = child.count;
-                  objChild.per1 = child.count_real;
+                  objChild.per1 = child.count_ok;
                   objChild.type = 1;
                   objChild.productName = child.product_.name;
                   objChild.productNum = child.product_.specification;
@@ -222,7 +223,7 @@
                 obj.endTime = endTime;
                 obj.planTime = [startTime, endTime];
                 obj.per = item.count;
-                obj.per1 = item.count_real;
+                obj.per1 = item.count_ok;
                 obj.type = 3;
                 obj.productName = item.product_.name;
                 obj.productNum = item.product_.specification;