From 56d152e1c37df75fdb8fbaa1562bd3906c8d1780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Tue, 28 Mar 2023 22:16:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=BB=98=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/workbench/components/about.vue  | 33 ++++++++++---
 .../dashboard/workbench/components/time.vue   |  8 ++--
 .../dashboard/workbench/components/ver.vue    | 48 ++++++++++++++-----
 web/src/views/dashboard/workbench/index.vue   | 17 +++----
 4 files changed, 73 insertions(+), 33 deletions(-)

diff --git a/web/src/views/dashboard/workbench/components/about.vue b/web/src/views/dashboard/workbench/components/about.vue
index e8571d8..aad348e 100644
--- a/web/src/views/dashboard/workbench/components/about.vue
+++ b/web/src/views/dashboard/workbench/components/about.vue
@@ -1,6 +1,8 @@
 <template>
-  <el-card  shadow="hover" header="关于项目" class="item-background">
-    <p>高性能 / 精致 / 优雅。基于Vue2 + Element-UI 的中后台前端解决方案，如果喜欢就点个星星支持一下。</p>
+  <el-card  shadow="hover" header="关于项目" class="card-view" :style="{backgroundColor:randomColor()}">
+    <p>后端:Django-rest-framework</p>
+    <p>前端:Vue2 + Element-UI + d2-crud-plus</p>
+    <p>快速系统开发平台，,如果喜欢就点个星星支持一下。</p>
     <p>
       <a href='https://liqianglog.gitee.io/django-vue-admin' target="_blank">
         <img src='https://liqianglog.gitee.io/django-vue-admin/badge/star.svg?theme=dark' alt='star' style="vertical-align: middle">
@@ -14,19 +16,36 @@ export default {
   title: '关于项目',
   icon: 'el-icon-setting',
   description: '点个星星支持一下',
-  height: 20,
+  height: 10,
   width: 8,
-  minH: 20,
+  minH: 10,
   minW: 4,
   isResizable: true,
   data () {
     return {}
+  },
+  methods:{
+    // 生成一个随机整数
+    randomColor () {
+      const color = [
+        '#50A8F4FF',
+        '#FD6165FF',
+        '#E679D8FF',
+        '#F9AB5BFF'
+      ]
+      const ran = Math.floor(Math.random() * 4)
+      return color[ran]
+    }
   }
 }
 </script>
 
-<style scoped>
-.item-background p {
-  color: #999;
+<style scoped lang="scss">
+.card-view{
+  color: #FFFFFF;
+p {
+  font-size: 0.7em;
+  color: #FFFFFF;
+}
 }
 </style>
diff --git a/web/src/views/dashboard/workbench/components/time.vue b/web/src/views/dashboard/workbench/components/time.vue
index d9ae761..5f5e6c0 100644
--- a/web/src/views/dashboard/workbench/components/time.vue
+++ b/web/src/views/dashboard/workbench/components/time.vue
@@ -14,8 +14,8 @@ export default {
   title: '时钟',
   icon: 'el-icon-alarm-clock',
   description: '演示部件效果',
-  height: 17,
-  minH: 17,
+  height: 10,
+  minH: 10,
   width: 8,
   minW: 4,
   isResizable: true,
@@ -47,11 +47,11 @@ export default {
 }
 
 .time h2 {
-  font-size: 40px;
+  font-size: 24px;
 }
 
 .time p {
-  font-size: 14px;
+  font-size: 18px;
   margin-top: 10px;
   opacity: 0.7;
 }
diff --git a/web/src/views/dashboard/workbench/components/ver.vue b/web/src/views/dashboard/workbench/components/ver.vue
index 9a0e7c5..1dd89ed 100644
--- a/web/src/views/dashboard/workbench/components/ver.vue
+++ b/web/src/views/dashboard/workbench/components/ver.vue
@@ -1,44 +1,70 @@
 <template>
-  <el-card shadow="hover" header="版本信息">
-    <div style="height: 70px;text-align: center;">
-      <h2 style="margin-top: 5px;">Dvadmin</h2>
+  <el-card shadow="hover" class="card-view" :style="{backgroundColor:randomColor()}" header="版本信息">
+    <div style="text-align: center;color: #FFFFFF">
+      <h2 style="margin-top: 5px;">{{ title }}</h2>
       <p style="margin-top: 5px;">最新版本 {{ ver }}</p>
     </div>
-    <div style="margin-top: 5px;">
-      <el-button type="primary" plain round @click="golog">更新日志</el-button>
-      <el-button type="primary" plain round @click="gogit">gitee</el-button>
-    </div>
   </el-card>
 </template>
 
 <script>
+import { mapState } from 'vuex'
+
 export default {
   title: '版本信息',
   icon: 'el-icon-monitor',
   description: '当前项目版本信息',
-  height: 22,
+  height: 10,
+  minH: 10,
   width: 8,
-  minH: 22,
   minW: 4,
   isResizable: true,
   data () {
     return {
-      ver: 'loading...'
+      ver: 'loading...',
+      title: ''
     }
   },
   mounted () {
     this.getVer()
   },
+  computed: {
+    ...mapState('d2admin', {
+      siteName: state => state.settings.data['login.site_name'] // 网站名称
+    })
+  },
   methods: {
     async getVer () {
-      this.ver = 'v2.1.0'
+      this.ver = `v${process.env.VUE_APP_VERSION}` || 'v2.1.1'
+      this.title = this.siteName || process.env.VUE_APP_TITLE
     },
     golog () {
       window.open('https://gitee.com/liqianglog/django-vue-admin/releases')
     },
     gogit () {
       window.open('https://gitee.com/liqianglog/django-vue-admin')
+    },
+    // 生成一个随机整数
+    randomColor () {
+      const color = [
+        '#50A8F4FF',
+        '#FD6165FF',
+        '#E679D8FF',
+        '#F9AB5BFF'
+      ]
+      const ran = Math.floor(Math.random() * 4)
+      return color[ran]
     }
   }
 }
 </script>
+<style scoped lang="scss">
+.card-view{
+  color: #FFFFFF;
+  //background: rgb(80,168,244);
+  //box-shadow: 1px 6px 8px 2px rgba(80,168,244,0.2);
+  .card-content{
+    //text-align: center;
+  }
+}
+</style>
diff --git a/web/src/views/dashboard/workbench/index.vue b/web/src/views/dashboard/workbench/index.vue
index 88e7227..8d65255 100644
--- a/web/src/views/dashboard/workbench/index.vue
+++ b/web/src/views/dashboard/workbench/index.vue
@@ -97,17 +97,12 @@ export default {
       customizing: false,
       allComps: allComps,
       selectLayout: [],
-      defaultGrid: {
-        // 默认分栏数量和宽度 例如 [24] [18,6] [8,8,8] [6,12,6]
-        layout: [12, 6, 6],
-        // 小组件分布，com取值:views/home/components 文件名
-        copmsList: [
-          ['welcome'],
-          ['about', 'ver'],
-          ['time', 'progress']
-        ]
-      },
-      defaultLayout: [],
+      defaultLayout: [
+        { x: 0, y: 0, w: 50, h: 50, i: '0', element: 'welcome' },
+        { x: 0, y: 52, w: 8, h: 16, i: '1', element: 'about' },
+        { x: 8, y: 52, w: 8, h: 16, i: '2', element: 'time' },
+        { x: 16, y: 52, w: 8, h: 20, i: '3', element: 'ver' }
+      ],
       layout: [
         // { x: 0, y: 0, w: 2, h: 2, i: '0', element: 'welcome' },
         // { x: 2, y: 0, w: 2, h: 4, i: '1', element: 'about' },