ming 3 роки тому
батько
коміт
55798acb96

+ 53 - 53
src/store/modules/routes.js

@@ -99,59 +99,59 @@ const actions = {
         // })
 
 
-        data.push({
-            path: "/platManage",
-            hidden: false,
-            redirect: "/platManage/index",
-            component: "Layout",
-            meta: {
-                title: "模板管理",
-                icon: "platManage",
-
-            },
-            children: [{
-                meta: {
-                    title: "模板管理",
-                    icon: "platManage",
-
-                },
-                path: "/platManage",
-                hidden: false,
-                component: "@/views/platManage/index",
-
-            }, ]
-        }, {
-            path: "/statisManage",
-            hidden: false,
-            redirect: "/statisManage/loginLog",
-            component: "Layout",
-            meta: {
-                title: "统计管理",
-                icon: "statisManage",
-
-            },
-            children: [{
-                meta: {
-                    title: "登录日志",
-                    icon: "statisManage",
-
-                },
-                path: "loginLog",
-                hidden: false,
-                component: "@/views/statisManage/loginLog/index",
-
-            }, {
-                meta: {
-                    title: "操作日志",
-                    icon: "statisManage",
-
-                },
-                path: "operLog",
-                hidden: false,
-                component: "@/views/statisManage/operLog/index",
-
-            }]
-        })
+        // data.push({
+        //     path: "/platManage",
+        //     hidden: false,
+        //     redirect: "/platManage/index",
+        //     component: "Layout",
+        //     meta: {
+        //         title: "模板管理",
+        //         icon: "platManage",
+
+        //     },
+        //     children: [{
+        //         meta: {
+        //             title: "模板管理",
+        //             icon: "platManage",
+
+        //         },
+        //         path: "/platManage",
+        //         hidden: false,
+        //         component: "@/views/platManage/index",
+
+        //     }, ]
+        // }, {
+        //     path: "/statisManage",
+        //     hidden: false,
+        //     redirect: "/statisManage/loginLog",
+        //     component: "Layout",
+        //     meta: {
+        //         title: "统计管理",
+        //         icon: "statisManage",
+
+        //     },
+        //     children: [{
+        //         meta: {
+        //             title: "登录日志",
+        //             icon: "statisManage",
+
+        //         },
+        //         path: "loginLog",
+        //         hidden: false,
+        //         component: "@/views/statisManage/loginLog/index",
+
+        //     }, {
+        //         meta: {
+        //             title: "操作日志",
+        //             icon: "statisManage",
+
+        //         },
+        //         path: "operLog",
+        //         hidden: false,
+        //         component: "@/views/statisManage/operLog/index",
+
+        //     }]
+        // })
 
 
 

+ 5 - 5
src/views/login/index.vue

@@ -150,15 +150,15 @@ export default {
         .getLoginStyle({
           url:
             window.location.host.indexOf('localhost') != -1
-              ? 'dianli.usky.cn:13201'
+              ? 'fivee.dianli.usky.cn:13201'
               : window.location.host,
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {
-            this.backdropUrl = requset.data[0].loginBackUrl
-            this.companyName = requset.data[0].loginTitle
-            this.loginFooter = requset.data[0].loginFooter
-            this.loginLogo = requset.data[0].loginLogo
+            this.backdropUrl = requset.data[0].loginBackUrl?requset.data[0].loginBackUrl:this.backdropUrl
+            this.companyName = requset.data[0].loginTitle?requset.data[0].loginTitle:this.companyName
+            this.loginFooter = requset.data[0].loginFooter?requset.data[0].loginFooter:this.loginFooter
+            this.loginLogo = requset.data[0].loginLogo?requset.data[0].loginLogo:this.loginLogo
           } else {
             alert(requset.msg)
           }

+ 1 - 1
src/views/tenantManage/tenantUnit/index.vue

@@ -4,7 +4,7 @@
     <div class="filter-container mb-10">
       <div class="left">
         <div>
-          <a class="" style="margin-right: 30px">租户单位配置列表</a>
+          <a class="" style="margin-right: 30px">单位管理列表</a>
           <el-button
             icon="el-icon-plus"
             type="success"