ming 3 jaren geleden
bovenliggende
commit
bca60b8b78

+ 2 - 0
public/static/svgIcons/tenantManage.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1652190894773" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1732" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M437.333 149.333c-123.733 0-224 100.267-224 224s100.267 224 224 224 224-100.266 224-224-100.266-224-224-224z m0 384c-87.466 0-160-72.533-160-160s72.534-160 160-160 160 72.534 160 160-70.4 160-160 160z m0 0C256 533.333 104.533 672 87.467 849.067c-2.134 19.2 12.8 36.266 32 36.266 17.066 0 29.866-12.8 32-29.866C166.4 710.4 288 599.467 435.2 599.467s268.8 113.066 283.733 256c2.134 17.066 14.934 29.866 32 29.866 19.2 0 34.134-17.066 32-36.266C770.133 672 620.8 533.333 437.333 533.333z m317.867 0c57.6-40.533 96-108.8 96-183.466 0-96-61.867-179.2-147.2-211.2-21.333-6.4-42.667 8.533-42.667 29.866 0 12.8 8.534 25.6 21.334 29.867C744.533 221.867 787.2 279.467 787.2 347.733c0 66.134-40.533 123.734-98.133 147.2-17.067 6.4-27.734 23.467-27.734 42.667 0 21.333 14.934 40.533 36.267 44.8 115.2 27.733 172.8 125.867 185.6 245.333 2.133 17.067 12.8 29.867 29.867 32 21.333 2.134 38.4-14.933 36.266-36.266-12.8-132.267-72.533-243.2-194.133-290.134z" p-id="1733" fill="#ffffff"></path></svg>

File diff suppressed because it is too large
+ 0 - 5
src/icons/svgIcon/tenantManage.svg


+ 4 - 4
src/layout/index.vue

@@ -177,10 +177,10 @@ export default {
       overflow-y: auto;
       height: calc(100vh - @vab-header-height);
       li {
-        margin-top: 0px;
-    margin-bottom: 0px;
-    line-height: 50px;
-    height: 50px;
+    //     margin-top: 10px;
+    // margin-bottom: 10px;
+    // line-height: 50px;
+    // height: 50px;
    
       }
       

+ 44 - 73
src/store/modules/routes.js

@@ -81,90 +81,61 @@ const actions = {
             }]
         })
 
-        data.push({
-            path: "/tenantManage",
-            hidden: false,
-            redirect: "/tenantManage/tenantUnit",
-            component: "Layout",
-            meta: {
-                title: "租户管理",
-                icon: "systemManage",
+        // data.push({
+        //     path: "/tenantManage",
+        //     hidden: false,
+        //     redirect: "/tenantManage/tenantUnit",
+        //     component: "Layout",
+        //     meta: {
+        //         title: "租户管理",
+        //         icon: "tenantManage",
 
-            },
-            children: [{
-                meta: {
-                    title: "租户单位配置",
-                    icon: "systemManage",
+        //     },
+        //     children: [{
+        //         meta: {
+        //             title: "租户单位配置",
+        //             icon: "tenantManage",
 
-                },
-                path: "/tenantUnit",
-                hidden: false,
-                component: "@/views/tenantManage/tenantUnit",
+        //         },
+        //         path: "/tenantUnit",
+        //         hidden: false,
+        //         component: "@/views/tenantManage/tenantUnit",
 
-            }, {
-                meta: {
-                    title: "管理员配置",
-                    icon: "systemManage",
+        //     }, {
+        //         meta: {
+        //             title: "管理员配置",
+        //             icon: "tenantManage",
 
-                },
-                path: "/adminConfig",
-                hidden: false,
-                component: "@/views/tenantManage/adminConfig",
+        //         },
+        //         path: "/adminConfig",
+        //         hidden: false,
+        //         component: "@/views/tenantManage/adminConfig",
 
-            }, {
-                meta: {
-                    title: "系统配置",
-                    icon: "systemManage",
+        //     }, {
+        //         meta: {
+        //             title: "系统配置",
+        //             icon: "tenantManage",
 
-                },
-                path: "/systemConfig",
-                hidden: false,
-                component: "@/views/tenantManage/systemConfig",
+        //         },
+        //         path: "/systemConfig",
+        //         hidden: false,
+        //         component: "@/views/tenantManage/systemConfig",
 
-            }, {
-                meta: {
-                    title: "权限配置",
-                    icon: "systemManage",
+        //     }, {
+        //         meta: {
+        //             title: "权限配置",
+        //             icon: "tenantManage",
 
-                },
-                path: "/authConfig",
-                hidden: false,
-                component: "@/views/tenantManage/authConfig",
+        //         },
+        //         path: "/authConfig",
+        //         hidden: false,
+        //         component: "@/views/tenantManage/authConfig",
+
+        //     }, ]
+        // })
 
-            }, ]
-        })
 
 
-        // data.push({
-        //     "path": "/systemManage",
-        //     "hidden": false,
-        //     "redirect": "/systemManage/userManage",
-        //     "component": "Layout",
-        //     "meta": {
-        //         "title": "租户管理",
-        //         "icon": "systemManage",
-        //         "affix": null
-        //     },
-        //     "children": [{
-        //         "path": "userManage",
-        //         "hidden": false,
-        //         "component": "@/views/systemManage/userManage/index",
-        //         "meta": {
-        //             "title": "租户单位配置",
-        //             "icon": "systemManage",
-        //             "affix": null
-        //         }
-        //     }, {
-        //         "path": "rolePermission1",
-        //         "hidden": false,
-        //         "component": "@/views/tenantManage/rolePermission1/index",
-        //         "meta": {
-        //             "title": "管理员配置",
-        //             "icon": "systemManage",
-        //             "affix": null
-        //         }
-        //     }]
-        // })
         data.forEach(function(item) {
             if (item.children.length > 1) {
                 item.children.forEach(function(i) {

+ 2 - 1
src/views/login/index.vue

@@ -2,13 +2,14 @@
   <div
     class="login-container"
     :style="{ backgroundImage: 'url(' + backdropUrl + ')' }"
+
   >
     <a-row>
       <a-col :xs="0" :md="0" :sm="12" :lg="14" :xl="16"></a-col>
       <a-col :xs="24" :sm="24" :md="12" :lg="10" :xl="6">
         <div class="login-container-form">
           <!-- <div class="login-container-hello">hello!</div> -->
-          <div class="login-container-title">{{ companyName }}</div>
+          <div class="login-container-title">{{ companyName}}</div>
           <a-form :model="form" @submit="handleSubmit" @submit.prevent>
             <a-form-item>
               <a-input v-model:value="form.username" placeholder="Username">

Some files were not shown because too many files changed in this diff