From fd19536cbf9e5acec9bf7270f3f46037e822827d Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 29 八月 2023 16:44:45 +0800
Subject: [PATCH] 添加菜单折叠自适应宽度 修改密码 修改用户角色 中英文切换全局配置
---
CanadaMes-ui/src/views/user/index.vue | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/CanadaMes-ui/src/views/user/index.vue b/CanadaMes-ui/src/views/user/index.vue
index 89edbf2..bd77f59 100644
--- a/CanadaMes-ui/src/views/user/index.vue
+++ b/CanadaMes-ui/src/views/user/index.vue
@@ -11,11 +11,11 @@
<el-row :gutter="20">
<!--鎼滅储涓庢坊鍔犲尯鍩�-->
<el-col :span="6">
- <el-input v-model="queryInfo.username" clearable @clear="getUserList">
+ <el-input placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" v-model="queryInfo.username" clearable @clear="getUserList">
</el-input>
</el-col>
<el-col :span="6">
- <el-input v-model="queryInfo.email" clearable @clear="getUserList">
+ <el-input placeholder="璇疯緭鍏ラ偖绠�" v-model="queryInfo.email" clearable @clear="getUserList">
</el-input>
</el-col>
<!--鎼滅储鎸夐挳-->
@@ -76,22 +76,34 @@
width="50%"
@close="addDialogClosed">
<!--鍐呭涓讳綋鍖哄煙-->
- <el-form :model="addUserForm" :rules="addUserRules" ref="addUserRef" label-width="70px">
- <el-form-item :label="$t('langUsername')" prop="username">
- <el-input v-model="addUserForm.username"></el-input>
+ <el-form :model="addUserForm" :rules="addUserRules" ref="addUserRef" label-width="100px">
+ <el-form-item :label="$t('langUsername')" prop="username" >
+ <el-input v-model="addUserForm.username" ></el-input>
</el-form-item>
- <el-form-item :label="$t('langPassword')" prop="password">
+ <el-form-item :label="$t('langPassword')" prop="password" >
<el-input v-model="addUserForm.password" type="password"></el-input>
</el-form-item>
<el-form-item :label="$t('langEmail')" prop="email">
<el-input v-model="addUserForm.email"></el-input>
</el-form-item>
+
+
<el-form-item :label="$t('langState')" prop="state">
<el-select v-model="addUserForm.state" >
<el-option v-for="(item,index) in options"
:key="index"
:value="item.value"
:label="item.label">
+ </el-option>
+ </el-select>
+ </el-form-item>
+
+ <el-form-item label="瑙掕壊" prop="roleId">
+ <el-select filterable v-model="addUserForm.roleId" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in roleList"
+ :key="item.id"
+ :value="item.id"
+ :label="item.name">
</el-option>
</el-select>
</el-form-item>
@@ -107,7 +119,7 @@
:visible.sync="editDialogVisible"
width="50%">
<!--鍐呭涓讳綋鍖哄煙-->
- <el-form :model="editUserForm" :rules="addUserRules" ref="addCategoryRef" label-width="70px">
+ <el-form :model="editUserForm" :rules="addUserRules" ref="addCategoryRef" label-width="100px">
<el-form-item :label="$t('langUsername')" prop="username">
<el-input v-model="editUserForm.username" disabled></el-input>
</el-form-item>
@@ -143,7 +155,7 @@
<script>
-import {getById, removeById, saveOrUpdate, selectPage} from "../../api/user";
+import {getById, removeById, saveOrUpdate, selectPage,test,testup,call} from "../../api/user";
import {select} from "../../api/role";
import LanguageMixin from '../../lang/LanguageMixin'
@@ -207,10 +219,28 @@
this.userList.records = res.data.records;
this.userList.total = res.data.total
});
+ test().then(res => {
+ console.log(res.data)
+ });
+ const data6 = {id:32,name:'6667'}; // 濉叆闇�瑕佷紶閫掔殑鍙傛暟
+ testup(data6).then(res => {
+ console.log(res.data);
+ });
+
+ call({
+ id: 1,
+ name: 12345
+}).then(res => {
+ console.log(res.data);
+ });
+
},
showAddDialog() {
this.addDialogVisible = true;
+ select().then(res => {
+ this.roleList = res.data;
+});
},
stateChange(info) {
saveOrUpdate(info).then(() => {
@@ -222,6 +252,8 @@
this.editUserForm = res.data;
this.editDialogVisible = true;
});
+
+
select().then(res => {
this.roleList = res.data;
});
--
Gitblit v1.8.0