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/ 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" > 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.vue b/ruoyi-ui/src/views/index.vue index a99504ec..418c0ad4 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -84,6 +84,7 @@
  • Sentinel
  • Seata
  • Minio
  • +
  • FastDFS
  • ...
  • @@ -408,7 +409,7 @@
  • slidebar eslint报错优化
  • 当tags-view滚动关闭右键菜单
  • 支持一级菜单(和主页同级)在main区域显示
  • -
  • 限制外链地址必须以http(s)😕/开头
  • +
  • 限制外链地址必须以http(s)�/开头
  • tagview & sidebar 主题颜色与element ui(全局)同步
  • 修复dict_sort不可update为0的问题&查询返回增加dict_sort升序排序 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 @@