From 3ed50045139eb39c6cbe860f475905b38691ad3c Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期五, 08 九月 2023 17:10:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.150:10101/r/CanadaMes
---
CanadaMes-ui/src/views/user/index.vue | 242 +++++++++++++++++++++++++++---------------------
1 files changed, 137 insertions(+), 105 deletions(-)
diff --git a/CanadaMes-ui/src/views/user/index.vue b/CanadaMes-ui/src/views/user/index.vue
index 700277e..82dbf5f 100644
--- a/CanadaMes-ui/src/views/user/index.vue
+++ b/CanadaMes-ui/src/views/user/index.vue
@@ -11,12 +11,11 @@
<el-row :gutter="20">
<!--鎼滅储涓庢坊鍔犲尯鍩�-->
<el-col :span="6">
- <el-input :placeholder="$t('langUsernamePlaceholder')" v-model="queryInfo.username" clearable
- @clear="getUserList">
+ <el-input :placeholder= "$t('langUsernamePlaceholder')" v-model="queryInfo.username" clearable @clear="getUserList">
</el-input>
</el-col>
<el-col :span="6">
- <el-input :placeholder="$t('langEmailPlaceholder')" v-model="queryInfo.email" clearable @clear="getUserList">
+ <el-input :placeholder="$t('langEmailPlaceholder')" v-model="queryInfo.email" clearable @clear="getUserList">
</el-input>
</el-col>
<!--鎼滅储鎸夐挳-->
@@ -36,62 +35,86 @@
<el-table-column :label="$t('langCreateTime')" prop="createTime"></el-table-column>
<el-table-column :label="$t('langDisabled')">
<template slot-scope="scope">
- <el-switch :active-value="0" :inactive-value="1" v-model="scope.row.state" @change="stateChange(scope.row)">
+ <el-switch
+ :active-value="0"
+ :inactive-value="1"
+ v-model="scope.row.state"
+ @change="stateChange(scope.row)">
</el-switch>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔">
- <template slot-scope="scope">
- <el-button type="primary" icon="el-icon-refresh" @click="resetPassword(scope.row)">
-
- {{ $t('resetPassword') }}
- </el-button>
- </template>
- </el-table-column>
+ <template slot-scope="scope">
+ <el-button type="primary" icon="el-icon-refresh" @click="resetPassword(scope.row)">
+
+ {{ $t('resetPassword') }}
+ </el-button>
+ </template>
+</el-table-column>
<el-table-column :label="$t('langAction')">
<template slot-scope="scope">
<!--淇敼-->
<el-tooltip effect="dark" :content="$t('langEdit')" placement="top" :enterable="false">
- <el-button type="primary" icon="el-icon-edit" size="mini" @click="showEditDialog(scope.row.id)"></el-button>
+ <el-button type="primary" icon="el-icon-edit" size="mini"
+ @click="showEditDialog(scope.row.id)"></el-button>
</el-tooltip>
<!--鍒犻櫎-->
<el-tooltip effect="dark" :content="$t('langDelete')" placement="top" :enterable="false">
- <el-button type="danger" icon="el-icon-delete" size="mini" @click="removeUserById(scope.row)"></el-button>
+ <el-button type="danger" icon="el-icon-delete" size="mini"
+ @click="removeUserById(scope.row)"></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<!--鍒嗛〉鍖哄煙-->
- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
- :current-page="queryInfo.pageNum" :page-sizes="[6, 12, 18, 24]" :page-size="queryInfo.pageSize"
- :total="userList.total" :pager-count="7" :layout="layout">
- </el-pagination>
+ <el-pagination
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="queryInfo.pageNum"
+ :page-sizes="[6, 12, 18, 24]"
+ :page-size="queryInfo.pageSize"
+ :total="userList.total"
+
+ :pager-count="7"
+ :layout="layout"
+ >
+ </el-pagination>
</el-card>
<!--娣诲姞鐢ㄦ埛鐨勫璇濇-->
- <el-dialog :title="$t('langAddUserTitle')" :visible.sync="addDialogVisible" width="50%" @close="addDialogClosed">
+ <el-dialog
+ :title="$t('langAddUserTitle')"
+ :visible.sync="addDialogVisible"
+ width="50%"
+ @close="addDialogClosed">
<!--鍐呭涓讳綋鍖哄煙-->
<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 :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-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-form-item :label="$t('role')" prop="roleId">
+ <el-select filterable v-model="addUserForm.roleId" :placeholder="$t('langSelect')" >
+ <el-option v-for="item in roleList"
+ :key="item.id"
+ :value="item.id"
+ :label="item.name">
</el-option>
</el-select>
</el-form-item>
@@ -102,15 +125,21 @@
</span>
</el-dialog>
<!--淇敼鐢ㄦ埛鐨勫璇濇-->
- <el-dialog :title="$t('langEditUserTitle')" :visible.sync="editDialogVisible" width="50%">
+ <el-dialog
+ :title="$t('langEditUserTitle')"
+ :visible.sync="editDialogVisible"
+ width="50%">
<!--鍐呭涓讳綋鍖哄煙-->
<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>
<el-form-item :label="$t('role')" prop="roleId">
- <el-select filterable v-model="editUserForm.roleId" placeholder="璇烽�夋嫨">
- <el-option v-for="item in roleList" :key="item.id" :value="item.id" :label="item.name">
+ <el-select filterable v-model="editUserForm.roleId" :placeholder="$t('langSelect')" >
+ <el-option v-for="item in roleList"
+ :key="item.id"
+ :value="item.id"
+ :label="item.name">
</el-option>
</el-select>
</el-form-item>
@@ -118,8 +147,11 @@
<el-input v-model="editUserForm.email"></el-input>
</el-form-item>
<el-form-item :label="$t('langDisabled')" prop="state">
- <el-select v-model="editUserForm.state">
- <el-option v-for="(item, index) in options" :key="index" :value="item.value" :label="item.label">
+ <el-select v-model="editUserForm.state" >
+ <el-option v-for="(item,index) in options"
+ :key="index"
+ :value="item.value"
+ :label="item.label">
</el-option>
</el-select>
</el-form-item>
@@ -134,15 +166,15 @@
<script>
-import { getById, removeById, saveOrUpdate, selectPage, resetPass } from "../../api/user";
-import { select } from "../../api/role";
+import {getById, removeById, saveOrUpdate, selectPage,resetPass} from "../../api/user";
+import {select} from "../../api/role";
import LanguageMixin from '../../lang/LanguageMixin'
export default {
name: "User",
mixins: [LanguageMixin],
- data () {
+ data() {
return {
layout: 'total, sizes, prev, pager, next, jumper',
queryInfo: {
@@ -161,23 +193,23 @@
editUserForm: {
roleId: null,
- name: null,
- roleid: null,
+ name:null,
+ roleid:null,
},
// 娣诲姞鍒嗙被鐨勯獙璇佽鍒�
addUserRules: {
roleId: null,
username: [
- { required: true, message: '璇疯緭鍏ョ敤鎴峰悕', trigger: 'blur' },
- { min: 5, max: 15, message: '闀垮害鍦� 5 鍒� 15 涓瓧绗�', trigger: 'blur' }
+ {required: true, message: '璇疯緭鍏ョ敤鎴峰悕', trigger: 'blur'},
+ {min: 5, max: 15, message: '闀垮害鍦� 5 鍒� 15 涓瓧绗�', trigger: 'blur'}
],
password: [
- { required: true, message: '璇疯緭鍏ュ瘑鐮�', trigger: 'blur' },
- { min: 5, max: 15, message: '闀垮害鍦� 5 鍒� 15 涓瓧绗�', trigger: 'blur' }
+ {required: true, message: '璇疯緭鍏ュ瘑鐮�', trigger: 'blur'},
+ {min: 5, max: 15, message: '闀垮害鍦� 5 鍒� 15 涓瓧绗�', trigger: 'blur'}
],
email: [
- { required: true, message: '璇疯緭鍏ラ偖绠�', trigger: 'blur' },
- { type: 'email', message: '璇疯緭鍏ユ纭牸寮忕殑閭鍦板潃', trigger: 'blur' }
+ {required: true, message: '璇疯緭鍏ラ偖绠�', trigger: 'blur'},
+ {type: 'email', message: '璇疯緭鍏ユ纭牸寮忕殑閭鍦板潃', trigger: 'blur'}
]
},
// 鎺у埗娣诲姞鐢ㄦ埛寮规鐨勬樉绀哄拰闅愯棌
@@ -185,96 +217,95 @@
// 鎺у埗淇敼鐢ㄦ埛寮规鐨勬樉绀哄拰闅愯棌
editDialogVisible: false,
options: [
- { label: '姝ｅ父', value: 1 },
- { label: '绂佺敤', value: 0 }
+ {label: '姝ｅ父', value: 1},
+ {label: '绂佺敤', value: 0}
],
roleList: [],
}
},
- created () {
+ created() {
this.getUserList();
},
methods: {
- getUserList () {
+ getUserList() {
selectPage(this.queryInfo).then(res => {
this.userList.records = res.data.records;
-
this.userList.total = res.data.total
});
+
+// test().then(res => {
+// console.log(res.data)
+// });
+// const data6 = [
+// { id: 32, deviceName: 'Device 7', address: 'Address 1' },
+// { id: 33, deviceName: 'Device 8', address: 'Address 2' },
- // test().then(res => {
- // console.log(res.data)
- // });
- // const data6 = [
- // { id: 32, deviceName: 'Device 7', address: 'Address 1' },
- // { id: 33, deviceName: 'Device 8', address: 'Address 2' },
+// ];
- // ];
-
- // testup(data6).then(res => {
- // console.log(res.data);
- // });
-
- // call({
- // id: 1,
- // name: 12345
- // }).then(res => {
- // console.log(res.data);
- // });
+// testup(data6).then(res => {
+// console.log(res.data);
+// });
+
+// call({
+// id: 1,
+// name: 12345
+// }).then(res => {
+// console.log(res.data);
+// });
},
-
- showAddDialog () {
+
+ showAddDialog() {
this.addDialogVisible = true;
- select().then(res => {
- this.roleList = res.data;
- });
+ select().then(res => {
+ this.roleList = res.data;
+});
},
// stateChange(info) {
// saveOrUpdate(info).then(() => {
// this.$message.success("鏇存柊鐘舵�佹垚鍔�")
// });
// },
- stateChange (info) {
- saveOrUpdate(info).then(() => {
- const successMessage = this.$t('updateSuccessMessage');
- this.$message.success(successMessage);
+ stateChange(info) {
+ saveOrUpdate(info).then(() => {
+ const successMessage = this.$t('updateSuccessMessage');
+ this.$message.success(successMessage);
+ });
+},
+ resetPassword(info) {
+ this.$confirm('纭閲嶇疆瀵嗙爜涓洪粯璁ゅ�煎悧锛�', '閲嶇疆瀵嗙爜', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ })
+ .then(() => {
+ resetPass(info).then(() => {
+ this.$message.success('瀵嗙爜宸查噸缃负榛樿鍊�');
});
- },
- resetPassword (info) {
- this.$confirm('纭閲嶇疆瀵嗙爜涓洪粯璁ゅ�煎悧锛�', '閲嶇疆瀵嗙爜', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- })
- .then(() => {
- resetPass(info).then(() => {
- this.$message.success('瀵嗙爜宸查噸缃负榛樿鍊�');
- });
- })
- .catch(() => {
- // 鐢ㄦ埛鍙栨秷閲嶇疆瀵嗙爜鎿嶄綔
- });
- },
- showEditDialog (id) {
- getById({ id: id }).then(res => {
+ })
+ .catch(() => {
+ // 鐢ㄦ埛鍙栨秷閲嶇疆瀵嗙爜鎿嶄綔
+ });
+},
+ showEditDialog(id) {
+ getById({id: id}).then(res => {
this.editUserForm = res.data;
this.editDialogVisible = true;
});
-
+
select().then(res => {
- this.roleList = res.data;
- });
+ this.roleList = res.data;
+});
},
- removeUserById (user) {
+ removeUserById(user) {
// 寮规璇㈤棶鐢ㄦ埛鏄惁鍒犻櫎鍒嗙被
this.$confirm('姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ュ垎绫�, 鏄惁缁х画?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- removeById({ id: user.id }).then(() => {
+ removeById({id: user.id}).then(() => {
// 閲嶆柊鑾峰彇鍒嗙被鍒楄〃
this.getUserList();
this.$message.success("鍒犻櫎鐢ㄦ埛鎴愬姛");
@@ -283,18 +314,18 @@
this.$message.info('宸插彇娑堝垹闄�');
});
},
- handleSizeChange (newSize) {
+ handleSizeChange(newSize) {
this.queryInfo.pageSize = newSize;
this.getUserList()
},
- handleCurrentChange (newPage) {
+ handleCurrentChange(newPage) {
this.queryInfo.pageNum = newPage;
this.getUserList()
},
- addDialogClosed () {
+ addDialogClosed() {
this.$refs['addUserRef'].resetFields();
},
- addUser () {
+ addUser() {
this.$refs.addUserRef.validate(async valid => {
if (!valid) return;
saveOrUpdate(this.addUserForm).then(() => {
@@ -306,12 +337,13 @@
});
})
},
- editUserInfo () {
+ editUserInfo() {
this.$refs.addCategoryRef.validate(async valid => {
if (!valid) return;
-
+
saveOrUpdate(this.editUserForm).then(() => {
- this.$message.success("淇敼鐢ㄦ埛鎴愬姛");
+ const 淇敼鐢ㄦ埛鎴愬姛 = this.$t('淇敼鐢ㄦ埛鎴愬姛');
+ this.$message.success(淇敼鐢ㄦ埛鎴愬姛);
// 闅愯棌娣诲姞鍒嗙被瀵硅瘽妗�
this.editDialogVisible = false;
// 閲嶆柊鑾峰彇鍒嗙被鍒楄〃
--
Gitblit v1.8.0