From 09a0d30ae96be51c9c0d6d4ff25621e11bbe3580 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 04 Mar 2023 17:13:28 +0800
Subject: [PATCH] 添加车辆管理、设备管理、火灾管理
---
src/views/system/user.vue | 278 ++++++++++++++++++++++++-------------------------------
1 files changed, 120 insertions(+), 158 deletions(-)
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 80ff0ef..b3408d1 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -1,15 +1,15 @@
<template>
<el-row>
- <el-col :span="5">
- <div class="box">
- <el-scrollbar>
- <basic-container>
- <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick"/>
- </basic-container>
- </el-scrollbar>
- </div>
- </el-col>
- <el-col :span="19">
+<!-- <el-col :span="5">-->
+<!-- <div class="box">-->
+<!-- <el-scrollbar>-->
+<!-- <basic-container>-->
+<!-- <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick"/>-->
+<!-- </basic-container>-->
+<!-- </el-scrollbar>-->
+<!-- </div>-->
+<!-- </el-col>-->
+ <el-col :span="24">
<basic-container>
<avue-crud :option="option"
:search.sync="search"
@@ -38,13 +38,13 @@
v-if="permission.user_delete"
@click="handleDelete">删 除
</el-button>
- <el-button type="info"
- size="small"
- plain
- v-if="permission.user_role"
- icon="el-icon-user"
- @click="handleGrant">角色配置
- </el-button>
+<!-- <el-button type="info"-->
+<!-- size="small"-->
+<!-- plain-->
+<!-- v-if="permission.user_role"-->
+<!-- icon="el-icon-user"-->
+<!-- @click="handleGrant">角色配置-->
+<!-- </el-button>-->
<el-button type="info"
size="small"
plain
@@ -52,34 +52,34 @@
icon="el-icon-refresh"
@click="handleReset">密码重置
</el-button>
- <el-button type="info"
- size="small"
- plain
- v-if="userInfo.role_name.includes('admin')"
- icon="el-icon-setting"
- @click="handlePlatform">平台配置
- </el-button>
- <el-button type="info"
- size="small"
- plain
- v-if="userInfo.role_name.includes('admin')"
- icon="el-icon-coordinate"
- @click="handleLock">账号解封
- </el-button>
- <el-button type="success"
- size="small"
- plain
- v-if="userInfo.role_name.includes('admin')"
- icon="el-icon-upload2"
- @click="handleImport">导入
- </el-button>
- <el-button type="warning"
- size="small"
- plain
- v-if="userInfo.role_name.includes('admin')"
- icon="el-icon-download"
- @click="handleExport">导出
- </el-button>
+<!-- <el-button type="info"-->
+<!-- size="small"-->
+<!-- plain-->
+<!-- v-if="userInfo.role_name.includes('admin')"-->
+<!-- icon="el-icon-setting"-->
+<!-- @click="handlePlatform">平台配置-->
+<!-- </el-button>-->
+<!-- <el-button type="info"-->
+<!-- size="small"-->
+<!-- plain-->
+<!-- v-if="userInfo.role_name.includes('admin')"-->
+<!-- icon="el-icon-coordinate"-->
+<!-- @click="handleLock">账号解封-->
+<!-- </el-button>-->
+<!-- <el-button type="success"-->
+<!-- size="small"-->
+<!-- plain-->
+<!-- v-if="userInfo.role_name.includes('admin')"-->
+<!-- icon="el-icon-upload2"-->
+<!-- @click="handleImport">导入-->
+<!-- </el-button>-->
+<!-- <el-button type="warning"-->
+<!-- size="small"-->
+<!-- plain-->
+<!-- v-if="userInfo.role_name.includes('admin')"-->
+<!-- icon="el-icon-download"-->
+<!-- @click="handleExport">导出-->
+<!-- </el-button>-->
</template>
<template slot-scope="{row}"
slot="tenantName">
@@ -274,28 +274,10 @@
border: true,
index: true,
selection: true,
- viewBtn: true,
+ viewBtn: false,
dialogType: 'drawer',
dialogClickModal: false,
column: [
- {
- label: "登录账号",
- prop: "account",
- search: true,
- display: false
- },
- {
- label: "所属租户",
- prop: "tenantName",
- slot: true,
- display: false
- },
- {
- label: "用户姓名",
- prop: "realName",
- search: true,
- display: false
- },
{
label: "所属角色",
prop: "roleName",
@@ -303,35 +285,51 @@
display: false
},
{
- label: "所属部门",
+ label: "用户名",
+ prop: "account",
+ search: true,
+ searchSpan:4,
+ display: false
+ },
+ {
+ label: "真实姓名",
+ prop: "realName",
+ search: true,
+ searchSpan:4,
+ display: false
+ },
+ {
+ label: "用户性别",
+ prop: "sex",
+ type: "select",
+ dicData: [
+ {
+ label: "男",
+ value: 1
+ },
+ {
+ label: "女",
+ value: 2
+ },
+ {
+ label: "未知",
+ value: 3
+ }
+ ],
+ display: false,
+ },
+ {
+ label: "手机号码",
+ prop: "phone",
+ search: true,
+ searchSpan:4,
+ display: false,
+ },
+ {
+ label: "所属单位",
prop: "deptName",
slot: true,
display: false
- },
- {
- label: "用户平台",
- prop: "userTypeName",
- slot: true,
- display: false
- },
- {
- label: "用户平台",
- type: "select",
- dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- search: true,
- hide: true,
- display: false,
- prop: "userType",
- rules: [{
- required: true,
- message: "请选择用户平台",
- trigger: "blur"
- }]
},
],
group: [
@@ -341,26 +339,6 @@
icon: 'el-icon-user-solid',
column: [
{
- label: "所属租户",
- prop: "tenantId",
- type: "tree",
- dicUrl: "/api/blade-system/tenant/select",
- props: {
- label: "tenantName",
- value: "tenantId"
- },
- hide: !website.tenantMode,
- addDisplay: website.tenantMode,
- editDisplay: website.tenantMode,
- viewDisplay: website.tenantMode,
- rules: [{
- required: true,
- message: "请输入所属租户",
- trigger: "click"
- }],
- span: 24,
- },
- {
label: "登录账号",
prop: "account",
rules: [{
@@ -368,23 +346,6 @@
message: "请输入登录账号",
trigger: "blur"
}],
- },
- {
- label: "用户平台",
- type: "select",
- dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- slot: true,
- prop: "userType",
- rules: [{
- required: true,
- message: "请选择用户平台",
- trigger: "blur"
- }]
},
{
label: '密码',
@@ -463,14 +424,14 @@
],
hide: true
},
- {
- label: "用户生日",
- type: "date",
- prop: "birthday",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "yyyy-MM-dd hh:mm:ss",
- hide: true
- },
+ // {
+ // label: "用户生日",
+ // type: "date",
+ // prop: "birthday",
+ // format: "yyyy-MM-dd hh:mm:ss",
+ // valueFormat: "yyyy-MM-dd hh:mm:ss",
+ // hide: true
+ // },
{
label: "账号状态",
prop: "statusName",
@@ -484,13 +445,14 @@
prop: 'dutyInfo',
icon: 'el-icon-s-custom',
column: [
- {
- label: "用户编号",
- prop: "code",
- },
+ // {
+ // label: "用户编号",
+ // prop: "code",
+ // },
{
label: "所属角色",
prop: "roleId",
+ search:true,
multiple: true,
type: "tree",
dicData: [],
@@ -506,10 +468,10 @@
}]
},
{
- label: "所属部门",
+ label: "所属单位",
prop: "deptId",
type: "tree",
- multiple: true,
+ // multiple: true,
dicData: [],
props: {
label: "title"
@@ -518,26 +480,26 @@
slot: true,
rules: [{
required: true,
- message: "请选择所属部门",
+ message: "请选择所属单位",
trigger: "click"
}]
},
- {
- label: "所属岗位",
- prop: "postId",
- type: "tree",
- multiple: true,
- dicData: [],
- props: {
- label: "postName",
- value: "id"
- },
- rules: [{
- required: true,
- message: "请选择所属岗位",
- trigger: "click"
- }],
- },
+ // {
+ // label: "所属岗位",
+ // prop: "postId",
+ // type: "tree",
+ // multiple: true,
+ // dicData: [],
+ // props: {
+ // label: "postName",
+ // value: "id"
+ // },
+ // rules: [{
+ // required: true,
+ // message: "请选择所属岗位",
+ // trigger: "click"
+ // }],
+ // },
]
},
]
--
Gitblit v1.9.3