From dbfe263681d211e06e13d55774424521b9fb0dc4 Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail.com>
Date: 星期二, 06 六月 2023 22:27:31 +0800
Subject: [PATCH] update 修改代码缩进格式
---
src/views/system/role/index.vue | 356 +++---
src/views/system/oss/config.vue | 280 ++--
src/views/system/dept/index.vue | 184 +-
src/views/system/post/index.vue | 134 +-
src/views/system/user/profile/index.vue | 18
src/views/tool/gen/basicInfoForm.vue | 10
src/views/system/tenant/index.vue | 236 ++--
src/views/system/oss/index.vue | 226 ++--
src/views/register.vue | 122 +-
src/views/system/menu/index.vue | 162 +-
src/views/system/user/index.vue | 336 +++---
src/views/login.vue | 147 +-
src/views/tool/gen/genInfoForm.vue | 10
src/views/system/role/authUser.vue | 66
src/views/tool/gen/index.vue | 122 +-
src/views/system/dict/data.vue | 178 +-
src/views/system/role/selectUser.vue | 64
src/views/tool/gen/editTable.vue | 6
src/views/tool/gen/importTable.vue | 72
src/views/system/notice/index.vue | 130 +-
src/views/system/tenantPackage/index.vue | 2
src/views/system/dict/index.vue | 144 +-
22 files changed, 1,507 insertions(+), 1,498 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index 8e3c014..11f3aae 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -56,19 +56,19 @@
const router = useRouter();
const loginForm = ref<LoginData>({
- tenantId: "000000",
- username: 'admin',
- password: 'admin123',
- rememberMe: false,
- code: '',
- uuid: ''
+ tenantId: "000000",
+ username: 'admin',
+ password: 'admin123',
+ rememberMe: false,
+ code: '',
+ uuid: ''
});
const loginRules: ElFormRules = {
- tenantId: [{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勭鎴风紪鍙�" }],
- username: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ偍鐨勮处鍙�' }],
- password: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ偍鐨勫瘑鐮�' }],
- code: [{ required: true, trigger: 'change', message: '璇疯緭鍏ラ獙璇佺爜' }]
+ tenantId: [{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勭鎴风紪鍙�" }],
+ username: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ偍鐨勮处鍙�' }],
+ password: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ偍鐨勫瘑鐮�' }],
+ code: [{ required: true, trigger: 'change', message: '璇疯緭鍏ラ獙璇佺爜' }]
};
const codeUrl = ref('');
@@ -87,64 +87,64 @@
const tenantList = ref<TenantVO[]>([]);
const handleLogin = () => {
- loginRef.value.validate(async (valid:boolean, fields: any) => {
- if (valid) {
- loading.value = true;
- // 鍕鹃�変簡闇�瑕佽浣忓瘑鐮佽缃湪 cookie 涓缃浣忕敤鎴峰悕鍜屽瘑鐮�
- if (loginForm.value.rememberMe) {
- Cookies.set("tenantId", loginForm.value.tenantId, { expires: 30 });
- Cookies.set('username', loginForm.value.username, { expires: 30 });
- Cookies.set('password', String(encrypt(loginForm.value.password)), { expires: 30 });
- Cookies.set('rememberMe', String(loginForm.value.rememberMe), { expires: 30 });
- } else {
- // 鍚﹀垯绉婚櫎
- Cookies.remove("tenantId");
- Cookies.remove('username');
- Cookies.remove('password');
- Cookies.remove('rememberMe');
- }
- // 璋冪敤action鐨勭櫥褰曟柟娉�
- // prittier-ignore
- const [err] = await to(userStore.login(loginForm.value));
- if (!err) {
- await router.push({ path: redirect.value || '/' });
- } else {
- loading.value = false;
- // 閲嶆柊鑾峰彇楠岃瘉鐮�
- if (captchaEnabled.value) {
- await getCode();
- }
- }
- } else {
- console.log('error submit!', fields);
+ loginRef.value.validate(async (valid: boolean, fields: any) => {
+ if (valid) {
+ loading.value = true;
+ // 鍕鹃�変簡闇�瑕佽浣忓瘑鐮佽缃湪 cookie 涓缃浣忕敤鎴峰悕鍜屽瘑鐮�
+ if (loginForm.value.rememberMe) {
+ Cookies.set("tenantId", loginForm.value.tenantId, { expires: 30 });
+ Cookies.set('username', loginForm.value.username, { expires: 30 });
+ Cookies.set('password', String(encrypt(loginForm.value.password)), { expires: 30 });
+ Cookies.set('rememberMe', String(loginForm.value.rememberMe), { expires: 30 });
+ } else {
+ // 鍚﹀垯绉婚櫎
+ Cookies.remove("tenantId");
+ Cookies.remove('username');
+ Cookies.remove('password');
+ Cookies.remove('rememberMe');
+ }
+ // 璋冪敤action鐨勭櫥褰曟柟娉�
+ // prittier-ignore
+ const [err] = await to(userStore.login(loginForm.value));
+ if (!err) {
+ await router.push({ path: redirect.value || '/' });
+ } else {
+ loading.value = false;
+ // 閲嶆柊鑾峰彇楠岃瘉鐮�
+ if (captchaEnabled.value) {
+ await getCode();
}
- });
+ }
+ } else {
+ console.log('error submit!', fields);
+ }
+ });
};
/**
* 鑾峰彇楠岃瘉鐮�
*/
const getCode = async () => {
- const res = await getCodeImg();
- const { data } = res;
- captchaEnabled.value = data.captchaEnabled === undefined ? true : data.captchaEnabled;
- if (captchaEnabled.value) {
- codeUrl.value = 'data:image/gif;base64,' + data.img;
- loginForm.value.uuid = data.uuid;
- }
+ const res = await getCodeImg();
+ const { data } = res;
+ captchaEnabled.value = data.captchaEnabled === undefined ? true : data.captchaEnabled;
+ if (captchaEnabled.value) {
+ codeUrl.value = 'data:image/gif;base64,' + data.img;
+ loginForm.value.uuid = data.uuid;
+ }
};
const getCookie = () => {
- const tenantId = Cookies.get("tenantId");
- const username = Cookies.get('username');
- const password = Cookies.get('password');
- const rememberMe = Cookies.get('rememberMe');
- loginForm.value = {
- tenantId: tenantId === undefined ? loginForm.value.tenantId : tenantId,
- username: username === undefined ? loginForm.value.username : username,
- password: password === undefined ? loginForm.value.password : (decrypt(password) as string),
- rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
- };
+ const tenantId = Cookies.get("tenantId");
+ const username = Cookies.get('username');
+ const password = Cookies.get('password');
+ const rememberMe = Cookies.get('rememberMe');
+ loginForm.value = {
+ tenantId: tenantId === undefined ? loginForm.value.tenantId : tenantId,
+ username: username === undefined ? loginForm.value.username : username,
+ password: password === undefined ? loginForm.value.password : (decrypt(password) as string),
+ rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
+ };
}
@@ -152,20 +152,20 @@
* 鑾峰彇绉熸埛鍒楄〃
*/
const initTenantList = async () => {
- const { data } = await getTenantList();
- tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
- if (tenantEnabled.value) {
- tenantList.value = data.voList;
- if (tenantList.value != null && tenantList.value.length !== 0) {
- loginForm.value.tenantId = tenantList.value[0].tenantId;
- }
+ const { data } = await getTenantList();
+ tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
+ if (tenantEnabled.value) {
+ tenantList.value = data.voList;
+ if (tenantList.value != null && tenantList.value.length !== 0) {
+ loginForm.value.tenantId = tenantList.value[0].tenantId;
}
+ }
}
onMounted(() => {
- getCode();
- initTenantList();
- getCookie();
+ getCode();
+ initTenantList();
+ getCookie();
});
</script>
@@ -178,6 +178,7 @@
background-image: url("../assets/images/login-background.jpg");
background-size: cover;
}
+
.title {
margin: 0px auto 30px auto;
text-align: center;
@@ -189,32 +190,39 @@
background: #ffffff;
width: 400px;
padding: 25px 25px 5px 25px;
+
.el-input {
height: 40px;
+
input {
height: 40px;
}
}
+
.input-icon {
height: 39px;
width: 14px;
margin-left: 0px;
}
}
+
.login-tip {
font-size: 13px;
text-align: center;
color: #bfbfbf;
}
+
.login-code {
width: 33%;
height: 40px;
float: right;
+
img {
cursor: pointer;
vertical-align: middle;
}
}
+
.el-login-footer {
height: 40px;
line-height: 40px;
@@ -223,10 +231,11 @@
width: 100%;
text-align: center;
color: #fff;
- font-family: Arial,serif;
+ font-family: Arial, serif;
font-size: 12px;
letter-spacing: 1px;
}
+
.login-code-img {
height: 40px;
padding-left: 12px;
diff --git a/src/views/register.vue b/src/views/register.vue
index 5ff6abd..0716532 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -63,13 +63,13 @@
const router = useRouter();
const registerForm = ref<RegisterForm>({
- tenantId: "",
- username: "",
- password: "",
- confirmPassword: "",
- code: "",
- uuid: "",
- userType: "sys_user"
+ tenantId: "",
+ username: "",
+ password: "",
+ confirmPassword: "",
+ code: "",
+ uuid: "",
+ userType: "sys_user"
});
// 绉熸埛寮�鍏�
@@ -77,30 +77,30 @@
const equalToPassword = (rule: any, value: string, callback: any) => {
- if (registerForm.value.password !== value) {
- callback(new Error("涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�"));
- } else {
- callback();
- }
+ if (registerForm.value.password !== value) {
+ callback(new Error("涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�"));
+ } else {
+ callback();
+ }
};
const registerRules: ElFormRules = {
- tenantId: [
- { required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勭鎴风紪鍙�" }
- ],
- username: [
- { required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勮处鍙�" },
- { min: 2, max: 20, message: "鐢ㄦ埛璐﹀彿闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿", trigger: "blur" }
- ],
- password: [
- { required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勫瘑鐮�" },
- { min: 5, max: 20, message: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿", trigger: "blur" }
- ],
- confirmPassword: [
- { required: true, trigger: "blur", message: "璇峰啀娆¤緭鍏ユ偍鐨勫瘑鐮�" },
- { required: true, validator: equalToPassword, trigger: "blur" }
- ],
- code: [{ required: true, trigger: "change", message: "璇疯緭鍏ラ獙璇佺爜" }]
+ tenantId: [
+ { required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勭鎴风紪鍙�" }
+ ],
+ username: [
+ { required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勮处鍙�" },
+ { min: 2, max: 20, message: "鐢ㄦ埛璐﹀彿闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿", trigger: "blur" }
+ ],
+ password: [
+ { required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勫瘑鐮�" },
+ { min: 5, max: 20, message: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿", trigger: "blur" }
+ ],
+ confirmPassword: [
+ { required: true, trigger: "blur", message: "璇峰啀娆¤緭鍏ユ偍鐨勫瘑鐮�" },
+ { required: true, validator: equalToPassword, trigger: "blur" }
+ ],
+ code: [{ required: true, trigger: "change", message: "璇疯緭鍏ラ獙璇佺爜" }]
};
const codeUrl = ref("");
const loading = ref(false);
@@ -110,50 +110,50 @@
const tenantList = ref<TenantVO[]>([]);
const handleRegister = () => {
- registerRef.value.validate(async (valid: boolean) => {
- if (valid) {
- loading.value = true;
- const [err] = await to(register(registerForm.value));
- if (!err) {
- const username = registerForm.value.username;
- await ElMessageBox.alert("<font color='red'>鎭枩浣狅紝鎮ㄧ殑璐﹀彿 " + username + " 娉ㄥ唽鎴愬姛锛�</font>", "绯荤粺鎻愮ず", {
- dangerouslyUseHTMLString: true,
- type: "success",
- });
- await router.push("/login");
- } else {
- loading.value = false;
- if (captchaEnabled) {
- getCode();
- }
- }
+ registerRef.value.validate(async (valid: boolean) => {
+ if (valid) {
+ loading.value = true;
+ const [err] = await to(register(registerForm.value));
+ if (!err) {
+ const username = registerForm.value.username;
+ await ElMessageBox.alert("<font color='red'>鎭枩浣狅紝鎮ㄧ殑璐﹀彿 " + username + " 娉ㄥ唽鎴愬姛锛�</font>", "绯荤粺鎻愮ず", {
+ dangerouslyUseHTMLString: true,
+ type: "success",
+ });
+ await router.push("/login");
+ } else {
+ loading.value = false;
+ if (captchaEnabled) {
+ getCode();
}
- });
+ }
+ }
+ });
}
const getCode = async () => {
- const { data } = await getCodeImg();
- captchaEnabled.value = data.captchaEnabled === undefined ? true : data.captchaEnabled;
- if (captchaEnabled.value) {
- codeUrl.value = "data:image/gif;base64," + data.img;
- registerForm.value.uuid = data.uuid;
- }
+ const { data } = await getCodeImg();
+ captchaEnabled.value = data.captchaEnabled === undefined ? true : data.captchaEnabled;
+ if (captchaEnabled.value) {
+ codeUrl.value = "data:image/gif;base64," + data.img;
+ registerForm.value.uuid = data.uuid;
+ }
}
const initTenantList = async () => {
- const { data } = await getTenantList();
- tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
- if (tenantEnabled.value) {
- tenantList.value = data.voList;
- if (tenantList.value != null && tenantList.value.length !== 0) {
- registerForm.value.tenantId = tenantList.value[0].tenantId;
- }
+ const { data } = await getTenantList();
+ tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
+ if (tenantEnabled.value) {
+ tenantList.value = data.voList;
+ if (tenantList.value != null && tenantList.value.length !== 0) {
+ registerForm.value.tenantId = tenantList.value[0].tenantId;
}
+ }
}
onMounted(() => {
- getCode();
- initTenantList();
+ getCode();
+ initTenantList();
})
</script>
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 7daac8b..e833e71 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -135,9 +135,9 @@
import { DeptForm, DeptQuery, DeptVO } from "@/api/system/dept/types";
interface DeptOptionsType {
- deptId: number | string;
- deptName: string;
- children: DeptOptionsType[];
+ deptId: number | string;
+ deptName: string;
+ children: DeptOptionsType[];
}
@@ -152,8 +152,8 @@
const dialog = reactive<DialogOption>({
- visible: false,
- title: ''
+ visible: false,
+ title: ''
});
const deptTableRef = ref<ElTableInstance>();
@@ -161,137 +161,137 @@
const deptFormRef = ref<ElFormInstance>();
const initFormData: DeptForm = {
- deptId: undefined,
- parentId: undefined,
- deptName: undefined,
- orderNum: 0,
- leader: undefined,
- phone: undefined,
- email: undefined,
- status: "0"
+ deptId: undefined,
+ parentId: undefined,
+ deptName: undefined,
+ orderNum: 0,
+ leader: undefined,
+ phone: undefined,
+ email: undefined,
+ status: "0"
}
const data = reactive<PageData<DeptForm, DeptQuery>>({
- form: {...initFormData},
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- deptName: undefined,
- status: undefined
- },
- rules: {
- parentId: [{ required: true, message: "涓婄骇閮ㄩ棬涓嶈兘涓虹┖", trigger: "blur" }],
- deptName: [{ required: true, message: "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
- orderNum: [{ required: true, message: "鏄剧ず鎺掑簭涓嶈兘涓虹┖", trigger: "blur" }],
- email: [{ type: "email", message: "璇疯緭鍏ユ纭殑閭鍦板潃", trigger: ["blur", "change"] }],
- phone: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "璇疯緭鍏ユ纭殑鎵嬫満鍙风爜", trigger: "blur" }]
- },
+ form: { ...initFormData },
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ deptName: undefined,
+ status: undefined
+ },
+ rules: {
+ parentId: [{ required: true, message: "涓婄骇閮ㄩ棬涓嶈兘涓虹┖", trigger: "blur" }],
+ deptName: [{ required: true, message: "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
+ orderNum: [{ required: true, message: "鏄剧ず鎺掑簭涓嶈兘涓虹┖", trigger: "blur" }],
+ email: [{ type: "email", message: "璇疯緭鍏ユ纭殑閭鍦板潃", trigger: ["blur", "change"] }],
+ phone: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "璇疯緭鍏ユ纭殑鎵嬫満鍙风爜", trigger: "blur" }]
+ },
})
const { queryParams, form, rules } = toRefs<PageData<DeptForm, DeptQuery>>(data)
/** 鏌ヨ鑿滃崟鍒楄〃 */
const getList = async () => {
- loading.value = true;
- const res = await listDept(queryParams.value);
- const data = proxy?.handleTree<DeptVO>(res.data, "deptId")
- if (data) {
- deptList.value = data
- }
- loading.value = false
+ loading.value = true;
+ const res = await listDept(queryParams.value);
+ const data = proxy?.handleTree<DeptVO>(res.data, "deptId")
+ if (data) {
+ deptList.value = data
+ }
+ loading.value = false
}
/** 鍙栨秷鎸夐挳 */
const cancel = () => {
- reset()
- dialog.visible = false
+ reset()
+ dialog.visible = false
}
/** 琛ㄥ崟閲嶇疆 */
const reset = () => {
- form.value = {...initFormData};
- deptFormRef.value?.resetFields();
+ form.value = { ...initFormData };
+ deptFormRef.value?.resetFields();
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
- getList();
+ getList();
}
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
- queryFormRef.value?.resetFields();
- handleQuery()
+ queryFormRef.value?.resetFields();
+ handleQuery()
}
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = (row?: DeptVO) => {
- listDept().then(res => {
- const data = proxy?.handleTree<DeptOptionsType>(res.data, "deptId");
- if (data) {
- deptOptions.value = data
- dialog.visible = true;
- dialog.title = "娣诲姞閮ㄩ棬";
- nextTick(() => {
- reset();
- if (row && row.deptId) {
- form.value.parentId = row?.deptId;
- }
- })
+ listDept().then(res => {
+ const data = proxy?.handleTree<DeptOptionsType>(res.data, "deptId");
+ if (data) {
+ deptOptions.value = data
+ dialog.visible = true;
+ dialog.title = "娣诲姞閮ㄩ棬";
+ nextTick(() => {
+ reset();
+ if (row && row.deptId) {
+ form.value.parentId = row?.deptId;
}
- })
+ })
+ }
+ })
}
/** 灞曞紑/鎶樺彔鎿嶄綔 */
const handleToggleExpandAll = () => {
- isExpandAll.value = !isExpandAll.value;
- toggleExpandAll(deptList.value, isExpandAll.value)
+ isExpandAll.value = !isExpandAll.value;
+ toggleExpandAll(deptList.value, isExpandAll.value)
}
/** 灞曞紑/鎶樺彔鎵�鏈� */
const toggleExpandAll = (data: DeptVO[], status: boolean) => {
- data.forEach((item) => {
- deptTableRef.value?.toggleRowExpansion(item, status)
- if(item.children && item.children.length > 0) toggleExpandAll(item.children, status)
- })
+ data.forEach((item) => {
+ deptTableRef.value?.toggleRowExpansion(item, status)
+ if (item.children && item.children.length > 0) toggleExpandAll(item.children, status)
+ })
}
/** 淇敼鎸夐挳鎿嶄綔 */
const handleUpdate = async (row: DeptVO) => {
- const res = await getDept(row.deptId);
- dialog.visible = true;
- dialog.title = "淇敼閮ㄩ棬";
- await nextTick(async () => {
- reset();
- form.value = res.data
- const response = await listDeptExcludeChild(row.deptId);
- const data = proxy?.handleTree < DeptOptionsType > (response.data, "deptId")
- if (data) {
- deptOptions.value = data;
- if (data.length === 0) {
- const noResultsOptions: DeptOptionsType = {
- deptId: res.data.parentId,
- deptName: res.data.parentName,
- children: []
- };
- deptOptions.value.push(noResultsOptions);
- }
+ const res = await getDept(row.deptId);
+ dialog.visible = true;
+ dialog.title = "淇敼閮ㄩ棬";
+ await nextTick(async () => {
+ reset();
+ form.value = res.data
+ const response = await listDeptExcludeChild(row.deptId);
+ const data = proxy?.handleTree<DeptOptionsType>(response.data, "deptId")
+ if (data) {
+ deptOptions.value = data;
+ if (data.length === 0) {
+ const noResultsOptions: DeptOptionsType = {
+ deptId: res.data.parentId,
+ deptName: res.data.parentName,
+ children: []
+ };
+ deptOptions.value.push(noResultsOptions);
}
- })
+ }
+ })
}
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
- deptFormRef.value?.validate(async (valid: boolean) => {
- if (valid) {
- form.value.deptId ? await updateDept(form.value) : await addDept(form.value);
- proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
- dialog.visible = false;
- await getList();
- }
- })
+ deptFormRef.value?.validate(async (valid: boolean) => {
+ if (valid) {
+ form.value.deptId ? await updateDept(form.value) : await addDept(form.value);
+ proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ dialog.visible = false;
+ await getList();
+ }
+ })
}
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (row: DeptVO) => {
- await proxy?.$modal.confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.deptName + '"鐨勬暟鎹」?');
- await delDept(row.deptId);
- await getList();
- proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.deptName + '"鐨勬暟鎹」?');
+ await delDept(row.deptId);
+ await getList();
+ proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}
onMounted(() => {
- getList();
+ getList();
});
</script>
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 1bd7a8b..f40c129 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -159,154 +159,154 @@
const dialog = reactive<DialogOption>({
- visible: false,
- title: ''
+ visible: false,
+ title: ''
});
// 鏁版嵁鏍囩鍥炴樉鏍峰紡
const listClassOptions = ref<Array<{ value: string, label: string }>>([
- { value: "default", label: "榛樿" },
- { value: "primary", label: "涓昏" },
- { value: "success", label: "鎴愬姛" },
- { value: "info", label: "淇℃伅" },
- { value: "warning", label: "璀﹀憡" },
- { value: "danger", label: "鍗遍櫓" }
+ { value: "default", label: "榛樿" },
+ { value: "primary", label: "涓昏" },
+ { value: "success", label: "鎴愬姛" },
+ { value: "info", label: "淇℃伅" },
+ { value: "warning", label: "璀﹀憡" },
+ { value: "danger", label: "鍗遍櫓" }
]);
const initFormData: DictDataForm = {
- dictCode: undefined,
- dictLabel: '',
- dictValue: '',
- cssClass: '',
- listClass: "default",
- dictSort: 0,
- status: "0",
- remark: ''
+ dictCode: undefined,
+ dictLabel: '',
+ dictValue: '',
+ cssClass: '',
+ listClass: "default",
+ dictSort: 0,
+ status: "0",
+ remark: ''
}
const data = reactive<PageData<DictDataForm, DictDataQuery>>({
- form: { ...initFormData },
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- dictName: '',
- dictType: '',
- status: '',
- dictLabel: ''
- },
- rules: {
- dictLabel: [{ required: true, message: "鏁版嵁鏍囩涓嶈兘涓虹┖", trigger: "blur" }],
- dictValue: [{ required: true, message: "鏁版嵁閿�间笉鑳戒负绌�", trigger: "blur" }],
- dictSort: [{ required: true, message: "鏁版嵁椤哄簭涓嶈兘涓虹┖", trigger: "blur" }]
- }
+ form: { ...initFormData },
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ dictName: '',
+ dictType: '',
+ status: '',
+ dictLabel: ''
+ },
+ rules: {
+ dictLabel: [{ required: true, message: "鏁版嵁鏍囩涓嶈兘涓虹┖", trigger: "blur" }],
+ dictValue: [{ required: true, message: "鏁版嵁閿�间笉鑳戒负绌�", trigger: "blur" }],
+ dictSort: [{ required: true, message: "鏁版嵁椤哄簭涓嶈兘涓虹┖", trigger: "blur" }]
+ }
});
const { queryParams, form, rules } = toRefs(data);
/** 鏌ヨ瀛楀吀绫诲瀷璇︾粏 */
const getTypes = async (dictId: string | number) => {
- const { data } = await getType(dictId);
- queryParams.value.dictType = data.dictType;
- defaultDictType.value = data.dictType;
- getList();
+ const { data } = await getType(dictId);
+ queryParams.value.dictType = data.dictType;
+ defaultDictType.value = data.dictType;
+ getList();
}
/** 鏌ヨ瀛楀吀绫诲瀷鍒楄〃 */
const getTypeList = async () => {
- const res = await getDictOptionselect()
- typeOptions.value = res.data;
+ const res = await getDictOptionselect()
+ typeOptions.value = res.data;
}
/** 鏌ヨ瀛楀吀鏁版嵁鍒楄〃 */
const getList = async () => {
- loading.value = true;
- const res = await listData(queryParams.value);
- dataList.value = res.rows;
- total.value = res.total;
- loading.value = false;
+ loading.value = true;
+ const res = await listData(queryParams.value);
+ dataList.value = res.rows;
+ total.value = res.total;
+ loading.value = false;
}
/** 鍙栨秷鎸夐挳 */
const cancel = () => {
- dialog.visible = false;
- reset();
+ dialog.visible = false;
+ reset();
}
/** 琛ㄥ崟閲嶇疆 */
const reset = () => {
- form.value = { ...initFormData };
- dataFormRef.value?.resetFields();
+ form.value = { ...initFormData };
+ dataFormRef.value?.resetFields();
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
- queryParams.value.pageNum = 1;
- getList();
+ queryParams.value.pageNum = 1;
+ getList();
}
/** 杩斿洖鎸夐挳鎿嶄綔 */
const handleClose = () => {
- const obj = { path: "/system/dict" };
- proxy?.$tab.closeOpenPage(obj);
+ const obj = { path: "/system/dict" };
+ proxy?.$tab.closeOpenPage(obj);
}
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
- queryFormRef.value?.resetFields();
- queryParams.value.dictType = defaultDictType.value;
- handleQuery();
+ queryFormRef.value?.resetFields();
+ queryParams.value.dictType = defaultDictType.value;
+ handleQuery();
}
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = () => {
- dialog.visible = true;
- dialog.title = "娣诲姞瀛楀吀鏁版嵁";
- nextTick(() => {
- reset();
- form.value.dictType = queryParams.value.dictType;
- })
+ dialog.visible = true;
+ dialog.title = "娣诲姞瀛楀吀鏁版嵁";
+ nextTick(() => {
+ reset();
+ form.value.dictType = queryParams.value.dictType;
+ })
}
/** 澶氶�夋閫変腑鏁版嵁 */
const handleSelectionChange = (selection: DictDataVO[]) => {
- ids.value = selection.map(item => item.dictCode);
- single.value = selection.length != 1;
- multiple.value = !selection.length;
+ ids.value = selection.map(item => item.dictCode);
+ single.value = selection.length != 1;
+ multiple.value = !selection.length;
}
/** 淇敼鎸夐挳鎿嶄綔 */
const handleUpdate = (row?: DictDataVO) => {
- const dictCode = row?.dictCode || ids.value[0];
- dialog.visible = true;
- dialog.title = "淇敼瀛楀吀鏁版嵁";
- nextTick(async () => {
- const res = await getData(dictCode);
- reset();
- form.value = res.data;
- })
+ const dictCode = row?.dictCode || ids.value[0];
+ dialog.visible = true;
+ dialog.title = "淇敼瀛楀吀鏁版嵁";
+ nextTick(async () => {
+ const res = await getData(dictCode);
+ reset();
+ form.value = res.data;
+ })
}
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
- dataFormRef.value?.validate(async (valid: boolean) => {
- if (valid) {
- form.value.dictCode ? await updateData(form.value) : await addData(form.value);
- useDictStore().removeDict(queryParams.value.dictType);
- proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
- dialog.visible = false;
- await getList();
+ dataFormRef.value?.validate(async (valid: boolean) => {
+ if (valid) {
+ form.value.dictCode ? await updateData(form.value) : await addData(form.value);
+ useDictStore().removeDict(queryParams.value.dictType);
+ proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ dialog.visible = false;
+ await getList();
- }
- });
+ }
+ });
}
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (row?: DictDataVO) => {
- const dictCodes = row?.dictCode || ids.value;
- await proxy?.$modal.confirm('鏄惁纭鍒犻櫎瀛楀吀缂栫爜涓�"' + dictCodes + '"鐨勬暟鎹」锛�');
- await delData(dictCodes);
- await getList();
- proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- useDictStore().removeDict(queryParams.value.dictType);
+ const dictCodes = row?.dictCode || ids.value;
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎瀛楀吀缂栫爜涓�"' + dictCodes + '"鐨勬暟鎹」锛�');
+ await delData(dictCodes);
+ await getList();
+ proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ useDictStore().removeDict(queryParams.value.dictType);
}
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
const handleExport = () => {
- proxy?.download("system/dict/data/export", {
- ...queryParams.value
- }, `dict_data_${new Date().getTime()}.xlsx`);
+ proxy?.download("system/dict/data/export", {
+ ...queryParams.value
+ }, `dict_data_${new Date().getTime()}.xlsx`);
}
onMounted(() => {
- getTypes(route.params && route.params.dictId as string);
- getTypeList();
+ getTypes(route.params && route.params.dictId as string);
+ getTypeList();
})
</script>
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 710d0fc..c246462 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -144,123 +144,123 @@
const dialog = reactive<DialogOption>({
- visible: false,
- title: ''
+ visible: false,
+ title: ''
});
const initFormData: DictTypeForm = {
- dictId: undefined,
- dictName: '',
- dictType: '',
- status: "0",
- remark: ''
+ dictId: undefined,
+ dictName: '',
+ dictType: '',
+ status: "0",
+ remark: ''
}
const data = reactive<PageData<DictTypeForm, DictTypeQuery>>({
- form: {...initFormData},
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- dictName: '',
- dictType: '',
- status: ''
- },
- rules: {
- dictName: [{ required: true, message: "瀛楀吀鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
- dictType: [{ required: true, message: "瀛楀吀绫诲瀷涓嶈兘涓虹┖", trigger: "blur" }]
- },
+ form: { ...initFormData },
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ dictName: '',
+ dictType: '',
+ status: ''
+ },
+ rules: {
+ dictName: [{ required: true, message: "瀛楀吀鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
+ dictType: [{ required: true, message: "瀛楀吀绫诲瀷涓嶈兘涓虹┖", trigger: "blur" }]
+ },
});
const { queryParams, form, rules } = toRefs(data);
/** 鏌ヨ瀛楀吀绫诲瀷鍒楄〃 */
const getList = () => {
- loading.value = true;
- listType(proxy?.addDateRange(queryParams.value, dateRange.value)).then(res => {
- typeList.value = res.rows;
- total.value = res.total;
- loading.value = false;
- });
+ loading.value = true;
+ listType(proxy?.addDateRange(queryParams.value, dateRange.value)).then(res => {
+ typeList.value = res.rows;
+ total.value = res.total;
+ loading.value = false;
+ });
}
/** 鍙栨秷鎸夐挳 */
const cancel = () => {
- reset();
- dialog.visible = false;
+ reset();
+ dialog.visible = false;
}
/** 琛ㄥ崟閲嶇疆 */
const reset = () => {
- form.value = {...initFormData};
- dictFormRef.value?.resetFields();
+ form.value = { ...initFormData };
+ dictFormRef.value?.resetFields();
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
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 handleAdd = () => {
- dialog.visible = true;
- dialog.title = "娣诲姞瀛楀吀绫诲瀷";
- nextTick(() => {
- reset();
- })
+ dialog.visible = true;
+ dialog.title = "娣诲姞瀛楀吀绫诲瀷";
+ nextTick(() => {
+ reset();
+ })
}
/** 澶氶�夋閫変腑鏁版嵁 */
-const handleSelectionChange = (selection: DictTypeVO[]) => {
- ids.value = selection.map(item => item.dictId);
- single.value = selection.length != 1;
- multiple.value = !selection.length;
+const handleSelectionChange = (selection: DictTypeVO[]) => {
+ ids.value = selection.map(item => item.dictId);
+ single.value = selection.length != 1;
+ multiple.value = !selection.length;
}
/** 淇敼鎸夐挳鎿嶄綔 */
const handleUpdate = (row?: DictTypeVO) => {
- dialog.visible = true;
- dialog.title = "淇敼瀛楀吀绫诲瀷";
- const dictId = row?.dictId || ids.value[0];
- nextTick(async () => {
- reset();
- const res = await getType(dictId);
- form.value = res.data;
- })
+ dialog.visible = true;
+ dialog.title = "淇敼瀛楀吀绫诲瀷";
+ const dictId = row?.dictId || ids.value[0];
+ nextTick(async () => {
+ reset();
+ const res = await getType(dictId);
+ form.value = res.data;
+ })
}
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
- dictFormRef.value?.validate(async (valid: boolean) => {
- if (valid) {
- form.value.dictId ? await updateType(form.value) : await addType(form.value);
- proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
- dialog.visible = false;
- getList();
- }
- });
+ dictFormRef.value?.validate(async (valid: boolean) => {
+ if (valid) {
+ form.value.dictId ? await updateType(form.value) : await addType(form.value);
+ proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ dialog.visible = false;
+ getList();
+ }
+ });
}
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (row?: DictTypeVO) => {
- const dictIds = row?.dictId || ids.value;
- await proxy?.$modal.confirm('鏄惁纭鍒犻櫎瀛楀吀缂栧彿涓�"' + dictIds + '"鐨勬暟鎹」锛�');
- await delType(dictIds);
- getList();
- proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ const dictIds = row?.dictId || ids.value;
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎瀛楀吀缂栧彿涓�"' + dictIds + '"鐨勬暟鎹」锛�');
+ await delType(dictIds);
+ getList();
+ proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
const handleExport = () => {
- proxy?.download("system/dict/type/export", {
- ...queryParams.value
- }, `dict_${new Date().getTime()}.xlsx`);
+ proxy?.download("system/dict/type/export", {
+ ...queryParams.value
+ }, `dict_${new Date().getTime()}.xlsx`);
}
/** 鍒锋柊缂撳瓨鎸夐挳鎿嶄綔 */
const handleRefreshCache = async () => {
- await refreshCache();
- proxy?.$modal.msgSuccess("鍒锋柊鎴愬姛");
- useDictStore().cleanDict();
+ await refreshCache();
+ proxy?.$modal.msgSuccess("鍒锋柊鎴愬姛");
+ useDictStore().cleanDict();
}
-onMounted(()=>{
- getList();
+onMounted(() => {
+ getList();
})
</script>
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 7578389..00979c9 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -266,9 +266,9 @@
import { MenuTypeEnum } from '@/enums/MenuTypeEnum';
interface MenuOptionsType {
- menuId: number;
- menuName: string;
- children: MenuOptionsType[] | undefined;
+ menuId: number;
+ menuName: string;
+ children: MenuOptionsType[] | undefined;
}
const { proxy } = getCurrentInstance() as ComponentInternalInstance
@@ -281,36 +281,36 @@
const isExpandAll = ref(false)
const dialog = reactive<DialogOption>({
- visible: false,
- title: ''
+ visible: false,
+ title: ''
});
const queryFormRef = ref<ElFormInstance>();
const menuFormRef = ref<ElFormInstance>();
const initFormData = {
- path: '',
- menuId: undefined,
- parentId: 0,
- menuName: '',
- icon: '',
- menuType: MenuTypeEnum.M,
- orderNum: 1,
- isFrame: "1",
- isCache: "0",
- visible: "0",
- status: "0"
+ path: '',
+ menuId: undefined,
+ parentId: 0,
+ menuName: '',
+ icon: '',
+ menuType: MenuTypeEnum.M,
+ orderNum: 1,
+ isFrame: "1",
+ isCache: "0",
+ visible: "0",
+ status: "0"
}
const data = reactive<PageData<MenuForm, MenuQuery>>({
- form: { ...initFormData },
- queryParams: {
- menuName: undefined,
- status: undefined
- },
- rules: {
- menuName: [{ required: true, message: "鑿滃崟鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
- orderNum: [{ required: true, message: "鑿滃崟椤哄簭涓嶈兘涓虹┖", trigger: "blur" }],
- path: [{ required: true, message: "璺敱鍦板潃涓嶈兘涓虹┖", trigger: "blur" }]
- },
+ form: { ...initFormData },
+ queryParams: {
+ menuName: undefined,
+ status: undefined
+ },
+ rules: {
+ menuName: [{ required: true, message: "鑿滃崟鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
+ orderNum: [{ required: true, message: "鑿滃崟椤哄簭涓嶈兘涓虹┖", trigger: "blur" }],
+ path: [{ required: true, message: "璺敱鍦板潃涓嶈兘涓虹┖", trigger: "blur" }]
+ },
})
const menuTableRef = ref<ElTableInstance>();
@@ -318,99 +318,99 @@
const { queryParams, form, rules } = toRefs<PageData<MenuForm, MenuQuery>>(data)
/** 鏌ヨ鑿滃崟鍒楄〃 */
const getList = async () => {
- loading.value = true
- const res = await listMenu(queryParams.value);
- const data = proxy?.handleTree<MenuVO>(res.data, "menuId")
- if (data) {
- menuList.value = data
- }
- loading.value = false
+ loading.value = true
+ const res = await listMenu(queryParams.value);
+ const data = proxy?.handleTree<MenuVO>(res.data, "menuId")
+ if (data) {
+ menuList.value = data
+ }
+ loading.value = false
}
/** 鏌ヨ鑿滃崟涓嬫媺鏍戠粨鏋� */
const getTreeselect = async () => {
- menuOptions.value = []
- const response = await listMenu();
- const menu: MenuOptionsType = { menuId: 0, menuName: "涓荤被鐩�", children: [] }
- menu.children = proxy?.handleTree<MenuOptionsType>(response.data, "menuId")
- menuOptions.value.push(menu)
+ menuOptions.value = []
+ const response = await listMenu();
+ const menu: MenuOptionsType = { menuId: 0, menuName: "涓荤被鐩�", children: [] }
+ menu.children = proxy?.handleTree<MenuOptionsType>(response.data, "menuId")
+ menuOptions.value.push(menu)
}
/** 鍙栨秷鎸夐挳 */
const cancel = () => {
- reset()
- dialog.visible = false
+ reset()
+ dialog.visible = false
}
/** 琛ㄥ崟閲嶇疆 */
const reset = () => {
- form.value = { ...initFormData };
- menuFormRef.value?.resetFields();
+ form.value = { ...initFormData };
+ menuFormRef.value?.resetFields();
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
- getList();
+ getList();
}
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
- queryFormRef.value?.resetFields();
- handleQuery();
+ queryFormRef.value?.resetFields();
+ handleQuery();
}
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = (row?: MenuVO) => {
- dialog.visible = true;
- dialog.title = "娣诲姞鑿滃崟";
- getTreeselect();
- nextTick(() => {
- reset();
- row && row.menuId ? form.value.parentId = row.menuId : form.value.parentId = 0;
- })
+ dialog.visible = true;
+ dialog.title = "娣诲姞鑿滃崟";
+ getTreeselect();
+ nextTick(() => {
+ reset();
+ row && row.menuId ? form.value.parentId = row.menuId : form.value.parentId = 0;
+ })
}
/** 灞曞紑/鎶樺彔鎿嶄綔 */
const handleToggleExpandAll = () => {
- isExpandAll.value = !isExpandAll.value;
- toggleExpandAll(menuList.value, isExpandAll.value)
+ isExpandAll.value = !isExpandAll.value;
+ toggleExpandAll(menuList.value, isExpandAll.value)
}
/** 灞曞紑/鎶樺彔鎵�鏈� */
const toggleExpandAll = (data: MenuVO[], status: boolean) => {
- data.forEach((item: MenuVO) => {
- menuTableRef.value?.toggleRowExpansion(item, status)
- if (item.children && item.children.length > 0) toggleExpandAll(item.children, status)
- })
+ data.forEach((item: MenuVO) => {
+ menuTableRef.value?.toggleRowExpansion(item, status)
+ if (item.children && item.children.length > 0) toggleExpandAll(item.children, status)
+ })
}
/** 淇敼鎸夐挳鎿嶄綔 */
const handleUpdate = async (row: MenuVO) => {
- await getTreeselect();
- dialog.visible = true;
- dialog.title = "淇敼鑿滃崟";
- await nextTick(async () => {
- if (row.menuId) {
- const { data } = await getMenu(row.menuId);
- reset();
- form.value = data;
- }
- })
+ await getTreeselect();
+ dialog.visible = true;
+ dialog.title = "淇敼鑿滃崟";
+ await nextTick(async () => {
+ if (row.menuId) {
+ const { data } = await getMenu(row.menuId);
+ reset();
+ form.value = data;
+ }
+ })
}
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
- menuFormRef.value?.validate(async (valid: boolean) => {
- if (valid) {
- form.value.menuId ? await updateMenu(form.value) : await addMenu(form.value);
- proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
- dialog.visible = false;
- await getList();
- }
- })
+ menuFormRef.value?.validate(async (valid: boolean) => {
+ if (valid) {
+ form.value.menuId ? await updateMenu(form.value) : await addMenu(form.value);
+ proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ dialog.visible = false;
+ await getList();
+ }
+ })
}
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (row: MenuVO) => {
- await proxy?.$modal.confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.menuName + '"鐨勬暟鎹」?');
- await delMenu(row.menuId);
- await getList();
- proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.menuName + '"鐨勬暟鎹」?');
+ await delMenu(row.menuId);
+ await getList();
+ proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}
onMounted(() => {
- getList();
+ getList();
});
</script>
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 8b92af7..9548093 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -139,111 +139,111 @@
const dialog = reactive<DialogOption>({
- visible: false,
- title: ''
+ visible: false,
+ title: ''
});
const initFormData: NoticeForm = {
- noticeId: undefined,
- noticeTitle: '',
- noticeType: '',
- noticeContent: '',
- status: "0",
- remark: '',
- createByName: ''
+ noticeId: undefined,
+ noticeTitle: '',
+ noticeType: '',
+ noticeContent: '',
+ status: "0",
+ remark: '',
+ createByName: ''
}
const data = reactive<PageData<NoticeForm, NoticeQuery>>({
- form: { ...initFormData },
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- noticeTitle: '',
- createByName: '',
- status: '',
- noticeType: ''
- },
- rules: {
- noticeTitle: [{ required: true, message: "鍏憡鏍囬涓嶈兘涓虹┖", trigger: "blur" }],
- noticeType: [{ required: true, message: "鍏憡绫诲瀷涓嶈兘涓虹┖", trigger: "change" }]
- },
+ form: { ...initFormData },
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ noticeTitle: '',
+ createByName: '',
+ status: '',
+ noticeType: ''
+ },
+ rules: {
+ noticeTitle: [{ required: true, message: "鍏憡鏍囬涓嶈兘涓虹┖", trigger: "blur" }],
+ noticeType: [{ required: true, message: "鍏憡绫诲瀷涓嶈兘涓虹┖", trigger: "change" }]
+ },
});
const { queryParams, form, rules } = toRefs(data);
/** 鏌ヨ鍏憡鍒楄〃 */
const getList = async () => {
- loading.value = true;
- const res = await listNotice(queryParams.value);
- noticeList.value = res.rows;
- total.value = res.total;
- loading.value = false;
+ loading.value = true;
+ const res = await listNotice(queryParams.value);
+ noticeList.value = res.rows;
+ total.value = res.total;
+ loading.value = false;
}
/** 鍙栨秷鎸夐挳 */
const cancel = () => {
- reset();
- dialog.visible = false;
+ reset();
+ dialog.visible = false;
}
/** 琛ㄥ崟閲嶇疆 */
const reset = () => {
- form.value = { ...initFormData };
- noticeFormRef.value?.resetFields();
+ form.value = { ...initFormData };
+ noticeFormRef.value?.resetFields();
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
- queryParams.value.pageNum = 1;
- getList();
+ queryParams.value.pageNum = 1;
+ getList();
}
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
- queryFormRef.value?.resetFields();
- handleQuery();
+ queryFormRef.value?.resetFields();
+ handleQuery();
}
/** 澶氶�夋閫変腑鏁版嵁 */
const handleSelectionChange = (selection: NoticeVO[]) => {
- ids.value = selection.map(item => item.noticeId);
- single.value = selection.length != 1;
- multiple.value = !selection.length;
+ ids.value = selection.map(item => item.noticeId);
+ single.value = selection.length != 1;
+ multiple.value = !selection.length;
}
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = () => {
- dialog.visible = true;
- dialog.title = "娣诲姞鍏憡";
- nextTick(() => {
- reset();
- })
+ dialog.visible = true;
+ dialog.title = "娣诲姞鍏憡";
+ nextTick(() => {
+ reset();
+ })
}
/**淇敼鎸夐挳鎿嶄綔 */
const handleUpdate = (row?: NoticeVO) => {
- dialog.visible = true;
- dialog.title = "淇敼鍏憡";
- nextTick(async () => {
- const noticeId = row?.noticeId || ids.value[0];
- reset();
- const { data } = await getNotice(noticeId);
- form.value = data;
- })
+ dialog.visible = true;
+ dialog.title = "淇敼鍏憡";
+ nextTick(async () => {
+ const noticeId = row?.noticeId || ids.value[0];
+ reset();
+ const { data } = await getNotice(noticeId);
+ form.value = data;
+ })
}
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
- noticeFormRef.value?.validate(async (valid: boolean) => {
- if (valid) {
- form.value.noticeId ? await updateNotice(form.value) : await addNotice(form.value);
- proxy?.$modal.msgSuccess("淇敼鎴愬姛");
- dialog.visible = false;
- await getList();
- }
- });
+ noticeFormRef.value?.validate(async (valid: boolean) => {
+ if (valid) {
+ form.value.noticeId ? await updateNotice(form.value) : await addNotice(form.value);
+ proxy?.$modal.msgSuccess("淇敼鎴愬姛");
+ dialog.visible = false;
+ await getList();
+ }
+ });
}
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (row?: NoticeVO) => {
- const noticeIds = row?.noticeId || ids.value
- await proxy?.$modal.confirm('鏄惁纭鍒犻櫎鍏憡缂栧彿涓�"' + noticeIds + '"鐨勬暟鎹」锛�');
- await delNotice(noticeIds);
- await getList();
- proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ const noticeIds = row?.noticeId || ids.value
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎鍏憡缂栧彿涓�"' + noticeIds + '"鐨勬暟鎹」锛�');
+ await delNotice(noticeIds);
+ await getList();
+ proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}
onMounted(() => {
- getList();
+ getList();
})
</script>
diff --git a/src/views/system/oss/config.vue b/src/views/system/oss/config.vue
index 3ce6b02..ba64c1b 100644
--- a/src/views/system/oss/config.vue
+++ b/src/views/system/oss/config.vue
@@ -133,12 +133,12 @@
<script setup name="OssConfig" lang="ts">
import {
- listOssConfig,
- getOssConfig,
- delOssConfig,
- addOssConfig,
- updateOssConfig,
- changeOssConfigStatus
+ listOssConfig,
+ getOssConfig,
+ delOssConfig,
+ addOssConfig,
+ updateOssConfig,
+ changeOssConfigStatus
} from "@/api/system/ossConfig";
import { OssConfigForm, OssConfigQuery, OssConfigVO } from "@/api/system/ossConfig/types";
@@ -159,189 +159,189 @@
const ossConfigFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
- visible: false,
- title: ''
+ visible: false,
+ title: ''
});
// 鍒楁樉闅愪俊鎭�
const columns = ref<FieldOption[]>([
- { key: 0, label: `涓诲缓`, visible: true },
- { key: 1, label: `閰嶇疆key`, visible: false },
- { key: 2, label: `璁块棶绔欑偣`, visible: true },
- { key: 3, label: `鑷畾涔夊煙鍚峘, visible: true },
- { key: 4, label: `妗跺悕绉癭, visible: true },
- { key: 5, label: `鍓嶇紑`, visible: true },
- { key: 6, label: `鍩焋, visible: true },
- { key: 7, label: `妗舵潈闄愮被鍨媊, visible: true },
- { key: 8, label: `鐘舵�乣, visible: true }
+ { key: 0, label: `涓诲缓`, visible: true },
+ { key: 1, label: `閰嶇疆key`, visible: false },
+ { key: 2, label: `璁块棶绔欑偣`, visible: true },
+ { key: 3, label: `鑷畾涔夊煙鍚峘, visible: true },
+ { key: 4, label: `妗跺悕绉癭, visible: true },
+ { key: 5, label: `鍓嶇紑`, visible: true },
+ { key: 6, label: `鍩焋, visible: true },
+ { key: 7, label: `妗舵潈闄愮被鍨媊, visible: true },
+ { key: 8, label: `鐘舵�乣, visible: true }
]);
const initFormData: OssConfigForm = {
- ossConfigId: undefined,
- configKey: '',
- accessKey: '',
- secretKey: '',
- bucketName: '',
- prefix: '',
- endpoint: '',
- domain: '',
- isHttps: "N",
- accessPolicy: "1",
- region: '',
- status: "1",
- remark: '',
+ ossConfigId: undefined,
+ configKey: '',
+ accessKey: '',
+ secretKey: '',
+ bucketName: '',
+ prefix: '',
+ endpoint: '',
+ domain: '',
+ isHttps: "N",
+ accessPolicy: "1",
+ region: '',
+ status: "1",
+ remark: '',
}
const data = reactive<PageData<OssConfigForm, OssConfigQuery>>({
- form: { ...initFormData },
- // 鏌ヨ鍙傛暟
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- configKey: '',
- bucketName: '',
- status: '',
- },
- rules: {
- configKey: [{ required: true, message: "configKey涓嶈兘涓虹┖", trigger: "blur" },],
- accessKey: [
- { required: true, message: "accessKey涓嶈兘涓虹┖", trigger: "blur" },
- {
- min: 2,
- max: 200,
- message: "accessKey闀垮害蹇呴』浠嬩簬 2 鍜� 100 涔嬮棿",
- trigger: "blur",
- },
- ],
- secretKey: [
- { required: true, message: "secretKey涓嶈兘涓虹┖", trigger: "blur" },
- {
- min: 2,
- max: 100,
- message: "secretKey闀垮害蹇呴』浠嬩簬 2 鍜� 100 涔嬮棿",
- trigger: "blur",
- },
- ],
- bucketName: [
- { required: true, message: "bucketName涓嶈兘涓虹┖", trigger: "blur" },
- {
- min: 2,
- max: 100,
- message: "bucketName闀垮害蹇呴』浠嬩簬 2 鍜� 100 涔嬮棿",
- trigger: "blur",
- },
- ],
- endpoint: [
- { required: true, message: "endpoint涓嶈兘涓虹┖", trigger: "blur" },
- {
- min: 2,
- max: 100,
- message: "endpoint鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 100 涔嬮棿",
- trigger: "blur",
- },
- ],
- accessPolicy: [{ required: true, message: "accessPolicy涓嶈兘涓虹┖", trigger: "blur" }]
- }
+ form: { ...initFormData },
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ configKey: '',
+ bucketName: '',
+ status: '',
+ },
+ rules: {
+ configKey: [{ required: true, message: "configKey涓嶈兘涓虹┖", trigger: "blur" },],
+ accessKey: [
+ { required: true, message: "accessKey涓嶈兘涓虹┖", trigger: "blur" },
+ {
+ min: 2,
+ max: 200,
+ message: "accessKey闀垮害蹇呴』浠嬩簬 2 鍜� 100 涔嬮棿",
+ trigger: "blur",
+ },
+ ],
+ secretKey: [
+ { required: true, message: "secretKey涓嶈兘涓虹┖", trigger: "blur" },
+ {
+ min: 2,
+ max: 100,
+ message: "secretKey闀垮害蹇呴』浠嬩簬 2 鍜� 100 涔嬮棿",
+ trigger: "blur",
+ },
+ ],
+ bucketName: [
+ { required: true, message: "bucketName涓嶈兘涓虹┖", trigger: "blur" },
+ {
+ min: 2,
+ max: 100,
+ message: "bucketName闀垮害蹇呴』浠嬩簬 2 鍜� 100 涔嬮棿",
+ trigger: "blur",
+ },
+ ],
+ endpoint: [
+ { required: true, message: "endpoint涓嶈兘涓虹┖", trigger: "blur" },
+ {
+ min: 2,
+ max: 100,
+ message: "endpoint鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 100 涔嬮棿",
+ trigger: "blur",
+ },
+ ],
+ accessPolicy: [{ required: true, message: "accessPolicy涓嶈兘涓虹┖", trigger: "blur" }]
+ }
});
const { queryParams, form, rules } = toRefs(data);
/** 鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃 */
const getList = async () => {
- loading.value = true;
- const res = await listOssConfig(queryParams.value);
- ossConfigList.value = res.rows;
- total.value = res.total;
- loading.value = false;
+ loading.value = true;
+ const res = await listOssConfig(queryParams.value);
+ ossConfigList.value = res.rows;
+ total.value = res.total;
+ loading.value = false;
}
/** 鍙栨秷鎸夐挳 */
const cancel = () => {
- dialog.visible = false;
- reset();
+ dialog.visible = false;
+ reset();
}
/** 琛ㄥ崟閲嶇疆 */
const reset = () => {
- form.value = { ...initFormData };
- ossConfigFormRef.value?.resetFields();
+ form.value = { ...initFormData };
+ ossConfigFormRef.value?.resetFields();
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
- queryParams.value.pageNum = 1;
- getList();
+ queryParams.value.pageNum = 1;
+ getList();
}
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
- queryFormRef.value?.resetFields();
- handleQuery();
+ queryFormRef.value?.resetFields();
+ handleQuery();
}
/** 閫夋嫨鏉℃暟 */
const handleSelectionChange = (selection: OssConfigVO[]) => {
- ids.value = selection.map(item => item.ossConfigId);
- single.value = selection.length != 1;
- multiple.value = !selection.length;
+ ids.value = selection.map(item => item.ossConfigId);
+ single.value = selection.length != 1;
+ multiple.value = !selection.length;
}
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = () => {
- dialog.visible = true;
- dialog.title = "娣诲姞瀵硅薄瀛樺偍閰嶇疆";
- nextTick(() => {
- reset();
- })
+ dialog.visible = true;
+ dialog.title = "娣诲姞瀵硅薄瀛樺偍閰嶇疆";
+ nextTick(() => {
+ reset();
+ })
}
/** 淇敼鎸夐挳鎿嶄綔 */
const handleUpdate = (row?: OssConfigVO) => {
- loading.value = true;
- dialog.visible = true;
- dialog.title = "淇敼瀵硅薄瀛樺偍閰嶇疆";
- const ossConfigId = row?.ossConfigId || ids.value[0];
- nextTick(async () => {
- reset();
- const res = await getOssConfig(ossConfigId);
- loading.value = false;
- form.value = res.data;
- })
+ loading.value = true;
+ dialog.visible = true;
+ dialog.title = "淇敼瀵硅薄瀛樺偍閰嶇疆";
+ const ossConfigId = row?.ossConfigId || ids.value[0];
+ nextTick(async () => {
+ reset();
+ const res = await getOssConfig(ossConfigId);
+ loading.value = false;
+ form.value = res.data;
+ })
}
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
- ossConfigFormRef.value?.validate(async (valid: boolean) => {
- if (valid) {
- buttonLoading.value = true;
- if (form.value.ossConfigId) {
- await updateOssConfig(form.value).finally(() => buttonLoading.value = false);
- } else {
- await addOssConfig(form.value).finally(() => buttonLoading.value = false);
- }
- proxy?.$modal.msgSuccess("鏂板鎴愬姛");
- dialog.visible = false;
- getList();
- }
- });
+ ossConfigFormRef.value?.validate(async (valid: boolean) => {
+ if (valid) {
+ buttonLoading.value = true;
+ if (form.value.ossConfigId) {
+ await updateOssConfig(form.value).finally(() => buttonLoading.value = false);
+ } else {
+ await addOssConfig(form.value).finally(() => buttonLoading.value = false);
+ }
+ proxy?.$modal.msgSuccess("鏂板鎴愬姛");
+ dialog.visible = false;
+ getList();
+ }
+ });
}
/** 鐘舵�佷慨鏀� */
-const handleStatusChange = async (row: OssConfigVO) => {
- let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
- try {
- await proxy?.$modal.confirm('纭瑕�"' + text + '""' + row.configKey + '"閰嶇疆鍚�?');
- await changeOssConfigStatus(row.ossConfigId, row.status, row.configKey);
- getList()
- proxy?.$modal.msgSuccess(text + "鎴愬姛");
- } catch { return } finally {
- row.status = row.status === "0" ? "1" : "0";
- }
+const handleStatusChange = async (row: OssConfigVO) => {
+ let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
+ try {
+ await proxy?.$modal.confirm('纭瑕�"' + text + '""' + row.configKey + '"閰嶇疆鍚�?');
+ await changeOssConfigStatus(row.ossConfigId, row.status, row.configKey);
+ getList()
+ proxy?.$modal.msgSuccess(text + "鎴愬姛");
+ } catch { return } finally {
+ row.status = row.status === "0" ? "1" : "0";
+ }
}
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (row?: OssConfigVO) => {
- const ossConfigIds = row?.ossConfigId || ids.value;
- await proxy?.$modal.confirm('鏄惁纭鍒犻櫎OSS閰嶇疆缂栧彿涓�"' + ossConfigIds + '"鐨勬暟鎹」?');
- loading.value = true;
- await delOssConfig(ossConfigIds).finally(() => loading.value = false);
- getList();
- proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ const ossConfigIds = row?.ossConfigId || ids.value;
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎OSS閰嶇疆缂栧彿涓�"' + ossConfigIds + '"鐨勬暟鎹」?');
+ loading.value = true;
+ await delOssConfig(ossConfigIds).finally(() => loading.value = false);
+ getList();
+ proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}
onMounted(() => {
- getList();
+ getList();
})
</script>
diff --git a/src/views/system/oss/index.vue b/src/views/system/oss/index.vue
index e067eeb..7bfaabe 100644
--- a/src/views/system/oss/index.vue
+++ b/src/views/system/oss/index.vue
@@ -154,8 +154,8 @@
const daterangeCreateTime = ref<[DateModelType, DateModelType]>(['', '']);
const dialog = reactive<DialogOption>({
- visible: false,
- title: ''
+ visible: false,
+ title: ''
});
// 榛樿鎺掑簭
@@ -165,175 +165,175 @@
const queryFormRef = ref<ElFormInstance>();
const initFormData = {
- file: undefined,
+ file: undefined,
}
const data = reactive<PageData<OssForm, OssQuery>>({
- form: { ...initFormData },
- // 鏌ヨ鍙傛暟
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- fileName: '',
- originalName: '',
- fileSuffix: '',
- createTime: '',
- service: '',
- orderByColumn: defaultSort.value.prop,
- isAsc: defaultSort.value.order
- },
- rules: {
- file: [
- { required: true, message: "鏂囦欢涓嶈兘涓虹┖", trigger: "blur" }
- ]
- }
+ form: { ...initFormData },
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ fileName: '',
+ originalName: '',
+ fileSuffix: '',
+ createTime: '',
+ service: '',
+ orderByColumn: defaultSort.value.prop,
+ isAsc: defaultSort.value.order
+ },
+ rules: {
+ file: [
+ { required: true, message: "鏂囦欢涓嶈兘涓虹┖", trigger: "blur" }
+ ]
+ }
});
const { queryParams, form, rules } = toRefs(data);
/** 鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃 */
const getList = async () => {
- loading.value = true;
- const res = await proxy?.getConfigKey("sys.oss.previewListResource");
- previewListResource.value = res?.msg === undefined ? true : res.msg === 'true';
- const response = await listOss(proxy?.addDateRange(queryParams.value, daterangeCreateTime.value, "CreateTime"));
- ossList.value = response.rows;
- total.value = response.total;
- loading.value = false;
- showTable.value = true;
+ loading.value = true;
+ const res = await proxy?.getConfigKey("sys.oss.previewListResource");
+ previewListResource.value = res?.msg === undefined ? true : res.msg === 'true';
+ const response = await listOss(proxy?.addDateRange(queryParams.value, daterangeCreateTime.value, "CreateTime"));
+ ossList.value = response.rows;
+ total.value = response.total;
+ loading.value = false;
+ showTable.value = true;
}
function checkFileSuffix(fileSuffix: string[]) {
- let arr = ["png", "jpg", "jpeg"];
- return arr.some(type => {
- return fileSuffix.indexOf(type) > -1;
- });
+ let arr = ["png", "jpg", "jpeg"];
+ return arr.some(type => {
+ return fileSuffix.indexOf(type) > -1;
+ });
}
/** 鍙栨秷鎸夐挳 */
function cancel() {
- dialog.visible = false;
- reset();
+ dialog.visible = false;
+ reset();
}
/** 琛ㄥ崟閲嶇疆 */
function reset() {
- form.value = { ...initFormData };
- ossFormRef.value?.resetFields();
+ form.value = { ...initFormData };
+ ossFormRef.value?.resetFields();
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
function handleQuery() {
- queryParams.value.pageNum = 1;
- getList();
+ queryParams.value.pageNum = 1;
+ getList();
}
/** 閲嶇疆鎸夐挳鎿嶄綔 */
function resetQuery() {
- showTable.value = false;
- daterangeCreateTime.value = ['', ''];
- queryFormRef.value?.resetFields();
- queryParams.value.orderByColumn = defaultSort.value.prop;
- queryParams.value.isAsc = defaultSort.value.order;
- handleQuery();
+ showTable.value = false;
+ daterangeCreateTime.value = ['', ''];
+ queryFormRef.value?.resetFields();
+ queryParams.value.orderByColumn = defaultSort.value.prop;
+ queryParams.value.isAsc = defaultSort.value.order;
+ handleQuery();
}
/** 閫夋嫨鏉℃暟 */
function handleSelectionChange(selection: OssVO[]) {
- ids.value = selection.map(item => item.ossId);
- single.value = selection.length != 1;
- multiple.value = !selection.length;
+ ids.value = selection.map(item => item.ossId);
+ single.value = selection.length != 1;
+ multiple.value = !selection.length;
}
/** 璁剧疆鍒楃殑鎺掑簭涓烘垜浠嚜瀹氫箟鐨勬帓搴� */
const handleHeaderClass = ({ column }: any): any => {
- column.order = column.multiOrder
+ column.order = column.multiOrder
}
/** 鐐瑰嚮琛ㄥご杩涜鎺掑簭 */
const handleHeaderCLick = (column: any) => {
- if (column.sortable !== 'custom') {
- return
- }
- switch (column.multiOrder) {
- case 'descending':
- column.multiOrder = 'ascending';
- break;
- case 'ascending':
- column.multiOrder = '';
- break;
- default:
- column.multiOrder = 'descending';
- break;
- }
- handleOrderChange(column.property, column.multiOrder)
+ if (column.sortable !== 'custom') {
+ return
+ }
+ switch (column.multiOrder) {
+ case 'descending':
+ column.multiOrder = 'ascending';
+ break;
+ case 'ascending':
+ column.multiOrder = '';
+ break;
+ default:
+ column.multiOrder = 'descending';
+ break;
+ }
+ handleOrderChange(column.property, column.multiOrder)
}
const handleOrderChange = (prop: string, order: string) => {
- let orderByArr = queryParams.value.orderByColumn ? queryParams.value.orderByColumn.split(",") : [];
- let isAscArr = queryParams.value.isAsc ? queryParams.value.isAsc.split(",") : [];
- let propIndex = orderByArr.indexOf(prop)
- if (propIndex !== -1) {
- if (order) {
- //鎺掑簭閲屽凡瀛樺湪 鍙慨鏀规帓搴�
- isAscArr[propIndex] = order;
- } else {
- //濡傛灉order涓簄ull 鍒欏垹闄ゆ帓搴忓瓧娈靛拰灞炴��
- isAscArr.splice(propIndex, 1);//鍒犻櫎鎺掑簭
- orderByArr.splice(propIndex, 1);//鍒犻櫎灞炴��
- }
+ let orderByArr = queryParams.value.orderByColumn ? queryParams.value.orderByColumn.split(",") : [];
+ let isAscArr = queryParams.value.isAsc ? queryParams.value.isAsc.split(",") : [];
+ let propIndex = orderByArr.indexOf(prop)
+ if (propIndex !== -1) {
+ if (order) {
+ //鎺掑簭閲屽凡瀛樺湪 鍙慨鏀规帓搴�
+ isAscArr[propIndex] = order;
} else {
- //鎺掑簭閲屼笉瀛樺湪鍒欐柊澧炴帓搴�
- orderByArr.push(prop);
- isAscArr.push(order);
+ //濡傛灉order涓簄ull 鍒欏垹闄ゆ帓搴忓瓧娈靛拰灞炴��
+ isAscArr.splice(propIndex, 1);//鍒犻櫎鎺掑簭
+ orderByArr.splice(propIndex, 1);//鍒犻櫎灞炴��
}
- //鍚堝苟鎺掑簭
- queryParams.value.orderByColumn = orderByArr.join(",");
- queryParams.value.isAsc = isAscArr.join(",");
- getList();
+ } else {
+ //鎺掑簭閲屼笉瀛樺湪鍒欐柊澧炴帓搴�
+ orderByArr.push(prop);
+ isAscArr.push(order);
+ }
+ //鍚堝苟鎺掑簭
+ queryParams.value.orderByColumn = orderByArr.join(",");
+ queryParams.value.isAsc = isAscArr.join(",");
+ getList();
}
/** 浠诲姟鏃ュ織鍒楄〃鏌ヨ */
const handleOssConfig = () => {
- router.push('/system/oss-config/index')
+ router.push('/system/oss-config/index')
}
/** 鏂囦欢鎸夐挳鎿嶄綔 */
const handleFile = () => {
- dialog.visible = true;
- dialog.title = "涓婁紶鏂囦欢";
- nextTick(() => {
- reset();
- type.value = 0;
- })
+ dialog.visible = true;
+ dialog.title = "涓婁紶鏂囦欢";
+ nextTick(() => {
+ reset();
+ type.value = 0;
+ })
}
/** 鍥剧墖鎸夐挳鎿嶄綔 */
const handleImage = () => {
- dialog.visible = true;
- dialog.title = "涓婁紶鍥剧墖";
- nextTick(() => {
- reset();
- type.value = 1;
- })
+ dialog.visible = true;
+ dialog.title = "涓婁紶鍥剧墖";
+ nextTick(() => {
+ reset();
+ type.value = 1;
+ })
}
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
- dialog.visible = false;
- getList();
+ dialog.visible = false;
+ getList();
}
/** 涓嬭浇鎸夐挳鎿嶄綔 */
const handleDownload = (row: OssVO) => {
- proxy?.$download.oss(row.ossId)
+ proxy?.$download.oss(row.ossId)
}
/** 鐢ㄦ埛鐘舵�佷慨鏀� */
const handlePreviewListResource = async (preview: boolean) => {
- let text = preview ? "鍚敤" : "鍋滅敤";
- try {
- await proxy?.$modal.confirm('纭瑕�"' + text + '""棰勮鍒楄〃鍥剧墖"閰嶇疆鍚�?');
- await proxy?.updateConfigByKey("sys.oss.previewListResource", preview);
- getList()
- proxy?.$modal.msgSuccess(text + "鎴愬姛");
- } catch { return }
+ let text = preview ? "鍚敤" : "鍋滅敤";
+ try {
+ await proxy?.$modal.confirm('纭瑕�"' + text + '""棰勮鍒楄〃鍥剧墖"閰嶇疆鍚�?');
+ await proxy?.updateConfigByKey("sys.oss.previewListResource", preview);
+ getList()
+ proxy?.$modal.msgSuccess(text + "鎴愬姛");
+ } catch { return }
}
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (row?: OssVO) => {
- const ossIds = row?.ossId || ids.value;
- await proxy?.$modal.confirm('鏄惁纭鍒犻櫎OSS瀵硅薄瀛樺偍缂栧彿涓�"' + ossIds + '"鐨勬暟鎹」?');
- loading.value = true;
- await delOss(ossIds).finally(() => loading.value = false);
- getList();
- proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ const ossIds = row?.ossId || ids.value;
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎OSS瀵硅薄瀛樺偍缂栧彿涓�"' + ossIds + '"鐨勬暟鎹」?');
+ loading.value = true;
+ await delOss(ossIds).finally(() => loading.value = false);
+ getList();
+ proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}
onMounted(() => {
- getList();
+ getList();
})
</script>
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 6b1e8fd..d53eb1c 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -125,117 +125,117 @@
const queryFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
- visible: false,
- title: ''
+ visible: false,
+ title: ''
});
const initFormData: PostForm = {
- postId: undefined,
- postCode: '',
- postName: '',
- postSort: 0,
- status: "0",
- remark: ''
+ postId: undefined,
+ postCode: '',
+ postName: '',
+ postSort: 0,
+ status: "0",
+ remark: ''
}
const data = reactive<PageData<PostForm, PostQuery>>({
- form: {...initFormData},
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- postCode: '',
- postName: '',
- status: ''
- },
- rules: {
- postName: [{ required: true, message: "宀椾綅鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
- postCode: [{ required: true, message: "宀椾綅缂栫爜涓嶈兘涓虹┖", trigger: "blur" }],
- postSort: [{ required: true, message: "宀椾綅椤哄簭涓嶈兘涓虹┖", trigger: "blur" }],
- }
+ form: { ...initFormData },
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ postCode: '',
+ postName: '',
+ status: ''
+ },
+ rules: {
+ postName: [{ required: true, message: "宀椾綅鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
+ postCode: [{ required: true, message: "宀椾綅缂栫爜涓嶈兘涓虹┖", trigger: "blur" }],
+ postSort: [{ required: true, message: "宀椾綅椤哄簭涓嶈兘涓虹┖", trigger: "blur" }],
+ }
});
const { queryParams, form, rules } = toRefs<PageData<PostForm, PostQuery>>(data);
/** 鏌ヨ宀椾綅鍒楄〃 */
const getList = async () => {
- loading.value = true;
- const res = await listPost(queryParams.value);
- postList.value = res.rows;
- total.value = res.total;
- loading.value = false;
+ loading.value = true;
+ const res = await listPost(queryParams.value);
+ postList.value = res.rows;
+ total.value = res.total;
+ loading.value = false;
}
/** 鍙栨秷鎸夐挳 */
const cancel = () => {
- reset();
- dialog.visible = false;
+ reset();
+ dialog.visible = false;
}
/** 琛ㄥ崟閲嶇疆 */
const reset = () => {
- form.value = {...initFormData};
- postFormRef.value?.resetFields();
+ form.value = { ...initFormData };
+ postFormRef.value?.resetFields();
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
- queryParams.value.pageNum = 1;
- getList();
+ queryParams.value.pageNum = 1;
+ getList();
}
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
- queryFormRef.value?.resetFields();
- handleQuery();
+ queryFormRef.value?.resetFields();
+ handleQuery();
}
/** 澶氶�夋閫変腑鏁版嵁 */
const handleSelectionChange = (selection: PostVO[]) => {
- ids.value = selection.map(item => item.postId);
- single.value = selection.length != 1;
- multiple.value = !selection.length;
+ ids.value = selection.map(item => item.postId);
+ single.value = selection.length != 1;
+ multiple.value = !selection.length;
}
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = () => {
- dialog.visible = true;
- dialog.title = "娣诲姞宀椾綅";
- nextTick(() => {
- reset();
- })
+ dialog.visible = true;
+ dialog.title = "娣诲姞宀椾綅";
+ nextTick(() => {
+ reset();
+ })
}
/** 淇敼鎸夐挳鎿嶄綔 */
const handleUpdate = (row?: PostVO) => {
- dialog.visible = true;
- dialog.title = "淇敼宀椾綅";
- nextTick(async () => {
- reset();
- const postId = row?.postId || ids.value[0];
- const res = await getPost(postId);
- form.value = res.data;
- })
+ dialog.visible = true;
+ dialog.title = "淇敼宀椾綅";
+ nextTick(async () => {
+ reset();
+ const postId = row?.postId || ids.value[0];
+ const res = await getPost(postId);
+ form.value = res.data;
+ })
}
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
- postFormRef.value?.validate(async (valid: boolean) => {
- if (valid) {
- form.value.postId ? await updatePost(form.value) : await addPost(form.value);
- proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
- dialog.visible = false;
- await getList();
- }
- });
+ postFormRef.value?.validate(async (valid: boolean) => {
+ if (valid) {
+ form.value.postId ? await updatePost(form.value) : await addPost(form.value);
+ proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ dialog.visible = false;
+ await getList();
+ }
+ });
}
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (row?: PostVO) => {
- const postIds = row?.postId || ids.value;
- await proxy?.$modal.confirm('鏄惁纭鍒犻櫎宀椾綅缂栧彿涓�"' + postIds + '"鐨勬暟鎹」锛�');
- await delPost(postIds);
- await getList();
- proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ const postIds = row?.postId || ids.value;
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎宀椾綅缂栧彿涓�"' + postIds + '"鐨勬暟鎹」锛�');
+ await delPost(postIds);
+ await getList();
+ proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
const handleExport = () => {
- proxy?.download("system/post/export", {
- ...queryParams.value
- }, `post_${new Date().getTime()}.xlsx`);
+ proxy?.download("system/post/export", {
+ ...queryParams.value
+ }, `post_${new Date().getTime()}.xlsx`);
}
onMounted(() => {
- getList();
+ getList();
});
</script>
diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue
index 815c82f..7ad8a5a 100644
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -86,64 +86,64 @@
const selectRef = ref<InstanceType<typeof SelectUser>>();
const queryParams = reactive<UserQuery>({
- pageNum: 1,
- pageSize: 10,
- roleId: route.params.roleId as string,
- userName: undefined,
- phonenumber: undefined,
+ pageNum: 1,
+ pageSize: 10,
+ roleId: route.params.roleId as string,
+ userName: undefined,
+ phonenumber: undefined,
});
/** 鏌ヨ鎺堟潈鐢ㄦ埛鍒楄〃 */
const getList = async () => {
- loading.value = true;
- const res = await allocatedUserList(queryParams);
- userList.value = res.rows;
- total.value = res.total;
- loading.value = false;
+ loading.value = true;
+ const res = await allocatedUserList(queryParams);
+ userList.value = res.rows;
+ total.value = res.total;
+ loading.value = false;
}
// 杩斿洖鎸夐挳
const handleClose = () => {
- const obj = { path: "/system/role" };
- proxy?.$tab.closeOpenPage(obj);
+ const obj = { path: "/system/role" };
+ proxy?.$tab.closeOpenPage(obj);
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
-const handleQuery=() => {
- queryParams.pageNum = 1;
- getList();
+const handleQuery = () => {
+ queryParams.pageNum = 1;
+ getList();
}
/** 閲嶇疆鎸夐挳鎿嶄綔 */
-const resetQuery=() =>{
- queryFormRef.value?.resetFields();
- handleQuery();
+const resetQuery = () => {
+ queryFormRef.value?.resetFields();
+ handleQuery();
}
// 澶氶�夋閫変腑鏁版嵁
-const handleSelectionChange = (selection: UserVO[]) =>{
- userIds.value = selection.map(item => item.userId);
- multiple.value = !selection.length;
+const handleSelectionChange = (selection: UserVO[]) => {
+ userIds.value = selection.map(item => item.userId);
+ multiple.value = !selection.length;
}
/** 鎵撳紑鎺堟潈鐢ㄦ埛琛ㄥ脊绐� */
const openSelectUser = () => {
- selectRef.value.show();
+ selectRef.value?.show();
}
/** 鍙栨秷鎺堟潈鎸夐挳鎿嶄綔 */
const cancelAuthUser = async (row: UserVO) => {
- await proxy?.$modal.confirm('纭瑕佸彇娑堣鐢ㄦ埛"' + row.userName + '"瑙掕壊鍚楋紵');
- await authUserCancel({ userId: row.userId, roleId: queryParams.roleId });
- await getList();
- proxy?.$modal.msgSuccess("鍙栨秷鎺堟潈鎴愬姛");
+ await proxy?.$modal.confirm('纭瑕佸彇娑堣鐢ㄦ埛"' + row.userName + '"瑙掕壊鍚楋紵');
+ await authUserCancel({ userId: row.userId, roleId: queryParams.roleId });
+ await getList();
+ proxy?.$modal.msgSuccess("鍙栨秷鎺堟潈鎴愬姛");
}
/** 鎵归噺鍙栨秷鎺堟潈鎸夐挳鎿嶄綔 */
const cancelAuthUserAll = async () => {
- const roleId = queryParams.roleId;
- const uIds = userIds.value.join(",");
- await proxy?.$modal.confirm("鏄惁鍙栨秷閫変腑鐢ㄦ埛鎺堟潈鏁版嵁椤�?");
- await authUserCancelAll({ roleId: roleId, userIds: uIds });
- await getList();
- proxy?.$modal.msgSuccess("鍙栨秷鎺堟潈鎴愬姛");
+ const roleId = queryParams.roleId;
+ const uIds = userIds.value.join(",");
+ await proxy?.$modal.confirm("鏄惁鍙栨秷閫変腑鐢ㄦ埛鎺堟潈鏁版嵁椤�?");
+ await authUserCancelAll({ roleId: roleId, userIds: uIds });
+ await getList();
+ proxy?.$modal.msgSuccess("鍙栨秷鎺堟潈鎴愬姛");
}
onMounted(() => {
- getList();
+ getList();
});
</script>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index c61c65f..bcc893f 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,40 +235,40 @@
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: ''
});
@@ -276,241 +276,241 @@
* 鏌ヨ瑙掕壊鍒楄〃
*/
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();
- })
+ dialog.visible = true;
+ dialog.title = "娣诲姞瑙掕壊";
+ nextTick(() => {
+ reset();
+ getMenuTreeselect();
+ })
}
/** 淇敼瑙掕壊 */
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);
- })
+ 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);
})
})
})
+ })
}
/** 鏍规嵁瑙掕壊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 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 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>
diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue
index 5d26332..26b7ae2 100644
--- a/src/views/system/role/selectUser.vue
+++ b/src/views/system/role/selectUser.vue
@@ -50,9 +50,9 @@
const props = defineProps({
- roleId: {
- type: [Number, String]
- }
+ roleId: {
+ type: [Number, String]
+ }
})
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -64,68 +64,68 @@
const userIds = ref<Array<string | number>>([]);
const queryParams = reactive<UserQuery>({
- pageNum: 1,
- pageSize: 10,
- roleId: undefined,
- userName: undefined,
- phonenumber: undefined
+ pageNum: 1,
+ pageSize: 10,
+ roleId: undefined,
+ userName: undefined,
+ phonenumber: undefined
})
const tableRef = ref<ElTableInstance>();
const queryFormRef = ref<ElFormInstance>();
const show = () => {
- queryParams.roleId = props.roleId;
- getList();
- visible.value = true;
+ queryParams.roleId = props.roleId;
+ getList();
+ visible.value = true;
}
/**
* 閫夋嫨琛�
*/
const clickRow = (row: any) => {
- // ele鐨刡ug
- tableRef.value?.toggleRowSelection(row);
+ // ele鐨刡ug
+ tableRef.value?.toggleRowSelection(row);
}
/** 澶氶�夋閫変腑鏁版嵁 */
const handleSelectionChange = (selection: UserVO[]) => {
- userIds.value = selection.map((item: UserVO) => item.userId);
+ userIds.value = selection.map((item: UserVO) => item.userId);
}
/** 鏌ヨ鏁版嵁 */
const getList = async () => {
- const res = await unallocatedUserList(queryParams);
- userList.value = res.rows;
- total.value = res.total;
+ const res = await unallocatedUserList(queryParams);
+ userList.value = res.rows;
+ total.value = res.total;
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
- queryParams.pageNum = 1;
- getList();
+ queryParams.pageNum = 1;
+ getList();
}
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
- queryFormRef.value?.resetFields();
- getList();
+ queryFormRef.value?.resetFields();
+ getList();
}
const emit = defineEmits(["ok"]);
/**閫夋嫨鎺堟潈鐢ㄦ埛鎿嶄綔 */
const handleSelectUser = async () => {
- const roleId = queryParams.roleId;
- const ids = userIds.value.join(',');
- if (ids == "") {
- proxy?.$modal.msgError('璇烽�夋嫨瑕佸垎閰嶇殑鐢ㄦ埛');
- return;
- }
- await authUserSelectAll({ roleId, userIds: ids });
- proxy?.$modal.msgSuccess('鍒嗛厤鎴愬姛');
- emit('ok');
- visible.value = false;
+ const roleId = queryParams.roleId;
+ const ids = userIds.value.join(',');
+ if (ids == "") {
+ proxy?.$modal.msgError('璇烽�夋嫨瑕佸垎閰嶇殑鐢ㄦ埛');
+ return;
+ }
+ await authUserSelectAll({ roleId, userIds: ids });
+ proxy?.$modal.msgSuccess('鍒嗛厤鎴愬姛');
+ emit('ok');
+ visible.value = false;
}
// 鏆撮湶
defineExpose({
- show,
+ show,
});
</script>
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index b593607..711ee7f 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -82,7 +82,7 @@
</el-table-column>
</el-table>
- <pagination v-show="total>0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+ <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 娣诲姞鎴栦慨鏀圭鎴峰璇濇 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
@@ -162,192 +162,192 @@
const tenantFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
- visible: false,
- title: ''
+ visible: false,
+ title: ''
});
const initFormData: TenantForm = {
- id: undefined,
- tenantId: undefined,
- contactUserName: '',
- contactPhone: '',
- username: '',
- password: '',
- companyName: '',
- licenseNumber: '',
- domain: '',
- address: '',
- intro: '',
- remark: '',
- packageId: '',
- expireTime: '',
- accountCount: 0,
- status: '0',
+ id: undefined,
+ tenantId: undefined,
+ contactUserName: '',
+ contactPhone: '',
+ username: '',
+ password: '',
+ companyName: '',
+ licenseNumber: '',
+ domain: '',
+ address: '',
+ intro: '',
+ remark: '',
+ packageId: '',
+ expireTime: '',
+ accountCount: 0,
+ status: '0',
}
const data = reactive<PageData<TenantForm, TenantQuery>>({
- form: {...initFormData},
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- tenantId: '',
- contactUserName: '',
- contactPhone: '',
- companyName: ''
- },
- rules: {
- id: [{ required: true, message: "id涓嶈兘涓虹┖", trigger: "blur" }],
- tenantId: [{ required: true, message: "绉熸埛缂栧彿涓嶈兘涓虹┖", trigger: "blur" }],
- contactUserName: [{ required: true, message: "鑱旂郴浜轰笉鑳戒负绌�", trigger: "blur" }],
- contactPhone: [{ required: true, message: "鑱旂郴鐢佃瘽涓嶈兘涓虹┖", trigger: "blur" }],
- companyName: [{ required: true, message: "浼佷笟鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
- username: [
- { required: true, message: "鐢ㄦ埛鍚嶄笉鑳戒负绌�", trigger: "blur" },
- { min: 2, max: 20, message: '鐢ㄦ埛鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿', trigger: 'blur' }
- ],
- password: [
- { required: true, message: "瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" },
- { min: 5, max: 20, message: '鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿', trigger: 'blur' }
- ]
- }
+ form: { ...initFormData },
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ tenantId: '',
+ contactUserName: '',
+ contactPhone: '',
+ companyName: ''
+ },
+ rules: {
+ id: [{ required: true, message: "id涓嶈兘涓虹┖", trigger: "blur" }],
+ tenantId: [{ required: true, message: "绉熸埛缂栧彿涓嶈兘涓虹┖", trigger: "blur" }],
+ contactUserName: [{ required: true, message: "鑱旂郴浜轰笉鑳戒负绌�", trigger: "blur" }],
+ contactPhone: [{ required: true, message: "鑱旂郴鐢佃瘽涓嶈兘涓虹┖", trigger: "blur" }],
+ companyName: [{ required: true, message: "浼佷笟鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
+ username: [
+ { required: true, message: "鐢ㄦ埛鍚嶄笉鑳戒负绌�", trigger: "blur" },
+ { min: 2, max: 20, message: '鐢ㄦ埛鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿', trigger: 'blur' }
+ ],
+ password: [
+ { required: true, message: "瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" },
+ { min: 5, max: 20, message: '鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿', trigger: 'blur' }
+ ]
+ }
});
const { queryParams, form, rules } = toRefs(data);
/** 鏌ヨ鎵�鏈夌鎴峰椁� */
const getTenantPackage = async () => {
- const res = await selectTenantPackage()
- packageList.value = res.data;
+ const res = await selectTenantPackage()
+ packageList.value = res.data;
}
/** 鏌ヨ绉熸埛鍒楄〃 */
const getList = async () => {
- loading.value = true;
- const res = await listTenant(queryParams.value);
- tenantList.value = res.rows;
- total.value = res.total;
- loading.value = false;
+ loading.value = true;
+ const res = await listTenant(queryParams.value);
+ tenantList.value = res.rows;
+ total.value = res.total;
+ loading.value = false;
}
// 绉熸埛濂楅鐘舵�佷慨鏀�
const handleStatusChange = async (row: TenantVO) => {
- let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
- try {
- await proxy?.$modal.confirm('纭瑕�"' + text + '""' + row.companyName + '"绉熸埛鍚楋紵');
- await changeTenantStatus(row.id, row.tenantId, 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.companyName + '"绉熸埛鍚楋紵');
+ await changeTenantStatus(row.id, row.tenantId, row.status);
+ proxy?.$modal.msgSuccess(text + "鎴愬姛");
+ } catch {
+ row.status = row.status === "0" ? "1" : "0";
+ }
}
// 鍙栨秷鎸夐挳
const cancel = () => {
- reset();
- dialog.visible = false;
+ reset();
+ dialog.visible = false;
}
// 琛ㄥ崟閲嶇疆
const reset = () => {
- form.value = {...initFormData};
- tenantFormRef.value?.resetFields();
+ form.value = { ...initFormData };
+ tenantFormRef.value?.resetFields();
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
- queryParams.value.pageNum = 1;
- getList();
+ queryParams.value.pageNum = 1;
+ getList();
}
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
- queryFormRef.value?.resetFields();
- handleQuery();
+ queryFormRef.value?.resetFields();
+ handleQuery();
}
// 澶氶�夋閫変腑鏁版嵁
const handleSelectionChange = (selection: TenantVO[]) => {
- ids.value = selection.map(item => item.id);
- single.value = selection.length != 1;
- multiple.value = !selection.length;
+ ids.value = selection.map(item => item.id);
+ single.value = selection.length != 1;
+ multiple.value = !selection.length;
}
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = () => {
- dialog.visible = true;
- dialog.title = "娣诲姞绉熸埛";
- nextTick(() => {
- reset();
- getTenantPackage();
- })
+ dialog.visible = true;
+ dialog.title = "娣诲姞绉熸埛";
+ nextTick(() => {
+ reset();
+ getTenantPackage();
+ })
}
/** 淇敼鎸夐挳鎿嶄綔 */
const handleUpdate = (row?: TenantVO) => {
- loading.value = true;
- dialog.visible = true;
- dialog.title = "淇敼绉熸埛";
- nextTick(async () => {
- reset();
- await getTenantPackage();
- const _id = row?.id || ids.value[0];
- const res = await getTenant(_id);
- loading.value = false;
- Object.assign(form.value, res.data)
- })
+ loading.value = true;
+ dialog.visible = true;
+ dialog.title = "淇敼绉熸埛";
+ nextTick(async () => {
+ reset();
+ await getTenantPackage();
+ const _id = row?.id || ids.value[0];
+ const res = await getTenant(_id);
+ loading.value = false;
+ Object.assign(form.value, res.data)
+ })
}
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
- tenantFormRef.value?.validate(async (valid: boolean) => {
- if (valid) {
- buttonLoading.value = true;
- if (form.value.id) {
- await updateTenant(form.value).finally(() => buttonLoading.value = false);
- } else {
- await addTenant(form.value).finally(() => buttonLoading.value = false);
- }
- proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
- dialog.visible = false;
- getList();
- }
- });
+ tenantFormRef.value?.validate(async (valid: boolean) => {
+ if (valid) {
+ buttonLoading.value = true;
+ if (form.value.id) {
+ await updateTenant(form.value).finally(() => buttonLoading.value = false);
+ } else {
+ await addTenant(form.value).finally(() => buttonLoading.value = false);
+ }
+ proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ dialog.visible = false;
+ getList();
+ }
+ });
}
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (row?: TenantVO) => {
- const _ids = row?.id || ids.value;
- await proxy?.$modal.confirm('鏄惁纭鍒犻櫎绉熸埛缂栧彿涓�"' + _ids + '"鐨勬暟鎹」锛�')
- loading.value = true;
- await delTenant(_ids).finally(() => loading.value = false);
- await getList();
- proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ const _ids = row?.id || ids.value;
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎绉熸埛缂栧彿涓�"' + _ids + '"鐨勬暟鎹」锛�')
+ loading.value = true;
+ await delTenant(_ids).finally(() => loading.value = false);
+ await getList();
+ proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}
/** 鍚屾绉熸埛濂楅鎸夐挳鎿嶄綔 */
const handleSyncTenantPackage = async (row: TenantVO) => {
- try {
- await proxy?.$modal.confirm('鏄惁纭鍚屾绉熸埛濂楅绉熸埛缂栧彿涓�"' + row.tenantId + '"鐨勬暟鎹」锛�');
- loading.value = true;
- await syncTenantPackage(row.tenantId, row.packageId);
- await getList();
- proxy?.$modal.msgSuccess("鍚屾鎴愬姛");
- } catch {return} finally {
- loading.value = false;
- }
+ try {
+ await proxy?.$modal.confirm('鏄惁纭鍚屾绉熸埛濂楅绉熸埛缂栧彿涓�"' + row.tenantId + '"鐨勬暟鎹」锛�');
+ loading.value = true;
+ await syncTenantPackage(row.tenantId, row.packageId);
+ await getList();
+ proxy?.$modal.msgSuccess("鍚屾鎴愬姛");
+ } catch { return } finally {
+ loading.value = false;
+ }
}
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
const handleExport = () => {
- proxy?.download('system/tenant/export', {
- ...queryParams.value
- }, `tenant_${new Date().getTime()}.xlsx`)
+ proxy?.download('system/tenant/export', {
+ ...queryParams.value
+ }, `tenant_${new Date().getTime()}.xlsx`)
}
onMounted(() => {
- getList();
+ getList();
})
</script>
diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue
index b91f40b..add2eb5 100644
--- a/src/views/system/tenantPackage/index.vue
+++ b/src/views/system/tenantPackage/index.vue
@@ -61,7 +61,7 @@
</el-table-column>
</el-table>
- <pagination v-show="total>0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+ <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 娣诲姞鎴栦慨鏀圭鎴峰椁愬璇濇 -->
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 7fd53cb..8e3bcfa 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -211,7 +211,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 }}</el-radio>
+ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -317,7 +317,7 @@
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
-const dateRange = ref<[DateModelType, DateModelType]>(['','']);
+const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
const deptName = ref('');
const deptOptions = ref<DeptVO[]>([]);
const initPassword = ref('123456');
@@ -325,28 +325,28 @@
const roleOptions = ref<RoleVO[]>([]);
/*** 鐢ㄦ埛瀵煎叆鍙傛暟 */
const upload = reactive<ImportOption>({
- // 鏄惁鏄剧ず寮瑰嚭灞傦紙鐢ㄦ埛瀵煎叆锛�
- open: false,
- // 寮瑰嚭灞傛爣棰橈紙鐢ㄦ埛瀵煎叆锛�
- title: "",
- // 鏄惁绂佺敤涓婁紶
- isUploading: false,
- // 鏄惁鏇存柊宸茬粡瀛樺湪鐨勭敤鎴锋暟鎹�
- updateSupport: 0,
- // 璁剧疆涓婁紶鐨勮姹傚ご閮�
- headers: { Authorization: "Bearer " + getToken() },
- // 涓婁紶鐨勫湴鍧�
- url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData"
+ // 鏄惁鏄剧ず寮瑰嚭灞傦紙鐢ㄦ埛瀵煎叆锛�
+ open: false,
+ // 寮瑰嚭灞傛爣棰橈紙鐢ㄦ埛瀵煎叆锛�
+ title: "",
+ // 鏄惁绂佺敤涓婁紶
+ isUploading: false,
+ // 鏄惁鏇存柊宸茬粡瀛樺湪鐨勭敤鎴锋暟鎹�
+ updateSupport: 0,
+ // 璁剧疆涓婁紶鐨勮姹傚ご閮�
+ headers: { Authorization: "Bearer " + getToken() },
+ // 涓婁紶鐨勫湴鍧�
+ url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData"
})
// 鍒楁樉闅愪俊鎭�
const columns = ref<FieldOption[]>([
- { key: 0, label: `鐢ㄦ埛缂栧彿`, visible: false },
- { key: 1, label: `鐢ㄦ埛鍚嶇О`, visible: true },
- { key: 2, label: `鐢ㄦ埛鏄电О`, visible: true },
- { key: 3, label: `閮ㄩ棬`, visible: true },
- { key: 4, label: `鎵嬫満鍙风爜`, visible: true },
- { key: 5, label: `鐘舵�乣, visible: true },
- { key: 6, label: `鍒涘缓鏃堕棿`, visible: true }
+ { key: 0, label: `鐢ㄦ埛缂栧彿`, visible: false },
+ { key: 1, label: `鐢ㄦ埛鍚嶇О`, visible: true },
+ { key: 2, label: `鐢ㄦ埛鏄电О`, visible: true },
+ { key: 3, label: `閮ㄩ棬`, visible: true },
+ { key: 4, label: `鎵嬫満鍙风爜`, visible: true },
+ { key: 5, label: `鐘舵�乣, visible: true },
+ { key: 6, label: `鍒涘缓鏃堕棿`, visible: true }
])
@@ -356,243 +356,243 @@
const uploadRef = ref<ElUploadInstance>();
const dialog = reactive<DialogOption>({
- visible: false,
- title: ''
+ visible: false,
+ title: ''
});
const initFormData: UserForm = {
- userId: undefined,
- deptId: undefined,
- userName: '',
- nickName: undefined,
- password: '',
- phonenumber: undefined,
- email: undefined,
- sex: undefined,
- status: "0",
- remark: '',
- postIds: [],
- roleIds: []
+ userId: undefined,
+ deptId: undefined,
+ userName: '',
+ nickName: undefined,
+ password: '',
+ phonenumber: undefined,
+ email: undefined,
+ sex: undefined,
+ status: "0",
+ remark: '',
+ postIds: [],
+ roleIds: []
}
const data = reactive<PageData<UserForm, UserQuery>>({
- form: { ...initFormData },
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- userName: '',
- phonenumber: '',
- status: '',
- deptId: ''
- },
- rules: {
- userName: [{ required: true, message: "鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }, { min: 2, max: 20, message: "鐢ㄦ埛鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿", trigger: "blur" }],
- nickName: [{ required: true, message: "鐢ㄦ埛鏄电О涓嶈兘涓虹┖", trigger: "blur" }],
- password: [{ required: true, message: "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" }, { min: 5, max: 20, message: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿", trigger: "blur" }],
- email: [{ type: "email", message: "璇疯緭鍏ユ纭殑閭鍦板潃", trigger: ["blur", "change"] }],
- phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "璇疯緭鍏ユ纭殑鎵嬫満鍙风爜", trigger: "blur" }]
- }
+ form: { ...initFormData },
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ userName: '',
+ phonenumber: '',
+ status: '',
+ deptId: ''
+ },
+ rules: {
+ userName: [{ required: true, message: "鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }, { min: 2, max: 20, message: "鐢ㄦ埛鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿", trigger: "blur" }],
+ nickName: [{ required: true, message: "鐢ㄦ埛鏄电О涓嶈兘涓虹┖", trigger: "blur" }],
+ password: [{ required: true, message: "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" }, { min: 5, max: 20, message: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿", trigger: "blur" }],
+ email: [{ type: "email", message: "璇疯緭鍏ユ纭殑閭鍦板潃", trigger: ["blur", "change"] }],
+ phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "璇疯緭鍏ユ纭殑鎵嬫満鍙风爜", trigger: "blur" }]
+ }
})
const { queryParams, form, rules } = toRefs<PageData<UserForm, UserQuery>>(data)
/** 閫氳繃鏉′欢杩囨护鑺傜偣 */
const filterNode = (value: string, data: any) => {
- if (!value) return true
- return data.label.indexOf(value) !== -1
+ if (!value) return true
+ return data.label.indexOf(value) !== -1
}
/** 鏍规嵁鍚嶇О绛涢�夐儴闂ㄦ爲 */
watchEffect(
- () => {deptTreeRef.value?.filter(deptName.value);},
- {
- flush: 'post' // watchEffect浼氬湪DOM鎸傝浇鎴栬�呮洿鏂颁箣鍓嶅氨浼氳Е鍙戯紝姝ゅ睘鎬ф帶鍒跺湪DOM鍏冪礌鏇存柊鍚庤繍琛�
- }
+ () => { deptTreeRef.value?.filter(deptName.value); },
+ {
+ flush: 'post' // watchEffect浼氬湪DOM鎸傝浇鎴栬�呮洿鏂颁箣鍓嶅氨浼氳Е鍙戯紝姝ゅ睘鎬ф帶鍒跺湪DOM鍏冪礌鏇存柊鍚庤繍琛�
+ }
);
/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
const getTreeSelect = async () => {
- const res = await api.deptTreeSelect();
- deptOptions.value = res.data;
+ const res = await api.deptTreeSelect();
+ deptOptions.value = res.data;
};
/** 鏌ヨ鐢ㄦ埛鍒楄〃 */
const getList = async () => {
- loading.value = true;
- const res = await api.listUser(proxy?.addDateRange(queryParams.value, dateRange.value));
- loading.value = false;
- userList.value = res.rows;
- total.value = res.total;
+ loading.value = true;
+ const res = await api.listUser(proxy?.addDateRange(queryParams.value, dateRange.value));
+ loading.value = false;
+ userList.value = res.rows;
+ total.value = res.total;
}
/** 鑺傜偣鍗曞嚮浜嬩欢 */
const handleNodeClick = (data: DeptVO) => {
- queryParams.value.deptId = data.id;
- handleQuery()
+ queryParams.value.deptId = data.id;
+ handleQuery()
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
- queryParams.value.pageNum = 1
- getList()
+ queryParams.value.pageNum = 1
+ getList()
}
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
- dateRange.value = ['','']
- queryFormRef.value?.resetFields();
- queryParams.value.pageNum = 1;
- queryParams.value.deptId = undefined;
- deptTreeRef.value?.setCurrentKey(undefined);
- handleQuery();
+ dateRange.value = ['', '']
+ queryFormRef.value?.resetFields();
+ queryParams.value.pageNum = 1;
+ queryParams.value.deptId = undefined;
+ deptTreeRef.value?.setCurrentKey(undefined);
+ handleQuery();
}
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (row?: UserVO) => {
- const userIds = row?.userId || ids.value;
- const [err] = await to(proxy?.$modal.confirm('鏄惁纭鍒犻櫎鐢ㄦ埛缂栧彿涓�"' + userIds + '"鐨勬暟鎹」锛�') as any);
- if (!err) {
- await api.delUser(userIds);
- await getList();
- proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }
+ const userIds = row?.userId || ids.value;
+ const [err] = await to(proxy?.$modal.confirm('鏄惁纭鍒犻櫎鐢ㄦ埛缂栧彿涓�"' + userIds + '"鐨勬暟鎹」锛�') as any);
+ if (!err) {
+ await api.delUser(userIds);
+ await getList();
+ proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }
}
/** 鐢ㄦ埛鐘舵�佷慨鏀� */
const handleStatusChange = async (row: UserVO) => {
- let text = row.status === "0" ? "鍚敤" : "鍋滅敤"
- try {
- await proxy?.$modal.confirm('纭瑕�"' + text + '""' + row.userName + '"鐢ㄦ埛鍚�?');
- await api.changeUserStatus(row.userId, row.status);
- proxy?.$modal.msgSuccess(text + "鎴愬姛");
- } catch (err) {
- row.status = row.status === "0" ? "1" : "0";
- }
+ let text = row.status === "0" ? "鍚敤" : "鍋滅敤"
+ try {
+ await proxy?.$modal.confirm('纭瑕�"' + text + '""' + row.userName + '"鐢ㄦ埛鍚�?');
+ await api.changeUserStatus(row.userId, row.status);
+ proxy?.$modal.msgSuccess(text + "鎴愬姛");
+ } catch (err) {
+ row.status = row.status === "0" ? "1" : "0";
+ }
}
/** 璺宠浆瑙掕壊鍒嗛厤 */
const handleAuthRole = (row: UserVO) => {
- const userId = row.userId;
- router.push("/system/user-auth/role/" + userId);
+ const userId = row.userId;
+ router.push("/system/user-auth/role/" + userId);
}
/** 閲嶇疆瀵嗙爜鎸夐挳鎿嶄綔 */
const handleResetPwd = async (row: UserVO) => {
- const [err, res] = await to(ElMessageBox.prompt('璇疯緭鍏�"' + row.userName + '"鐨勬柊瀵嗙爜', "鎻愮ず", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- closeOnClickModal: false,
- inputPattern: /^.{5,20}$/,
- inputErrorMessage: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿",
- }))
- if (!err) {
- await api.resetUserPwd(row.userId, res.value);
- proxy?.$modal.msgSuccess("淇敼鎴愬姛锛屾柊瀵嗙爜鏄細" + res.value);
- }
+ const [err, res] = await to(ElMessageBox.prompt('璇疯緭鍏�"' + row.userName + '"鐨勬柊瀵嗙爜', "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ closeOnClickModal: false,
+ inputPattern: /^.{5,20}$/,
+ inputErrorMessage: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿",
+ }))
+ if (!err) {
+ await api.resetUserPwd(row.userId, res.value);
+ proxy?.$modal.msgSuccess("淇敼鎴愬姛锛屾柊瀵嗙爜鏄細" + res.value);
+ }
}
/** 閫夋嫨鏉℃暟 */
const handleSelectionChange = (selection: UserVO[]) => {
- ids.value = selection.map((item) => item.userId);
- single.value = selection.length != 1;
- multiple.value = !selection.length;
+ ids.value = selection.map((item) => item.userId);
+ single.value = selection.length != 1;
+ multiple.value = !selection.length;
}
/** 瀵煎叆鎸夐挳鎿嶄綔 */
const handleImport = () => {
- upload.title = "鐢ㄦ埛瀵煎叆";
- upload.open = true;
+ upload.title = "鐢ㄦ埛瀵煎叆";
+ upload.open = true;
}
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
const handleExport = () => {
- proxy?.download("system/user/export", {
- ...queryParams.value,
- }, `user_${new Date().getTime()}.xlsx`);
+ proxy?.download("system/user/export", {
+ ...queryParams.value,
+ }, `user_${new Date().getTime()}.xlsx`);
};
/** 涓嬭浇妯℃澘鎿嶄綔 */
const importTemplate = () => {
- proxy?.download("system/user/importTemplate", {
- }, `user_template_${new Date().getTime()}.xlsx`);
+ proxy?.download("system/user/importTemplate", {
+ }, `user_template_${new Date().getTime()}.xlsx`);
}
/**鏂囦欢涓婁紶涓鐞� */
const handleFileUploadProgress = () => {
- upload.isUploading = true;
+ upload.isUploading = true;
}
/** 鏂囦欢涓婁紶鎴愬姛澶勭悊 */
const handleFileSuccess = (response: any, file: UploadFile) => {
- upload.open = false;
- upload.isUploading = false;
- uploadRef.value?.handleRemove(file);
- ElMessageBox.alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "瀵煎叆缁撴灉", { dangerouslyUseHTMLString: true });
- getList();
+ upload.open = false;
+ upload.isUploading = false;
+ uploadRef.value?.handleRemove(file);
+ ElMessageBox.alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "瀵煎叆缁撴灉", { dangerouslyUseHTMLString: true });
+ getList();
}
/** 鎻愪氦涓婁紶鏂囦欢 */
function submitFileForm() {
- uploadRef.value?.submit();
+ uploadRef.value?.submit();
}
/** 鍒濆鍖栭儴闂ㄦ暟鎹� */
const initTreeData = async () => {
- // 鍒ゆ柇閮ㄩ棬鐨勬暟鎹槸鍚﹀瓨鍦紝瀛樺湪涓嶈幏鍙栵紝涓嶅瓨鍦ㄥ垯鑾峰彇
- if (deptOptions.value === undefined) {
- const { data } = await treeselect();
- deptOptions.value = data;
- }
+ // 鍒ゆ柇閮ㄩ棬鐨勬暟鎹槸鍚﹀瓨鍦紝瀛樺湪涓嶈幏鍙栵紝涓嶅瓨鍦ㄥ垯鑾峰彇
+ if (deptOptions.value === undefined) {
+ const { data } = await treeselect();
+ deptOptions.value = data;
+ }
}
/** 閲嶇疆鎿嶄綔琛ㄥ崟 */
const reset = () => {
- form.value = { ...initFormData };
- userFormRef.value?.resetFields();
+ form.value = { ...initFormData };
+ userFormRef.value?.resetFields();
}
/** 鍙栨秷鎸夐挳 */
const cancel = () => {
- reset();
- dialog.visible = false;
+ reset();
+ dialog.visible = false;
}
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = () => {
- dialog.visible = true;
- dialog.title = "鏂板鐢ㄦ埛";
- nextTick(async () => {
- reset();
- await initTreeData();
- const { data } = await api.getUser();
- postOptions.value = data.posts;
- roleOptions.value = data.roles;
- form.value.password = initPassword.value;
- })
+ dialog.visible = true;
+ dialog.title = "鏂板鐢ㄦ埛";
+ nextTick(async () => {
+ reset();
+ await initTreeData();
+ const { data } = await api.getUser();
+ postOptions.value = data.posts;
+ roleOptions.value = data.roles;
+ form.value.password = initPassword.value;
+ })
}
/** 淇敼鎸夐挳鎿嶄綔 */
const handleUpdate = (row?: UserForm) => {
- dialog.visible = true;
- dialog.title = "淇敼鐢ㄦ埛";
- nextTick(async () => {
- reset();
- await initTreeData();
- const userId = row?.userId || ids.value[0]
- const { data } = await api.getUser(userId)
- Object.assign(form.value, data.user);
- postOptions.value = data.posts;
- roleOptions.value = data.roles;
- form.value.postIds = data.postIds;
- form.value.roleIds = data.roleIds;
- form.value.password = "";
- })
+ dialog.visible = true;
+ dialog.title = "淇敼鐢ㄦ埛";
+ nextTick(async () => {
+ reset();
+ await initTreeData();
+ const userId = row?.userId || ids.value[0]
+ const { data } = await api.getUser(userId)
+ Object.assign(form.value, data.user);
+ postOptions.value = data.posts;
+ roleOptions.value = data.roles;
+ form.value.postIds = data.postIds;
+ form.value.roleIds = data.roleIds;
+ form.value.password = "";
+ })
}
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
- userFormRef.value?.validate(async (valid: boolean) => {
- if (valid) {
- form.value.userId ? await api.updateUser(form.value) : await api.addUser(form.value);
- proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
- dialog.visible = false;
- await getList();
- }
- })
+ userFormRef.value?.validate(async (valid: boolean) => {
+ if (valid) {
+ form.value.userId ? await api.updateUser(form.value) : await api.addUser(form.value);
+ proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ dialog.visible = false;
+ await getList();
+ }
+ })
}
@@ -600,23 +600,23 @@
* 鍏抽棴鐢ㄦ埛寮圭獥
*/
const closeDialog = () => {
- dialog.visible = false;
- resetForm();
+ dialog.visible = false;
+ resetForm();
}
/**
* 閲嶇疆琛ㄥ崟
*/
const resetForm = () => {
- userFormRef.value?.resetFields();
- userFormRef.value?.clearValidate();
+ userFormRef.value?.resetFields();
+ userFormRef.value?.clearValidate();
- form.value.id = undefined;
- form.value.status = '1';
+ form.value.id = undefined;
+ form.value.status = '1';
}
onMounted(() => {
- getTreeSelect() // 鍒濆鍖栭儴闂ㄦ暟鎹�
- getList() // 鍒濆鍖栧垪琛ㄦ暟鎹�
+ getTreeSelect() // 鍒濆鍖栭儴闂ㄦ暟鎹�
+ getList() // 鍒濆鍖栧垪琛ㄦ暟鎹�
});
</script>
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index 76ea863..21638e3 100644
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -70,22 +70,22 @@
const activeTab = ref("userinfo");
const state = ref<Record<string, any>>({
- user: {},
- roleGroup: '',
- postGroup: ''
+ user: {},
+ roleGroup: '',
+ postGroup: ''
});
const userForm = ref({});
const getUser = async () => {
- const res = await getUserProfile();
- state.value.user = res.data.user;
- userForm.value = { ...res.data.user }
- state.value.roleGroup = res.data.roleGroup;
- state.value.postGroup = res.data.postGroup;
+ const res = await getUserProfile();
+ state.value.user = res.data.user;
+ userForm.value = { ...res.data.user }
+ state.value.roleGroup = res.data.roleGroup;
+ state.value.postGroup = res.data.postGroup;
};
onMounted(() => {
- getUser();
+ getUser();
})
</script>
diff --git a/src/views/tool/gen/basicInfoForm.vue b/src/views/tool/gen/basicInfoForm.vue
index e7c9bdd..c77d0c9 100644
--- a/src/views/tool/gen/basicInfoForm.vue
+++ b/src/views/tool/gen/basicInfoForm.vue
@@ -34,16 +34,16 @@
import { propTypes } from "@/utils/propTypes";
const prop = defineProps({
- info: propTypes.any.def({})
+ info: propTypes.any.def({})
});
const infoForm = computed(() => prop.info)
// 琛ㄥ崟鏍￠獙
const rules = ref({
- tableName: [{ required: true, message: "璇疯緭鍏ヨ〃鍚嶇О", trigger: "blur" }],
- tableComment: [{ required: true, message: "璇疯緭鍏ヨ〃鎻忚堪", trigger: "blur" }],
- className: [{ required: true, message: "璇疯緭鍏ュ疄浣撶被鍚嶇О", trigger: "blur" }],
- functionAuthor: [{ required: true, message: "璇疯緭鍏ヤ綔鑰�", trigger: "blur" }]
+ tableName: [{ required: true, message: "璇疯緭鍏ヨ〃鍚嶇О", trigger: "blur" }],
+ tableComment: [{ required: true, message: "璇疯緭鍏ヨ〃鎻忚堪", trigger: "blur" }],
+ className: [{ required: true, message: "璇疯緭鍏ュ疄浣撶被鍚嶇О", trigger: "blur" }],
+ functionAuthor: [{ required: true, message: "璇疯緭鍏ヤ綔鑰�", trigger: "blur" }]
});
</script>
diff --git a/src/views/tool/gen/editTable.vue b/src/views/tool/gen/editTable.vue
index 7361bdb..fdd1eeb 100644
--- a/src/views/tool/gen/editTable.vue
+++ b/src/views/tool/gen/editTable.vue
@@ -135,8 +135,8 @@
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
- const basicForm = basicInfo.value.$refs.basicInfoForm;
- const genForm = genInfo.value.$refs.genInfoForm;
+ const basicForm = basicInfo.value?.$refs.basicInfoForm;
+ const genForm = genInfo.value?.$refs.genInfoForm;
Promise.all([basicForm, genForm].map(getFormPromise)).then(async res => {
const validateResult = res.every(item => !!item);
@@ -167,7 +167,7 @@
});
}
const close = () => {
- const obj = {path: "/tool/gen", query: {t: Date.now(), pageNum: route.query.pageNum}};
+ const obj = { path: "/tool/gen", query: { t: Date.now(), pageNum: route.query.pageNum } };
proxy?.$tab.closeOpenPage(obj);
}
diff --git a/src/views/tool/gen/genInfoForm.vue b/src/views/tool/gen/genInfoForm.vue
index bfb24f1..94486e2 100644
--- a/src/views/tool/gen/genInfoForm.vue
+++ b/src/views/tool/gen/genInfoForm.vue
@@ -246,11 +246,11 @@
// 琛ㄥ崟鏍￠獙
const rules = ref({
- tplCategory: [{required: true, message: "璇烽�夋嫨鐢熸垚妯℃澘", trigger: "blur"}],
- packageName: [{required: true, message: "璇疯緭鍏ョ敓鎴愬寘璺緞", trigger: "blur"}],
- moduleName: [{required: true, message: "璇疯緭鍏ョ敓鎴愭ā鍧楀悕", trigger: "blur"}],
- businessName: [{required: true, message: "璇疯緭鍏ョ敓鎴愪笟鍔″悕", trigger: "blur"}],
- functionName: [{required: true, message: "璇疯緭鍏ョ敓鎴愬姛鑳藉悕", trigger: "blur"}]
+ tplCategory: [{ required: true, message: "璇烽�夋嫨鐢熸垚妯℃澘", trigger: "blur" }],
+ packageName: [{ required: true, message: "璇疯緭鍏ョ敓鎴愬寘璺緞", trigger: "blur" }],
+ moduleName: [{ required: true, message: "璇疯緭鍏ョ敓鎴愭ā鍧楀悕", trigger: "blur" }],
+ businessName: [{ required: true, message: "璇疯緭鍏ョ敓鎴愪笟鍔″悕", trigger: "blur" }],
+ functionName: [{ required: true, message: "璇疯緭鍏ョ敓鎴愬姛鑳藉悕", trigger: "blur" }]
});
const subSelectChange = () => {
infoForm.value.subTableFkName = "";
diff --git a/src/views/tool/gen/importTable.vue b/src/views/tool/gen/importTable.vue
index 00ce7a2..91e88fc 100644
--- a/src/views/tool/gen/importTable.vue
+++ b/src/views/tool/gen/importTable.vue
@@ -26,7 +26,7 @@
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿"></el-table-column>
<el-table-column prop="updateTime" label="鏇存柊鏃堕棿"></el-table-column>
</el-table>
- <pagination v-show="total>0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+ <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-row>
<template #footer>
<div class="dialog-footer">
@@ -51,11 +51,11 @@
const queryFormRef = ref<ElFormInstance>();
const queryParams = reactive<DbTableQuery>({
- pageNum: 1,
- pageSize: 10,
- dataName: '',
- tableName: '',
- tableComment: ''
+ pageNum: 1,
+ pageSize: 10,
+ dataName: '',
+ tableName: '',
+ tableComment: ''
});
const dataNameList = ref<Array<string>>([]);
@@ -63,53 +63,53 @@
/** 鏌ヨ鍙傛暟鍒楄〃 */
const show = (dataName: string) => {
- getDataNameList();
- if(dataName){
- queryParams.dataName = dataName;
- } else {
- queryParams.dataName = 'master';
- }
- getList();
- visible.value = true;
+ getDataNameList();
+ if (dataName) {
+ queryParams.dataName = dataName;
+ } else {
+ queryParams.dataName = 'master';
+ }
+ getList();
+ visible.value = true;
}
/** 鍗曞嚮閫夋嫨琛� */
const clickRow = (row: DbTableVO) => {
- // ele bug
- tableRef.value?.toggleRowSelection(row);
+ // ele bug
+ tableRef.value?.toggleRowSelection(row);
}
/** 澶氶�夋閫変腑鏁版嵁 */
const handleSelectionChange = (selection: DbTableVO[]) => {
- tables.value = selection.map(item => item.tableName);
+ tables.value = selection.map(item => item.tableName);
}
/** 鏌ヨ琛ㄦ暟鎹� */
const getList = async () => {
- const res = await listDbTable(queryParams);
- dbTableList.value = res.rows;
- total.value = res.total;
+ const res = await listDbTable(queryParams);
+ dbTableList.value = res.rows;
+ total.value = res.total;
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
- queryParams.pageNum = 1;
- getList();
+ queryParams.pageNum = 1;
+ getList();
}
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
- queryFormRef.value?.resetFields();
- handleQuery();
+ queryFormRef.value?.resetFields();
+ handleQuery();
}
/** 瀵煎叆鎸夐挳鎿嶄綔 */
const handleImportTable = async () => {
- const tableNames = tables.value.join(",");
- if (tableNames == "") {
- proxy?.$modal.msgError("璇烽�夋嫨瑕佸鍏ョ殑琛�");
- return;
- }
- const res = await importTable({ tables: tableNames, dataName: queryParams.dataName });
- proxy?.$modal.msgSuccess(res.msg);
- if (res.code === 200) {
- visible.value = false;
- emit("ok");
- }
+ const tableNames = tables.value.join(",");
+ if (tableNames == "") {
+ proxy?.$modal.msgError("璇烽�夋嫨瑕佸鍏ョ殑琛�");
+ return;
+ }
+ const res = await importTable({ tables: tableNames, dataName: queryParams.dataName });
+ proxy?.$modal.msgSuccess(res.msg);
+ if (res.code === 200) {
+ visible.value = false;
+ emit("ok");
+ }
}
/** 鏌ヨ澶氭暟鎹簮鍚嶇О */
const getDataNameList = async () => {
@@ -118,6 +118,6 @@
}
defineExpose({
- show,
+ show,
});
</script>
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index dd48635..66300bd 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -136,31 +136,31 @@
const importRef = ref<InstanceType<typeof ImportTable>>();
const queryParams = ref<TableQuery>({
- pageNum: 1,
- pageSize: 10,
- tableName: '',
- tableComment: '',
- dataName: ""
+ pageNum: 1,
+ pageSize: 10,
+ tableName: '',
+ tableComment: '',
+ dataName: ""
})
-const preview = ref <any>({
- data: {},
- activeName: 'domain.java'
+const preview = ref<any>({
+ data: {},
+ activeName: 'domain.java'
})
const dialog = reactive<DialogOption>({
- visible: false,
- title: '浠ｇ爜棰勮'
+ visible: false,
+ title: '浠ｇ爜棰勮'
});
onActivated(() => {
- const time = route.query.t;
- if (time != null && time != uniqueId.value) {
- uniqueId.value = time as string;
- queryParams.value.pageNum = Number(route.query.pageNum);
- dateRange.value = ['', ''];
- queryFormRef.value?.resetFields();
- getList();
- }
+ const time = route.query.t;
+ if (time != null && time != uniqueId.value) {
+ uniqueId.value = time as string;
+ queryParams.value.pageNum = Number(route.query.pageNum);
+ dateRange.value = ['', ''];
+ queryFormRef.value?.resetFields();
+ getList();
+ }
})
/** 鏌ヨ澶氭暟鎹簮鍚嶇О */
@@ -171,81 +171,81 @@
/** 鏌ヨ琛ㄩ泦鍚� */
const getList = async () => {
- loading.value = true;
- const res = await listTable(proxy?.addDateRange(queryParams.value, dateRange.value));
- tableList.value = res.rows;
- total.value = res.total;
- loading.value = false;
+ loading.value = true;
+ const res = await listTable(proxy?.addDateRange(queryParams.value, dateRange.value));
+ tableList.value = res.rows;
+ total.value = res.total;
+ loading.value = false;
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
- queryParams.value.pageNum = 1;
- getList();
+ queryParams.value.pageNum = 1;
+ getList();
}
/** 鐢熸垚浠ｇ爜鎿嶄綔 */
const handleGenTable = async (row?: TableVO) => {
- const tbIds = row?.tableId || ids.value;
- if (tbIds == "") {
- proxy?.$modal.msgError('璇烽�夋嫨瑕佺敓鎴愮殑鏁版嵁');
- return;
- }
- if (row?.genType === "1") {
- await genCode(row.tableId);
- proxy?.$modal.msgSuccess('鎴愬姛鐢熸垚鍒拌嚜瀹氫箟璺緞锛�' + row.genPath);
- } else {
- proxy?.$download.zip('/tool/gen/batchGenCode?tableIdStr=' + tbIds, 'ruoyi.zip');
- }
+ const tbIds = row?.tableId || ids.value;
+ if (tbIds == "") {
+ proxy?.$modal.msgError('璇烽�夋嫨瑕佺敓鎴愮殑鏁版嵁');
+ return;
+ }
+ if (row?.genType === "1") {
+ await genCode(row.tableId);
+ proxy?.$modal.msgSuccess('鎴愬姛鐢熸垚鍒拌嚜瀹氫箟璺緞锛�' + row.genPath);
+ } else {
+ proxy?.$download.zip('/tool/gen/batchGenCode?tableIdStr=' + tbIds, 'ruoyi.zip');
+ }
}
/** 鍚屾鏁版嵁搴撴搷浣� */
const handleSynchDb = async (row: TableVO) => {
- const tableId = row.tableId;
- await proxy?.$modal.confirm('纭瑕佸己鍒跺悓姝�"' + row.tableName + '"琛ㄧ粨鏋勫悧锛�');
- await synchDb(tableId);
- proxy?.$modal.msgSuccess('鍚屾鎴愬姛');
+ const tableId = row.tableId;
+ await proxy?.$modal.confirm('纭瑕佸己鍒跺悓姝�"' + row.tableName + '"琛ㄧ粨鏋勫悧锛�');
+ await synchDb(tableId);
+ proxy?.$modal.msgSuccess('鍚屾鎴愬姛');
}
/** 鎵撳紑瀵煎叆琛ㄥ脊绐� */
const openImportTable = () => {
- importRef.value.show(queryParams.value.dataName);
+ importRef.value?.show(queryParams.value.dataName);
}
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
- dateRange.value = ['', ''];
- queryFormRef.value?.resetFields();
- handleQuery();
+ dateRange.value = ['', ''];
+ queryFormRef.value?.resetFields();
+ handleQuery();
}
/** 棰勮鎸夐挳 */
const handlePreview = async (row: TableVO) => {
- const res = await previewTable(row.tableId);
- preview.value.data = res.data;
- dialog.visible = true;
- preview.value.activeName = 'domain.java';
+ const res = await previewTable(row.tableId);
+ preview.value.data = res.data;
+ dialog.visible = true;
+ preview.value.activeName = 'domain.java';
}
/** 澶嶅埗浠ｇ爜鎴愬姛 */
const copyTextSuccess = () => {
- proxy?.$modal.msgSuccess('澶嶅埗鎴愬姛');
+ proxy?.$modal.msgSuccess('澶嶅埗鎴愬姛');
}
// 澶氶�夋閫変腑鏁版嵁
const handleSelectionChange = (selection: TableVO[]) => {
- ids.value = selection.map(item => item.tableId);
- single.value = selection.length != 1;
- multiple.value = !selection.length;
+ ids.value = selection.map(item => item.tableId);
+ single.value = selection.length != 1;
+ multiple.value = !selection.length;
}
/** 淇敼鎸夐挳鎿嶄綔 */
const handleEditTable = (row?: TableVO) => {
- const tableId = row?.tableId || ids.value[0];
- router.push({ path: '/tool/gen-edit/index/' + tableId, query: { pageNum: queryParams.value.pageNum } });
+ const tableId = row?.tableId || ids.value[0];
+ router.push({ path: '/tool/gen-edit/index/' + tableId, query: { pageNum: queryParams.value.pageNum } });
}
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (row?: TableVO) => {
- const tableIds = row?.tableId || ids.value;
- await proxy?.$modal.confirm('鏄惁纭鍒犻櫎琛ㄧ紪鍙蜂负"' + tableIds + '"鐨勬暟鎹」锛�');
- await delTable(tableIds);
- getList();
- proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
+ const tableIds = row?.tableId || ids.value;
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎琛ㄧ紪鍙蜂负"' + tableIds + '"鐨勬暟鎹」锛�');
+ await delTable(tableIds);
+ getList();
+ proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
}
onMounted(() => {
- getList();
- getDataNameList();
+ getList();
+ getDataNameList();
})
</script>
--
Gitblit v1.9.3