From 131132bb2bab045737ae49708b90fd4cf30533db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=BC=9F=E5=BA=9A?= Date: Wed, 2 Nov 2022 16:19:10 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E9=83=A8=E5=88=86=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/index.css | 4 +-- src/components/api-type/rest.vue | 2 +- src/page/main/config/dict/index.vue | 16 ++++----- src/page/main/develop/account/index.vue | 2 +- src/page/main/develop/menu/index.vue | 10 +++--- src/page/main/develop/menu/menu-form.vue | 2 +- src/page/main/system/organization/index.vue | 17 +++++++++- src/page/main/system/organization/tree.vue | 37 ++++++++++++++------- src/page/main/system/role/add/role_form.vue | 17 +++++----- src/page/main/system/role/index.vue | 12 +++---- 10 files changed, 74 insertions(+), 45 deletions(-) diff --git a/src/assets/css/index.css b/src/assets/css/index.css index ffafb95..aeaca4c 100644 --- a/src/assets/css/index.css +++ b/src/assets/css/index.css @@ -1474,14 +1474,14 @@ border-radius:8px; } .flex_left { - height: calc(100% - 20px); + height: calc(100% - 16px); width: 320px; margin-right: 10px; overflow: hidden; } .flex_right { - height: calc(100% - 20px); + height: calc(100% - 16px); flex: 1; overflow: hidden; diff --git a/src/components/api-type/rest.vue b/src/components/api-type/rest.vue index 889a393..6b50d3a 100644 --- a/src/components/api-type/rest.vue +++ b/src/components/api-type/rest.vue @@ -401,7 +401,7 @@ const serviceTest = () => { .post(`/apaas/service/v5/service/test`,params) .then((res) => { if (res.data.code !== 200) { - $message.error(res.data.msg) + $message.error(res.data.data) } else { detailData.test_state = true detailData.backJSONdata = res.data.data.response_str diff --git a/src/page/main/config/dict/index.vue b/src/page/main/config/dict/index.vue index 0ccd5df..f6fdc7f 100644 --- a/src/page/main/config/dict/index.vue +++ b/src/page/main/config/dict/index.vue @@ -278,7 +278,7 @@ const getTypeList = () => { getTableRows() } }else { - ElMessage.error(res.data.msg) + ElMessage.error(res.data.data) } }).catch((err) => { console.log(err) @@ -352,7 +352,7 @@ const getTableRows = () => { state.tableRows[state.tableRows.length - 1].canMoveDown = false } }else { - ElMessage.error(res.data.msg) + ElMessage.error(res.data.data) } }) } // 获取表格数据 @@ -365,7 +365,7 @@ const changeUseRow = (row) => { ElMessage.success(res.data.msg) changePage(1) }else { - ElMessage.error(res.data.msg) + ElMessage.error(res.data.data) } }) } // 启用禁用 @@ -411,7 +411,7 @@ const edit_row = (row) => { state: state.actionRow.state } }else { - ElMessage.error(res.data.msg) + ElMessage.error(res.data.data) } }).catch((err) => { console.log(err) @@ -445,7 +445,7 @@ const addConfirm = () => { state.addDialog = false changePage(1) }else { - ElMessage.error(res.data.msg) + ElMessage.error(res.data.data) } }) }else { // 编辑 @@ -461,7 +461,7 @@ const addConfirm = () => { state.addDialog = false changePage(1) }else { - ElMessage.error(res.data.msg) + ElMessage.error(res.data.data) } }) } @@ -485,7 +485,7 @@ const deleteData = () => { state.dialogDelete = false changePage(1) }else { - ElMessage.error(res.data.msg) + ElMessage.error(res.data.data) } }) } // 确定删除 @@ -520,7 +520,7 @@ const moveRow = (row,type) => { ElMessage.success(res.data.msg) changePage(1) }else { - ElMessage.error(res.data.msg) + ElMessage.error(res.data.data) } }) .catch((err) => { diff --git a/src/page/main/develop/account/index.vue b/src/page/main/develop/account/index.vue index 6bee986..6c8c998 100644 --- a/src/page/main/develop/account/index.vue +++ b/src/page/main/develop/account/index.vue @@ -607,12 +607,12 @@ import CryptoJS from "crypto-js"; background-color: var(--el-tree-node-hover-bg-color); } .main_container { - padding: 15px; height: 100%; } .table_container { height: calc(100% - 30px); overflow: auto; + padding: 0 16px; } .pagination_box { diff --git a/src/page/main/develop/menu/index.vue b/src/page/main/develop/menu/index.vue index 18d3595..cc49890 100644 --- a/src/page/main/develop/menu/index.vue +++ b/src/page/main/develop/menu/index.vue @@ -177,7 +177,7 @@ const getMenuTree = (type) => { }) }else { - ElMessage.error(res.data.msg) + ElMessage.error(res.data.data) } }) } // 获取菜单树 @@ -307,7 +307,7 @@ const fileAction = (val,data,parent,disabled=false) => { let type = parent ? 1 : 2 // 1--有父级 2--无父级 getMenuTree(type) }else { - ElMessage.error(res.data.msg) + ElMessage.error(res.data.data) } }) }else if (val == 4) { // 菜单上移 @@ -378,7 +378,7 @@ const changeSort = (data,nextObj) => { ElMessage.success(res.data.msg) getMenuTree() }else { - ElMessage.error(res.data.msg) + ElMessage.error(res.data.data) } }) } // 菜单上下移 @@ -406,7 +406,7 @@ const saveMenu = (el,type) => { ElMessage.success(res.data.msg) getMenuTree() }else { - ElMessage.error(res.data.msg) + ElMessage.error(res.data.data) } }) }else { // 新增 @@ -429,7 +429,7 @@ const saveMenu = (el,type) => { state.selectData = null getMenuTree() }else { - ElMessage.error(res.data.msg) + ElMessage.error(res.data.data) } }) } diff --git a/src/page/main/develop/menu/menu-form.vue b/src/page/main/develop/menu/menu-form.vue index 49d17e8..05bc4ab 100644 --- a/src/page/main/develop/menu/menu-form.vue +++ b/src/page/main/develop/menu/menu-form.vue @@ -151,7 +151,7 @@ const getGroupList = () => { if (res.data.code == 200) { state.groupList = res.data.data || [] }else { - ElMessage.error(res.data.msg) + ElMessage.error(res.data.data) } }).catch((err) => { console.log(err) diff --git a/src/page/main/system/organization/index.vue b/src/page/main/system/organization/index.vue index 6072aff..a995745 100644 --- a/src/page/main/system/organization/index.vue +++ b/src/page/main/system/organization/index.vue @@ -939,13 +939,28 @@ import { downloadFileFormatNew } from '@/services/helper' font-size: 14px; } .main_container { - padding: 15px; flex: 1; overflow: hidden; } +.filter-group .left-filter { + flex: 1; + display: flex; + justify-content: start; + flex-wrap: wrap; +} +.filter-group .right-action { + width: 144px; + padding-bottom: 16px; +} +.filter-group .right-action .el-button { + width: 64px; +} + + .table_container { height: calc(100% - 20px); overflow: auto; + padding: 0 16px; } .bg-pagination { diff --git a/src/page/main/system/organization/tree.vue b/src/page/main/system/organization/tree.vue index 236a45c..0693f6f 100644 --- a/src/page/main/system/organization/tree.vue +++ b/src/page/main/system/organization/tree.vue @@ -17,7 +17,7 @@ :title="data.name" >{{ data.name }} - + .tree-action-box { - display: none; - position: absolute; - right: -5px; - top: 0px; - width: 44px; - height: 36px; - line-height: 36px; - text-align: center; - background-color: #f2f3f7; - box-shadow: -3px 0px 8px -3px - rgba(0, 7, 101, 0.15); + display: none; + position: absolute; + right: -5px; + top: 0px; + width: 44px; + height: 36px; + line-height: 36px; + text-align: center; + background-color: #f2f3f7; + box-shadow: -3px 0px 8px -3px + rgba(0, 7, 101, 0.15); } .position_sticky { position: sticky; @@ -220,8 +220,21 @@ import { useRouter } from 'vue-router'; .file-tree :deep() .el-tree-node__content:hover .tree-action-box { display: inline-block; } + .file-tree :deep() .el-tree-node__content .first_node { display: inline-block; + background-color: #fff; + box-shadow: none; +} +.file-tree :deep() .el-tree-node__content .first_node_focus { + background-color: #f2f3f7; + box-shadow: -3px 0px 8px -3px + rgba(0, 7, 101, 0.15); +} +.file-tree :deep() .el-tree-node__content:hover .first_node { + background-color: #f2f3f7; + box-shadow: -3px 0px 8px -3px + rgba(0, 7, 101, 0.15); } .file-tree :deep() .el-tree-node > .el-tree-node__children { overflow: visible; diff --git a/src/page/main/system/role/add/role_form.vue b/src/page/main/system/role/add/role_form.vue index 71853ac..d30f790 100644 --- a/src/page/main/system/role/add/role_form.vue +++ b/src/page/main/system/role/add/role_form.vue @@ -60,7 +60,7 @@
- + 取消 @@ -100,9 +100,7 @@ const roleState = reactive({ role_name: [ { required: true, message: "请输入角色名称", trigger: "blur" }, ], - role_desc: [ - { required: true, message: "请输入描述", trigger: "blur" }, - ], + data_purview: [ { required: true, message: "请选择数据权限", trigger: "change" }, ], @@ -127,7 +125,7 @@ const getMenuTree = () => { if (res.data.code == 200) { roleState.permissionData = res.data.data || [] }else { - ElMessage.error(res.data.msg) + ElMessage.error(res.data.data) } }) } // 获取菜单数据 @@ -157,7 +155,7 @@ const getRoleDetail = () => { } console.log(roleState.formData.permission_arr) }else { - ElMessage.error(res.data.msg) + ElMessage.error(res.data.data) } }) } // 获取角色详情 @@ -180,7 +178,7 @@ const saveRole = () => { ElMessage.success(res.data.msg) router.push('/system/role') }else { - ElMessage.error(res.data.msg) + ElMessage.error(res.data.data) } }) }else { // 编辑 @@ -192,13 +190,16 @@ const saveRole = () => { ElMessage.success(res.data.msg) router.push('/system/role') }else { - ElMessage.error(res.data.msg) + ElMessage.error(res.data.data) } }) } } }) } // 新增或编辑角色的保存 +const goList = () => { + router.push("/system/role") +} onBeforeMount(() => { getMenuTree() diff --git a/src/page/main/system/role/index.vue b/src/page/main/system/role/index.vue index 58c05b2..1f23d5d 100644 --- a/src/page/main/system/role/index.vue +++ b/src/page/main/system/role/index.vue @@ -306,7 +306,7 @@ const getRoleRows = () => { state.tableRows = res.data.data || [] state.tableTotal = res.data.total }else { - ElMessage.error(re.data.msg) + ElMessage.error(re.data.data) } }) } // 获取角色列表 @@ -319,7 +319,7 @@ const getOrgList = () => { console.log(res.data.data) userState.orgList = res.data.data || [] }else { - ElMessage.error(res.data.msg) + ElMessage.error(res.data.data) } }) } // 获取组织列表 @@ -346,7 +346,7 @@ const changeUseRow = (row) => { ElMessage.success(res.data.msg) changePage(1) }else { - ElMessage.error(res.data.msg) + ElMessage.error(res.data.data) } }) } // 更改启用禁用状态 @@ -408,7 +408,7 @@ const getUserList = () => { }) }) }else { - ElMessage.error(res.data.msg) + ElMessage.error(res.data.data) } }) } @@ -465,7 +465,7 @@ const distribute = () => { userState.distributeDialog = false changePage(1) }else { - ElMessage.error(res.data.msg) + ElMessage.error(res.data.data) } }) @@ -506,7 +506,7 @@ const deleteData = () => { state.delDialog = false changePage(1) }else { - ElMessage.error(res.data.msg) + ElMessage.error(res.data.data) } }) } -- 2.26.0