From 0082354aba6d4202f97cd8f79412d74e015f3b9f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 25 七月 2023 11:40:29 +0800
Subject: [PATCH] fix 修复 oss上传与zip下载未传输clientid问题
---
src/views/system/role/index.vue | 352 ++++++++++++++++++++++++++++------------------------------
1 files changed, 169 insertions(+), 183 deletions(-)
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index c61c65f..ffbd67c 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -121,7 +121,7 @@
<el-form-item label="鐘舵��">
<el-radio-group v-model="form.status">
<el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{
- dict.label
+ dict.label
}}</el-radio>
</el-radio-group>
</el-form-item>
@@ -221,11 +221,11 @@
/** 鏁版嵁鑼冨洿閫夐」*/
const dataScopeOptions = ref([
- { value: "1", label: "鍏ㄩ儴鏁版嵁鏉冮檺" },
- { value: "2", label: "鑷畾鏁版嵁鏉冮檺" },
- { value: "3", label: "鏈儴闂ㄦ暟鎹潈闄�" },
- { value: "4", label: "鏈儴闂ㄥ強浠ヤ笅鏁版嵁鏉冮檺" },
- { value: "5", label: "浠呮湰浜烘暟鎹潈闄�" }
+ { value: "1", label: "鍏ㄩ儴鏁版嵁鏉冮檺" },
+ { value: "2", label: "鑷畾鏁版嵁鏉冮檺" },
+ { value: "3", label: "鏈儴闂ㄦ暟鎹潈闄�" },
+ { value: "4", label: "鏈儴闂ㄥ強浠ヤ笅鏁版嵁鏉冮檺" },
+ { value: "5", label: "浠呮湰浜烘暟鎹潈闄�" }
])
const queryFormRef = ref<ElFormInstance>();
@@ -235,282 +235,268 @@
const deptRef = ref<ElTreeInstance>();
const initForm: RoleForm = {
- roleId: undefined,
- roleSort: 1,
- status: '0',
- roleName: '',
- roleKey: '',
- menuCheckStrictly: true,
- deptCheckStrictly: true,
- remark: '',
- dataScope: '1',
- menuIds: [],
- deptIds: [],
+ roleId: undefined,
+ roleSort: 1,
+ status: '0',
+ roleName: '',
+ roleKey: '',
+ menuCheckStrictly: true,
+ deptCheckStrictly: true,
+ remark: '',
+ dataScope: '1',
+ menuIds: [],
+ deptIds: [],
}
const data = reactive<PageData<RoleForm, RoleQuery>>({
- form: {...initForm},
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- roleName: '',
- roleKey: '',
- status: '',
- },
- rules: {
- roleName: [{ required: true, message: "瑙掕壊鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
- roleKey: [{ required: true, message: "鏉冮檺瀛楃涓嶈兘涓虹┖", trigger: "blur" }],
- roleSort: [{ required: true, message: "瑙掕壊椤哄簭涓嶈兘涓虹┖", trigger: "blur" }]
- }
+ form: { ...initForm },
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ roleName: '',
+ roleKey: '',
+ status: '',
+ },
+ rules: {
+ roleName: [{ required: true, message: "瑙掕壊鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
+ roleKey: [{ required: true, message: "鏉冮檺瀛楃涓嶈兘涓虹┖", trigger: "blur" }],
+ roleSort: [{ required: true, message: "瑙掕壊椤哄簭涓嶈兘涓虹┖", trigger: "blur" }]
+ }
})
const { form, queryParams, rules } = toRefs(data)
-
const dialog = reactive<DialogOption>({
- visible: false,
- title: ''
+ visible: false,
+ title: ''
});
-
/**
* 鏌ヨ瑙掕壊鍒楄〃
*/
const getList = () => {
- loading.value = true
- listRole(proxy?.addDateRange(queryParams.value, dateRange.value)).then(res => {
- roleList.value = res.rows
- total.value = res.total
- loading.value = false
- })
+ loading.value = true
+ listRole(proxy?.addDateRange(queryParams.value, dateRange.value)).then(res => {
+ roleList.value = res.rows
+ total.value = res.total
+ loading.value = false
+ })
}
/**
* 鎼滅储鎸夐挳鎿嶄綔
*/
const handleQuery = () => {
- queryParams.value.pageNum = 1;
- getList();
+ queryParams.value.pageNum = 1;
+ getList();
}
/** 閲嶇疆 */
const resetQuery = () => {
- dateRange.value = ['', '']
- queryFormRef.value?.resetFields();
- handleQuery();
+ dateRange.value = ['', '']
+ queryFormRef.value?.resetFields();
+ handleQuery();
}
/**鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (row?: RoleVO) => {
- const roleids = row?.roleId || ids.value;
- await proxy?.$modal.confirm('鏄惁纭鍒犻櫎瑙掕壊缂栧彿涓�' + roleids + '鏁版嵁椤圭洰');
- await delRole(roleids);
- getList();
- proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
+ const roleids = row?.roleId || ids.value;
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎瑙掕壊缂栧彿涓�' + roleids + '鏁版嵁椤圭洰');
+ await delRole(roleids);
+ getList();
+ proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
}
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
const handleExport = () => {
- proxy?.download("system/role/export", {
- ...queryParams.value,
- }, `role_${new Date().getTime()}.xlsx`)
+ proxy?.download("system/role/export", {
+ ...queryParams.value,
+ }, `role_${new Date().getTime()}.xlsx`)
}
/** 澶氶�夋閫変腑鏁版嵁 */
const handleSelectionChange = (selection: RoleVO[]) => {
- ids.value = selection.map((item: RoleVO) => item.roleId);
- single.value = selection.length != 1;
- multiple.value = !selection.length;
+ ids.value = selection.map((item: RoleVO) => item.roleId);
+ single.value = selection.length != 1;
+ multiple.value = !selection.length;
}
/** 瑙掕壊鐘舵�佷慨鏀� */
const handleStatusChange = async (row: RoleVO) => {
- let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
- try {
- await proxy?.$modal.confirm('纭瑕�"' + text + '""' + row.roleName + '"瑙掕壊鍚�?');
- await changeRoleStatus(row.roleId, row.status);
- proxy?.$modal.msgSuccess(text + "鎴愬姛");
- } catch {
- row.status = row.status === "0" ? "1" : "0";
- }
+ let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
+ try {
+ await proxy?.$modal.confirm('纭瑕�"' + text + '""' + row.roleName + '"瑙掕壊鍚�?');
+ await changeRoleStatus(row.roleId, row.status);
+ proxy?.$modal.msgSuccess(text + "鎴愬姛");
+ } catch {
+ row.status = row.status === "0" ? "1" : "0";
+ }
}
/** 鍒嗛厤鐢ㄦ埛 */
const handleAuthUser = (row: RoleVO) => {
- router.push("/system/role-auth/user/" + row.roleId);
+ router.push("/system/role-auth/user/" + row.roleId);
}
/** 鏌ヨ鑿滃崟鏍戠粨鏋� */
const getMenuTreeselect = async () => {
- const res = await menuTreeselect();
- menuOptions.value = res.data;
+ const res = await menuTreeselect();
+ menuOptions.value = res.data;
}
/** 鎵�鏈夐儴闂ㄨ妭鐐规暟鎹� */
const getDeptAllCheckedKeys = (): any => {
- // 鐩墠琚�変腑鐨勯儴闂ㄨ妭鐐�
- let checkedKeys = deptRef.value?.getCheckedKeys();
- // 鍗婇�変腑鐨勯儴闂ㄨ妭鐐�
- let halfCheckedKeys = deptRef.value?.getHalfCheckedKeys();
- if(halfCheckedKeys) {
- checkedKeys?.unshift.apply(checkedKeys, halfCheckedKeys);
- }
- return checkedKeys
+ // 鐩墠琚�変腑鐨勯儴闂ㄨ妭鐐�
+ let checkedKeys = deptRef.value?.getCheckedKeys();
+ // 鍗婇�変腑鐨勯儴闂ㄨ妭鐐�
+ let halfCheckedKeys = deptRef.value?.getHalfCheckedKeys();
+ if (halfCheckedKeys) {
+ checkedKeys?.unshift.apply(checkedKeys, halfCheckedKeys);
+ }
+ return checkedKeys
}
/** 閲嶇疆鏂板鐨勮〃鍗曚互鍙婂叾浠栨暟鎹� */
const reset = () => {
- menuRef.value?.setCheckedKeys([]);
- menuExpand.value = false
- menuNodeAll.value = false
- deptExpand.value = true
- deptNodeAll.value = false
- form.value = { ...initForm };
- roleFormRef.value?.resetFields();
+ menuRef.value?.setCheckedKeys([]);
+ menuExpand.value = false
+ menuNodeAll.value = false
+ deptExpand.value = true
+ deptNodeAll.value = false
+ form.value = { ...initForm };
+ roleFormRef.value?.resetFields();
}
/** 娣诲姞瑙掕壊 */
const handleAdd = () => {
- dialog.visible = true;
- dialog.title = "娣诲姞瑙掕壊";
- nextTick(() => {
- reset();
- getMenuTreeselect();
- })
+ reset();
+ getMenuTreeselect();
+ dialog.visible = true;
+ dialog.title = "娣诲姞瑙掕壊";
}
/** 淇敼瑙掕壊 */
const handleUpdate = async (row?: RoleVO) => {
- const roleId = row?.roleId || ids.value[0]
- const roleMenu = getRoleMenuTreeselect(roleId)
- const { data } = await getRole(roleId);
- dialog.visible = true;
- dialog.title = "淇敼瑙掕壊";
- await nextTick(() => {
- reset();
- Object.assign(form.value, data);
- form.value.roleSort = Number(form.value.roleSort);
- nextTick(async () => {
- const res = await roleMenu;
- let checkedKeys = res.checkedKeys;
- checkedKeys.forEach((v) => {
- nextTick(() => {
- menuRef.value?.setChecked(v, true, false);
- })
- })
- })
+ reset();
+ const roleId = row?.roleId || ids.value[0]
+ const { data } = await getRole(roleId);
+ Object.assign(form.value, data);
+ form.value.roleSort = Number(form.value.roleSort);
+ const res = await getRoleMenuTreeselect(roleId);
+ dialog.title = "淇敼瑙掕壊";
+ dialog.visible = true;
+ res.checkedKeys.forEach((v) => {
+ nextTick(() => {
+ menuRef.value?.setChecked(v, true, false);
})
+ })
+
}
/** 鏍规嵁瑙掕壊ID鏌ヨ鑿滃崟鏍戠粨鏋� */
const getRoleMenuTreeselect = (roleId: string | number) => {
- return roleMenuTreeselect(roleId).then((res): RoleMenuTree => {
- menuOptions.value = res.data.menus;
- return res.data;
- })
+ return roleMenuTreeselect(roleId).then((res): RoleMenuTree => {
+ menuOptions.value = res.data.menus;
+ return res.data;
+ })
}
/** 鏍规嵁瑙掕壊ID鏌ヨ閮ㄩ棬鏍戠粨鏋� */
const getRoleDeptTreeSelect = async (roleId: string | number) => {
- const res = await deptTreeSelect(roleId);
- deptOptions.value = res.data.depts;
- return res.data;
+ const res = await deptTreeSelect(roleId);
+ deptOptions.value = res.data.depts;
+ return res.data;
}
/** 鏍戞潈闄愶紙灞曞紑/鎶樺彔锛�*/
const handleCheckedTreeExpand = (value: boolean, type: string) => {
- if (type == "menu") {
- let treeList = menuOptions.value;
- for (let i = 0; i < treeList.length; i++) {
- if (menuRef.value) {
- menuRef.value.store.nodesMap[treeList[i].id].expanded = value;
- }
- }
- } else if (type == "dept") {
- let treeList = deptOptions.value;
- for (let i = 0; i < treeList.length; i++) {
- if (deptRef.value) {
- deptRef.value.store.nodesMap[treeList[i].id].expanded = value;
- }
- }
+ if (type == "menu") {
+ let treeList = menuOptions.value;
+ for (let i = 0; i < treeList.length; i++) {
+ if (menuRef.value) {
+ menuRef.value.store.nodesMap[treeList[i].id].expanded = value;
+ }
}
+ } else if (type == "dept") {
+ let treeList = deptOptions.value;
+ for (let i = 0; i < treeList.length; i++) {
+ if (deptRef.value) {
+ deptRef.value.store.nodesMap[treeList[i].id].expanded = value;
+ }
+ }
+ }
}
/** 鏍戞潈闄愶紙鍏ㄩ��/鍏ㄤ笉閫夛級 */
const handleCheckedTreeNodeAll = (value: any, type: string) => {
- if (type == "menu") {
- menuRef.value?.setCheckedNodes(value ? menuOptions.value as any : []);
- } else if (type == "dept") {
- deptRef.value?.setCheckedNodes(value ? deptOptions.value as any : []);
- }
+ if (type == "menu") {
+ menuRef.value?.setCheckedNodes(value ? menuOptions.value as any : []);
+ } else if (type == "dept") {
+ deptRef.value?.setCheckedNodes(value ? deptOptions.value as any : []);
+ }
}
/** 鏍戞潈闄愶紙鐖跺瓙鑱斿姩锛� */
const handleCheckedTreeConnect = (value: any, type: string) => {
- if (type == "menu") {
- form.value.menuCheckStrictly = value;
- } else if (type == "dept") {
- form.value.deptCheckStrictly = value;
- }
+ if (type == "menu") {
+ form.value.menuCheckStrictly = value;
+ } else if (type == "dept") {
+ form.value.deptCheckStrictly = value;
+ }
}
/** 鎵�鏈夎彍鍗曡妭鐐规暟鎹� */
const getMenuAllCheckedKeys = (): any => {
- // 鐩墠琚�変腑鐨勮彍鍗曡妭鐐�
- let checkedKeys = menuRef.value?.getCheckedKeys();
- // 鍗婇�変腑鐨勮彍鍗曡妭鐐�
- let halfCheckedKeys = menuRef.value?.getHalfCheckedKeys();
- if (halfCheckedKeys) {
- checkedKeys?.unshift.apply(checkedKeys, halfCheckedKeys);
- }
- return checkedKeys;
+ // 鐩墠琚�変腑鐨勮彍鍗曡妭鐐�
+ let checkedKeys = menuRef.value?.getCheckedKeys();
+ // 鍗婇�変腑鐨勮彍鍗曡妭鐐�
+ let halfCheckedKeys = menuRef.value?.getHalfCheckedKeys();
+ if (halfCheckedKeys) {
+ checkedKeys?.unshift.apply(checkedKeys, halfCheckedKeys);
+ }
+ return checkedKeys;
}
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
- roleFormRef.value?.validate(async (valid: boolean) => {
- if (valid) {
- form.value.menuIds = getMenuAllCheckedKeys()
- form.value.roleId ? await updateRole(form.value) : await addRole(form.value);
- proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛")
- dialog.visible = false
- getList()
- }
- })
+ roleFormRef.value?.validate(async (valid: boolean) => {
+ if (valid) {
+ form.value.menuIds = getMenuAllCheckedKeys()
+ form.value.roleId ? await updateRole(form.value) : await addRole(form.value);
+ proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛")
+ dialog.visible = false
+ getList()
+ }
+ })
}
/** 鍙栨秷鎸夐挳 */
const cancel = () => {
- reset()
- dialog.visible = false;
+ reset()
+ dialog.visible = false;
}
/** 閫夋嫨瑙掕壊鏉冮檺鑼冨洿瑙﹀彂 */
const dataScopeSelectChange = (value: string) => {
- if (value !== "2") {
- deptRef.value?.setCheckedKeys([])
- }
+ if (value !== "2") {
+ deptRef.value?.setCheckedKeys([])
+ }
}
/** 鍒嗛厤鏁版嵁鏉冮檺鎿嶄綔 */
const handleDataScope = async (row: RoleVO) => {
- const roleDeptTreeselect = getRoleDeptTreeSelect(row.roleId);
- const response = await getRole(row.roleId);
- Object.assign(form.value, response.data);
- openDataScope.value = true;
- dialog.title = "鍒嗛厤鏁版嵁鏉冮檺";
- await nextTick(async () => {
- const res = await roleDeptTreeselect;
- await nextTick(() => {
- if (deptRef.value) {
- deptRef.value.setCheckedKeys(res.checkedKeys);
- }
- })
- })
+ const response = await getRole(row.roleId);
+ Object.assign(form.value, response.data);
+ const res = await getRoleDeptTreeSelect(row.roleId);
+ openDataScope.value = true;
+ dialog.title = "鍒嗛厤鏁版嵁鏉冮檺";
+ await nextTick(() => {
+ deptRef.value?.setCheckedKeys(res.checkedKeys);
+ })
}
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
const submitDataScope = async () => {
- if (form.value.roleId) {
- form.value.deptIds = getDeptAllCheckedKeys();
- await dataScope(form.value);
- proxy?.$modal.msgSuccess("淇敼鎴愬姛");
- openDataScope.value = false;
- getList();
- }
+ if (form.value.roleId) {
+ form.value.deptIds = getDeptAllCheckedKeys();
+ await dataScope(form.value);
+ proxy?.$modal.msgSuccess("淇敼鎴愬姛");
+ openDataScope.value = false;
+ getList();
+ }
}
/** 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級*/
const cancelDataScope = () => {
- dataScopeRef.value?.resetFields();
- form.value = {...initForm};
- openDataScope.value = false;
+ dataScopeRef.value?.resetFields();
+ form.value = { ...initForm };
+ openDataScope.value = false;
}
onMounted(() => {
- getList();
+ getList();
});
</script>
--
Gitblit v1.9.3