From 873b78a9ce52c1aa0e8fddac6ae25ddd3f0e6ed3 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Mon, 22 Aug 2022 14:43:20 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=8A=A5=E5=91=8A=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=88=87=E6=8D=A2=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9B=AE=E5=BD=95=E8=A2=AB=E8=A6=86=E7=9B=96?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1016062 --user=宋昌昌 【测试跟踪】-【测试计划】github #17151页面，点击列表某一测试计划，切到【报告统计】页面，发现左侧菜单处出现样式问题 https://www.tapd.cn/55049933/s/1229270
---
 frontend/src/business/App.vue                 |  4 ++-
 .../detail/TestPlanReportNavigationBar.vue    | 26 +++++++++++++++----
 frontend/src/store/index.js                   |  3 ++-
 frontend/src/store/mutations.js               |  1 +
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/frontend/src/business/App.vue b/frontend/src/business/App.vue
index 51bb0aa122..ef933ae4de 100644
--- a/frontend/src/business/App.vue
+++ b/frontend/src/business/App.vue
@@ -109,7 +109,8 @@ export default {
       localStorage.setItem("store", JSON.stringify(this.$store.state));
     });
     this.isFixed = localStorage.getItem('app-fixed') === 'true' || false;
-    this.isCollapse = this.isFixed === true ? false : true;
+    this.isCollapse = !this.isFixed;
+    this.$store.commit('setAppFixed', this.isFixed);
   },
   beforeCreate() {
     this.$get("/isLogin").then(response => {
@@ -187,6 +188,7 @@ export default {
       }
       localStorage.removeItem('app-fixed');
       localStorage.setItem('app-fixed', this.isFixed);
+      this.$store.commit('setAppFixed', this.isFixed);
     },
     collapseOpen() {
       this.isCollapse = false;
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportNavigationBar.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportNavigationBar.vue
index e9404a0713..90dfb09dfb 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportNavigationBar.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportNavigationBar.vue
@@ -2,7 +2,7 @@
   <div>
     <ms-drawer class="drawer-content"
                direction="left"
-               :class="{'move-bar' : needMoveBar}"
+               :class="moveBarClass"
                :visible="true"
                :size="10"
                :show-full-screen="false"
@@ -66,7 +66,8 @@ export default {
           link: 'load',
           title: this.$t('test_track.report.analysis_load'),
         }
-      ]
+      ],
+      moveBarClass: '',
     }
   },
   watch: {
@@ -91,7 +92,12 @@ export default {
     },
     uiEnable() {
       this.setData();
-    }
+    },
+    '$store.state.appFixed'(newVal){
+      if (this.needMoveBar) {
+        this.toggleMoveBarClass(newVal);
+      }
+    },
   },
   computed: {
     navBtnClass() {
@@ -107,10 +113,13 @@ export default {
       } else {
         return 'zh-button-span';
       }
-    }
+    },
   },
   mounted() {
     this.setData();
+    if (this.needMoveBar) {
+      this.toggleMoveBarClass(this.$store.state.appFixed);
+    }
   },
   methods: {
     setData() {
@@ -128,6 +137,9 @@ export default {
           this.data.push(item);
         }
       });
+    },
+    toggleMoveBarClass(val) {
+      this.moveBarClass = val ? 'fixed-move-bar' : 'move-bar';
     }
   }
 }
@@ -197,7 +209,11 @@ export default {
 }
 
 .move-bar {
-  margin-left: 50px;
+  margin-left: 53px;
+}
+
+.fixed-move-bar {
+  margin-left: 159px;
 }
 
 .drawer-content {
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index 8be4ac0c39..576c51ef6d 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -49,7 +49,8 @@ const state = {
   refreshUiScenario: false,
   showLicenseCountWarning: false,
   temWorkspaceId: null,
-  fileDownloadList: [], // 文件下载进度列表
+  fileDownloadList: [], // 文件下载进度列表,
+  appFixed: null,
 }
 
 const store = new Vuex.Store({
diff --git a/frontend/src/store/mutations.js b/frontend/src/store/mutations.js
index 2109194049..f26e0851c4 100644
--- a/frontend/src/store/mutations.js
+++ b/frontend/src/store/mutations.js
@@ -43,6 +43,7 @@ const mutations = {
   deleteDownloadFile: (state, props) => {
     state.fileDownloadList.splice(state.fileDownloadList.findIndex(item => item.id === props), 1);
   },
+  setAppFixed: (state, value) => state.appFixed = value,
 }
 
 export default mutations;