From fa59bd43c01dbc8fa2c38499dc92b18ca836bacd Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Thu, 11 Apr 2024 11:46:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=88=E5=AE=A1=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=B7=B3=E8=BD=ACbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Header/index.vue               |  5 ++---
 src/layout/components/Menu/index.vue                 |  3 +++
 src/router/modules/final.ts                          |  2 +-
 src/views/home/aside/Aside.vue                       | 12 +++++++-----
 .../home/aside/comp/modals/CustomFilterModal.vue     |  2 +-
 .../home/content/modal/PackageSettingsModal.vue      |  7 +++++--
 6 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue
index e80254a..9756995 100644
--- a/src/layout/components/Header/index.vue
+++ b/src/layout/components/Header/index.vue
@@ -197,12 +197,10 @@ export default defineComponent({
       <!-- 菜单收起 -->
       <div
         class="ml-1 layout-header-trigger layout-header-trigger-min"
-        style="padding-top: 2px;"
         @click="() => $emit('update:collapsed', !collapsed)"
       >
         <SvgIcon name="homepage" size="16" />
       </div>
-
       <div>当前位置：{{ routename }}</div>
     </div>
     <div class="layout-header-right">
@@ -228,7 +226,7 @@ export default defineComponent({
       <!-- 个人中心 -->
       <div class="layout-header-trigger layout-header-trigger-min">
         <!-- <n-avatar :src="getImgUrl(useInfo.usericon)" round /> -->
-        <n-avatar :src="(useInfo.usericon && getImgUrl(useInfo.usericon)) || defaultAvatarSrc" round/>
+        <n-avatar style="width:36px;height:36px;" :src="(useInfo.usericon && getImgUrl(useInfo.usericon)) || defaultAvatarSrc" round/>
       </div>
       <!-- 设置 -->
       <UserSettings @logout="doLogout" />
@@ -254,6 +252,7 @@ export default defineComponent({
   &-left {
     display: flex;
     align-items: center;
+    justify-content: flex-start;
     color: #666666;
 
     .logo {
diff --git a/src/layout/components/Menu/index.vue b/src/layout/components/Menu/index.vue
index 0ecf5f8..5126514 100644
--- a/src/layout/components/Menu/index.vue
+++ b/src/layout/components/Menu/index.vue
@@ -68,11 +68,14 @@ export default defineComponent({
           return v;
         });
       }
+      console.log(userInfo.frontmenuTList,'frontmenuTList');
+      console.log(menus.value,'menus')
       updateSelectedKeys();
     }
 
     // 点击菜单
     function clickMenuItem(key: string) {
+      console.log('clickMenuItem',key)
       if (/http(s)?:/.test(key)) window.open(key);
       else router.push({ name: key });
 
diff --git a/src/router/modules/final.ts b/src/router/modules/final.ts
index bb5f16b..da6608a 100644
--- a/src/router/modules/final.ts
+++ b/src/router/modules/final.ts
@@ -28,7 +28,7 @@ const routes: Array<RouteRecordRaw> = [
     children: [
       {
         path: 'final',
-        name: 'FinalMain',
+        name: 'final-main',
         meta: {
           title: '任务终审',
           keepAlive: true,
diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue
index aa326e3..a6b2249 100644
--- a/src/views/home/aside/Aside.vue
+++ b/src/views/home/aside/Aside.vue
@@ -101,7 +101,8 @@ onBeforeMount(async () => {
   configStore.fetchCustomConfig();
 });
 
-configStore.$subscribe(() => {
+nextTick(()=>{
+  configStore.$subscribe(() => {
   const config = configStore.getConfig;
   const customConfig = configStore.getCustomConfig;
   if (
@@ -122,7 +123,7 @@ configStore.$subscribe(() => {
 
   let sortKeyList: any = [];
   configStore.getFilterConfig.map((item: any) => {
-    sortKeyList.push(item.id);
+    sortKeyList.push(item?.id);
   });
   const showKeys = [...sortKeyList];
 
@@ -172,10 +173,10 @@ configStore.$subscribe(() => {
   }
   // console.log("showKeys", showKeys);
   const items = showKeys.reduce((acc, key) => {
-    const { render } = asideMap[key];
-
+    const currentData = asideMap[key];
+    const render = currentData?.render;
     if (render !== false) {
-      const str = key.toLowerCase();
+      const str = key?.toLowerCase();
 
       const o = {
         key: str,
@@ -191,6 +192,7 @@ configStore.$subscribe(() => {
   configFilterRef.value = configStore.getFilterConfig;
 });
 
+})
 const asideEnter = ref(false);
 
 const showCollapse = computed(() => {
diff --git a/src/views/home/aside/comp/modals/CustomFilterModal.vue b/src/views/home/aside/comp/modals/CustomFilterModal.vue
index 4c89ba0..90f9e95 100644
--- a/src/views/home/aside/comp/modals/CustomFilterModal.vue
+++ b/src/views/home/aside/comp/modals/CustomFilterModal.vue
@@ -236,7 +236,7 @@ function onCheckChange(checked: any, item: any) {
 
 const showIds = computed(() => {
   return onList.value.map((item) => {
-    return item.id
+    return item?.id
   })
 })
 
diff --git a/src/views/home/content/modal/PackageSettingsModal.vue b/src/views/home/content/modal/PackageSettingsModal.vue
index 034c3d9..9789829 100644
--- a/src/views/home/content/modal/PackageSettingsModal.vue
+++ b/src/views/home/content/modal/PackageSettingsModal.vue
@@ -80,7 +80,8 @@ function afterLeave() {
             <span :style="{ 'margin-left': '18px', 'font-size': '16px','font-weight':'600' }">基本信息</span>
           </div>
         </div>
-        <n-form ref="formRef" :model="model" require-mark-placement="left" style="margin-top: 8px;" :rules="rules">
+        <!-- require-mark-placement="left" -->
+        <n-form ref="formRef" :model="model"  style="margin-top: 8px;" :rules="rules">
           <n-form-item class="wrapper-task-package-name" path="packagename" label="任务包名称">
             <n-input v-model:value="model.packagename" maxlength="12" @keydown.enter.prevent />
           </n-form-item>
@@ -109,7 +110,7 @@ function afterLeave() {
 .wrapper {
   display: flex;
   flex-direction: column;
-
+  padding: 14px 14px 0 14px ;
   &-title {
     font-weight: 600;
     // font-weight: bold;
@@ -135,6 +136,7 @@ function afterLeave() {
   &-task-package-name {
     ::v-deep(.n-form-item-label) {
       color: #666;
+      font-weight: 500;
     }
   }
 
@@ -157,6 +159,7 @@ function afterLeave() {
   &-footer {
     display: flex;
     justify-content: flex-end;
+    padding-bottom:6px ;
   }
 
   &-info {