From 5f104e1f523a23887a2bb15b61649cc1db826fdb Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 16 Jun 2022 10:20:46 +0800
Subject: [PATCH] =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/TaskPlanList.vue               | 30 ++++++++++++-------
 .../projectStatusBoard/index.vue              | 26 ++++++++++++----
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue
index 0551e59df..c2833f4be 100644
--- a/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue
+++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue
@@ -45,13 +45,19 @@
                 <div class="process-content-right-xian"></div>
                 <div class="process-content-content" :style="val.left"
                      v-for="(val,indexOne) in item.data[0]" :key="indexOne">
-                  <div class="process-content-right-top">{{val.name}}</div>
-                  <img v-if="val.status == 1" src="../../../../assets/wancheng.png" class="process-content-left" alt="">
-                  <img v-else-if="val.status == 2" src="../../../../assets/shijian.png" class="process-content-left"
-                       alt="">
-                  <img v-else-if="val.status == 3" src="../../../../assets/xian.png" class="process-content-left"
-                       alt="">
-                  <div class="process-content-right-button">{{val.time.slice(0,11)}}</div>
+                  <a-tooltip placement="topLeft">
+                    <template slot="title">
+                      <span>{{val.time.slice(0,11)}}</span>
+                    </template>
+                    <div class="process-content-right-top">{{val.name}}</div>
+                    <img v-if="val.status == 1" src="../../../../assets/done.svg" class="process-content-left" alt="">
+                    <img v-else-if="val.status == 2" src="../../../../assets/open.svg"
+                         class="process-content-left"
+                         alt="">
+                    <img v-else-if="val.status == 3" src="../../../../assets/inprogress.svg" class="process-content-left"
+                         alt="">
+                  </a-tooltip>
+                  <!--                  <div class="process-content-right-button">{{val.time.slice(0,11)}}</div>-->
                 </div>
               </div>
               <div class="box-top-content-right-xian"></div>
@@ -111,6 +117,8 @@
         getAction(this.url.timeline, query).then((res) => {
           if (res.success) {
             this.getTimelineList(res.result)
+          } else {
+            this.loadingMain = false
           }
         })
       },
@@ -140,6 +148,8 @@
         getAction(this.url.timelineList, query).then((res) => {
           if (res.success) {
             this.getEcharts(time, res.result)
+          } else {
+            this.loadingMain = false
           }
         })
       },
@@ -218,8 +228,8 @@
           }
           contentRightText[0].style = 'display:none'
           contentRightXian[0].style = 'display:none'
-          let clientWidthOne = dataList[0].clientWidth
-          clientWidthOne = clientWidthOne / length
+          let clientWidthOne = dataList[0].clientWidth * dataList.length
+          clientWidthOne = clientWidthOne / timeList.length
           let num = Math.ceil(clientWidthOne / 31) * parseInt(this.handlingTime.slice(8, 10))
           timeList.forEach((res, index) => {
             if (res.slice(0, 7) == this.handlingTime.slice(0, 7)) {
@@ -308,7 +318,7 @@
     width: 100%;
     height: calc(100vh - 160px);
     margin-bottom: 20px;
-    padding: 25px 20px 10px 20px;
+    padding: 25px 50px 10px 20px;
     box-sizing: border-box;
     overflow: auto;
   }
diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
index 1a70df1be..9cde8a7f5 100644
--- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
+++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
@@ -71,11 +71,21 @@
               <div class="process-content-right-xian"></div>
               <div class="process-content-content" :style="val.left"
                    v-for="(val,indexOne) in item.data[0]" :key="indexOne">
-                <div class="process-content-right-top">{{val.name}}</div>
-                <img v-if="val.status == 1" src="../../../assets/wancheng.png" class="process-content-left" alt="">
-                <img v-else-if="val.status == 2" src="../../../assets/shijian.png" class="process-content-left" alt="">
-                <img v-else-if="val.status == 3" src="../../../assets/xian.png" class="process-content-left" alt="">
-                <div class="process-content-right-button">{{val.time.slice(0,11)}}</div>
+                <a-tooltip placement="topLeft">
+                  <template slot="title">
+                    <span>{{val.time.slice(0,11)}}</span>
+                  </template>
+                  <div class="process-content-right-top">{{val.name}}</div>
+                  <img v-if="val.status == 1" src="../../../assets/done.svg" class="process-content-left"
+                       alt="">
+                  <img v-else-if="val.status == 2" src="../../../assets/open.svg"
+                       class="process-content-left"
+                       alt="">
+                  <img v-else-if="val.status == 3" src="../../../assets/inprogress.svg" class="process-content-left"
+                       alt="">
+                </a-tooltip>
+
+                <!--                <div class="process-content-right-button">{{val.time.slice(0,11)}}</div>-->
               </div>
             </div>
             <div class="box-top-content-right-xian"></div>
@@ -242,6 +252,8 @@
         getAction(this.url.timeline, query).then((res) => {
           if (res.success) {
             this.getTimelineList(res.result)
+          } else {
+            this.loadingMain = false
           }
         })
       },
@@ -272,6 +284,8 @@
         getAction(this.url.timelineList, query).then((res) => {
           if (res.success) {
             this.getEcharts(time, res.result)
+          } else {
+            this.loadingMain = false
           }
         })
       },
@@ -451,7 +465,7 @@
     width: 100%;
     height: 500px;
     margin-bottom: 20px;
-    padding: 20px 0;
+    padding: 20px 58px 20px 10px;
     box-sizing: border-box;
     overflow: auto;
   }