taskId:067 remark:"commit"

5 months ago · f28b224c91
5 changed files with 48 additions and 51 deletions
--- a/hx-op/index.html
+++ b/hx-op/index.html
@ -2,7 +2,7 @@
 <html lang="en">
  <head>
    <meta charset="UTF-8" />
-    <link rel="icon" href="/favicon.ico" />
+    <link rel="icon" href="/projectIcon.svg" />
    <meta name="referrer" content="never" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <!-- <script type="text/javascript">
--- a/hx-op/public/projectIcon.svg
+++ b/hx-op/public/projectIcon.svg
@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="0 0 36 36">
+  <g id="组_23402" data-name="组 23402" transform="translate(-959.12 -738.12)">
+    <rect id="矩形_16530" data-name="矩形 16530" width="36" height="36" transform="translate(959.12 738.12)" fill="none"/>
+    <g id="组_23400" data-name="组 23400" transform="translate(960.956 739.956)">
+      <path id="路径_30576" data-name="路径 30576" d="M207.674,163.872v-9.284a2.553,2.553,0,0,0-1.179-2.063l-8.056-4.634a2.417,2.417,0,0,0-2.358,0l-8.023,4.65a2.38,2.38,0,0,0-1.179,2.063v9.333A2.553,2.553,0,0,0,188.059,166l8.056,4.585a2.417,2.417,0,0,0,2.358,0l8.056-4.634A2.331,2.331,0,0,0,207.674,163.872Z" transform="translate(-181.117 -142.881)" fill="#4388fb" opacity="0.2"/>
+      <path id="路径_30577" data-name="路径 30577" d="M265.893,314.283h-2.718l-.884-2.653h-4.224l-.884,2.653h-2.718l4.224-11.625h2.9Zm-4.093-4.617-1.326-4.044a9.365,9.365,0,0,1-.2-1.015h-.065a5.831,5.831,0,0,1-.2,1.015l-1.326,4.044Zm8.072-7.073v11.625h-2.456V302.592Z" transform="translate(-246.539 -292.932)" fill="#4388fb"/>
+      <path id="路径_30578" data-name="路径 30578" d="M36.685,20.095a.9.9,0,0,0-.884.884v2.472a1.535,1.535,0,0,1-.77,1.294L23.7,31.262a1.422,1.422,0,0,1-1.523,0l-11.33-6.517a1.456,1.456,0,0,1-.77-1.294V20.177a2.409,2.409,0,0,0-1-4.6,2.425,2.425,0,0,0-2.423,2.407,2.391,2.391,0,0,0,1.637,2.276v3.176a3.268,3.268,0,0,0,1.637,2.816l11.33,6.582a3.244,3.244,0,0,0,1.637.409,3.471,3.471,0,0,0,1.637-.475l11.281-6.517a3.268,3.268,0,0,0,1.637-2.816V20.963A.76.76,0,0,0,36.685,20.095Zm.884-6.942V10.287a3.268,3.268,0,0,0-1.637-2.816L24.585.954a3.284,3.284,0,0,0-3.291,0L9.947,7.471A3.268,3.268,0,0,0,8.31,10.287v2.227a.884.884,0,1,0,1.768,0V10.287a1.535,1.535,0,0,1,.77-1.294l11.33-6.517a1.422,1.422,0,0,1,1.523,0L34.982,9.059a1.456,1.456,0,0,1,.77,1.294v2.734a2.4,2.4,0,1,0,1.817.065Z" transform="translate(-6.656 -0.512)" fill="#4388fb"/>
+    </g>
+  </g>
+</svg>
--- a/hx-op/src/router/home.ts
+++ b/hx-op/src/router/home.ts
@ -6,23 +6,14 @@ const home = {
  redirect: { name: 'homeIndex' },
  children: [
    {
-      path: 'homeModule',
-      name: 'HomeModule',
-      meta: { title: '首页', hideChildren: true, icon: 'dicizhishou' },
-      component: Base,
-      redirect: { name: 'homeIndex' },
-      children: [
-        {
-          path: 'index',
-          name: 'homeIndex',
-          component: () => import('/@/view/developing.vue'),
-          meta: {
-            title: '首页',
-            keepAlive: true,
-            // backApi: [],
-          },
-        },
-      ],
+      path: 'index',
+      name: 'homeIndex',
+      component: () => import('/@/view/developing.vue'),
+      meta: {
+        title: '首页',
+        keepAlive: true,
+        // backApi: [],
+      },
    },
  ],
 };
