diff --git a/.DS_Store b/.DS_Store index a7f0f6b..11a187c 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/web/src/views/dashboard/workbench/components/attachment.vue b/web/src/views/dashboard/workbench/components/attachment.vue index fcf3584..aabc132 100644 --- a/web/src/views/dashboard/workbench/components/attachment.vue +++ b/web/src/views/dashboard/workbench/components/attachment.vue @@ -9,7 +9,7 @@
附件统计
-
{{ total || 0 }}
+
{{ count}}
附件数量
@@ -17,7 +17,7 @@ 实时
-
{{ total || 0 }}MB
+
{{ occupy_space }}MB
附件大小
@@ -42,18 +42,20 @@ isResizable: true, data() { return { - total: 0, + count:"", + occupy_space:"", }; }, methods: { - initGet() { - request({ - url: "", - }).then((res) => { - const { data } = res; - // this.total = data.total; - }); - }, + initGet () { + request({ + url: '/api/system/homepage_statistics/' + }).then((res)=>{ + this.count=res.data.sum_file.count; + this.occupy_space=res.data.sum_file.occupy_space; +; + }) + }, // 生成一个随机整数 randomColor() { const color = ["#50A8F4FF", "#FD6165FF", "#E679D8FF", "#F9AB5BFF"]; diff --git a/web/src/views/dashboard/workbench/components/database.vue b/web/src/views/dashboard/workbench/components/database.vue index e545bab..37842ef 100644 --- a/web/src/views/dashboard/workbench/components/database.vue +++ b/web/src/views/dashboard/workbench/components/database.vue @@ -9,7 +9,7 @@
-
{{ total || 0 }}
+
{{count }}
数据库数量
@@ -17,7 +17,7 @@ 实时
-
{{ total || 0 }}MB
+
{{ occupy_space}}MB
占用空间
@@ -41,18 +41,19 @@ isResizable: true, data() { return { - total: 0, + count:"", + occupy_space:"", }; }, methods: { - initGet() { - request({ - url: "", - }).then((res) => { - const { data } = res; - // this.total = data.total; - }); - }, + initGet () { + request({ + url: '/api/system/homepage_statistics/' + }).then((res)=>{ + this.count=res.data.sum_file.count; + this.occupy_space=res.data.sum_file.occupy_space; + }) + }, // 生成一个随机整数 randomColor() { const color = ["#50A8F4FF", "#FD6165FF", "#E679D8FF", "#F9AB5BFF"]; diff --git a/web/src/views/dashboard/workbench/components/member.vue b/web/src/views/dashboard/workbench/components/member.vue index c27b658..bf55d0b 100644 --- a/web/src/views/dashboard/workbench/components/member.vue +++ b/web/src/views/dashboard/workbench/components/member.vue @@ -5,7 +5,7 @@
-
{{total || 0}}
+
{{sum_register}}
@@ -31,18 +31,17 @@ isResizable: true, data () { return { - total: 0 + sum_register:"", } }, methods: { initGet () { - request({ - url: '' - }).then(res => { - const { data } = res - // this.total = data.total - }) - }, + request({ + url: '/api/system/homepage_statistics/' + }).then((res)=>{ + this.sum_register=res.data.sum_register + }) + }, // 生成一个随机整数 randomColor () { const color = [ diff --git a/web/src/views/dashboard/workbench/components/newUsers.vue b/web/src/views/dashboard/workbench/components/newUsers.vue index 62b00ed..cbe4518 100644 --- a/web/src/views/dashboard/workbench/components/newUsers.vue +++ b/web/src/views/dashboard/workbench/components/newUsers.vue @@ -9,7 +9,7 @@
-

{{total || 0}}

+

{{ newName }}

今日注册
@@ -24,7 +24,7 @@
-

{{total || 1}}

+

{{today_login}}

今日登录
@@ -39,7 +39,7 @@
-

{{total || 7}}

+

{{Three_days_register}}

三日新增
@@ -54,7 +54,7 @@
-

{{total || 15}}

+

{{Seven_days_register}}

七日新增
@@ -69,7 +69,7 @@
-

{{total || 24}}

+

{{Seven_days_login}}

七日活跃
@@ -84,7 +84,7 @@
-

{{total || 89}}

+

{{month_login}}

月活跃
@@ -96,6 +96,8 @@ + }, + mounted() { + this.myChart = this.$echarts.init(document.getElementById("main")); + this.initGet(); + this.drawLine(); + }, +}; + +.card-view { + border-radius: 10px; + color: #ffffff; +} +.el-card { + height: 100%; +} + \ No newline at end of file diff --git a/web/src/views/dashboard/workbench/components/sumTotal.vue b/web/src/views/dashboard/workbench/components/sumTotal.vue index 8bdb321..640c0e5 100644 --- a/web/src/views/dashboard/workbench/components/sumTotal.vue +++ b/web/src/views/dashboard/workbench/components/sumTotal.vue @@ -9,7 +9,7 @@
-
{{ total || 0 }}
+
{{ count }}
附件总数量
@@ -17,7 +17,7 @@ 实时
-
{{ total || 0 }}MB
+
{{ occupy_space}}MB
占用空间
@@ -42,18 +42,20 @@ isResizable: true, data() { return { - total: 0, + count:"", + occupy_space:"", }; }, methods: { - initGet() { - request({ - url: "", - }).then((res) => { - const { data } = res; - // this.total = data.total; - }); - }, + initGet () { + request({ + url: '/api/system/homepage_statistics/' + }).then((res)=>{ + this.count=res.data.today_file.count; + this.occupy_space=res.data.today_file.occupy_space; +; + }) + }, // 生成一个随机整数 randomColor() { const color = ["#50A8F4FF", "#FD6165FF", "#E679D8FF", "#F9AB5BFF"]; @@ -95,7 +97,7 @@ } .el-icon-s-flag { font-size: 12px; - margin-right: 132px; + margin-right: 130px; } } .real-time { diff --git a/web/src/views/dashboard/workbench/components/userIogin.vue b/web/src/views/dashboard/workbench/components/userIogin.vue index b00fe46..0d871cf 100644 --- a/web/src/views/dashboard/workbench/components/userIogin.vue +++ b/web/src/views/dashboard/workbench/components/userIogin.vue @@ -1,98 +1,106 @@ - - - - - \ No newline at end of file + + \ No newline at end of file