From bb31220ccb1e5dbc7ba5498b306f32699185d3f8 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期四, 22 九月 2022 21:31:36 +0800
Subject: [PATCH] 修改前端页面
---
src/components/common/Header.vue | 26 +++++++------
src/components/page/user/index.vue | 36 ++++++++++++++++-
src/components/common/Sidebar.vue | 8 ++--
3 files changed, 51 insertions(+), 19 deletions(-)
diff --git a/src/components/common/Header.vue b/src/components/common/Header.vue
index c11ed88..dbbccb3 100644
--- a/src/components/common/Header.vue
+++ b/src/components/common/Header.vue
@@ -18,11 +18,11 @@
<!--<span><i class="el-icon-user"></i>{{this.userNames}}</span>-->
<!--</el-tooltip>-->
<!--</div>-->
- <div class="btn-fullscreen" @click="dialogFormVisible = true">
- <el-tooltip effect="dark" :content="`淇敼瀵嗙爜`" placement="bottom">
- <i class="el-icon-setting"></i>
- </el-tooltip>
- </div>
+<!-- <div class="btn-fullscreen" @click="dialogFormVisible = true">-->
+<!-- <el-tooltip effect="dark" :content="`淇敼瀵嗙爜`" placement="bottom">-->
+<!-- <i class="el-icon-setting"></i>-->
+<!-- </el-tooltip>-->
+<!-- </div>-->
<el-dialog title="淇敼瀵嗙爜" :visible.sync="dialogFormVisible">
<el-form :model="form">
<el-form-item label="鍘熷瀵嗙爜" :label-width="formLabelWidth">
@@ -58,9 +58,10 @@
<!-- 鐢ㄦ埛鍚嶄笅鎷夎彍鍗� -->
<el-dropdown class="user-name" trigger="click" @command="handleCommand">
<span class="el-dropdown-link">
- 閫�鍑虹櫥褰� <i class="el-icon-caret-bottom"></i>
+ {{loginName}} <i class="el-icon-caret-bottom"></i>
</span>
<el-dropdown-menu slot="dropdown">
+ <el-dropdown-item divided command="editPassword">淇敼瀵嗙爜</el-dropdown-item>
<el-dropdown-item divided command="loginout">閫�鍑虹櫥褰�</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
@@ -93,13 +94,13 @@
},
computed:{
- username(){
- let username = this.$byutil.getUser();
- return username ? username.realName : this.name;
- }
},
+ created() {
+ let username = localStorage.getItem('name')
+ this.loginName = username
+ },
- methods:{
+ methods:{
// 鐢ㄦ埛鍚嶄笅鎷夎彍鍗曢�夋嫨浜嬩欢
handleCommand(command) {
if(command == 'loginout'){
@@ -107,7 +108,6 @@
sessionStorage.userRoleNames = ''
sessionStorage.userGuid = ''
sessionStorage.userName = ''
- console.log(111);
this.$router.push('/login');
// this.$confirm("鏄惁閫�鍑虹櫥褰�?", "鎻愮ず", {
// confirmButtonText: "纭畾",
@@ -131,6 +131,8 @@
// });
// localStorage.removeItem('ms_username')
// this.$router.push('/login');
+ }else if(command == 'editPassword'){
+ this.dialogFormVisible = true
}
},
// 渚ц竟鏍忔姌鍙�
diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue
index 2a34483..209137b 100644
--- a/src/components/common/Sidebar.vue
+++ b/src/components/common/Sidebar.vue
@@ -48,13 +48,13 @@
items: [
{
id:1,
- icon: 'el-icon-document',
+ icon: 'el-icon-user-solid',
name: '浜哄憳绠＄悊',
indexUrl: 'user'
},
{
id:2,
- icon: 'el-icon-document',
+ icon: 'el-icon-place',
name: '鍋滆溅鍦虹鐞�',
indexUrl: 'park'
},
@@ -78,13 +78,13 @@
// },
{
id:6,
- icon: 'el-icon-document',
+ icon: 'el-icon-document-checked',
name: '鐧藉悕鍗�',
indexUrl: 'whiteList'
},
{
id:7,
- icon: 'el-icon-document',
+ icon: 'el-icon-s-fold',
name: '琛楅亾绠＄悊',
indexUrl: 'street'
},
diff --git a/src/components/page/user/index.vue b/src/components/page/user/index.vue
index 6bdffa2..ad5645d 100644
--- a/src/components/page/user/index.vue
+++ b/src/components/page/user/index.vue
@@ -41,7 +41,7 @@
<el-form-item label="濮撳悕" prop="name" :rules="[{required: true, message: '璇疯緭鍏ュ鍚�', trigger: 'blur'}]">
<el-input v-model="formData.name" auto-complete="off"></el-input>
</el-form-item>
- <el-form-item label="鎵嬫満鍙�" prop="phone" :rules="[{ required: true, message: '鎵嬫満鍙蜂笉鑳戒负绌�', trigger: 'blur'}]">
+ <el-form-item label="鎵嬫満鍙�" prop="phone">
<el-input v-model="formData.phone" auto-complete="off"></el-input>
</el-form-item>
<el-form-item label="浜哄憳绫诲瀷" prop="type" :rules="[{required: true, message: '璇烽�夋嫨浜哄憳绫诲瀷', trigger: 'change'}]">
@@ -50,6 +50,16 @@
<el-option label="鎵ф硶浜哄憳" :value=1></el-option>
</el-select>
</el-form-item>
+ <el-form-item label="绠＄悊鍋滆溅鍦�" prop="parkIds">
+ <el-select multiple filterable v-model="parkIds" clearable>
+ <el-option
+ v-for="item in parkList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="flag = false">鍙� 娑�</el-button>
@@ -68,20 +78,25 @@
searchForm: {
name: ''
},
+ parkList:[],
+ parkIds:[],
pageData: this.$byutil.defaultPageData(),
formData: {
name: '',
loginName: '',
phone: '',
type: '',
+ parkIds:'',
},
}
},
mounted() {
this.loadData();
+ this.getParkList();
},
methods: {
onSave(){
+ this.formData.parkIds = this.parkIds.toString()
this.$refs['formData'].validate((valid) => {
if (valid) {
this.$byutil.postData(this, this.$systemconfig.basePath + '/user/save', this.formData, res => {
@@ -98,6 +113,11 @@
loadData() {
this.$byutil.loadPageData(this, this.$systemconfig.basePath + '/user/findPage', this.searchForm);
},
+ getParkList(){
+ this.$byutil.postData(this, this.$systemconfig.basePath + '/park/findAll',null,res => {
+ this.parkList = res.obj
+ });
+ },
onSearch() {
this.pageData = this.$byutil.defaultPageData();
this.loadData();
@@ -105,16 +125,26 @@
onAdd() {
this.flag=true;
this.$refs['formData'].resetFields();
+ this.parkIds = [];
this.formData = {
name: '',
loginName: '',
phone: '',
type: '',
+ parkIds:'',
}
},
onEdit(index, row) {
- this.flag=true;
- this.formData = row;
+ this.getParkList()
+ this.flag=true;
+ this.formData = row;
+ let ids = this.formData.parkIds.split(",")
+ let resList = [];
+ ids.forEach(item => {
+ resList.push(Number(item))
+ })
+ this.parkIds = resList;
+ console.log(this.parkIds)
},
onDelete(index, row) {
this.$byutil.deleteData(this,this.$systemconfig.basePath+"/user/delete",{id:row.id}, res => {
--
Gitblit v1.9.1