【优化】登陆过程优化

src/components/login/Login.vue

@@ -8,12 +8,14 @@
 					<el-form label-width="0px" :model="ruleForm" status-icon :rules="rules" ref="ruleForm"
 						class="demo-ruleForm">
 						<el-form-item prop="uname">
-							<el-input placeholder="请输入账号" maxlength="16" v-model="ruleForm.uname"
+							<el-input ref="zhanghao" placeholder="请输入账号" maxlength="16" v-model="ruleForm.uname"
 								prefix-icon="el-icon-login-user"></el-input>
 						</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" @keyup.enter.native="submitForm('ruleForm')"></el-input>
+							<el-input ref="mima" placeholder="请输入密码" maxlength="16" type="password"
+								v-model="ruleForm.upass" 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>
@@ -75,32 +77,41 @@
 			submitForm(formName) {
 				let _this = this;
 				let params = {
-					page: 1,
-					rows: 8
+					number: '',
+					password: ''
 				}
 				var username = String(_this.ruleForm.uname).trim()
 				var userpass = String(_this.ruleForm.upass).trim()
-				if (username) {
+
+				if (username && userpass) {
 					params.number = username
+					params.password = userpass
+				} else {
+					_this.$message.warning('请输入账号和密码！')
+					if (!username)
+						_this.$refs['zhanghao'].focus()
+					else
+						_this.$refs['mima'].focus()
+					return
 				}
+
 				_this.$refs[formName].validate((valid) => {
-					_this.$axios.get('/jxch-smartmp-api/HotWaters/waterqueryAdmin.action', {
+					_this.$axios.get('/jxch-smartmp-api/HotWaters/waterlogin.action', {
 							params: params
 						})
 						.then(res => {
 							console.log(res.data);
-							if (typeof(res.data.rows) != 'undefined' && res.data.rows != '' && JSON.stringify(
-									res.data) !=
+							if (typeof(res.data.msg) != 'undefined' && res.data.msg != '' && JSON.stringify(res
+									.data) !=
 								'{}') {
-								for (var i = 0; i < res.data.rows.length; i++) {
-									if (username == res.data.rows[i].number && userpass == res.data.rows[i]
-										.password) {
-										_this.$message.success("登陆成功!");
-										sessionStorage.setItem('uname', username)
-										sessionStorage.setItem('unic', res.data.rows[i].name)
-										_this.$router.replace('/index'); //跳转到首页
-									}
+								_this.$message.success(res.data.msg);
+								sessionStorage.setItem('uname', username)
+								if (typeof(res.data.name) == 'undefined') {
+									sessionStorage.setItem('unic', '未设置昵称')
+								} else {
+									sessionStorage.setItem('unic', res.data.name)
 								}
+								_this.$router.replace('/index'); //跳转到首页
 							} else {
 								_this.$message({
 									showClose: true,

src/components/zhuanghaoguanli/zhuanghaoguanli.vue

@@ -67,7 +67,7 @@
 							<el-input v-model="addform.password" type="password" autocomplete="off" maxlength="16">
 							</el-input>
 						</el-form-item>
-						<el-form-item label="确认密码：" :label-width="formLabelWidth">
+						<el-form-item label="确认新密码：" :label-width="formLabelWidth">
 							<el-input v-model="addform.comfirmPass" type="password" autocomplete="off" maxlength="16">
 							</el-input>
 						</el-form-item>
@@ -84,17 +84,21 @@
 						style="width: 100%; position: absolute; top: 60px; left: 0px;background-color: #CCCCCC;height: 1px;border: 0;">
 					<el-form>
 						<el-form-item label="昵称：" :label-width="formLabelWidth">
-							<el-input v-model="form.name" autocomplete="off" maxlength="16"></el-input>
+							<el-input ref="nicheng" v-model="form.name" autocomplete="off" maxlength="16"></el-input>
 						</el-form-item>
 						<el-form-item label="账号：" :label-width="formLabelWidth">
-							<el-input v-model="form.number" autocomplete="off" maxlength="16"></el-input>
+							<el-input ref="zhanghao" v-model="form.number" autocomplete="off" maxlength="16"></el-input>
 						</el-form-item>
-						<el-form-item label="密码：" :label-width="formLabelWidth">
-							<el-input v-model="form.password" autocomplete="off" type="password" maxlength="16">
+						<el-form-item label="原密码：" :label-width="formLabelWidth">
+							<el-input ref="yuanmima" v-model="form.oldPassword" type="password" autocomplete="off" maxlength="16">
+							</el-input>
+						</el-form-item>
+						<el-form-item label="新密码：" :label-width="formLabelWidth">
+							<el-input ref="xinmima" v-model="form.password" autocomplete="off" type="password" maxlength="16">
 							</el-input>
 						</el-form-item>
-						<el-form-item label="确认密码：" :label-width="formLabelWidth">
-							<el-input v-model="form.comfirmPass" autocomplete="off" type="password" maxlength="16">
+						<el-form-item label="确认新密码：" :label-width="formLabelWidth">
+							<el-input ref="querenmima" v-model="form.comfirmPass" autocomplete="off" type="password" maxlength="16">
 							</el-input>
 						</el-form-item>
 					</el-form>
@@ -133,6 +137,7 @@
 					id: 0,
 					name: '',
 					number: '',
+					oldPassword: '',
 					password: '',
 					comfirmPass: ''
 				},
@@ -142,7 +147,7 @@
 					password: '',
 					comfirmPass: ''
 				},
-				formLabelWidth: '120px',
+				formLabelWidth: '132px',
 				// 表格数据
 				tableData: [],
 				current_page: 1, // 当前所在页码
@@ -277,7 +282,9 @@
 				this.form.id = row.id
 				this.form.name = row.name
 				this.form.number = row.number
-				this.form.password = row.password
+				this.form.oldPassword = ''
+				this.form.password = ''
+				this.form.comfirmPass = ''
 			},
 			/**
 			 * 更新指定的id所在的行
@@ -285,18 +292,27 @@
 			handleEditRow() {
 				if (!String(this.form.name).trim()) {
 					this.$message.error('请输入昵称')
+					this.$refs['nicheng'].focus()
 					return
 				}
 				if (!String(this.form.number).trim()) {
 					this.$message.error('请输入账号')
+					this.$refs['zhanghao'].focus()
+					return
+				}
+				if (!String(this.form.oldPassword).trim()) {
+					this.$message.error('请输入原密码')
+					this.$refs['yuanmima'].focus()
 					return
 				}
 				if (!String(this.form.password).trim()) {
-					this.$message.error('请输入密码')
+					this.$message.error('请输入新密码')
+					this.$refs['xinmima'].focus()
 					return
 				}
 				if (String(this.form.password).trim() != String(this.form.comfirmPass).trim()) {
-					this.$message.error('密码和确认密码不一致！')
+					this.$message.error('新密码和确认新密码不一致！')
+					this.$refs['querenmima'].focus()
 					return
 				}
 				var _this = this