From 17600f41d7c3f6c28cc5393dbb4d3d7e82eccad6 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 25 八月 2022 09:54:47 +0800
Subject: [PATCH] conflict
---
src/views/system/user/index.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index abd65ec..0b18e75 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -2,8 +2,9 @@
<div class="system-user-container">
<el-card shadow="hover">
<div class="system-user-search mb15">
- <el-input size="default" placeholder="请输入用户名称" style="max-width: 180px"> </el-input>
- <el-button size="default" type="primary" class="ml10">
+ <el-input size="default" v-model="userTableData.listQuery.searchParams.username" placeholder="请输入用户名称" style="max-width: 180px"> </el-input>
+ <el-input size="default" v-model="userTableData.listQuery.searchParams.realName" placeholder="请输入真实姓名" style="max-width: 180px; margin-left: 10px"> </el-input>
+ <el-button size="default" type="primary" class="ml10" @click="initUserTableData">
<el-icon>
<ele-Search />
</el-icon>
@@ -79,8 +80,8 @@
loading: boolean;
listQuery: {
searchParams: {
- username: string;
- realName: string;
+ username: string | null;
+ realName: string | null;
};
pageIndex: number;
pageSize: number;
@@ -102,8 +103,8 @@
loading: false,
listQuery: {
searchParams: {
- username: '',
- realName: ''
+ username: null,
+ realName: null
},
pageIndex: 1,
pageSize: 10
@@ -179,6 +180,10 @@
};
// 页面加载时
onMounted(() => {
+ let a = { name: 1, c: { name: 1 } };
+ let b = Object.assign({}, a);
+ b.c.name = 2;
+ console.log(a.c.name);
initUserTableData();
getDepartmentData();
getRoleData();
--
Gitblit v1.9.2