fix 404跳转,搜索框大小统一
This commit is contained in:
parent
731fb66724
commit
1f1c7b3f0c
@ -1109,7 +1109,7 @@ export const demoRoutes:Array<RouteRecordRaw> = [
|
|||||||
*/
|
*/
|
||||||
export const notFoundAndNoPower = [
|
export const notFoundAndNoPower = [
|
||||||
{
|
{
|
||||||
path: '/:path(.*)*',
|
path: '/:path(.*)',
|
||||||
name: 'notFound',
|
name: 'notFound',
|
||||||
component: () => import('/@/views/error/404.vue'),
|
component: () => import('/@/views/error/404.vue'),
|
||||||
meta: {
|
meta: {
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="right">
|
<div class="right">
|
||||||
<img
|
<img
|
||||||
src="https://img-blog.csdnimg.cn/3333f265772a4fa89287993500ecbf96.png?x-oss-process=image/watermark,type_d3F5LXplbmhlaQ,shadow_50,text_Q1NETiBAbHl0LXRvcA==,size_16,color_FFFFFF,t_70,g_se,x_16"
|
src="../../assets/401.png"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="right">
|
<div class="right">
|
||||||
<img
|
<img
|
||||||
src="https://img-blog.csdnimg.cn/9eb1d85a417f4ed1ba7107f149ce3da1.png?x-oss-process=image/watermark,type_d3F5LXplbmhlaQ,shadow_50,text_Q1NETiBAbHl0LXRvcA==,size_16,color_FFFFFF,t_70,g_se,x_16"
|
src="../../assets/404.png"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -4,10 +4,10 @@
|
|||||||
<div class="system-dept-search mb15">
|
<div class="system-dept-search mb15">
|
||||||
<el-form :inline="true">
|
<el-form :inline="true">
|
||||||
<el-form-item label="部门名称">
|
<el-form-item label="部门名称">
|
||||||
<el-input size="default" v-model="tableData.param.deptName" placeholder="请输入部门名称" class="w-50 m-2" clearable/>
|
<el-input v-model="tableData.param.deptName" placeholder="请输入部门名称" class="w-50 m-2" clearable/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="状态">
|
<el-form-item label="状态">
|
||||||
<el-select size="default" placeholder="请选择状态" class="w-50 m-2" v-model="tableData.param.status" clearable>
|
<el-select placeholder="请选择状态" class="w-50 m-2" v-model="tableData.param.status" clearable>
|
||||||
<el-option label="启用" value="1" />
|
<el-option label="启用" value="1" />
|
||||||
<el-option label="禁用" value="0" />
|
<el-option label="禁用" value="0" />
|
||||||
</el-select>
|
</el-select>
|
||||||
|
@ -8,7 +8,6 @@
|
|||||||
v-model="tableData.param.dictType"
|
v-model="tableData.param.dictType"
|
||||||
placeholder="请输入字典类型"
|
placeholder="请输入字典类型"
|
||||||
clearable
|
clearable
|
||||||
size="default"
|
|
||||||
@keyup.enter.native="dataList"
|
@keyup.enter.native="dataList"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@ -17,7 +16,6 @@
|
|||||||
v-model="tableData.param.dictLabel"
|
v-model="tableData.param.dictLabel"
|
||||||
placeholder="请输入字典标签"
|
placeholder="请输入字典标签"
|
||||||
clearable
|
clearable
|
||||||
size="default"
|
|
||||||
@keyup.enter.native="dataList"
|
@keyup.enter.native="dataList"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@ -26,7 +24,6 @@
|
|||||||
v-model="tableData.param.status"
|
v-model="tableData.param.status"
|
||||||
placeholder="字典状态"
|
placeholder="字典状态"
|
||||||
clearable
|
clearable
|
||||||
size="default"
|
|
||||||
style="width: 240px"
|
style="width: 240px"
|
||||||
>
|
>
|
||||||
<el-option label="启用" :value="1"/>
|
<el-option label="启用" :value="1"/>
|
||||||
|
@ -8,7 +8,6 @@
|
|||||||
v-model="tableData.param.dictName"
|
v-model="tableData.param.dictName"
|
||||||
placeholder="请输入字典名称"
|
placeholder="请输入字典名称"
|
||||||
clearable
|
clearable
|
||||||
size="default"
|
|
||||||
style="width: 240px"
|
style="width: 240px"
|
||||||
@keyup.enter.native="typeList"
|
@keyup.enter.native="typeList"
|
||||||
/>
|
/>
|
||||||
@ -18,7 +17,6 @@
|
|||||||
v-model="tableData.param.dictType"
|
v-model="tableData.param.dictType"
|
||||||
placeholder="请输入字典类型"
|
placeholder="请输入字典类型"
|
||||||
clearable
|
clearable
|
||||||
size="default"
|
|
||||||
style="width: 240px"
|
style="width: 240px"
|
||||||
@keyup.enter.native="typeList"
|
@keyup.enter.native="typeList"
|
||||||
/>
|
/>
|
||||||
@ -28,7 +26,6 @@
|
|||||||
v-model="tableData.param.status"
|
v-model="tableData.param.status"
|
||||||
placeholder="字典状态"
|
placeholder="字典状态"
|
||||||
clearable
|
clearable
|
||||||
size="default"
|
|
||||||
style="width: 240px"
|
style="width: 240px"
|
||||||
>
|
>
|
||||||
<el-option label="启用" :value="1"/>
|
<el-option label="启用" :value="1"/>
|
||||||
@ -38,7 +35,6 @@
|
|||||||
<el-form-item label="创建时间" prop="dateRange">
|
<el-form-item label="创建时间" prop="dateRange">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="tableData.param.dateRange"
|
v-model="tableData.param.dateRange"
|
||||||
size="default"
|
|
||||||
style="width: 240px"
|
style="width: 240px"
|
||||||
value-format="YYYY-MM-DD"
|
value-format="YYYY-MM-DD"
|
||||||
type="daterange"
|
type="daterange"
|
||||||
|
@ -10,14 +10,13 @@
|
|||||||
v-model="tableData.param.title"
|
v-model="tableData.param.title"
|
||||||
placeholder="请输入系统模块"
|
placeholder="请输入系统模块"
|
||||||
clearable
|
clearable
|
||||||
size="small"
|
|
||||||
@keyup.enter.native="sysOperLogList"
|
@keyup.enter.native="sysOperLogList"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8" class="colBlock">
|
<el-col :span="8" class="colBlock">
|
||||||
<el-form-item label="请求方式" prop="requestMethod">
|
<el-form-item label="请求方式" prop="requestMethod">
|
||||||
<el-select v-model="tableData.param.requestMethod" placeholder="请选择请求方式" clearable size="small">
|
<el-select v-model="tableData.param.requestMethod" placeholder="请选择请求方式" clearable >
|
||||||
<el-option
|
<el-option
|
||||||
v-for="dict in sys_oper_log_type"
|
v-for="dict in sys_oper_log_type"
|
||||||
:key="dict.value"
|
:key="dict.value"
|
||||||
|
@ -4,13 +4,13 @@
|
|||||||
<div class="system-user-search mb15">
|
<div class="system-user-search mb15">
|
||||||
<el-form :inline="true">
|
<el-form :inline="true">
|
||||||
<el-form-item label="岗位名称">
|
<el-form-item label="岗位名称">
|
||||||
<el-input size="default" v-model="tableData.param.postName" placeholder="请输入岗位名称" class="w-50 m-2" clearable/>
|
<el-input v-model="tableData.param.postName" placeholder="请输入岗位名称" class="w-50 m-2" clearable/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="岗位编码">
|
<el-form-item label="岗位编码">
|
||||||
<el-input size="default" v-model="tableData.param.postCode" placeholder="请输入岗位编码" class="w-50 m-2" clearable/>
|
<el-input v-model="tableData.param.postCode" placeholder="请输入岗位编码" class="w-50 m-2" clearable/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="状态">
|
<el-form-item label="状态">
|
||||||
<el-select size="default" placeholder="请选择状态" class="w-50 m-2" v-model="tableData.param.status" clearable>
|
<el-select placeholder="请选择状态" class="w-50 m-2" v-model="tableData.param.status" clearable>
|
||||||
<el-option label="启用" value="1" />
|
<el-option label="启用" value="1" />
|
||||||
<el-option label="禁用" value="0" />
|
<el-option label="禁用" value="0" />
|
||||||
</el-select>
|
</el-select>
|
||||||
|
@ -4,10 +4,10 @@
|
|||||||
<div class="system-user-search mb15">
|
<div class="system-user-search mb15">
|
||||||
<el-form :inline="true">
|
<el-form :inline="true">
|
||||||
<el-form-item label="角色名称">
|
<el-form-item label="角色名称">
|
||||||
<el-input size="default" v-model="tableData.param.roleName" placeholder="请输入角色名称" class="w-50 m-2" clearable/>
|
<el-input v-model="tableData.param.roleName" placeholder="请输入角色名称" class="w-50 m-2" clearable/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="状态">
|
<el-form-item label="状态">
|
||||||
<el-select size="default" placeholder="请选择状态" class="w-50 m-2" v-model="tableData.param.roleStatus" clearable>
|
<el-select placeholder="请选择状态" class="w-50 m-2" v-model="tableData.param.roleStatus" clearable>
|
||||||
<el-option label="启用" value="1" />
|
<el-option label="启用" value="1" />
|
||||||
<el-option label="禁用" value="0" />
|
<el-option label="禁用" value="0" />
|
||||||
</el-select>
|
</el-select>
|
||||||
@ -78,7 +78,7 @@ import EditRole from '/@/views/system/role/component/editRole.vue';
|
|||||||
import DataScope from '/@/views/system/role/component/dataScope.vue';
|
import DataScope from '/@/views/system/role/component/dataScope.vue';
|
||||||
import {deleteRole, getRoleList} from "/@/api/system/role";
|
import {deleteRole, getRoleList} from "/@/api/system/role";
|
||||||
import {getDeptTree} from '/@/api/system/user/index';
|
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 {
|
interface TableData {
|
||||||
|
@ -6,12 +6,12 @@
|
|||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="8" class="colBlock">
|
<el-col :span="8" class="colBlock">
|
||||||
<el-form-item label="任务名称" prop="jobName">
|
<el-form-item label="任务名称" prop="jobName">
|
||||||
<el-input v-model="tableData.param.jobName" placeholder="请输入任务名称" clearable size="small" @keyup.enter.native="sysJobList" />
|
<el-input v-model="tableData.param.jobName" placeholder="请输入任务名称" clearable @keyup.enter.native="sysJobList" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8" class="colBlock">
|
<el-col :span="8" class="colBlock">
|
||||||
<el-form-item label="任务组名" prop="jobGroup">
|
<el-form-item label="任务组名" prop="jobGroup">
|
||||||
<el-select v-model="tableData.param.jobGroup" placeholder="请选择任务组名" clearable size="small">
|
<el-select v-model="tableData.param.jobGroup" placeholder="请选择任务组名" clearable >
|
||||||
<el-option v-for="dict in sys_job_group" :key="dict.value" :label="dict.label" :value="dict.value" />
|
<el-option v-for="dict in sys_job_group" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
@ -4,15 +4,14 @@
|
|||||||
<div class="system-user-search mb15">
|
<div class="system-user-search mb15">
|
||||||
<el-form :inline="true" ref="queryRef" :model="tableData.param">
|
<el-form :inline="true" ref="queryRef" :model="tableData.param">
|
||||||
<el-form-item label="表名称" prop="tableName">
|
<el-form-item label="表名称" prop="tableName">
|
||||||
<el-input size="default" v-model="tableData.param.tableName" placeholder="请输入表名称" class="w-50 m-2" clearable/>
|
<el-input v-model="tableData.param.tableName" placeholder="请输入表名称" class="w-50 m-2" clearable/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="表描述" prop="tableComment">
|
<el-form-item label="表描述" prop="tableComment">
|
||||||
<el-input size="default" v-model="tableData.param.tableComment" placeholder="请输入岗位编码" class="w-50 m-2" clearable/>
|
<el-input v-model="tableData.param.tableComment" placeholder="请输入岗位编码" class="w-50 m-2" clearable/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="创建时间" prop="dateRange">
|
<el-form-item label="创建时间" prop="dateRange">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="tableData.param.dateRange"
|
v-model="tableData.param.dateRange"
|
||||||
size="default"
|
|
||||||
style="width: 240px"
|
style="width: 240px"
|
||||||
value-format="YYYY-MM-DD"
|
value-format="YYYY-MM-DD"
|
||||||
type="daterange"
|
type="daterange"
|
||||||
|
@ -28,7 +28,6 @@
|
|||||||
v-model="param.keyWords"
|
v-model="param.keyWords"
|
||||||
placeholder="请输入用户账号或姓名"
|
placeholder="请输入用户账号或姓名"
|
||||||
clearable
|
clearable
|
||||||
size="default"
|
|
||||||
style="width: 240px"
|
style="width: 240px"
|
||||||
@keyup.enter.native="userList"
|
@keyup.enter.native="userList"
|
||||||
/>
|
/>
|
||||||
@ -38,7 +37,6 @@
|
|||||||
v-model="param.mobile"
|
v-model="param.mobile"
|
||||||
placeholder="请输入手机号码"
|
placeholder="请输入手机号码"
|
||||||
clearable
|
clearable
|
||||||
size="default"
|
|
||||||
style="width: 240px"
|
style="width: 240px"
|
||||||
@keyup.enter.native="userList"
|
@keyup.enter.native="userList"
|
||||||
/>
|
/>
|
||||||
@ -48,7 +46,6 @@
|
|||||||
v-model="param.status"
|
v-model="param.status"
|
||||||
placeholder="用户状态"
|
placeholder="用户状态"
|
||||||
clearable
|
clearable
|
||||||
size="default"
|
|
||||||
style="width: 240px"
|
style="width: 240px"
|
||||||
>
|
>
|
||||||
<el-option label="启用" :value="1"/>
|
<el-option label="启用" :value="1"/>
|
||||||
@ -58,7 +55,6 @@
|
|||||||
<el-form-item label="创建时间" prop="dateRange">
|
<el-form-item label="创建时间" prop="dateRange">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="param.dateRange"
|
v-model="param.dateRange"
|
||||||
size="default"
|
|
||||||
style="width: 240px"
|
style="width: 240px"
|
||||||
value-format="YYYY-MM-DD"
|
value-format="YYYY-MM-DD"
|
||||||
type="daterange"
|
type="daterange"
|
||||||
@ -95,7 +91,7 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<UserList ref="userListRef" :dept-data="deptData" :gender-data="sys_user_sex" :param="param" @getUserList="userList"/>
|
<UserList ref="userListRef" :dept-data="deptData" :gender-data="sys_user_sex" :param="param" @getUserList="userList"/>
|
||||||
</el-card>
|
</el-card>
|
||||||
</el-col>
|
</el-col>
|
||||||
@ -107,14 +103,14 @@
|
|||||||
import {toRefs, reactive, onMounted, ref, defineComponent, watch, getCurrentInstance} from 'vue';
|
import {toRefs, reactive, onMounted, ref, defineComponent, watch, getCurrentInstance} from 'vue';
|
||||||
import {ElTree,FormInstance} from 'element-plus';
|
import {ElTree,FormInstance} from 'element-plus';
|
||||||
import { Search } from '@element-plus/icons-vue'
|
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';
|
import {getDeptTree} from '/@/api/system/user/index';
|
||||||
|
|
||||||
interface QueryParam {
|
interface QueryParam {
|
||||||
ids:number[];
|
ids:number[];
|
||||||
deptProps:{};
|
deptProps:{};
|
||||||
deptData:any[];
|
deptData:any[];
|
||||||
param: {
|
param: {
|
||||||
deptId:string;
|
deptId:string;
|
||||||
mobile:string;
|
mobile:string;
|
||||||
status:string;
|
status:string;
|
||||||
@ -182,11 +178,11 @@ export default defineComponent({
|
|||||||
// 打开新增用户弹窗
|
// 打开新增用户弹窗
|
||||||
const onOpenAddUser = () => {
|
const onOpenAddUser = () => {
|
||||||
userListRef.value.onOpenAddUser();
|
userListRef.value.onOpenAddUser();
|
||||||
};
|
};
|
||||||
// 删除用户
|
// 删除用户
|
||||||
const onRowDel = () => {
|
const onRowDel = () => {
|
||||||
userListRef.value.onRowDel(null);
|
userListRef.value.onRowDel(null);
|
||||||
};
|
};
|
||||||
// 页面加载时
|
// 页面加载时
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
initTableData();
|
initTableData();
|
||||||
@ -197,12 +193,12 @@ export default defineComponent({
|
|||||||
const deptFilterNode = (value: string, data:any) => {
|
const deptFilterNode = (value: string, data:any) => {
|
||||||
if (!value) return true;
|
if (!value) return true;
|
||||||
return data.deptName.includes(value)
|
return data.deptName.includes(value)
|
||||||
};
|
};
|
||||||
// 节点单击事件
|
// 节点单击事件
|
||||||
const handleNodeClick = (data:any) => {
|
const handleNodeClick = (data:any) => {
|
||||||
state.param.deptId = data.deptId;
|
state.param.deptId = data.deptId;
|
||||||
userList();
|
userList();
|
||||||
};
|
};
|
||||||
/** 重置按钮操作 */
|
/** 重置按钮操作 */
|
||||||
const resetQuery = (formEl: FormInstance | undefined) => {
|
const resetQuery = (formEl: FormInstance | undefined) => {
|
||||||
if (!formEl) return
|
if (!formEl) return
|
||||||
@ -212,14 +208,14 @@ export default defineComponent({
|
|||||||
return {
|
return {
|
||||||
queryRef,
|
queryRef,
|
||||||
userListRef,
|
userListRef,
|
||||||
onOpenAddUser,
|
onOpenAddUser,
|
||||||
onRowDel,
|
onRowDel,
|
||||||
deptFilterNode,
|
deptFilterNode,
|
||||||
filterText,
|
filterText,
|
||||||
treeRef,
|
treeRef,
|
||||||
search,
|
search,
|
||||||
sys_user_sex,
|
sys_user_sex,
|
||||||
userList,
|
userList,
|
||||||
handleNodeClick,
|
handleNodeClick,
|
||||||
resetQuery,
|
resetQuery,
|
||||||
...toRefs(state),
|
...toRefs(state),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user