From b944be5f6742188b0e5f2bae24a1ab201d15080a Mon Sep 17 00:00:00 2001 From: izory <791736813@qq.com> Date: Sat, 9 Oct 2021 18:08:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=8A=B6=E6=80=81=E5=9E=8B?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Repository/System/SysDictDataRepository.cs | 4 +- ZR.Service/System/SysDictDataService.cs | 4 +- ZR.Vue/src/assets/styles/sidebar.scss | 4 +- ZR.Vue/src/router/index.js | 26 +- ZR.Vue/src/views/components/dictData.vue | 58 +++- ZR.Vue/src/views/system/dept/index.vue | 12 +- ZR.Vue/src/views/system/dict/data.vue | 282 ------------------ ZR.Vue/src/views/system/dict/index.vue | 13 +- ZR.Vue/src/views/system/menu/index.vue | 5 +- ZR.Vue/src/views/system/post/index.vue | 12 +- 10 files changed, 96 insertions(+), 324 deletions(-) delete mode 100644 ZR.Vue/src/views/system/dict/data.vue diff --git a/ZR.Repository/System/SysDictDataRepository.cs b/ZR.Repository/System/SysDictDataRepository.cs index 110bf55..a6db1d3 100644 --- a/ZR.Repository/System/SysDictDataRepository.cs +++ b/ZR.Repository/System/SysDictDataRepository.cs @@ -63,7 +63,9 @@ namespace ZR.Repository.System DictSort = dict.DictSort, DictLabel = dict.DictLabel, DictValue = dict.DictValue, - Status = dict.Status + Status = dict.Status, + CssClass = dict.CssClass, + ListClass = dict.ListClass }) .Where(f => f.DictCode == dict.DictCode).ExecuteCommand(); } diff --git a/ZR.Service/System/SysDictDataService.cs b/ZR.Service/System/SysDictDataService.cs index 900341d..2c698c8 100644 --- a/ZR.Service/System/SysDictDataService.cs +++ b/ZR.Service/System/SysDictDataService.cs @@ -78,7 +78,9 @@ namespace ZR.Service.System /// public long UpdateDictData(SysDictData dict) { - return SysDictDataRepository.UpdateDictData(dict); + var result = SysDictDataRepository.UpdateDictData(dict); + CacheHelper.Remove($"SelectDictDataByCode_{dict.DictCode}"); + return result; } /// diff --git a/ZR.Vue/src/assets/styles/sidebar.scss b/ZR.Vue/src/assets/styles/sidebar.scss index c33d71f..2e68730 100644 --- a/ZR.Vue/src/assets/styles/sidebar.scss +++ b/ZR.Vue/src/assets/styles/sidebar.scss @@ -21,8 +21,8 @@ z-index: 1001; overflow: hidden; // 有改动 - -webkit-box-shadow: 2px 0 7px rgba(0,21,41 , .15); - box-shadow: 2px 0 7px rgba(0,21,41 , .15); + -webkit-box-shadow: 2px 0 14px rgba(0,21,41 , .10); + box-shadow: 2px 0 14px rgba(0,21,41 , .10); // reset element-ui css .horizontal-collapse-transition { diff --git a/ZR.Vue/src/router/index.js b/ZR.Vue/src/router/index.js index bec7dfb..f603cb2 100644 --- a/ZR.Vue/src/router/index.js +++ b/ZR.Vue/src/router/index.js @@ -93,19 +93,19 @@ export const constantRoutes = [ } ] }, - { - path: '/dict', - component: Layout, - hidden: true, - children: [ - { - path: 'type/data/:dictId(\\d+)', - component: (resolve) => require(['@/views/system/dict/data'], resolve), - name: 'Data', - meta: { title: '字典数据', icon: '' } - } - ] - } + // { + // path: '/dict', + // component: Layout, + // hidden: true, + // children: [ + // { + // path: 'type/data/:dictId(\\d+)', + // component: (resolve) => require(['@/views/system/dict/data'], resolve), + // name: 'Data', + // meta: { title: '字典数据', icon: '' } + // } + // ] + // } ] export default new Router({ diff --git a/ZR.Vue/src/views/components/dictData.vue b/ZR.Vue/src/views/components/dictData.vue index 05ad92b..d83a2b2 100644 --- a/ZR.Vue/src/views/components/dictData.vue +++ b/ZR.Vue/src/views/components/dictData.vue @@ -6,9 +6,6 @@ - - - @@ -27,10 +24,20 @@ - + + + + - + + +