From ad43f6cd307f8f065397f332c2819910ced15fe9 Mon Sep 17 00:00:00 2001 From: "Ken(E3-1230v2)" Date: Mon, 8 Feb 2021 10:37:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?longtext=E6=9B=B4=E6=94=B9=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=AD=E4=B8=8D=E4=B9=B1?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/ry_20210108.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/ry_20210108.sql b/sql/ry_20210108.sql index b983cc53..a97a615a 100644 --- a/sql/ry_20210108.sql +++ b/sql/ry_20210108.sql @@ -616,7 +616,7 @@ create table sys_notice ( notice_id int(4) not null auto_increment comment '公告ID', notice_title varchar(50) not null comment '公告标题', notice_type char(1) not null comment '公告类型（1通知 2公告）', - notice_content longblob default null comment '公告内容', + notice_content longtext default null comment '公告内容', status char(1) default '0' comment '公告状态（0正常 1关闭）', create_by varchar(64) default '' comment '创建者', create_time datetime comment '创建时间', From ef85f009cb0ff1ff146929ac69d3a854c8acc469 Mon Sep 17 00:00:00 2001 From: "Ken(E3-1230v2)" Date: Mon, 8 Feb 2021 10:37:59 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E5=8C=96=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/components/HeaderSearch/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-ui/src/components/HeaderSearch/index.vue b/ruoyi-ui/src/components/HeaderSearch/index.vue index ae952a98..8b5adac4 100644 --- a/ruoyi-ui/src/components/HeaderSearch/index.vue +++ b/ruoyi-ui/src/components/HeaderSearch/index.vue @@ -8,7 +8,7 @@ filterable default-first-option remote - placeholder="Search" + placeholder="搜索菜单功能" class="header-search-select" @change="change" > From f7a701db337a434a8ea6e4b4e2657ca8ed0aa787 Mon Sep 17 00:00:00 2001 From: "Ken(E3-1230v2)" Date: Mon, 8 Feb 2021 10:38:37 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=BF=BD=E7=95=A5=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=B8=AD=E7=9A=84logs=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4916f7a2..cef1714c 100644 --- a/.gitignore +++ b/.gitignore @@ -40,4 +40,5 @@ nbdist/ !*/build/*.java !*/build/*.html -!*/build/*.xml \ No newline at end of file +!*/build/*.xml +/logs/ From cf147fe5deb9fa1b339f06d31b38f6e30d60812f Mon Sep 17 00:00:00 2001 From: "Ken(E3-1230v2)" Date: Mon, 8 Feb 2021 10:40:13 +0800 Subject: [PATCH 4/5] =?UTF-8?q?panelGroup=E7=BB=84=E4=BB=B6=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E5=8F=82=E6=95=B0=E4=BC=A0=E5=85=A5=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9Apeoples=EF=BC=8Cmessage=EF=BC=8Cmoney=EF=BC=8Cshopping?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/dashboard/PanelGroup.vue | 21 +++++++++++++++++---- ruoyi-ui/src/views/index_v1.vue | 2 +- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ruoyi-ui/src/views/dashboard/PanelGroup.vue b/ruoyi-ui/src/views/dashboard/PanelGroup.vue index 8d3a73bc..59a28808 100644 --- a/ruoyi-ui/src/views/dashboard/PanelGroup.vue +++ b/ruoyi-ui/src/views/dashboard/PanelGroup.vue @@ -9,7 +9,7 @@
访客
- + @@ -22,7 +22,7 @@
消息
- + @@ -35,7 +35,7 @@
金额
- + @@ -48,7 +48,7 @@
订单
- + @@ -59,6 +59,19 @@ import CountTo from 'vue-count-to' export default { + props: ['peoples', 'message', 'money', 'shopping'], + data() { + let obj = { + maxNum : { + peoples : this.peoples==undefined? 0 : this.peoples,// 把传过来的值赋值给新的变量 + message : this.message==undefined? 0 : this.message,// 把传过来的值赋值给新的变量 + money : this.money==undefined? 0 : this.money,// 把传过来的值赋值给新的变量 + shopping : this.shopping==undefined? 0 : this.shopping // 把传过来的值赋值给新的变量 + } + } + // console.log(obj.maxNum.peoples); + return obj; + }, components: { CountTo }, diff --git a/ruoyi-ui/src/views/index_v1.vue b/ruoyi-ui/src/views/index_v1.vue index 4828d880..b4b8f0c5 100644 --- a/ruoyi-ui/src/views/index_v1.vue +++ b/ruoyi-ui/src/views/index_v1.vue @@ -1,7 +1,7 @@