From a52ce4c9a594e78b5931d487e05d0dd54ac8cd36 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 07 十月 2024 22:38:28 +0800
Subject: [PATCH] Merge branch 'release' of http://122.9.151.159:9090/r/smart-web into release
---
src/views/login/components/passwordForm.vue | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue
index 0f39872..49a4acc 100644
--- a/src/views/login/components/passwordForm.vue
+++ b/src/views/login/components/passwordForm.vue
@@ -22,11 +22,11 @@
export default {
data() {
return {
- socket: null,
+ socket: null,
userType: 'admin',
form: {
- user: "admin",
- password: "123456",
+ user: "",
+ password: "",
autologin: false
},
rules: {
@@ -54,7 +54,7 @@
mounted() {
//this.$HTTP.get('/api/blade-sync/outer-app-config/appStatus')
},
- methods: {
+ methods: {
async login() {
var validate = await this.$refs.loginForm.validate().catch(() => { })
if (!validate) { return false }
@@ -89,7 +89,7 @@
});
}
})
- if(!isToken) return;
+ if (!isToken) return;
//鑾峰彇鑿滃崟
await this.$HTTP.get("/api/blade-system/menu/routes?" + this.$TOOL.qsStringify({ "appCode": "CPS" })).then(res => {
if (res.data.length == 0) {
@@ -136,15 +136,27 @@
item.path = "/dashboard";
item.parentId = item.id;
})
- transformedArray[0].path = "/home";
- transformedArray[0].children = resp.data;
+ transformedArray.unshift({
+ children: resp.data,
+ code: "desk",
+ component: "console/desk",
+ id: "001",
+ meta: {title:聽'棣栭〉',聽icon:聽'el-icon-takeaway-box',聽type:聽'menu'},
+ name: "棣栭〉",
+ path: "/home"
+ });
+ transformedArray.forEach((item,index)=>{
+ if(item.name == "浠〃鏉�") {
+ transformedArray.splice(1,index);
+ }
+ })
var obj = {
dashboardGrid: ["Access", "deskNotice", "Entrance"],
menu: transformedArray,
permissions: ["list.add", "list.edit", "list.delete", "user.add", "user.edit", "user.delete"]
}
this.$TOOL.data.set("MENU", obj.menu);
- console.log(obj.menu,'menu')
+ console.log(obj.menu, 'menu')
this.$TOOL.data.set("PERMISSIONS", obj.permissions)
this.$TOOL.data.set("DASHBOARDGRID", obj.dashboardGrid)
--
Gitblit v1.9.3