From a13255b4129ee8a7a7b7e1ecd8e02dd2c78f7c17 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期四, 16 一月 2025 16:19:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/system/user/index.vue | 107 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 65 insertions(+), 42 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/system/user/index.vue b/Source/plt-web/plt-web-ui/src/views/system/user/index.vue
index b856de2..c1cf595 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/user/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/user/index.vue
@@ -28,36 +28,64 @@
</template>
<template #menu="{row,index,size}">
- <el-button v-if="permissionList.editBtn" icon="el-icon-edit" size="small" type="text"
- @click.stop="rowEditHandler(row,index)">缂栬緫
+ <el-button v-if="permissionList.editBtn" size="small" type="text"
+ @click.stop="rowEditHandler(row,index)">
+ <icon-show :name="permissionList.editBtn.source"></icon-show>
+ 缂栬緫
</el-button>
- <el-button v-if="permissionList.delBtn" icon="el-icon-delete" size="small" type="text"
- @click.stop="rowDeleteHandler(row)">鍒犻櫎
+ <el-button v-if="permissionList.delBtn" size="small" type="text"
+ @click.stop="rowDeleteHandler(row)">
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
</el-button>
- <el-button v-if="permissionList.stopActionBtn" size="small" type="text" @click.stop="stopUserHandler(row)">
- <span v-if="row.status === 0" style="color: #fa3434"><i class="el-icon-video-pause"></i> 鍋滅敤</span>
- <span v-if="row.status === 1" style="color: #55b61d"><i class="el-icon-video-play"></i> 鍚敤</span>
+ <el-button size="small" type="text" @click.stop="stopUserHandler(row)">
+ <span v-if="row.status === 0 && permissionList.stopBtn" style="color: #fa3434;display: flex">
+ <icon-show :name="permissionList.stopBtn.source"></icon-show>
+ 鍋滅敤
+ </span>
+ <span v-if="row.status === 1 && permissionList.actionBtn" style="color: #55b61d;display: flex">
+ <icon-show :name="permissionList.actionBtn.source"></icon-show>
+ 鍚敤
+ </span>
</el-button>
</template>
<template slot="menuLeft" slot-scope="scope">
- <el-button v-if="permissionList.editBtn" icon="el-icon-delete" plain size="small" type="danger"
- @click="allDelHandler">鍒犻櫎
+ <el-button v-if="permissionList.addBtn" class="button-custom-icon" size="small" type="primary"
+ @click="$refs.userCrud.rowAdd()">
+ <icon-show :name="permissionList.addBtn.source"></icon-show>
+ 鏂� 澧�
</el-button>
- <el-button v-if="permissionList.assigningRolesBtn" icon="el-icon-user" plain size="small" type="primary"
- @click="roleHandler">鍒嗛厤瑙掕壊
+ <el-button v-if="permissionList.delBtn" class="button-custom-icon" plain size="small" type="danger"
+ @click="allDelHandler">
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
</el-button>
- <el-button v-if="permissionList.distributionDepartmentBtn" icon="el-icon-school" plain size="small"
- type="primary" @click="departmentHandler">鍒嗛厤閮ㄩ棬
+ <el-button v-if="permissionList.assigningRolesBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="roleHandler">
+ <icon-show :name="permissionList.assigningRolesBtn.source"></icon-show>
+ 鍒嗛厤瑙掕壊
</el-button>
- <el-button v-if="permissionList.setPasswordPolicyBtn" icon="el-icon-key" plain size="small" type="success"
- @click="setPwsHandler">璁剧疆瀵嗙爜绛栫暐
+ <el-button v-if="permissionList.distributionDepartmentBtn" class="button-custom-icon" plain size="small"
+ type="primary" @click="departmentHandler">
+ <icon-show :name="permissionList.distributionDepartmentBtn.source"></icon-show>
+ 鍒嗛厤閮ㄩ棬
</el-button>
- <el-button v-if="permissionList.importPersonnelBtn" icon="el-icon-upload2" plain size="small" type="primary"
- @click="uploadUser">瀵煎叆浜哄憳
+ <el-button v-if="permissionList.setPasswordPolicyBtn" class="button-custom-icon" plain size="small"
+ type="success"
+ @click="setPwsHandler">
+ <icon-show :name="permissionList.setPasswordPolicyBtn.source"></icon-show>
+ 璁剧疆瀵嗙爜绛栫暐
</el-button>
- <el-button v-if="permissionList.downloadImportTemplateBtn" icon="el-icon-download" plain size="small"
- type="primary" @click="downloadHandler">涓嬭浇瀵煎叆妯℃澘
+ <el-button v-if="permissionList.importPersonnelBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="uploadUser">
+ <icon-show :name="permissionList.importPersonnelBtn.source"></icon-show>
+ 瀵煎叆浜哄憳
+ </el-button>
+ <el-button v-if="permissionList.downloadImportTemplateBtn" class="button-custom-icon" plain size="small"
+ type="primary" @click="downloadHandler">
+ <icon-show :name="permissionList.downloadImportTemplateBtn.source"></icon-show>
+ 涓嬭浇瀵煎叆妯℃澘
</el-button>
</template>
</avue-crud>
@@ -212,18 +240,19 @@
addBtn: this.vaildData(this.permission[this.$route.query.id].ADD, false),
delBtn: this.vaildData(this.permission[this.$route.query.id].DELETE, false),
editBtn: this.vaildData(this.permission[this.$route.query.id].EDIT, false),
- assigningRolesBtn: this.vaildData(this.permission[this.$route.query.id].assigningRoles, false),
- distributionDepartmentBtn: this.vaildData(this.permission[this.$route.query.id].distributionDepartment, false),
- downloadImportTemplateBtn: this.vaildData(this.permission[this.$route.query.id].downloadImportTemplate, false),
- importPersonnelBtn: this.vaildData(this.permission[this.$route.query.id].importPersonnel, false),
- setPasswordPolicyBtn: this.vaildData(this.permission[this.$route.query.id].setPasswordPolicy, false),
- stopActionBtn: this.vaildData(this.permission[this.$route.query.id].stopAction, false),
+ distributionDepartmentBtn: this.vaildData(this.permission[this.$route.query.id].ASSIGN, false),
+ assigningRolesBtn: this.vaildData(this.permission[this.$route.query.id].ASSIGN1, false),
+ downloadImportTemplateBtn: this.vaildData(this.permission[this.$route.query.id].DOWNLOADFILE, false),
+ importPersonnelBtn: this.vaildData(this.permission[this.$route.query.id].IMPORT, false),
+ setPasswordPolicyBtn: this.vaildData(this.permission[this.$route.query.id].RIGHT, false),
+ stopBtn: this.vaildData(this.permission[this.$route.query.id].FREEZE, false),
+ actionBtn: this.vaildData(this.permission[this.$route.query.id].UNFREZE, false),
};
},
option() {
return {
...basicOption,
- addBtn: this.permissionList.addBtn,
+ addBtn: false,
editBtn: false,
delBtn: false,
dialogWidth: '50%',
@@ -238,9 +267,13 @@
this.tableLoading = true;
getDataUsers(this.page.currentPage, this.page.pageSize, this.searchParams).then(res => {
const data = res.data.data;
+ data.map(item => {
+ item.secretGrade = item.secretGrade.toString()
+ })
this.tableData = data;
this.page.total = res.data.total;
this.tableLoading = false;
+ s
})
this.departmentQueryOnLoad()
},
@@ -297,9 +330,7 @@
stopUser(params).then(res => {
this.$message.success(res.data.obj);
this.getTableList();
- }).catch(err => {
- this.$message.error(err)
- })
+ });
},
// 閫夋嫨妗�
@@ -317,7 +348,7 @@
this.lastIndex = newIndex;
},
() => {
- this.selectList = [];
+ this.selectList = [row];
}
);
},
@@ -341,9 +372,7 @@
listRoleByUserOid(userOid).then(res => {
this.rightRoleData = res.data.data.map(item => item.oid);
})
- }).catch(err => {
- this.$message.error(err)
- })
+ });
this.$refs.transfer.visible = true;
},
@@ -356,9 +385,7 @@
saveRights(params).then(res => {
this.$message.success(res.data.obj);
this.getTableList();
- }).catch(err => {
- this.$message.error(err)
- })
+ });
},
// 璁剧疆瀵嗙爜绛栫暐
@@ -390,9 +417,7 @@
saveUserPasswordStrateg(params).then(res => {
this.pwdVisible = false;
this.$message.success(res.data.obj)
- }).catch(err => {
- this.$message.error(err)
- })
+ });
},
// 鏂板
@@ -523,9 +548,7 @@
children: this.departData
}]
this.option.column[7].defaultExpandedKeys = ['ALLDept'];
- }).catch(err => {
- this.$message.error(err);
- })
+ });
},
// 鍒嗛厤閮ㄩ棬鏁版嵁杞崲
--
Gitblit v1.9.3