diff --git a/.env.development b/.env.development index bfdecce..ec6e38a 100644 --- a/.env.development +++ b/.env.development @@ -8,4 +8,4 @@ VITE_PUBLIC_PATH = / VITE_ROUTER_HISTORY = "hash" # 开发环境后端地址 -VITE_APP_BASE_URL = 'http://192.168.10.13:8000' \ No newline at end of file +VITE_APP_BASE_URL = 'http://192.168.10.81:8848' \ No newline at end of file diff --git a/src/api/user.ts b/src/api/user.ts index 6aac1cc..10de275 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -33,12 +33,12 @@ export type RefreshTokenResult = { }; /** 登录 */ -// export const getLogin = (data?: object) => { -// return http.request("post", "/login", { data }); -// }; export const getLogin = (data?: object) => { - return http.request("post", baseUrlApi("login"), { data }); + return http.request("post", "/login", { data }); }; +// export const getLogin = (data?: object) => { +// return http.request("post", baseUrlApi("login"), { data }); +// }; // export const getLogin = (data?: object) => { // const AdminHostUrl = getConfig().AdminHostUrl; diff --git a/src/router/modules/configuration.ts b/src/router/modules/configuration.ts index 70c99c3..c41ccae 100644 --- a/src/router/modules/configuration.ts +++ b/src/router/modules/configuration.ts @@ -4,7 +4,7 @@ export default { meta: { icon: "lollipop", title: "配置管理", - // showLink: false, + showLink: false, rank: 5 }, children: [ diff --git a/src/router/modules/statistics.ts b/src/router/modules/statistics.ts index 0393075..93ae4dc 100644 --- a/src/router/modules/statistics.ts +++ b/src/router/modules/statistics.ts @@ -4,7 +4,7 @@ export default { meta: { icon: "lollipop", title: "数据统计", - // showLink: false, + showLink: false, rank: 4 }, children: [ diff --git a/src/views/system/user/form.vue b/src/views/system/user/form.vue index 39e2dad..e0f5dbc 100644 --- a/src/views/system/user/form.vue +++ b/src/views/system/user/form.vue @@ -18,16 +18,158 @@ const props = withDefaults(defineProps(), { /** 状态 */ status: null, /** 组织 */ - dept: { - id: null, - name: "" - } + deptId: null }) }); const ruleFormRef = ref(); const newFormInline = ref(props.formInline); +// const deptList = reactive([ +// { +// name: "杭州总公司", +// parentId: 0, +// id: 100, +// sort: 0, +// phone: "15888888888", +// principal: "@cname()", +// email: "@email", +// status: 1, // 状态 1 启用 0 停用 +// type: 1, // 1 公司 2 分公司 3 部门 +// createTime: 1605456000000, +// remark: "@cparagraph(1, 3)" +// }, +// { +// name: "郑州分公司", +// parentId: 100, +// id: 101, +// sort: 1, +// phone: "15888888888", +// principal: "@cname()", +// email: "@email", +// status: 1, +// type: 2, +// createTime: 1605456000000, +// remark: "@cparagraph(1, 3)" +// }, +// { +// name: "研发部门", +// parentId: 101, +// id: 103, +// sort: 1, +// phone: "15888888888", +// principal: "@cname()", +// email: "@email", +// status: 1, +// type: 3, +// createTime: 1605456000000, +// remark: "@cparagraph(1, 3)" +// }, +// { +// name: "市场部门", +// parentId: 102, +// id: 108, +// sort: 1, +// phone: "15888888888", +// principal: "@cname()", +// email: "@email", +// status: 1, +// type: 3, +// createTime: 1605456000000, +// remark: "@cparagraph(1, 3)" +// }, +// { +// name: "深圳分公司", +// parentId: 100, +// id: 102, +// sort: 2, +// phone: "15888888888", +// principal: "@cname()", +// email: "@email", +// status: 1, +// type: 2, +// createTime: 1605456000000, +// remark: "@cparagraph(1, 3)" +// }, +// { +// name: "市场部门", +// parentId: 101, +// id: 104, +// sort: 2, +// phone: "15888888888", +// principal: "@cname()", +// email: "@email", +// status: 1, +// type: 3, +// createTime: 1605456000000, +// remark: "@cparagraph(1, 3)" +// }, +// { +// name: "财务部门", +// parentId: 102, +// id: 109, +// sort: 2, +// phone: "15888888888", +// principal: "@cname()", +// email: "@email", +// status: 1, +// type: 3, +// createTime: 1605456000000, +// remark: "@cparagraph(1, 3)" +// }, +// { +// name: "测试部门", +// parentId: 101, +// id: 105, +// sort: 3, +// phone: "15888888888", +// principal: "@cname()", +// email: "@email", +// status: 0, +// type: 3, +// createTime: 1605456000000, +// remark: "@cparagraph(1, 3)" +// }, +// { +// name: "财务部门", +// parentId: 101, +// id: 106, +// sort: 4, +// phone: "15888888888", +// principal: "@cname()", +// email: "@email", +// status: 1, +// type: 3, +// createTime: 1605456000000, +// remark: "@cparagraph(1, 3)" +// }, +// { +// name: "运维部门", +// parentId: 101, +// id: 107, +// sort: 5, +// phone: "15888888888", +// principal: "@cname()", +// email: "@email", +// status: 0, +// type: 3, +// createTime: 1605456000000, +// remark: "@cparagraph(1, 3)" +// } +// ]); +// const buildTree = (data: any, parentId: number) => { +// const children = data.filter( +// (node: { parentId: number }) => node.parentId === parentId +// ); +// return children.map((node: { id: any; name: any }) => { +// const { id, name } = node; +// return { +// value: id, +// label: name, +// children: buildTree(data, id) +// }; +// }); +// }; function getRef() { return ruleFormRef.value; } @@ -67,5 +209,22 @@ defineExpose({ getRef }); inactive-text="已关闭" /> + + + + + + + + diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 22b8d6f..0408780 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -37,6 +37,7 @@ const { confirmClick, handleCheckAllChange, handleCheckedCitiesChange, + resetPassword, onSearch, openDialog, resetForm, @@ -162,7 +163,6 @@ console.log(allRole); link type="primary" :size="size" - @click="handleUpdate(row)" :icon="useRenderIcon(More)" />