From 757b4824b719fdb6d99e8414a1b65052fe08ce8e Mon Sep 17 00:00:00 2001 From: zhanglipeng <chinazhanglipeng@qq.com> Date: Thu, 12 Aug 2021 16:17:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/layout/components/Navbar.vue | 4 ++-- .../resources/mybatis/benyi/ByMicrocourseMapper.xml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue index d640ec33b..1fb98eb08 100644 --- a/ruoyi-ui/src/layout/components/Navbar.vue +++ b/ruoyi-ui/src/layout/components/Navbar.vue @@ -13,9 +13,9 @@ <template v-if="device !== 'mobile'"> <search id="header-search" class="right-menu-item" /> - <el-tooltip content="系统使用文档" effect="dark" placement="bottom"> + <!-- <el-tooltip content="系统使用文档" effect="dark" placement="bottom"> <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" /> - </el-tooltip> + </el-tooltip> --> <screenfull id="screenfull" class="right-menu-item hover-effect" /> diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByMicrocourseMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByMicrocourseMapper.xml index 0c5a0d1b4..273108d12 100644 --- a/ruoyi/src/main/resources/mybatis/benyi/ByMicrocourseMapper.xml +++ b/ruoyi/src/main/resources/mybatis/benyi/ByMicrocourseMapper.xml @@ -36,15 +36,15 @@ select dict_value+9999 id, 0 parent_id,dict_label title,dict_sort sort from sy union all select 1000302 ,concat(10003),'下册',10 union all - select concat(1000101,dict_value), 1000101,dict_label title,dict_sort sort from sys_dict_data where dict_type='sys_dm_wxkclx' and (dict_label not in ('百家姓','绕口令','游戏','孟子名言','谚语','千字文','韩非子名言','《诗经》名言','《春秋左传》名言','脑筋急转弯','《易经》名言 ','老子名言')) + select concat(1000101,dict_value), 1000101,dict_label title,dict_sort sort from sys_dict_data where dict_type='sys_dm_wxkclx' and (dict_label not in ('百家姓','绕口令','游戏','孟子名言','谚语','千字文','韩非子名言','《诗经》名言','《春秋左传》名言','脑筋急转弯','《易经》名言','老子名言')) union all - select concat(1000102,dict_value), 1000102,dict_label title,dict_sort sort from sys_dict_data where dict_type='sys_dm_wxkclx' and (dict_label not in ('百家姓','绕口令','游戏','孟子名言','谚语','千字文','韩非子名言','《诗经》名言','《春秋左传》名言','脑筋急转弯','《易经》名言 ','老子名言')) + select concat(1000102,dict_value), 1000102,dict_label title,dict_sort sort from sys_dict_data where dict_type='sys_dm_wxkclx' and (dict_label not in ('百家姓','绕口令','游戏','孟子名言','谚语','千字文','韩非子名言','《诗经》名言','《春秋左传》名言','脑筋急转弯','《易经》名言','老子名言')) union all - select concat(1000201,dict_value), 1000201,dict_label title,dict_sort sort from sys_dict_data where dict_type='sys_dm_wxkclx' and (dict_label not in ('三字经(节选)','千字文','语言游戏','孔子名言','韩非子名言','《诗经》名言','《春秋左传》名言','脑筋急转弯','《易经》名言 ','老子名言')) + select concat(1000201,dict_value), 1000201,dict_label title,dict_sort sort from sys_dict_data where dict_type='sys_dm_wxkclx' and (dict_label not in ('三字经(节选)','千字文','语言游戏','孔子名言','韩非子名言','《诗经》名言','《春秋左传》名言','脑筋急转弯','《易经》名言','老子名言')) union all - select concat(1000202,dict_value), 1000202,dict_label title,dict_sort sort from sys_dict_data where dict_type='sys_dm_wxkclx' and (dict_label not in ('三字经(节选)','千字文','语言游戏','孔子名言','韩非子名言','《诗经》名言','《春秋左传》名言','孟子名言','脑筋急转弯','《易经》名言 ')) + select concat(1000202,dict_value), 1000202,dict_label title,dict_sort sort from sys_dict_data where dict_type='sys_dm_wxkclx' and (dict_label not in ('三字经(节选)','千字文','语言游戏','孔子名言','韩非子名言','《诗经》名言','《春秋左传》名言','孟子名言','脑筋急转弯','《易经》名言')) union all - select concat(1000301,dict_value), 1000301,dict_label title,dict_sort sort from sys_dict_data where dict_type='sys_dm_wxkclx' and (dict_label not in ('百家姓','三字经(节选)','语言游戏','孔子名言','歇后语','孟子名言','《春秋左传》名言','《易经》名言 ','老子名言')) + select concat(1000301,dict_value), 1000301,dict_label title,dict_sort sort from sys_dict_data where dict_type='sys_dm_wxkclx' and (dict_label not in ('百家姓','三字经(节选)','语言游戏','孔子名言','歇后语','孟子名言','《春秋左传》名言','《易经》名言','老子名言')) union all select concat(1000302,dict_value), 1000302,dict_label title,dict_sort sort from sys_dict_data where dict_type='sys_dm_wxkclx' and (dict_label not in ('百家姓','三字经(节选)','语言游戏','孔子名言','歇后语','孟子名言','韩非子名言','《诗经》名言','老子名言')) union all