diff --git a/public/img/zuoye.png b/public/img/zuoye.png new file mode 100644 index 00000000..2102f25a Binary files /dev/null and b/public/img/zuoye.png differ diff --git a/src/config/index.js b/src/config/index.js index d3813ad3..50478b33 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -57,12 +57,12 @@ const DEFAULT_CONFIG = { //控制台首页默认布局 DEFAULT_GRID: { //默认分栏数量和宽度 例如 [24] [18,6] [8,8,8] [6,12,6] - layout: [12, 6, 6], + layout: [24, 24, 6], //小组件分布,com取值:views/home/components 文件名 copmsList: [ - ['welcome'], - ['about', 'ver'], - ['time', 'progress'] + ['ticket'], + ['eventlist'], + ] } } diff --git a/src/views/home/widgets/components/eventlist.vue b/src/views/home/widgets/components/eventlist.vue new file mode 100644 index 00000000..1d069ef3 --- /dev/null +++ b/src/views/home/widgets/components/eventlist.vue @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + {{item.workflow__name}} + + + + + + + + + 更多 + + + + + + {{ item.name }} + + + + + + {{ scope.row.employee_.name }} + 未知人员 + + + + + + + 企业员工 + 相关方 + 访客 + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/widgets/components/ticket.vue b/src/views/home/widgets/components/ticket.vue new file mode 100644 index 00000000..85ff28d2 --- /dev/null +++ b/src/views/home/widgets/components/ticket.vue @@ -0,0 +1,485 @@ + + + + + + + + + + + + + 作业 + + + + + + + + + + 相关方项目 + + + + + + + + + + 访客项目 + + + + + + + + + + + 人员统计 + + 有卡 + + 在厂 + + + + + + + 内部员工 + + {{ userCount.count_employee }} 人 + + + + + + + 访客 + + {{ userCount.count_visitor }} 人 + + + + + + + 相关方 + + {{ userCount.count_remployee }} 人 + + + + + + + + + + + + + + diff --git a/src/views/home/widgets/components/welcome.vue b/src/views/home/widgets/components/welcome.vue deleted file mode 100644 index f5156bb8..00000000 --- a/src/views/home/widgets/components/welcome.vue +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/views/home/widgets/index.vue b/src/views/home/widgets/index.vue index 8931ffe9..5e7d81bd 100644 --- a/src/views/home/widgets/index.vue +++ b/src/views/home/widgets/index.vue @@ -1,15 +1,13 @@ - - - 控制台 - + @@ -33,7 +31,7 @@ - + diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue index bc1a8279..48af8fc5 100644 --- a/src/views/login/components/passwordForm.vue +++ b/src/views/login/components/passwordForm.vue @@ -159,7 +159,7 @@ export default { try { var res1 = await this.$API.auth.info.get(); this.$TOOL.data.set("USER_INFO", res1); - this.$TOOL.data.set("PERMISSIONS", res1.perms); + this.$TOOL.data.set("PERMISSIONS", res1.perms.keys()); this.$router.replace({ path: "/", }); diff --git a/src/views/wf/state.vue b/src/views/wf/state.vue index 04f5ceaf..8928028c 100644 --- a/src/views/wf/state.vue +++ b/src/views/wf/state.vue @@ -336,6 +336,9 @@ > + + +