diff --git a/package-lock.json b/package-lock.json index 78c5eaf..0624a21 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3049,7 +3049,11 @@ "node_modules/connect/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", +<<<<<<< HEAD + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", +======= "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", +>>>>>>> 40d50ccf36aef63b9c0df852b2171d9185ea2c1f "dev": true }, "node_modules/consola": { @@ -3535,9 +3539,15 @@ } }, "node_modules/dayjs": { +<<<<<<< HEAD + "version": "1.11.3", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.3.tgz", + "integrity": "sha512-xxwlswWOlGhzgQ4TKzASQkUhqERI3egRNqgV4ScR8wlANA/A9tZ7miXa44vTTKEq5l7vWoL5G57bG3zA+Kow0A==" +======= "version": "1.11.2", "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.2.tgz", "integrity": "sha512-F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw==" +>>>>>>> 40d50ccf36aef63b9c0df852b2171d9185ea2c1f }, "node_modules/debug": { "version": "4.3.4", @@ -4352,9 +4362,15 @@ } }, "node_modules/esbuild-register": { +<<<<<<< HEAD + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/esbuild-register/-/esbuild-register-3.3.3.tgz", + "integrity": "sha512-eFHOkutgIMJY5gc8LUp/7c+LLlDqzNi9T6AwCZ2WKKl3HmT+5ef3ZRyPPxDOynInML0fgaC50yszPKfPnjC0NQ==", +======= "version": "3.3.2", "resolved": "https://registry.npmjs.org/esbuild-register/-/esbuild-register-3.3.2.tgz", "integrity": "sha512-jceAtTO6zxPmCfSD5cBb3rgIK1vmuqCKYwgylHiS1BF4pq0jJiJb4K2QMuqF4BEw7XDBRatYzip0upyTzfkgsQ==", +>>>>>>> 40d50ccf36aef63b9c0df852b2171d9185ea2c1f "dev": true, "peerDependencies": { "esbuild": ">=0.12 <1" @@ -6082,7 +6098,11 @@ "node_modules/is-module": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", +<<<<<<< HEAD + "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==", +======= "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=", +>>>>>>> 40d50ccf36aef63b9c0df852b2171d9185ea2c1f "dev": true }, "node_modules/is-number": { @@ -6232,9 +6252,15 @@ } }, "node_modules/jake/node_modules/async": { +<<<<<<< HEAD + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", + "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==", +======= "version": "3.2.3", "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==", +>>>>>>> 40d50ccf36aef63b9c0df852b2171d9185ea2c1f "dev": true }, "node_modules/jake/node_modules/chalk": { @@ -7854,9 +7880,15 @@ } }, "node_modules/pinia/node_modules/vue-demi": { +<<<<<<< HEAD + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.1.tgz", + "integrity": "sha512-xmkJ56koG3ptpLnpgmIzk9/4nFf4CqduSJbUM0OdPoU87NwRuZ6x49OLhjSa/fC15fV+5CbEnrxU4oyE022svg==", +======= "version": "0.12.5", "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.12.5.tgz", "integrity": "sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q==", +>>>>>>> 40d50ccf36aef63b9c0df852b2171d9185ea2c1f "hasInstallScript": true, "bin": { "vue-demi-fix": "bin/vue-demi-fix.js", @@ -13694,7 +13726,11 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", +<<<<<<< HEAD + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", +======= "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", +>>>>>>> 40d50ccf36aef63b9c0df852b2171d9185ea2c1f "dev": true } } @@ -14049,9 +14085,15 @@ "requires": {} }, "dayjs": { +<<<<<<< HEAD + "version": "1.11.3", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.3.tgz", + "integrity": "sha512-xxwlswWOlGhzgQ4TKzASQkUhqERI3egRNqgV4ScR8wlANA/A9tZ7miXa44vTTKEq5l7vWoL5G57bG3zA+Kow0A==" +======= "version": "1.11.2", "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.2.tgz", "integrity": "sha512-F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw==" +>>>>>>> 40d50ccf36aef63b9c0df852b2171d9185ea2c1f }, "debug": { "version": "4.3.4", @@ -14603,9 +14645,15 @@ "optional": true }, "esbuild-register": { +<<<<<<< HEAD + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/esbuild-register/-/esbuild-register-3.3.3.tgz", + "integrity": "sha512-eFHOkutgIMJY5gc8LUp/7c+LLlDqzNi9T6AwCZ2WKKl3HmT+5ef3ZRyPPxDOynInML0fgaC50yszPKfPnjC0NQ==", +======= "version": "3.3.2", "resolved": "https://registry.npmjs.org/esbuild-register/-/esbuild-register-3.3.2.tgz", "integrity": "sha512-jceAtTO6zxPmCfSD5cBb3rgIK1vmuqCKYwgylHiS1BF4pq0jJiJb4K2QMuqF4BEw7XDBRatYzip0upyTzfkgsQ==", +>>>>>>> 40d50ccf36aef63b9c0df852b2171d9185ea2c1f "dev": true, "requires": {} }, @@ -15884,7 +15932,11 @@ "is-module": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", +<<<<<<< HEAD + "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==", +======= "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=", +>>>>>>> 40d50ccf36aef63b9c0df852b2171d9185ea2c1f "dev": true }, "is-number": { @@ -15989,9 +16041,15 @@ }, "dependencies": { "async": { +<<<<<<< HEAD + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", + "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==", +======= "version": "3.2.3", "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==", +>>>>>>> 40d50ccf36aef63b9c0df852b2171d9185ea2c1f "dev": true }, "chalk": { @@ -17254,9 +17312,15 @@ }, "dependencies": { "vue-demi": { +<<<<<<< HEAD + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.1.tgz", + "integrity": "sha512-xmkJ56koG3ptpLnpgmIzk9/4nFf4CqduSJbUM0OdPoU87NwRuZ6x49OLhjSa/fC15fV+5CbEnrxU4oyE022svg==", +======= "version": "0.12.5", "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.12.5.tgz", "integrity": "sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q==", +>>>>>>> 40d50ccf36aef63b9c0df852b2171d9185ea2c1f "requires": {} } } diff --git a/src/api/home/index.js b/src/api/home/index.js new file mode 100644 index 0000000..09c47b8 --- /dev/null +++ b/src/api/home/index.js @@ -0,0 +1,9 @@ +import { defAxios as request } from '@/utils/http' +export function updatePwd(data) { + return request({ + url: '/index/updatePwd', + method: 'PUT', + data + }) +} + diff --git a/src/api/system/dept/index.js b/src/api/system/dept/index.js index 1570eaf..8e7dd20 100644 --- a/src/api/system/dept/index.js +++ b/src/api/system/dept/index.js @@ -1,6 +1,6 @@ import { defAxios as request } from '@/utils/http' /** - * 获取部门分页数据接口 + * 获取部门管理数据接口 * @returns 部门分页 */ export function getDeptList(params) { @@ -53,7 +53,7 @@ export function editDept(data) { */ export function deleteDept(id) { return request({ - url: `/dept/delete${[id]}`, + url: `/dept/delete/${id}`, method: 'DELETE' }) } diff --git a/src/api/system/menu/index.js b/src/api/system/menu/index.js index 6854bb6..350e803 100644 --- a/src/api/system/menu/index.js +++ b/src/api/system/menu/index.js @@ -1,7 +1,7 @@ import { defAxios as request } from '@/utils/http' /** - * 获取菜单分页数据接口 - * @returns 菜单分页数据 + * 获取菜单管理数据接口 + * @returns 菜单数据 */ export function getMenuList(params) { return request({ @@ -53,7 +53,7 @@ export function editMenu(data) { */ export function deleteMenu(id) { return request({ - url: `/menu/delete${[id]}`, + url: `/menu/delete/${id}`, method: 'DELETE' }) } diff --git a/src/api/system/role/index.js b/src/api/system/role/index.js index 421e1a3..878e891 100644 --- a/src/api/system/role/index.js +++ b/src/api/system/role/index.js @@ -63,9 +63,9 @@ export function setRoleStatus(data) { * 删除角色 * params */ -export function deleteRole(id) { +export function deleteRole(data) { return request({ - url: `/role/delete${[id]}`, + url: `/role/delete/${data}`, method: 'DELETE' }) } diff --git a/src/api/system/user/index.js b/src/api/system/user/index.js index 6707513..e12c1d7 100644 --- a/src/api/system/user/index.js +++ b/src/api/system/user/index.js @@ -39,9 +39,9 @@ export function editUser(data) { * 删除用户 * params */ -export function deleteUser(id) { +export function deleteUser(idList) { return request({ - url: `/user/delete${[id]}`, + url: `/user/delete/${idList}`, method: 'DELETE' }) } diff --git a/src/api/user/index.js b/src/api/user/index.js index 7704ca4..a157826 100644 --- a/src/api/user/index.js +++ b/src/api/user/index.js @@ -8,15 +8,9 @@ export function getUsers(data = {}) { }) } -export function getUser(id) { - if (id) { - return request({ - url: `/user/${id}`, - method: 'get' - }) - } +export function getUser() { return request({ - url: '/user', + url: '/index/getUserInfo', method: 'get' }) } diff --git a/src/components/CardModal/index.vue b/src/components/CardModal/index.vue new file mode 100644 index 0000000..2929d55 --- /dev/null +++ b/src/components/CardModal/index.vue @@ -0,0 +1,59 @@ + + + + + diff --git a/src/components/DataTable/tools/useDataSource.js b/src/components/DataTable/tools/useDataSource.js index b7726e0..5c85051 100644 --- a/src/components/DataTable/tools/useDataSource.js +++ b/src/components/DataTable/tools/useDataSource.js @@ -44,7 +44,7 @@ export function useDataSource(propsRef, { getPaginationInfo, setPagination, setL } } // 处理数据结构 - const resultInfo = res[listField] ? res[listField] : [] + const resultInfo = res[listField] ? res[listField] : res dataSourceRef.value = dataType === 'tree' ? dealTree(resultInfo) : resultInfo setPagination({ [pageField]: currentPage, @@ -74,7 +74,7 @@ export function useDataSource(propsRef, { getPaginationInfo, setPagination, setL * @returns 返回树形结构数据 */ function dealTree(info) { - const tree = toTreeData(info.data, 'id', 'pid', 'children') + const tree = toTreeData(info, 'id', 'pid', 'children') return tree } diff --git a/src/components/ImgUpload/index.vue b/src/components/ImgUpload/index.vue index 37a7280..129e482 100644 --- a/src/components/ImgUpload/index.vue +++ b/src/components/ImgUpload/index.vue @@ -9,7 +9,6 @@ 点击上传 @@ -50,8 +49,8 @@ export default defineComponent({ } } }) - function handleChange(file) { - console.log(222, file) + function handleChange(res) { + console.log('已选择的文件：', res.file.file) } /** * @description: 上传前判断文件是否符合条件 @@ -60,7 +59,6 @@ export default defineComponent({ */ function handleBeforeUpload(options) { const { file, fileList } = options - console.log(11, file, fileList) if (props.size) { const size = file.file.size if (size < props.size * 1024 * 1024) { diff --git a/src/components/Search/index.vue b/src/components/Search/index.vue index 8d785eb..e14aaa0 100644 --- a/src/components/Search/index.vue +++ b/src/components/Search/index.vue @@ -50,7 +50,7 @@ export default { /* 初始化搜索表单信息 */ function initForm() { data.info.forEach((item) => { - form.value[item.key] = '' + form.value[item.key] = null }) } diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue index 442f32a..f29b85d 100644 --- a/src/layout/components/Header/index.vue +++ b/src/layout/components/Header/index.vue @@ -1,15 +1,35 @@ + + diff --git a/src/layout/components/Logout/components/UpdateModal.vue b/src/layout/components/Logout/components/UpdateModal.vue new file mode 100644 index 0000000..f40569e --- /dev/null +++ b/src/layout/components/Logout/components/UpdateModal.vue @@ -0,0 +1,133 @@ + + diff --git a/src/layout/components/Logout/index.vue b/src/layout/components/Logout/index.vue new file mode 100644 index 0000000..14c8e7b --- /dev/null +++ b/src/layout/components/Logout/index.vue @@ -0,0 +1,108 @@ + + + diff --git a/src/layout/components/Menu/index.vue b/src/layout/components/Menu/index.vue index 5571a5d..aaa1812 100644 --- a/src/layout/components/Menu/index.vue +++ b/src/layout/components/Menu/index.vue @@ -1,6 +1,7 @@ + diff --git a/src/layout/index.vue b/src/layout/index.vue index 22d24a4..d7ebcab 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -32,9 +32,15 @@ import SideBar from './components/Sidebar/index.vue' import Tags from './components/Tags/index.vue' import { useSettingStore } from '@/store/modules/setting.js' import { computed } from 'vue' +import { useUserStore } from '@/store/modules/user.js' const settingStore = useSettingStore() const menuMode = computed(() => settingStore.getMenuMode) const tagsMenuSetting = computed(() => settingStore.getTagsMenuSetting) +const useUser = useUserStore() +function getUserNow() { + useUser.getUserInfo() +} +getUserNow() diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 47af4c2..e60f685 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -9,17 +9,8 @@ export const useUserStore = defineStore('user', { } }, getters: { - userId() { - return this.userInfo?.id - }, - name() { - return this.userInfo?.name - }, - avatar() { - return this.userInfo?.avatar - }, - role() { - return this.userInfo?.role || [] + userInfoMsg() { + return this.userInfo } }, actions: { @@ -27,15 +18,14 @@ export const useUserStore = defineStore('user', { try { const res = await getUser() if (res.code === 0) { - const { id, name, avatar, role } = res.data - this.userInfo = { id, name, avatar, role } - return Promise.resolve(res.data) + this.userInfo = res.data + return Promise.resolve(res.msg) } else { - return Promise.reject(res.message) + return Promise.reject(res.msg) } } catch (error) { console.error(error) - return Promise.reject(error.message) + return Promise.reject(error.msg) } }, logout() { diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 8108522..b9d4976 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -38,38 +38,19 @@ + diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index b1a85cb..3ccdb7e 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -1,81 +1,52 @@ diff --git a/src/views/system/dept/info.js b/src/views/system/dept/info.js new file mode 100644 index 0000000..7286b30 --- /dev/null +++ b/src/views/system/dept/info.js @@ -0,0 +1,12 @@ +const data = [ + { + label: '部门名称', + key: 'name', + props: { + placeholder: '请输入部门名称' + } + } +] + +export default data + diff --git a/src/views/system/dept/table.js b/src/views/system/dept/table.js new file mode 100644 index 0000000..cb0cc9b --- /dev/null +++ b/src/views/system/dept/table.js @@ -0,0 +1,30 @@ +const table = { + columns: [{ + title: '部门编号', + key: 'code', + align: 'center' + }, + { + title: '部门名称', + key: 'name', + align: 'center' + }, + { + title: '排序', + key: 'sort', + align: 'center' + }, + { + title: '创建时间', + key: 'createTime', + align: 'center', + minWidth: 120 + }, + { + title: '更新时间', + key: 'updateTime', + align: 'center', + minWidth: 120 + }] +} +export default table diff --git a/src/views/system/menu/components/MenuModal.vue b/src/views/system/menu/components/MenuModal.vue index bf4296e..e62c0e9 100644 --- a/src/views/system/menu/components/MenuModal.vue +++ b/src/views/system/menu/components/MenuModal.vue @@ -6,21 +6,21 @@ :on-negative-click="handleClose" > diff --git a/src/views/system/menu/info.js b/src/views/system/menu/info.js new file mode 100644 index 0000000..94939bf --- /dev/null +++ b/src/views/system/menu/info.js @@ -0,0 +1,12 @@ +const data = [ + { + label: '菜单名称', + key: 'title', + props: { + placeholder: '请输入菜单名称' + } + } +] + +export default data + diff --git a/src/views/system/menu/table.js b/src/views/system/menu/table.js new file mode 100644 index 0000000..6a87500 --- /dev/null +++ b/src/views/system/menu/table.js @@ -0,0 +1,101 @@ +import { h } from 'vue' +import TableTags from '@/components/DataTable/tools/Tags.vue' +const table = { + columns: [ + { + title: '菜单标题', + key: 'title', + align: 'center', + width: 200 + }, + { + title: '菜单类型', + key: 'type', + align: 'center', + width: 100, + render(row) { + return h(TableTags, { + data: row.type, + filters: [ + { + key: 0, + label: '菜单' + }, + { + key: 1, + label: '节点' + } + ] + }) + } + }, + { + title: '路由地址', + key: 'path', + align: 'center', + width: 200 + }, + { + title: '组件路径', + key: 'component', + align: 'center', + width: 200 + }, + { + title: '状态', + key: 'status', + align: 'center', + width: 100, + render(row) { + return h(TableTags, { + data: row.status, + filters: [ + { + key: 1, + label: '在用' + }, + { + key: 2, + label: '停用' + } + ] + }) + } + }, + { + title: '排序', + key: 'sort', + align: 'center', + width: 100 + }, + { + title: '是否可见', + key: 'hide', + align: 'center', + width: 100, + render(row) { + return h(TableTags, { + data: row.hide, + filters: [ + { + key: 1, + label: '可见' + }, + { + key: 2, + label: '不可见' + } + ] + }) + } + }, + { + title: '创建时间', + key: 'createTime', + align: 'center', + width: 160 + } + ] +} + +export default table diff --git a/src/views/system/role/components/ConfigModal.vue b/src/views/system/role/components/ConfigModal.vue new file mode 100644 index 0000000..247627f --- /dev/null +++ b/src/views/system/role/components/ConfigModal.vue @@ -0,0 +1,113 @@ + + diff --git a/src/views/system/role/components/RoleModal.vue b/src/views/system/role/components/RoleModal.vue new file mode 100644 index 0000000..66ccaae --- /dev/null +++ b/src/views/system/role/components/RoleModal.vue @@ -0,0 +1,166 @@ + + + + diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 0c9e410..8337fb8 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -1,45 +1,86 @@ diff --git a/src/views/system/role/info.js b/src/views/system/role/info.js index 211910b..d80fb79 100644 --- a/src/views/system/role/info.js +++ b/src/views/system/role/info.js @@ -6,24 +6,6 @@ const data = [ placeholder: '请输入角色名称' } } - // { - // label: '角色类型', - // type: 'select', - // key: 'op', - // props: { - // options: [{ - // label: 11, value: 1 - // }] - // } - // }, - // { - // label: '角色类型', - // type: 'date', - // key: 'date', - // props: { - // type: 'date' - // } - // } ] export default data diff --git a/src/views/system/role/table.js b/src/views/system/role/table.js index 04c91b2..7c1a4f8 100644 --- a/src/views/system/role/table.js +++ b/src/views/system/role/table.js @@ -1,71 +1,28 @@ -import TableImage from '@/components/DataTable/tools/Image.vue' -import { h } from 'vue' const data = { columns: [ + { type: 'selection' }, { - title: '用户编号', + title: '角色编号', key: 'code', align: 'center' }, { - title: '头像', - key: 'avatar', - align: 'center', - render(row) { - return h(TableImage, { - images: { - width: 36, - height: 36, - src: row.avatar - } - }) - } - }, - { - title: '用户账号', - key: 'username', - align: 'center' - }, - { - title: '用户姓名', - key: 'realname', - align: 'center' - }, - { - title: '用户类型', - key: 'type', - align: 'center', - width: 100 - }, - { - title: '角色', - key: 'roles', - align: 'center' - - }, - { - title: '状态', - key: 'status', - align: 'center', - width: 100 - }, - { - title: '部门', - key: 'deptName', + title: '角色名称', + key: 'name', align: 'center' }, { title: '创建时间', key: 'createTime', align: 'center', - width: 160 + Minwidth: 160 }, { title: '更新时间', key: 'updateTime', align: 'center', - width: 160 + Minwidth: 160 } ] } diff --git a/src/views/system/user/components/UserModal.vue b/src/views/system/user/components/UserModal.vue index dbf0cdf..2278a5b 100644 --- a/src/views/system/user/components/UserModal.vue +++ b/src/views/system/user/components/UserModal.vue @@ -1,11 +1,18 @@