up

src/views/login/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="login-container">
-    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left">
+    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on"
+      label-position="left">
 
       <div class="title-container">
         <h3 class="title">安全生产管理系统登录</h3>
@@ -10,45 +11,32 @@
         <span class="svg-container">
           <svg-icon icon-class="user" />
         </span>
-        <el-input
+        <el-input ref="username" v-model="loginForm.username" placeholder="请输入账号" name="username" type="text"
-          ref="username"
+          tabindex="1" auto-complete="off" />
-          v-model="loginForm.username"
-          placeholder="请输入账号"
-          name="username"
-          type="text"
-          tabindex="1"
-          auto-complete="off"
-        />
       </el-form-item>
 
       <el-form-item prop="password">
         <span class="svg-container">
           <svg-icon icon-class="password" />
         </span>
-        <el-input
+        <el-input :key="passwordType" ref="password" v-model="loginForm.password" :type="passwordType"
-          :key="passwordType"
+          placeholder="请输入密码" name="password" tabindex="2" auto-complete="off" @keyup.enter.native="handleLogin" />
-          ref="password"
+        <!-- <span class="show-pwd" @click="showPwd">
-          v-model="loginForm.password"
-          :type="passwordType"
-          placeholder="请输入密码"
-          name="password"
-          tabindex="2"
-          auto-complete="off"
-          @keyup.enter.native="handleLogin"
-        />
-        <span class="show-pwd" @click="showPwd">
           <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
-        </span>
+        </span> -->
       </el-form-item>
 
-      <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">登录</el-button>
+      <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;"
+        @click.native.prevent="handleLogin">登录</el-button>
 
     </el-form>
   </div>
 </template>
 
 <script>
-import { validUsername } from '@/utils/validate'
+  import {
+    validUsername
+  } from '@/utils/validate'
 
   export default {
     name: 'Login',
@@ -73,8 +61,16 @@ export default {
           password: ''
         },
         loginRules: {
-        username: [{ required: true, trigger: 'blur', validator: validateUsername }],
+          username: [{
-        password: [{ required: true, trigger: 'blur', validator: validatePassword }]
+            required: true,
+            trigger: 'blur',
+            validator: validateUsername
+          }],
+          password: [{
+            required: true,
+            trigger: 'blur',
+            validator: validatePassword
+          }]
         },
         loading: false,
         passwordType: 'password',
@@ -106,7 +102,9 @@ export default {
             this.loading = true
             this.$store.dispatch('user/login', this.loginForm).then(() => {
               console.log(this.redirect)
-            this.$router.push({ path: this.redirect || '/' })
+              this.$router.push({
+                path: this.redirect || '/'
+              })
               this.loading = false
             }).catch(() => {
               this.loading = false

vue.config.js

@@ -46,7 +46,8 @@ module.exports = {
     //before: require('./mock/mock-server.js')
     proxy: {
       [process.env.VUE_APP_BASE_API]: {
-        target: 'http://118.31.104.155:9001/',
+        //target: 'http://192.168.60.99:9001/',
+        target: 'http://safety.115.langye.net/',
         changeOrigin: true, //配置跨域
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''