From e41f19ca6975dca61601527d7363d10a2cd2f3a2 Mon Sep 17 00:00:00 2001 From: easy <1358086367@qq.com> Date: Sat, 28 Jan 2023 18:12:36 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/home.js | 8 - src/api/home.ts | 15 ++ src/api/system/permission.ts | 6 + src/router/menu.ts | 4 + src/utils/utils.ts | 5 +- src/views/home/components/InitHome/index.vue | 28 ++- src/views/home/index.vue | 43 +++- .../Permission/components/EditDialog.vue | 234 ++++++++++++++++++ .../Permission/components/StatusLabel.vue | 29 +++ src/views/system/Permission/index.vue | 197 +++++++++++++++ src/views/system/Role/Detail/index.vue | 1 - .../system/Role/components/AddDialog.vue | 30 +-- src/views/system/Role/index.vue | 25 +- 13 files changed, 570 insertions(+), 55 deletions(-) delete mode 100644 src/api/home.js create mode 100644 src/api/home.ts create mode 100644 src/api/system/permission.ts create mode 100644 src/views/system/Permission/components/EditDialog.vue create mode 100644 src/views/system/Permission/components/StatusLabel.vue create mode 100644 src/views/system/Permission/index.vue diff --git a/src/api/home.js b/src/api/home.js deleted file mode 100644 index ea3aa339..00000000 --- a/src/api/home.js +++ /dev/null @@ -1,8 +0,0 @@ -import server from '@/utils/request'; - -// 设备数量 -export const getDeviceCount_api = () => server.get(`/device/instance/_count`); -// 产品数量 -export const getProductCount_api = (data) => server.post(`/device-product/_count`, data); -// 查询产品列表 -export const getProductList_api = (data) => server.get(`/device/product/_query/no-paging?paging=false`, data); diff --git a/src/api/home.ts b/src/api/home.ts new file mode 100644 index 00000000..2164e2f5 --- /dev/null +++ b/src/api/home.ts @@ -0,0 +1,15 @@ +import server from '@/utils/request'; + +// 当前登录用户权限信息 +export const getMe_api = () => server.get(`/authorize/me`); +// 设置登录用户选择的页面 +export const setView_api = (data:object) => server.patch(`/user/settings/view/user`, data); +// 当前登录用户选择的页面 +export const getView_api = () => server.get(`/user/settings/view/user`); + +// 设备数量 +export const getDeviceCount_api = () => server.get(`/device/instance/_count`); +// 产品数量 +export const getProductCount_api = (data:object) => server.post(`/device-product/_count`, data); +// 查询产品列表 +export const getProductList_api = (data:object) => server.get(`/device/product/_query/no-paging?paging=false`, data); diff --git a/src/api/system/permission.ts b/src/api/system/permission.ts new file mode 100644 index 00000000..978e4b26 --- /dev/null +++ b/src/api/system/permission.ts @@ -0,0 +1,6 @@ +import server from '@/utils/request'; + +// 获取权限列表 +export const getPermission_api = (data:object) => server.post(`/permission/_query/`,data); +// 修改权限信息 +export const editPermission_api = (data:object) => server.patch(`/permission`,data); \ No newline at end of file diff --git a/src/router/menu.ts b/src/router/menu.ts index 27d4f961..dfb5de5c 100644 --- a/src/router/menu.ts +++ b/src/router/menu.ts @@ -109,6 +109,10 @@ export default [ path:'/system/Role/detail/:id', component: ()=>import('@/views/system/Role/Detail/index.vue') }, + { + path:'/system/Permission', + component: ()=>import('@/views/system/Permission/index.vue') + }, // 初始化 { path: '/init-home', diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 3e5df69b..30e21216 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -1,6 +1,7 @@ import moment from "moment"; import { LocalStore } from "./comm"; import { TOKEN_KEY } from "./variable"; +import {SystemConst} from './consts'; /** * 把数据下载成JSON @@ -52,4 +53,6 @@ export const downloadObject = (record: Record, fileName: string, fo document.body.appendChild(formElement); formElement.submit(); document.body.removeChild(formElement); -}; \ No newline at end of file +}; +// 是否不是community版本 +export const isNoCommunity = !(localStorage.getItem(SystemConst.VERSION_CODE) === 'community'); \ No newline at end of file diff --git a/src/views/home/components/InitHome/index.vue b/src/views/home/components/InitHome/index.vue index 57be6d23..888aae8a 100644 --- a/src/views/home/components/InitHome/index.vue +++ b/src/views/home/components/InitHome/index.vue @@ -7,37 +7,47 @@ - 确定 + 确定 diff --git a/src/views/system/Permission/components/StatusLabel.vue b/src/views/system/Permission/components/StatusLabel.vue new file mode 100644 index 00000000..7641fea2 --- /dev/null +++ b/src/views/system/Permission/components/StatusLabel.vue @@ -0,0 +1,29 @@ + + + + + diff --git a/src/views/system/Permission/index.vue b/src/views/system/Permission/index.vue new file mode 100644 index 00000000..ec763acd --- /dev/null +++ b/src/views/system/Permission/index.vue @@ -0,0 +1,197 @@ + + + + + diff --git a/src/views/system/Role/Detail/index.vue b/src/views/system/Role/Detail/index.vue index 1c58b369..8a907baa 100644 --- a/src/views/system/Role/Detail/index.vue +++ b/src/views/system/Role/Detail/index.vue @@ -1,6 +1,5 @@ @@ -59,8 +59,8 @@ import { import AddDialog from './components/AddDialog.vue'; import { getRoleList_api, delRole_api } from '@/api/system/role'; import { message } from 'ant-design-vue'; - -const router = useRouter() +const addDialogRef = ref(); // 新增弹窗实例 +const router = useRouter(); // 筛选 const query = reactive({ columns: [ @@ -122,24 +122,21 @@ const table = reactive({ ], tableData: [], clickAdd: () => { - dialog.openAdd += 1; + addDialogRef.value.openDialog(true, {}) }, clickDel: (row: any) => { - delRole_api(row.id).then((resp:any)=>{ - if(resp.status === 200){ - tableRef.value?.reload() - message.success('操作成功!') + delRole_api(row.id).then((resp: any) => { + if (resp.status === 200) { + tableRef.value?.reload(); + message.success('操作成功!'); } - }) + }); }, clickEdit: (row: any) => { - router.push(`/system/Role/detail/${row.id}`) + router.push(`/system/Role/detail/${row.id}`); }, }); -// 弹窗相关 -const dialog = reactive({ - openAdd: 0, -}); +