【改进】输入账号密码后，回车即可触发登陆。

【修复】用户登陆，不能删除当前登录账号。隐藏删除按钮等处理。

src/components/index/Index.css

@@ -130,7 +130,7 @@
 }
 
 .wecome-text {
-	width: 130px;
+	width: 300px;
 	height: 90px;
 	line-height: 90px;
 	font-size: 16px;
@@ -164,7 +164,6 @@
 }
 
 .user-name {
-	width: 80px;
 	height: 54px;
 	line-height: 54px;
 	font-size: 20px;
@@ -173,6 +172,7 @@
 	color: #333333;
 	margin-left: 18px;
 	text-align: center;
+	white-space: nowrap;
 }
 
 .logout-btn {

src/components/index/Index.vue

@@ -59,10 +59,10 @@
 		<el-col :span="20">
 			<el-row>
 				<el-col :span="24" class="right-top">
-					<div class="wecome-text">您好，欢迎登陆！</div>
+					<div class="wecome-text">{{userName}} 您好，欢迎登陆！</div>
 					<div class="right-items">
 						<div class="tx"></div>
-						<div class="user-name">我是名称</div>
+						<div class="user-name">我是【{{unic}}】</div>
 						<div class="shuxian"></div>
 						<div class="logout-btn" @click="logout"></div>
 					</div>
@@ -81,14 +81,19 @@
 	export default {
 		data() {
 			return {
-
+				userName: '',
+				unic: ''
 			}
 		},
 		created() {
 			var statue = sessionStorage.getItem('uname')
+			var unic = sessionStorage.getItem('unic')
 			if (!statue || typeof(statue) == 'undefined' || statue == '' || statue == 'null') {
 				this.$router.replace('/')
 				return
+			} else {
+				this.userName = statue
+				this.unic = unic
 			}
 		},
 		methods: {

src/components/login/Login.vue

@@ -13,7 +13,7 @@
 						</el-form-item>
 						<el-form-item prop="upass">
 							<el-input placeholder="请输入密码" maxlength="16" type="password" v-model="ruleForm.upass"
-								prefix-icon="el-icon-login-pass"></el-input>
+								prefix-icon="el-icon-login-pass" @keyup.enter.native="submitForm('ruleForm')"></el-input>
 						</el-form-item>
 						<el-form-item>
 							<el-button type="primary" @click="submitForm('ruleForm')">登 陆</el-button>
@@ -88,7 +88,7 @@
 							params: params
 						})
 						.then(res => {
-							// console.log(res.data);
+							console.log(res.data);
 							if (typeof(res.data.rows) != 'undefined' && res.data.rows != '' && JSON.stringify(
 									res.data) !=
 								'{}') {
@@ -96,7 +96,8 @@
 									if (username == res.data.rows[i].number && userpass == res.data.rows[i]
 										.password) {
 										_this.$message.success("登陆成功!");
-										sessionStorage.setItem('uname', JSON.stringify(username))
+										sessionStorage.setItem('uname', username)
+										sessionStorage.setItem('unic', res.data.rows[i].name)
 										_this.$router.replace('/index'); //跳转到首页
 									}
 								}

src/components/zhuanghaoguanli/zhuanghaoguanli.vue

@@ -31,7 +31,7 @@
 					<el-table-column prop="number" label="账号" align="center"></el-table-column>
 					<el-table-column prop="password" label="密码" show-overflow-tooltip></el-table-column>
 					<el-table-column label="操作" align="center" width="80">
-						<el-button type="text" class="del-btn" slot-scope="scope"
+						<el-button type="text" class="del-btn" slot-scope="scope" v-if="scope.row.number != login_account"
 							@click="handleDelete(scope.$index, scope.row)">删除
 						</el-button>
 					</el-table-column>
@@ -123,8 +123,9 @@
 		data() {
 			return {
 				account: '', // 需要查找的账号
-				del_account: '',
-				del_id: 0,
+				del_account: '', // 要删除的账号
+				del_id: 0,  // 要删除的id
+				login_account: '',
 				adddialogFormVisible: false,
 				editdialogFormVisible: false, // 控制编辑对话框显示、隐藏
 				delDialogVisible: false, // 控制删除对话框显示、隐藏
@@ -150,6 +151,7 @@
 			}
 		},
 		created() {
+			this.login_account = sessionStorage.getItem('uname')
 			// 获取账号列表
 			this.updateTable()
 		},
@@ -344,6 +346,11 @@
 			 * 删除指定的id所在的行
 			 */
 			handleDelRow() {
+				if (this.login_account == this.del_account) {
+					this.delDialogVisible = false
+					this.$message.error('不能删除当前登录账号！')
+					return
+				}
 				var _this = this
 				this.$axios.get('/jxch-smartmp-api/HotWaters/waterdelAdmin.action', {
 						params: {