From 43263419eec3d2e15eefa1dfcd403f71f279e3e0 Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期二, 12 四月 2022 00:55:13 +0800
Subject: [PATCH] 问题修改
---
src/views/system/user/index.vue | 10 +++++-----
src/views/device/peripheralUnit/index.vue | 8 ++++----
src/layout/components/Navbar.vue | 26 ++++++++++++++++++++++----
3 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 31d9b3c..267c6d9 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -18,9 +18,12 @@
<!--</template>-->
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
- <div class="avatar-wrapper">
- <img :src="avatar" class="user-avatar">
- <i class="el-icon-caret-bottom" />
+ <div class="avatar-wrapper" style="float: left; font-size: 14px;">
+ <!--<img :src="avatar" class="user-avatar">-->
+ <!--<i class="el-icon-caret-bottom" />-->
+ <i class="el-icon-user" style="margin-right: 5px;"></i>
+ <span style="margin-right: 5px;">{{ user.nickName }}</span>
+ <i class="el-icon-arrow-down"></i>
</div>
<el-dropdown-menu slot="dropdown">
<router-link to="/user/profile">
@@ -48,6 +51,7 @@
import Search from '@/components/HeaderSearch'
import RuoYiGit from '@/components/RuoYi/Git'
import RuoYiDoc from '@/components/RuoYi/Doc'
+import { getUserProfile } from "@/api/system/user";
export default {
components: {
@@ -64,7 +68,8 @@
...mapGetters([
'sidebar',
'avatar',
- 'device'
+ 'device',
+ 'name'
]),
setting: {
get() {
@@ -83,7 +88,20 @@
}
}
},
+ data() {
+ return {
+ user: {}
+ }
+ },
+ created() {
+ this.getUser();
+ },
methods: {
+ getUser() {
+ getUserProfile().then(response => {
+ this.user = response.data.user;
+ });
+ },
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
},
diff --git a/src/views/device/peripheralUnit/index.vue b/src/views/device/peripheralUnit/index.vue
index 077ff91..27b24b2 100644
--- a/src/views/device/peripheralUnit/index.vue
+++ b/src/views/device/peripheralUnit/index.vue
@@ -121,7 +121,7 @@
</el-table-column>
<el-table-column label="澶栬浠ｇ爜" width="80" align="center" prop="code"/>
<el-table-column label="澶栬鍚嶇О" align="center" prop="name" show-overflow-tooltip/>
- <el-table-column label="瑙勬牸鍨嬪彿" align="center" prop="model" min-width="80"/>
+ <el-table-column label="瑙勬牸鍨嬪彿" align="center" prop="model" min-width="60"/>
<el-table-column label="鐢熶骇鍘傚晢" align="center" prop="manufacturer_dictText"/>
<el-table-column label="鍘傚晢浠ｇ爜" width="100" align="center" prop="vendorCode_dictText"/>
<el-table-column label="娉㈢壒鐜�" width="100" align="center" prop="baudRate">
@@ -129,7 +129,7 @@
<dict-tag :options="dict.type.DICT103" :value="scope.row.baudRate"/>
</template>
</el-table-column>
- <el-table-column label="闂鎸囦护" align="center" width="180" prop="readInstruction"/>
+ <el-table-column label="闂鎸囦护" align="center" width="220" prop="readInstruction"/>
<el-table-column label="鎸囦护闀垮害" width="80" align="center" prop="orderLength"/>
<el-table-column label="杩斿洖闀垮害" width="80" align="center" prop="loopLength"/>
<!-- <el-table-column label="瑙ｆ瀽璇存槑" align="center" min-width="300" show-overflow-tooltip prop="description"/>-->
@@ -224,7 +224,7 @@
<el-input v-model="form.loopLength" type='number' placeholder="璇疯緭鍏ヨ繑鍥為暱搴�" :disabled="disabled"/>
</el-form-item>
<el-form-item label="瑙ｆ瀽璇存槑" prop="description">
- <el-input v-model="form.description" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" :disabled="disabled"/>
+ <el-input v-model="form.description" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" maxlength="512" show-word-limit :disabled="disabled"/>
</el-form-item>
<el-form-item label="闄勪欢">
<fileUpload v-model="form.filePath" :disabled="disabled"/>
@@ -355,7 +355,7 @@
{required: true, message: "闄勪欢涓嶈兘涓虹┖", trigger: "blur"}
],
description: [
- {max: 128, message: '鏈�澶氳緭鍏�256涓瓧绗�', trigger: 'blur' }
+ {max: 512, message: '鏈�澶氳緭鍏�512涓瓧绗�', trigger: 'blur' }
]
},
disabled: false,
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index bfcfdaf..872616a 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -141,9 +141,9 @@
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="鐢ㄦ埛缂栧彿" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
- <el-table-column label="鐢ㄦ埛鍚嶇О" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
- <el-table-column label="鐢ㄦ埛鏄电О" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
- <el-table-column label="閮ㄩ棬" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+ <el-table-column label="鐢ㄦ埛璐︽埛" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+ <el-table-column label="鐢ㄦ埛鍚嶇О" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+ <el-table-column label="鎵�鍦ㄩ儴闂�" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
<el-table-column label="鎵嬫満鍙风爜" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
<el-table-column label="鐘舵��" align="center" key="status" v-if="columns[5].visible">
<template slot-scope="scope">
@@ -213,8 +213,8 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
- <el-form-item v-if="form.userId == undefined" label="璐﹀彿" prop="userName">
- <el-input v-model="form.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" maxlength="30" />
+ <el-form-item v-if="form.userId == undefined" label="鐢ㄦ埛璐︽埛" prop="userName">
+ <el-input v-model="form.userName" placeholder="璇疯緭鍏ョ敤鎴疯处鎴�" maxlength="30" />
</el-form-item>
</el-col>
<el-col :span="12">
--
Gitblit v1.9.1