From 7a8920cd22441a8b14174e4dfad42be591b3725f Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期二, 17 三月 2020 09:28:04 +0800
Subject: [PATCH] Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs

---
 src/views/login.vue |  153 ++++++++++++++++++++++++++++++--------------------
 1 files changed, 91 insertions(+), 62 deletions(-)

diff --git a/src/views/login.vue b/src/views/login.vue
index 194a614..816158a 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,43 +1,39 @@
 <template>
-  <div class="login">
-    <div class="img-container">
+  <div class="login" ref="hello_div">
+    <!-- <div class="img-container">
       <img :src="loginImg" alt="">
-    </div>
-    <el-form ref="loginForm" :model="loginForm" class="login-form" auto-complete="on" label-position="left">
-      <el-form-item prop="username">
-        <el-input
-          v-model="loginForm.username"
-          placeholder="杈撳叆鐢ㄦ埛鍚�"
-          name="username"
-          type="text"
-          auto-complete="on"
-        >
-          <span v-show="isClearIconShow" slot="suffix" class="suffix-icon" @click="clearUsername">
-            <svg-icon icon-class="close-circle" />
-          </span>
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="password">
-        <el-input
-          :type="passwordType"
-          v-model="loginForm.password"
-          placeholder="杈撳叆瀵嗙爜"
-          name="password"
-          auto-complete="on"
-          @keyup.enter.native="handleLogin"
-        >
-          <span slot="suffix" class="suffix-icon" :class="{eyeOpen: isOpen}" @click="showPwd">
-            <svg-icon :icon-class="eyeIconClass" />
-          </span>
-        </el-input>
-      </el-form-item>
-      <div class="user-action">
-        <a @click="handleForgetPassword">
-          <span>蹇樿瀵嗙爜</span>
-        </a>
-      </div>
-      <el-button :loading="loading" class="loginButton" type="primary" @click.native.prevent="handleLogin">鐧诲綍</el-button>
-    </el-form>
+    </div> -->
+		<div class="login_" ref="logon_div">
+			<el-form ref="loginForm" :model="loginForm" class="login-form" label-position="left">
+				<el-form-item prop="loginName">
+					<el-input
+						v-model="loginForm.loginName"
+						placeholder="杈撳叆鐢ㄦ埛鍚�"
+						name="loginName"
+						type="text"
+						
+					>
+						
+					</el-input>
+				</el-form-item>
+				<el-form-item prop="password">
+					<el-input
+						:type="passwordType"
+						v-model="loginForm.password"
+						placeholder="杈撳叆瀵嗙爜"
+						name="password"
+					 
+						@keyup.enter.native="handleLogin"
+					>
+						<span slot="suffix" class="suffix-icon" :class="{eyeOpen: isOpen}" @click="showPwd">
+							<svg-icon :icon-class="eyeIconClass" />
+						</span>
+					</el-input>
+				</el-form-item>
+			 
+				<el-button :loading="loading" class="loginButton" type="primary" @click.native.prevent="handleLogin">鐧诲綍</el-button>
+			</el-form>
+		</div>
   </div>
 </template>
 
@@ -47,14 +43,14 @@
  * @author Sky
  */
 export default {
-  name: 'Login',
+
   data () {
     return {
    //   path: '/' + process.env.VUE_APP_FACTORY_KEY + '/user/confirm-password',
-   //   loginImg: require('@/assets/img/login-logo.png'),
+      loginImg: require('@/assets/login-left.jpg'),
       loginForm: { // 琛ㄥ崟鏁版嵁
-        username: process.env.VUE_APP_BUILD_MODE === 'production' ? '' : 'bayer_admin',
-        password: process.env.VUE_APP_BUILD_MODE === 'production' ? '' : '123456'
+        loginName: '',
+        password: ''
       },
       passwordType: 'password', // 杈撳叆妗嗙被鍨�
       loading: false, // 鍔犺浇涓�
@@ -62,26 +58,35 @@
       isOpen: false // 鏍规嵁鐘舵�佹樉绀轰笉鍚屾牱寮忕被鍚�
     }
   },
-  computed: {
-    isClearIconShow () {
-      return this.loginForm.username.length
-    }
-  },
+	
+	mounted() {
+		this.setWH();
+	},
+
   methods: {
+		setWH() {
+			//鑾峰彇灞忓箷瀹藉害
+			let hello_Width = this.$refs.hello_div.offsetWidth;
+		//	let hello_Height = this.$refs.hello_div.offsetHeight;
+			let hello_Height = document.documentElement.clientHeight;
+			//鑾峰彇鐧诲綍鍏冪礌瀹藉害
+			let logon_Width = this.$refs.logon_div.offsetWidth;
+			let logon_Height = this.$refs.logon_div.offsetHeight;
+			//璁剧疆鐧诲綍鍏冪礌鐨刴agin-left
+			if (hello_Width>logon_Width) {
+				let margin_left = (hello_Width - logon_Width)/2;
+				this.$refs.logon_div.style['margin-left'] = margin_left + "px";
+			}
+			
+			if (hello_Height>logon_Height) {
+				let margin_top = (hello_Height - logon_Height)/2;
+				this.$refs.logon_div.style['margin-top'] = margin_top + "px";
+			}
+		},
     // 蹇樿瀵嗙爜鍥炶皟
-    handleForgetPassword () {
-      this.$alert('', '璇疯仈绯诲叕鍙哥鐞嗗憳淇敼瀵嗙爜', {
-        confirmButtonText: '鐭ラ亾浜�',
-        center: true,
-        showClose: true
-      })
-    },
+   
     // 娓呴櫎鐢ㄦ埛鍚�
-    clearUsername () {
-      if (this.loginForm.username) {
-        this.loginForm.username = ''
-      }
-    },
+    
     // 瀵嗙爜鏄剧ず鍒囨崲
     showPwd () {
       if (this.passwordType === 'password') {
@@ -97,13 +102,37 @@
 		
     // 鐧诲綍
     handleLogin () {
-			localStorage.setItem('userId','user001');
-			this.$router.push('/');
+			let url = "/api/user/login";
+			let params = this.loginForm;
+			this.$axios.get(url,{
+			     params
+			   }).then(data_ => {
+			   if(data_.data.success) {
+				   localStorage.setItem('userId',data_.data.data.id);
+				   localStorage.setItem('userName',data_.data.data.name);
+				   localStorage.setItem('roleId',data_.data.data.roleCode);
+				   localStorage.setItem('roleName',data_.data.data.roleName);
+				   localStorage.setItem('departId',data_.data.data.departCode);
+				   localStorage.setItem('departName',data_.data.data.departName);
+				   	this.$router.push('/');
+			   }else {
+					this.$message({message:'鐧婚檰澶辫触', type: 'warning'});
+			   }
+			    
+			   }).catch(error =>{
+			   })
+			
+		
 		},
   }
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss">
+<style >
+	.login_ {
+		max-width: 350px;
+		background-color: #f9f9fb;
+		padding: 20px;
+	}
 
 </style>

--
Gitblit v1.8.0