diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss index 7e6001b..29c8bfe 100644 --- a/src/assets/styles/archives-manage.scss +++ b/src/assets/styles/archives-manage.scss @@ -186,11 +186,6 @@ border-radius: 26px; } -.archives-table.el-table .el-table__fixed-right{ - background-color: $boxBg !important; - box-shadow: -5px 5px 10px 1px rgba(15,164,222,0.16); -} - // archives - tab .archives-tab{ position: relative; diff --git a/src/assets/styles/mixin.scss b/src/assets/styles/mixin.scss index d4f038b..25b3bcd 100644 --- a/src/assets/styles/mixin.scss +++ b/src/assets/styles/mixin.scss @@ -918,4 +918,15 @@ color: #545B65; background-color: #F5F7FA; } +} + +@mixin table-fixed-style{ + [data-theme="dark"] & { + background-color: $boxBg !important; + box-shadow: -5px 5px 10px 1px rgba(15,164,222,0.16); + } + [data-theme="light"] & { + background-color: #FFFFFF !important; + box-shadow: -3px 3px 11px 0px rgba(0,0,0,0.08); + } } \ No newline at end of file diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss index 26af22d..72ff41f 100644 --- a/src/assets/styles/yxk-admin.scss +++ b/src/assets/styles/yxk-admin.scss @@ -1938,7 +1938,6 @@ input[type ='number'] { font-size: 16px; margin-left: 6px; background-image: none; - transition: all ease-in 0.5s; &.arrow-up { transform: rotate(180deg); @@ -2063,4 +2062,22 @@ input[type ='number'] { background: transparent !important; width: 100%; height: 630px !important; -} \ No newline at end of file +} + +.tip { + display: inline-block; + margin: 4px 0 0 14px; + padding-left: 20px; + font-style: normal; + font-weight: normal; + font-size: 12px; + line-height: 20px; + background: url('~@/assets/images/icon/tip-icon.png') no-repeat left center; + background-size: 14px 14px; +} + + +.fixed-table.el-table .el-table__fixed-right{ + @include table-fixed-style; + +} diff --git a/src/views/system/archiveScopeManage/index.vue b/src/views/system/archiveScopeManage/index.vue index 3c12916..409879b 100644 --- a/src/views/system/archiveScopeManage/index.vue +++ b/src/views/system/archiveScopeManage/index.vue @@ -1,9 +1,327 @@ - diff --git a/src/views/system/archivesCategory/orderingRule/index.vue b/src/views/system/archivesCategory/orderingRule/index.vue index 52b7114..353b924 100644 --- a/src/views/system/archivesCategory/orderingRule/index.vue +++ b/src/views/system/archivesCategory/orderingRule/index.vue @@ -188,15 +188,4 @@ export default { ::v-deep .el-table tr .el-table__cell { height: 40px; } -.tip { - display: inline-block; - margin: 4px 0 0 14px; - padding-left: 20px; - font-style: normal; - font-weight: normal; - font-size: 12px; - line-height: 20px; - background: url('~@/assets/images/icon/tip-icon.png') no-repeat left center; - background-size: 14px 14px; -} diff --git a/src/views/system/fieldCorresManage/index.vue b/src/views/system/fieldCorresManage/index.vue index 059620a..83fcf36 100644 --- a/src/views/system/fieldCorresManage/index.vue +++ b/src/views/system/fieldCorresManage/index.vue @@ -22,7 +22,14 @@ /> - + + + @@ -66,6 +73,7 @@ @select="crud.selectChange" @select-all="crud.selectAllChange" @selection-change="crud.selectionChangeHandler" + @cell-dblclick="tableDoubleClick" > @@ -98,7 +106,19 @@ export default { name: 'FieldCorresManage', components: { crudOperation, rrOperation, Treeselect, eForm }, cruds() { - return CRUD({ title: '对应关系', url: 'api/menus', crudMethod: { }}) + return CRUD({ + title: '对应关系', + url: 'api/menus', + crudMethod: { }, + optShow: { + add: true, + edit: false, + del: true, + reset: false, + download: true, + group: false + } + }) }, mixins: [presenter(), header(), form(defaultForm), crud()], data() { @@ -127,6 +147,15 @@ export default { toCorresForm() { this.$refs.corresForm.corresVisible = true }, + // table - 双击查看详情 + tableDoubleClick(row) { + this.$refs.corresForm.title = '对应关系' + this.$refs.corresForm.corresVisible = true + }, + toEdit() { + this.$refs.corresForm.title = '编辑对应关系' + this.$refs.corresForm.corresVisible = true + }, loadSource({ action, parentNode, callback }) { if (action === LOAD_CHILDREN_OPTIONS) { crudMenu.getMenusTree(parentNode.id).then(res => { diff --git a/src/views/system/fieldCorresManage/module/form.vue b/src/views/system/fieldCorresManage/module/form.vue index 16206bc..6e55317 100644 --- a/src/views/system/fieldCorresManage/module/form.vue +++ b/src/views/system/fieldCorresManage/module/form.vue @@ -2,16 +2,16 @@
- - - + + +
@@ -22,7 +22,7 @@
- + -

{{ sourceValue[index] }}

+

{{ sourceValue[index] }}

显示
@@ -48,45 +48,29 @@
-
- diff --git a/src/views/system/subjectLibraryManage/orderingRule/index.vue b/src/views/system/subjectLibraryManage/orderingRule/index.vue index aa597f1..49dcd76 100644 --- a/src/views/system/subjectLibraryManage/orderingRule/index.vue +++ b/src/views/system/subjectLibraryManage/orderingRule/index.vue @@ -182,15 +182,4 @@ export default {