update 优化 整体代码结构

This commit is contained in:
疯狂的狮子Li
2023-08-11 17:58:58 +08:00
parent 73df6a1b30
commit f3195be732
16 changed files with 62 additions and 68 deletions

View File

@ -43,7 +43,6 @@ export interface ClientVO {
* 状态0正常 1停用
*/
status: string;
}
export interface ClientForm extends BaseEntity {
@ -91,7 +90,6 @@ export interface ClientForm extends BaseEntity {
* 状态0正常 1停用
*/
status?: string;
}
export interface ClientQuery extends PageQuery {
@ -134,5 +132,4 @@ export interface ClientQuery extends PageQuery {
* 状态0正常 1停用
*/
status?: string;
}

View File

@ -175,8 +175,8 @@ export const updateAuthRole = (data: { userId: string; roleIds: string }) => {
*/
export const listUserByDeptId = (deptId: string | number): AxiosPromise<UserVO[]> => {
return request({
url: "/system/user/list/dept/" + deptId,
method: "get"
url: '/system/user/list/dept/' + deptId,
method: 'get'
});
};

View File

@ -37,7 +37,7 @@ export const updateGenTable = (data: DbTableForm) => {
};
// 导入表
export const importTable = (data: { tables: string, dataName: string }) => {
export const importTable = (data: { tables: string; dataName: string }) => {
return request({
url: '/tool/gen/importTable',
method: 'post',
@ -83,4 +83,4 @@ export const getDataNames = () => {
url: '/tool/gen/getDataNames',
method: 'get'
});
};
};

View File

@ -78,8 +78,6 @@
overflow-x: hidden;
}
// refine element ui upload
.upload-container {
.el-upload {
@ -109,10 +107,10 @@
box-sizing: content-box;
}
.el-menu--collapse>div>.el-submenu>.el-submenu__title .el-submenu__icon-arrow {
.el-menu--collapse > div > .el-submenu > .el-submenu__title .el-submenu__icon-arrow {
display: none;
}
.el-dropdown .el-dropdown-link {
color: var(--el-color-primary) !important;
}
}

View File

@ -26,7 +26,8 @@ html {
box-sizing: border-box;
}
html.dark .svg-icon, html.dark svg {
html.dark .svg-icon,
html.dark svg {
fill: var(--el-text-color-regular);
}

View File

@ -4,11 +4,11 @@
const props = defineProps({
formJson: {
type: [String, Object],
default: {}
default: ""
},
formData: {
type: [String, Object],
default: {}
default: ""
},
isView: {
type: Boolean,

View File

@ -15,4 +15,4 @@ const props = defineProps({
}
});
const height = ref(document.documentElement.clientHeight - 94.5 + "px");
</script>
</script>

View File

@ -3,7 +3,7 @@ import FileSaver from 'file-saver';
import errorCode from '@/utils/errorCode';
import { blobValidate } from '@/utils/ruoyi';
import { LoadingInstance } from 'element-plus/es/components/loading/src/loading';
import { globalHeaders } from "@/utils/request";
import { globalHeaders } from '@/utils/request';
const baseURL = import.meta.env.VITE_APP_BASE_API;
let downloadLoadingInstance: LoadingInstance;
@ -16,7 +16,7 @@ export default {
method: 'get',
url: url,
responseType: 'blob',
headers: globalHeaders(),
headers: globalHeaders()
});
const isBlob = blobValidate(res.data);
if (isBlob) {
@ -40,7 +40,7 @@ export default {
method: 'get',
url: url,
responseType: 'blob',
headers: globalHeaders(),
headers: globalHeaders()
});
const isBlob = blobValidate(res.data);
if (isBlob) {

View File

@ -181,5 +181,4 @@ const router = createRouter({
}
});
export default router;

View File

@ -16,10 +16,10 @@ let downloadLoadingInstance: LoadingInstance;
export const isRelogin = { show: false };
export const globalHeaders = () => {
return {
Authorization: "Bearer " + getToken(),
Authorization: 'Bearer ' + getToken(),
clientid: import.meta.env.VITE_APP_CLIENT_ID
}
}
};
};
axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8';
axios.defaults.headers['clientid'] = import.meta.env.VITE_APP_CLIENT_ID;

View File

@ -68,7 +68,7 @@ export const validAlphabets = (str: string) => {
*/
export const validEmail = (email: string) => {
const reg =
/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
/^(([^<>()\]\\.,;:\s@"]+(\.[^<>()\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
return reg.test(email);
};

View File

@ -116,7 +116,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>
}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>

View File

@ -299,7 +299,6 @@
<script setup name="User" lang="ts">
import api from "@/api/system/user"
import { UserForm, UserQuery, UserVO } from '@/api/system/user/types';
import { getToken } from "@/utils/auth";
import { treeselect } from "@/api/system/dept";
import { DeptVO } from "@/api/system/dept/types";
import { RoleVO } from "@/api/system/role/types";