--- a/hx-op/src/router/organizationManage.ts
+++ b/hx-op/src/router/organizationManage.ts
@ -1,28 +1,19 @@
 const Base = () => import('/nerv-lib/saas/view/system/layout/content.vue');
 const organizationManage = {
  path: '/organizationManage',
-  name: 'organizationManage',
+  name: 'EnterpriseManage',
  meta: { title: '企业管理', icon: 'dicizhishou', index: 99, hideChildren: true },
-  redirect: { name: 'EnterpriseManage' },
+  redirect: { name: 'EnterpriseManageIndex' },
  children: [
    {
-      path: 'enterpriseManage',
-      name: 'EnterpriseManage',
-      meta: { title: '企业管理', hideChildren: true, icon: 'dicizhishou' },
-      component: Base,
-      redirect: { name: 'EnterpriseManageIndex' },
-      children: [
-        {
-          path: 'index',
-          name: 'EnterpriseManageIndex',
-          component: () => import('/@/view/organizationManage/enterpriseManage/index.vue'),
-          meta: {
-            title: '企业管理',
-            keepAlive: true,
-            // backApi: [],
-          },
-        },
-      ],
+      path: 'index',
+      name: 'EnterpriseManageIndex',
+      component: () => import('/@/view/organizationManage/enterpriseManage/index.vue'),
+      meta: {
+        title: '企业管理',
+        keepAlive: true,
+        // backApi: [],
+      },
    },
  ],
 };
--- a/hx-op/src/theme/global.less
+++ b/hx-op/src/theme/global.less
@ -11,10 +11,11 @@
 //   .ant-menu-dark.ant-menu-horizontal>.ant-menu-item:hover {
 //     background-color: #43BB79 !important;
 //   }
-  
+
 .ant-menu-inline .ant-menu-item,
 .ant-menu-inline .ant-menu-submenu-title {
-  width: 100% !important;
+  max-width: 100% !important;
+  transition: none !important;
 }

 .ns-basic-table .ant-btn:hover {
@ -46,17 +47,17 @@
 }

 // header菜单字体样式
-.ant-menu-dark.ant-menu-horizontal>.ant-menu-item,
-.ant-menu-dark.ant-menu-horizontal>.ant-menu-submenu {
-  color: #fff;
-}
+// .ant-menu-dark.ant-menu-horizontal>.ant-menu-item,
+// .ant-menu-dark.ant-menu-horizontal>.ant-menu-submenu {
+//   color: #fff;
+// }

-.ant-menu-dark .ant-menu-item,
-.ant-menu-dark .ant-menu-item-group-title,
-.ant-menu-dark .ant-menu-item>a,
-.ant-menu-dark .ant-menu-item>span>a {
-  color: #fff;
-}
+// .ant-menu-dark .ant-menu-item,
+// .ant-menu-dark .ant-menu-item-group-title,
+// .ant-menu-dark .ant-menu-item>a,
+// .ant-menu-dark .ant-menu-item>span>a {
+//   color: #fff;
+// }

@font-face {
  /*给字体命名*/
@ -111,13 +112,13 @@

 .ant-menu-title-content  {
  svg {
-    color: #A1ABC2;
+    // color: #A1ABC2;
  }
 }

 .ant-menu-item-selected {
  svg {
-    color: #D0DBF5;
+    // color: #D0DBF5;
  }
 }

@ -181,3 +182,7 @@
    background-color: #AEAEAE;
  }
 }
+
+#app {
+  min-width: 1200px;
+}