diff --git a/.env.development b/.env.development index 5560e19..647351e 100644 --- a/.env.development +++ b/.env.development @@ -6,10 +6,10 @@ VITE_PUBLIC_PATH = / # 跨域代理,您可以配置多个 ,请注意,没有换行符 -VITE_PROXY = [["/jeecgboot","http://localhost:8080/jeecg-boot"],["/upload","http://localhost:3300/upload"]] +VITE_PROXY = [["/jeecgboot","http://localhost:8091/jeecg-boot"],["/upload","http://localhost:3300/upload"]] #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=http://localhost:8080/jeecg-boot +VITE_GLOB_DOMAIN_URL=http://localhost:8091/jeecg-boot #后台接口父地址(必填) VITE_GLOB_API_URL=/jeecgboot diff --git a/src/views/cees/user/CeesUser.api.ts b/src/views/cees/user/CeesUser.api.ts index 6d627fc..35346e1 100644 --- a/src/views/cees/user/CeesUser.api.ts +++ b/src/views/cees/user/CeesUser.api.ts @@ -4,14 +4,15 @@ import { useMessage } from "/@/hooks/web/useMessage"; const { createConfirm } = useMessage(); enum Api { - list = '/org.jeecg.modules/ceesUser/list', - save='/org.jeecg.modules/ceesUser/add', - edit='/org.jeecg.modules/ceesUser/edit', - deleteOne = '/org.jeecg.modules/ceesUser/delete', - deleteBatch = '/org.jeecg.modules/ceesUser/deleteBatch', - importExcel = '/org.jeecg.modules/ceesUser/importExcel', - exportXls = '/org.jeecg.modules/ceesUser/exportXls', + list = '/cees/ceesUser/list', + save='/cees/ceesUser/add', + edit='/cees/ceesUser/edit', + deleteOne = '/cees/ceesUser/delete', + deleteBatch = '/cees/ceesUser/deleteBatch', + importExcel = '/cees/ceesUser/importExcel', + exportXls = '/cees/ceesUser/exportXls', updateGroupUser = '/cees/ceesGroup/updateGroupUser', + createAccount = '/cees/ceesUser/createAccount' } //获取分组 @@ -80,3 +81,9 @@ export const saveOrUpdate = (params, isUpdate) => { updateGroupUser(groupUserParams); return defHttp.post({url: url, params}); } + +// 生成账号 +export const generateAccount = async (params) => { + const res = await defHttp.post({url: Api.createAccount, params}); + return res; +} diff --git a/src/views/cees/user/CeesUser.data.ts b/src/views/cees/user/CeesUser.data.ts index 8d3f3f6..f1bdcbe 100644 --- a/src/views/cees/user/CeesUser.data.ts +++ b/src/views/cees/user/CeesUser.data.ts @@ -13,20 +13,20 @@ export const updateGroupOptions = reactive({ }); //列表数据 export const columns: BasicColumn[] = [ - { - title: '姓名', - align: 'center', - dataIndex: 'userName', - }, { title: '用户身份码', align: 'center', dataIndex: 'userId', }, + { + title: '姓名', + align: 'center', + dataIndex: 'userName', + }, { title: '用户专业ID', align: 'center', - dataIndex: 'userHeadingCode', + dataIndex: 'userMajorId', }, { title: '身份', @@ -93,7 +93,7 @@ export const formSchema: FormSchema[] = [ options: [ { label: '管理员', value: 1 }, { label: '学生', value: 2 }, - { label: '老师', value: 3 }, + { label: '本校老师', value: 3 }, { label: '外校老师', value: 4 }, ], }, diff --git a/src/views/cees/user/CeesUserList.vue b/src/views/cees/user/CeesUserList.vue index 469c0a4..a1c16ea 100644 --- a/src/views/cees/user/CeesUserList.vue +++ b/src/views/cees/user/CeesUserList.vue @@ -22,6 +22,10 @@ + + + 生成账号 + + + + + + + + + + {{ item.name }} + + + + + + + + {{ item.name }} + + + + + + + + + - + diff --git a/src/views/cees/user/components/CeesUserForm.vue b/src/views/cees/user/components/CeesUserForm.vue index d74051e..c5c68e1 100644 --- a/src/views/cees/user/components/CeesUserForm.vue +++ b/src/views/cees/user/components/CeesUserForm.vue @@ -40,7 +40,7 @@ }); let formData = {}; - const queryByIdUrl = '/org.jeecg.modules/ceesUser/queryById'; + const queryByIdUrl = '/cees/ceesUser/queryById'; async function initFormData() { let params = { id: props.formData.dataId }; const data = await defHttp.get({ url: queryByIdUrl, params });