From 1f1c7b3f0c10c93dfdb879206e636737a0d672aa Mon Sep 17 00:00:00 2001 From: yxh Date: Wed, 5 Apr 2023 15:11:29 +0800 Subject: [PATCH] =?UTF-8?q?fix=20404=E8=B7=B3=E8=BD=AC=EF=BC=8C=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=A1=86=E5=A4=A7=E5=B0=8F=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/route.ts | 2 +- src/views/error/401.vue | 2 +- src/views/error/404.vue | 2 +- src/views/system/dept/index.vue | 4 +-- src/views/system/dict/dataList.vue | 3 --- src/views/system/dict/index.vue | 4 --- src/views/system/monitor/operLog/index.vue | 3 +-- src/views/system/post/index.vue | 6 ++--- src/views/system/role/index.vue | 6 ++--- src/views/system/sysJob/list/index.vue | 4 +-- src/views/system/tools/gen/index.vue | 5 ++-- src/views/system/user/index.vue | 30 ++++++++++------------ 12 files changed, 29 insertions(+), 42 deletions(-) diff --git a/src/router/route.ts b/src/router/route.ts index c9c6e73..379c6e5 100644 --- a/src/router/route.ts +++ b/src/router/route.ts @@ -1109,7 +1109,7 @@ export const demoRoutes:Array = [ */ export const notFoundAndNoPower = [ { - path: '/:path(.*)*', + path: '/:path(.*)', name: 'notFound', component: () => import('/@/views/error/404.vue'), meta: { diff --git a/src/views/error/401.vue b/src/views/error/401.vue index 711fa25..9afe13b 100644 --- a/src/views/error/401.vue +++ b/src/views/error/401.vue @@ -13,7 +13,7 @@
diff --git a/src/views/error/404.vue b/src/views/error/404.vue index 3a7ce22..1a5e465 100644 --- a/src/views/error/404.vue +++ b/src/views/error/404.vue @@ -13,7 +13,7 @@
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 931b861..98e6b7e 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -4,10 +4,10 @@
- + - + diff --git a/src/views/system/dict/dataList.vue b/src/views/system/dict/dataList.vue index 96351bf..b9bf9c1 100644 --- a/src/views/system/dict/dataList.vue +++ b/src/views/system/dict/dataList.vue @@ -8,7 +8,6 @@ v-model="tableData.param.dictType" placeholder="请输入字典类型" clearable - size="default" @keyup.enter.native="dataList" /> @@ -17,7 +16,6 @@ v-model="tableData.param.dictLabel" placeholder="请输入字典标签" clearable - size="default" @keyup.enter.native="dataList" /> @@ -26,7 +24,6 @@ v-model="tableData.param.status" placeholder="字典状态" clearable - size="default" style="width: 240px" > diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index fd47b00..80c28f0 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -8,7 +8,6 @@ v-model="tableData.param.dictName" placeholder="请输入字典名称" clearable - size="default" style="width: 240px" @keyup.enter.native="typeList" /> @@ -18,7 +17,6 @@ v-model="tableData.param.dictType" placeholder="请输入字典类型" clearable - size="default" style="width: 240px" @keyup.enter.native="typeList" /> @@ -28,7 +26,6 @@ v-model="tableData.param.status" placeholder="字典状态" clearable - size="default" style="width: 240px" > @@ -38,7 +35,6 @@ - + - + - + - + diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 6a2a7bb..9dac0b3 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -4,10 +4,10 @@
- + - + @@ -78,7 +78,7 @@ import EditRole from '/@/views/system/role/component/editRole.vue'; import DataScope from '/@/views/system/role/component/dataScope.vue'; import {deleteRole, getRoleList} from "/@/api/system/role"; import {getDeptTree} from '/@/api/system/user/index'; -import UserList from '/@/views/system/user/component/userList.vue'; +import UserList from '/@/views/system/user/component/userList.vue'; // 定义接口来定义对象的类型 interface TableData { diff --git a/src/views/system/sysJob/list/index.vue b/src/views/system/sysJob/list/index.vue index 4269dbc..8e09fc0 100644 --- a/src/views/system/sysJob/list/index.vue +++ b/src/views/system/sysJob/list/index.vue @@ -6,12 +6,12 @@ - + - + diff --git a/src/views/system/tools/gen/index.vue b/src/views/system/tools/gen/index.vue index 9e09585..ba58c29 100644 --- a/src/views/system/tools/gen/index.vue +++ b/src/views/system/tools/gen/index.vue @@ -4,15 +4,14 @@
- + - + @@ -38,7 +37,6 @@ v-model="param.mobile" placeholder="请输入手机号码" clearable - size="default" style="width: 240px" @keyup.enter.native="userList" /> @@ -48,7 +46,6 @@ v-model="param.status" placeholder="用户状态" clearable - size="default" style="width: 240px" > @@ -58,7 +55,6 @@
- + @@ -107,14 +103,14 @@ import {toRefs, reactive, onMounted, ref, defineComponent, watch, getCurrentInstance} from 'vue'; import {ElTree,FormInstance} from 'element-plus'; import { Search } from '@element-plus/icons-vue' -import UserList from '/@/views/system/user/component/userList.vue'; +import UserList from '/@/views/system/user/component/userList.vue'; import {getDeptTree} from '/@/api/system/user/index'; - -interface QueryParam { + +interface QueryParam { ids:number[]; deptProps:{}; deptData:any[]; - param: { + param: { deptId:string; mobile:string; status:string; @@ -182,11 +178,11 @@ export default defineComponent({ // 打开新增用户弹窗 const onOpenAddUser = () => { userListRef.value.onOpenAddUser(); - }; + }; // 删除用户 const onRowDel = () => { - userListRef.value.onRowDel(null); - }; + userListRef.value.onRowDel(null); + }; // 页面加载时 onMounted(() => { initTableData(); @@ -197,12 +193,12 @@ export default defineComponent({ const deptFilterNode = (value: string, data:any) => { if (!value) return true; return data.deptName.includes(value) - }; + }; // 节点单击事件 const handleNodeClick = (data:any) => { state.param.deptId = data.deptId; userList(); - }; + }; /** 重置按钮操作 */ const resetQuery = (formEl: FormInstance | undefined) => { if (!formEl) return @@ -212,14 +208,14 @@ export default defineComponent({ return { queryRef, userListRef, - onOpenAddUser, - onRowDel, + onOpenAddUser, + onRowDel, deptFilterNode, filterText, treeRef, search, sys_user_sex, - userList, + userList, handleNodeClick, resetQuery, ...toRefs(state),