Merge branch 'main' of https://git.opencomputing.cn/yumoqing/kboss

f/web-kboss/src/layout/components/Sidebar/index.vue

@@ -1,3 +1,4 @@
+
 <template>
   <div class="index">
     <div :class="{ 'has-logo': showLogo }" class="sidebar-container">
@@ -47,7 +48,12 @@ export default {
     };
   },
   components: { SidebarItem, Logo },
+  created() {
+    console.log("filteredRoutes路由Menu",this.filteredRoutes);
+
+  },
   computed: {
+
     ...mapGetters(["permission_routes", "sidebar"]),
     showLogo() {
       return true;
@@ -64,6 +70,7 @@ export default {
          return [];
        }
        return this.permission_routes.filter(route => !this.homePageRouteIdentifier(route));
+
     }
   },
   methods: {
@@ -75,7 +82,7 @@ export default {
 <style lang="scss" scoped>
 .index {
   width: 100%;
-  height: 100%;
+  height: 100vh;
   position: relative;
 
   .sidebar-container {
@@ -133,3 +140,4 @@ export default {
 
 
 
+

f/web-kboss/src/router/index.js

@@ -605,7 +605,7 @@ export const asyncRoutes = [
         component: () => import('@/views/product/productHome/ucloud/Eip/showUEip'),
         name: 'showUEip',
         meta: { title: "Eip列表", fullPath: "/product/productHome/ucloud/Eip/showUEip", noCache: true },
-      },]
+      }]
     }, // {
     //   hidden: true,
     //   path: "baiduProduct",
@@ -757,16 +757,20 @@ export const asyncRoutes = [
   //   component: () => import("@/views/product"),
   //   meta: { title: "产品", fullPath: "/product", icon: "el-icon-s-data", },
   // },
-
+  // 客户
   {
     path: "/customer", component: Layout, redirect: "/customer/workOrderManagement", meta: {
       title: "客户", icon: "el-icon-s-custom", noCache: true, fullPath: "/customer",
-    }, children: [{
+    },
+    children: [
+    // 工单
+    {
       path: "workOrderManagement",
       component: () => import("@/views/customer/workOrderManagement"),
       name: "WorkOrderManagement",
       meta: { title: "工单管理", fullPath: "/customer/workOrderManagement" },
     },
+    // 退订
     {
       path: "unsubscribe",
 
@@ -792,30 +796,39 @@ export const asyncRoutes = [
 
       ]
     },
+    // 完善信息
     {
       path: 'approve',
       component: () => import('@/views/customer/ncApprove/index.vue'),
       name: "Approve",
       meta: { title: "信息完善", fullPath: "/customer/ncApprove" },
-    }, {
+    },
+    // 渠道管理
+    {
       hidden: true,
       path: "channelMangement",
       component: () => import("@/views/customer/channelMangement/index.vue"),
       name: "ChannelMangement",
       meta: { title: "渠道管理", fullPath: "/customer/channelMangement" },
-    }, {
+    },
+    //渠道产品管理
+    {
       hidden: true,
       path: "channelProductMangement",
       component: () => import("@/views/customer/channelMangement/channelProductMangement/index.vue"),
       name: "channelProductMangement",
       meta: { title: "渠道产品管理", fullPath: "/customer/channelMangement/channelProductMangement", noCache: true },
-    }, {
+    },
+    // 无权限
+    {
       hidden: true,
       path: "noChannelPermission",
       component: () => import("@/views/customer/channelMangement/noChannelPermission/index.vue"),
       name: "noChannelPermission",
       meta: { title: "无权限", fullPath: "/customer/channelMangement/noChannelPermission", noCache: true },
-    }, {
+    },
+    // 聊天
+    {
       hidden: true,
       path: "chat",
       component: () => import("@/views/product/productHome/chat/index.vue"),
@@ -823,35 +836,47 @@ export const asyncRoutes = [
       meta: {
         title: "聊天", fullPath: "/product/productHome/chat", noCache: true
       },
-    }, // {
+    },
+
+    // {
     //     path: "workOrderManagement/mobile",
     //     component: () => import("@/views/customer/mobile_workOrderManagement"),
     //     name: "mobile_workOrderManagement",
     //     meta: { title: "工单管理", fullPath: "/customer/workOrderManagement" , isMobile: true },
     // },
+
+    // 个人中心
     {
       hidden: true,
       path: "customerInformation",
       component: () => import("@/views/customer/customerInformation"),
       name: "customerInformation",
       meta: { title: "个人中心", fullPath: "/customer/customerInformation" },
-    }, {
+    },
+    // 充值管理
+    {
       path: "rechargeRecord",
       component: () => import("@/views/customer/rechargeRecord"),
       name: "RechargeRecord",
       meta: { title: "充值管理", fullPath: "/customer/rechargeRecord" },
-    }, {
+    },
+    // 订单管理
+    {
       path: "orderManagement",
       component: () => import("@/views/customer/orderManagement"),
       name: "OrderManagement",
       meta: { title: "产品订单", fullPath: "/customer/orderManagement", noCache: true, },
-    }, {
+    },
+    // 订单详情
+    {
       path: "orderDetil",
       component: () => import("@/views/customer/orderDetil"),
       name: "orderDetil",
       hidden: true,
       meta: { title: "订单详情", fullPath: "/customer/orderDetil", noCache: true, },
-    }, {
+    },
+    // 促销邀请码
+    {
       hidden: true,
       path: "promotionalInvitationCode",
       component: () => import("@/views/customer/promotionalInvitationCode"),
@@ -912,6 +937,7 @@ export const asyncRoutes = [
       meta: { title: "产品最新页", fullPath: "/product/productHome/productIndex", noCache: true },
     },],
   },
+  // 资质审核
   {
     path: "/qualificationReview",
     component: Layout,
@@ -934,6 +960,7 @@ export const asyncRoutes = [
 
     ]
   },
+  // 供需审核
   {
     path: "/approveMangement",
     component: Layout,
@@ -956,6 +983,28 @@ export const asyncRoutes = [
 
     ]
   },
+  // 需求管理 - 移动到商品管理上方
+  {
+    path: "/demandMangement",
+    component: Layout,
+    name: "demandMangement",
+    redirect: "/demandMangement/index",
+    meta: { fullPath: "/demandMangement", title: "需求管理", noCache: true, icon: 'el-icon-s-home' },
+    children: [
+      {
+        path: "index",
+        component: () => import("@/views/customer/demand/demandList.vue"),
+        name: "demandList",
+        meta: { title: "发布清单", fullPath: "/demandMangement/index" },
+      },
+      {
+        path: "rejectDemand",
+        component: () => import("@/views/customer/demand/rejectDemand.vue"),
+        name: "rejectDemand",
+        meta: { title: "未通过清单", fullPath: "/demandMangement/rejectDemand" },
+      },
+    ]
+  },
   {
     path: "/productMangement",
     component: Layout,
@@ -967,13 +1016,13 @@ export const asyncRoutes = [
         path: "index",
         component: () => import("@/views/customer/productMangement/productList/index.vue"),
         name: "productList",
-        meta: { title: "商品发布清单", fullPath: "/productMangement/index" },
+        meta: { title: "发布清单", fullPath: "/productMangement/index" },
       },
       {
         path: "rejectedPro",
         component: () => import("@/views/customer/productMangement/rejectedPro/index.vue"),
         name: "rejectedPro",
-        meta: { title: "商品未通过清单", fullPath: "/productMangement/index" },
+        meta: { title: "未通过清单", fullPath: "/productMangement/index" },
       },
     ]
   },
@@ -992,27 +1041,6 @@ export const asyncRoutes = [
       },
     ]
   },
-  {
-    path: "/demandMangement",
-    component: Layout,
-    name: "demandMangement",
-    redirect: "/demandMangement/index",
-    meta: { fullPath: "/demandMangement", title: "需求管理", noCache: true, icon: 'el-icon-s-home' },
-    children: [
-      {
-        path: "index",
-        component: () => import("@/views/customer/demand/demandList.vue"),
-        name: "demandList",
-        meta: { title: "需求发布清单", fullPath: "/demandMangement/index" },
-      },
-      {
-        path: "rejectDemand",
-        component: () => import("@/views/customer/demand/rejectDemand.vue"),
-        name: "rejectDemand",
-        meta: { title: "需求未通过清单", fullPath: "/demandMangement/rejectDemand" },
-      },
-    ]
-  },
 
   {
     path: "/sales", component: Layout,
@@ -1691,7 +1719,7 @@ export const asyncRoutes = [
   //             name: "obile_supplierSettlementStatistics",
   //             meta: { title: "供应商结算统计", fullPath: "/endDay/supplierSettlementStatistics" },
   //         },
-
+  //
   //     ],
   // },
   {
@@ -1731,24 +1759,26 @@ export const asyncRoutes = [
         title: "代码与键值管理", fullPath: "/superAdministrator/codeManagement",
       },
     },],
-  }, {
+  },
+  {
     path: "/administrator", component: Layout, redirect: "/administrator/index", meta: {
-      title: "管理员", icon: "el-icon-s-tools", noCache: true, fullPath: "/administrator",
-    }, children: [{
-      path: "configureOrganizationUserRole",
-      component: () => import("@/views/administrator/configureOrganizationUserRole"),
-      name: "ConfigureOrganizationUserRole",
-      meta: {
-        title: "本机构用户角色配置", fullPath: "/administrator/configureOrganizationUserRole",
-      },
-    }, {
+      title: "企业管理", icon: "el-icon-s-tools", noCache: true, fullPath: "/administrator",
+    }, children: [
+      {
       path: "departmentManagement",
       component: () => import("@/views/administrator/departmentManagement"),
       name: "epartmentManagement",
       meta: {
         title: "部门管理", fullPath: "/administrator/departmentManagement",
       },
-    }, {
+    },{
+      path: "configureOrganizationUserRole",
+      component: () => import("@/views/administrator/configureOrganizationUserRole"),
+      name: "ConfigureOrganizationUserRole",
+      meta: {
+        title: "角色管理", fullPath: "/administrator/configureOrganizationUserRole",
+      },
+    },  {
       path: "stationMessageSettings",
       component: () => import("@/views/administrator/stationMessageSettings"),
       name: "StationMessageSettings",

f/web-kboss/src/styles/variables.scss

@@ -10,7 +10,7 @@ $panGreen: #30B08F;
 
 // sidebar
 $menuText: #000;
-$menuActiveText: #1b14d9; // 当前激活菜单项的文字颜色
+$menuActiveText: #296ad9; // 当前激活菜单项的文字颜色
 $subMenuActiveText: #100101; // 当前激活子菜单项的文字颜色
 
 $menuBg: #fff; // 整体背景颜色