From 6cffd81540e06bfc971cb2df20f0b41ef894225f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A6=E8=8D=A3=E8=B6=85?= <302645122@qq.com>
Date: Mon, 14 Mar 2022 18:17:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A1=B9=E7=9B=AE=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE=E5=9B=BE=E6=A0=87=E5=8F=8A=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=A7=BB=E5=8A=A8=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/pages/manage/components/GanttView.vue  | 6 ++++++
 .../assets/js/pages/manage/components/ProjectList.vue      | 7 +------
 resources/assets/sass/pages/components/project-list.scss   | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/GanttView.vue b/resources/assets/js/pages/manage/components/GanttView.vue
index c9901b088..eafac13af 100644
--- a/resources/assets/js/pages/manage/components/GanttView.vue
+++ b/resources/assets/js/pages/manage/components/GanttView.vue
@@ -299,6 +299,9 @@ export default {
             if (this.mouseItem != null) {
                 e.preventDefault();
                 var diff = e.clientX - this.mouseBak.clientX;
+                if (diff < 0 && this.mouseItem.time.start > this.mouseItem.time.end) {
+                    return false;
+                }
                 this.$set(this.mouseItem, this.mouseBak.type, this.mouseBak.value + diff);
             } else if (this.dateMove != null) {
                 e.preventDefault();
@@ -329,6 +332,9 @@ export default {
                     this.$set(this.mouseItem, 'moveW', 0);
                     isM = true;
                 }
+                if (this.mouseItem.time && this.mouseItem.time.start > this.mouseItem.time.end) {
+                    return false;
+                }
                 //
                 if (isM) {
                     this.$emit("on-change", this.mouseItem)
diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue
index 6c4717bbc..3cbd6f020 100644
--- a/resources/assets/js/pages/manage/components/ProjectList.vue
+++ b/resources/assets/js/pages/manage/components/ProjectList.vue
@@ -84,13 +84,8 @@
                     <div :class="['project-switch-button', !projectParameter('card') ? 'menu' : '']" @click="$store.dispatch('toggleProjectParameter', 'card')">
                         <div><i class="taskfont">&#xe60c;</i></div>
                         <div><i class="taskfont">&#xe66a;</i></div>
+                        <div  @click="projectGanttShow=!projectGanttShow"><i class="taskfont">&#xe797;</i></div>
                     </div>
-                  <div class="project-gantt-item"
-                       :class="{active:projectGanttShow}"
-                       @click="projectGanttShow=!projectGanttShow">
-                      <Icon type="ios-paper-outline" size="26"/>
-                      <label class="gantt-name">{{ $L('甘特图') }}</label>
-                  </div>
                 </div>
             </div>
         </div>
diff --git a/resources/assets/sass/pages/components/project-list.scss b/resources/assets/sass/pages/components/project-list.scss
index d5582c4a7..6b793565d 100644
--- a/resources/assets/sass/pages/components/project-list.scss
+++ b/resources/assets/sass/pages/components/project-list.scss
@@ -202,7 +202,7 @@
                         position: absolute;
                         top: 0;
                         left: 0;
-                        width: 50%;
+                        width: 33.3%;
                         height: 100%;
                         z-index: 0;
                         color: $primary-color;
@@ -230,7 +230,7 @@
                     }
                     &.menu {
                         &:before {
-                            left: 50%;
+                            left: 33.3%;
                         }
                         > div:first-child {
                             color: $primary-text-color;