From 4512fc9d652e0127441a84f1141b9e074dc16aa6 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期日, 09 六月 2024 17:40:24 +0800
Subject: [PATCH] 1
---
src/views/home/widgets/components/Entrance.vue | 0
src/views/home/widgets/time.vue | 0
src/views/home/widgets/components/Access.vue | 0
src/config/index.js | 11 ++++++-----
src/views/home/widgets/index.vue | 36 +++++++++++++++++++++++++++++++++---
src/views/login/components/passwordForm.vue | 2 +-
src/views/home/widgets/components/deskNotice.vue | 0
7 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/src/config/index.js b/src/config/index.js
index 6bea09e..5c16e03 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -1,8 +1,8 @@
/*
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
- * @LastEditors: Sneed
- * @LastEditTime: 2024-04-10 22:12:06
+ * @LastEditors: lzhe lzhe@example.com
+ * @LastEditTime: 2024-06-09 17:12:15
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/config/index.js
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@@ -67,9 +67,10 @@
layout: [12, 6, 6],
//灏忕粍浠跺垎甯冿紝com鍙栧��:views/home/components 鏂囦欢鍚�
copmsList: [
- ['welcome'],
- ['about', 'ver'],
- ['time', 'progress']
+ // ['welcome'],
+ // ['about', 'ver'],
+ // ['time', 'progress']
+ [],[],[]
]
}
}
diff --git a/src/views/home/widgets/components/about.vue b/src/views/home/widgets/components/Access.vue
similarity index 100%
rename from src/views/home/widgets/components/about.vue
rename to src/views/home/widgets/components/Access.vue
diff --git a/src/views/home/widgets/components/ver.vue b/src/views/home/widgets/components/Entrance.vue
similarity index 100%
rename from src/views/home/widgets/components/ver.vue
rename to src/views/home/widgets/components/Entrance.vue
diff --git a/src/views/home/widgets/components/welcome.vue b/src/views/home/widgets/components/deskNotice.vue
similarity index 100%
rename from src/views/home/widgets/components/welcome.vue
rename to src/views/home/widgets/components/deskNotice.vue
diff --git a/src/views/home/widgets/index.vue b/src/views/home/widgets/index.vue
index c23cb5c..bcf5b65 100644
--- a/src/views/home/widgets/index.vue
+++ b/src/views/home/widgets/index.vue
@@ -107,7 +107,8 @@
}
},
created(){
- this.grid = this.$TOOL.data.get("grid") || JSON.parse(JSON.stringify(this.defaultGrid))
+ //this.grid = this.$TOOL.data.get("grid") || JSON.parse(JSON.stringify(this.defaultGrid))
+ this.getWorkbenchCarList();
},
mounted() {
this.$emit('on-mounted')
@@ -133,14 +134,43 @@
return allCompsList
},
myCompsList(){
- var myGrid = this.$TOOL.data.get("DASHBOARDGRID")
+ var copmsList = [];
+ if(this.defaultGrid.copmsList == undefined) return [];
+ this.defaultGrid.copmsList.forEach(item=> {
+ copmsList = copmsList.concat([...item])
+ })
+ var myGrid = copmsList;
+ this.$TOOL.data.set("DASHBOARDGRID", copmsList);
return this.allCompsList.filter(item => !item.disabled && myGrid.includes(item.key))
},
nowCompsList(){
- return this.grid.copmsList.reduce(function(a, b){return a.concat(b)})
+ var copmsList = [];
+ if(this.grid.copmsList == undefined) return [];
+ this.grid.copmsList.forEach(item=> {
+ copmsList = copmsList.concat([...item])
+ })
+ return copmsList;
}
},
methods: {
+ getWorkbenchCarList() {
+ var data = this.$TOOL.data.get("MENU");
+ this.workid = data[0].children[0].id; //璁板綍绗竴涓猚hildren鐨刬d
+ this.$HTTP.get(`/api/blade-system/workbench-card/list?workbenchId=${this.workid}`).then(res=> {
+ if(res.code == 200) {
+ let cards = res.data;
+ cards.sort((a, b) => {
+ return parseInt(a.xcoordinate, 10) - parseInt(b.xcoordinate, 10);
+ });
+ cards.forEach((item,index)=> {
+ this.$CONFIG.DEFAULT_GRID.copmsList[index] = [item.cardKey];
+ this.$CONFIG.DEFAULT_GRID.layout[index] = item.cardWide * 2;
+ })
+ this.defaultGrid = this.$CONFIG.DEFAULT_GRID;
+ this.grid = this.$TOOL.data.get("grid") || JSON.parse(JSON.stringify(this.defaultGrid))
+ }
+ })
+ },
//寮�鍚嚜瀹氫箟
custom(){
this.customizing = true
diff --git a/src/views/home/widgets/components/time.vue b/src/views/home/widgets/time.vue
similarity index 100%
rename from src/views/home/widgets/components/time.vue
rename to src/views/home/widgets/time.vue
diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue
index fd366da..7881276 100644
--- a/src/views/login/components/passwordForm.vue
+++ b/src/views/login/components/passwordForm.vue
@@ -141,7 +141,7 @@
transformedArray[0].path = "/home";
transformedArray[0].children = resp.data;
var obj = {
- dashboardGrid: ["welcome", "ver", "time", "progress", "echarts", "about"],
+ dashboardGrid: ["Access", "deskNotice", "Entrance"],
menu: transformedArray,
permissions: ["list.add", "list.edit", "list.delete", "user.add", "user.edit", "user.delete"]
}
--
Gitblit v1.9.3