diff --git a/report-ui/src/utils/request.js b/report-ui/src/utils/request.js
index 98fd24bc..77453695 100644
--- a/report-ui/src/utils/request.js
+++ b/report-ui/src/utils/request.js
@@ -49,7 +49,7 @@ service.interceptors.response.use(
         type: 'error',
         duration: 5 * 1000
       })
-      return Promise.reject('error')
+      return response.data
     } else {
       return response.data
     }
diff --git a/report-ui/src/views/login.vue b/report-ui/src/views/login.vue
index 56814d20..1f3e802a 100644
--- a/report-ui/src/views/login.vue
+++ b/report-ui/src/views/login.vue
@@ -8,20 +8,19 @@
   <div class="login_container">
     <!-- 顶部logo -->
     <div class="login_title">
-      <img src="@/assets/images/home-logo.png"
-           alt="logo" />
+      <img src="@/assets/images/home-logo.png" alt="logo" />
     </div>
     <div class="login_contant">
-      <img src="@/assets/images/login.png"
-           alt="image"
-           class="login_img" />
-      <el-form ref="loginForm"
-               :model="loginForm"
-               :rules="loginRules"
-               class="login_form"
-               autocomplete="on"
-               label-position="left"
-               @keyup.enter.native="handleLogin">
+      <img src="@/assets/images/login.png" alt="image" class="login_img" />
+      <el-form
+        ref="loginForm"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login_form"
+        autocomplete="on"
+        label-position="left"
+        @keyup.enter.native="handleLogin"
+      >
         <div class="title_container">
           <h3 class="title">
             HELLO,
@@ -37,41 +36,48 @@
           <div>
             <p>用户名</p>
             <el-form-item prop="loginName">
-              <el-input ref="loginName"
-                        v-model="loginForm.loginName"
-                        placeholder="用户名"
-                        name="loginName"
-                        type="text"
-                        tabindex="1"
-                        autocomplete="on"
-                        @focus="setTop('0')"
-                        @change="getPsw" />
+              <el-input
+                ref="loginName"
+                v-model="loginForm.loginName"
+                placeholder="用户名"
+                name="loginName"
+                type="text"
+                tabindex="1"
+                autocomplete="on"
+                @focus="setTop('0')"
+                @change="getPsw"
+              />
             </el-form-item>
           </div>
           <div>
             <p>密码</p>
-            <input name="password"
-                   type="password"
-                   autocomplete="off"
-                   class="take" />
-            <el-tooltip v-model="capsTooltip"
-                        content="Caps lock is On"
-                        placement="right"
-                        manual>
+            <input
+              name="password"
+              type="password"
+              autocomplete="off"
+              class="take"
+            />
+            <el-tooltip
+              v-model="capsTooltip"
+              content="Caps lock is On"
+              placement="right"
+              manual
+            >
               <el-form-item prop="password">
-                <el-input :key="passwordType"
-                          ref="password"
-                          v-model="loginForm.password"
-                          :type="passwordType"
-                          placeholder="用户密码"
-                          name="password"
-                          tabindex="2"
-                          autocomplete="on"
-                          @blur="capsTooltip = false"
-                          @focus="setTop('50')"
-                          @keyup.native="checkCapslock" />
-                <span class="show_pwd"
-                      @click="showPwd">
+                <el-input
+                  :key="passwordType"
+                  ref="password"
+                  v-model="loginForm.password"
+                  :type="passwordType"
+                  placeholder="用户密码"
+                  name="password"
+                  tabindex="2"
+                  autocomplete="on"
+                  @blur="capsTooltip = false"
+                  @focus="setTop('50')"
+                  @keyup.native="checkCapslock"
+                />
+                <span class="show_pwd" @click="showPwd">
                   <i class="el-icon-view" />
                 </span>
               </el-form-item>
@@ -80,180 +86,181 @@
         </div>
         <div class="control">
           <div class="remember">
-            <input v-model="rememberPsw"
-                   type="checkbox" />
+            <input v-model="rememberPsw" type="checkbox" />
             <p>记住密码</p>
           </div>
         </div>
-        <el-button :loading="loading"
-                   type="primary"
-                   class="login_btn"
-                   @click.native.prevent="handleLogin">登录</el-button>
+        <el-button
+          :loading="loading"
+          type="primary"
+          class="login_btn"
+          @click.native.prevent="handleLogin"
+          >登录</el-button
+        >
       </el-form>
     </div>
     <!--  验证码  -->
-    <Verify v-if="needCaptcha"
-            ref="verify"
-            :captcha-type="'blockPuzzle'"
-            :img-size="{ width: '400px', height: '200px' }"
-            @success="verifylogin" />
+    <Verify
+      v-if="needCaptcha"
+      ref="verify"
+      :captcha-type="'blockPuzzle'"
+      :img-size="{ width: '400px', height: '200px' }"
+      @success="verifylogin"
+    />
   </div>
 </template>
 
 <script>
-import Verify from '@/components/verifition/Verify'
-import cookies from 'js-cookie'
-import { Decrypt, Encrypt } from '@/utils/index'
-import { login } from '@/api/login'
-import { transPsw } from '@/utils/encrypted'
+import Verify from "@/components/verifition/Verify";
+import cookies from "js-cookie";
+import { Decrypt, Encrypt } from "@/utils/index";
+import { login } from "@/api/login";
+import { transPsw } from "@/utils/encrypted";
 import { setToken, setAccessUser } from "@/utils/auth";
 export default {
-  name: 'Login',
+  name: "Login",
   components: {
-    Verify,
+    Verify
   },
-  data () {
+  data() {
     return {
-      activeTop: '-50%', // 色条滑块控制
+      activeTop: "-50%", // 色条滑块控制
       rememberPsw: false, // 记住密码选择框
       loginForm: {
-        loginName: 'admin',
-        password: '123456',
-        verifyCode: '',
+        loginName: "admin",
+        password: "123456",
+        verifyCode: ""
       }, // 登录表单
       loginRules: {
-        loginName: [{ required: true, message: '用户名必填', trigger: 'blur' }],
-        password: [
-          { required: true, message: '用户密码必填', trigger: 'blur' },
-        ],
+        loginName: [{ required: true, message: "用户名必填", trigger: "blur" }],
+        password: [{ required: true, message: "用户密码必填", trigger: "blur" }]
       }, // 登录表单验证
-      passwordType: 'password', // 用来控制查看密码操作时的输入框类型
+      passwordType: "password", // 用来控制查看密码操作时的输入框类型
       capsTooltip: false, // 键盘大写是否打开
       loading: false, // 登录loding
       redirect: undefined, // 记录重定向地址
       otherQuery: {}, // 记录重定向地址中的参数
-      needCaptcha: false,
-    }
+      needCaptcha: false
+    };
   },
   watch: {
     $route: {
       // 监听路由获取上个路由（from）的地址和参数
-      handler: function (route) {
-        const query = route.query
+      handler: function(route) {
+        const query = route.query;
         if (query) {
-          this.redirect = query.redirect
-          this.otherQuery = this.getOtherQuery(query)
+          this.redirect = query.redirect;
+          this.otherQuery = this.getOtherQuery(query);
         }
       },
-      immediate: true,
-    },
+      immediate: true
+    }
   },
-  mounted () {
+  mounted() {
     // 获取焦点
-    if (this.loginForm.loginName === '') {
-      this.$refs.loginName.focus()
-    } else if (this.loginForm.password === '') {
-      this.$refs.password.focus()
+    if (this.loginForm.loginName === "") {
+      this.$refs.loginName.focus();
+    } else if (this.loginForm.password === "") {
+      this.$refs.password.focus();
     }
   },
   methods: {
     // 获取存储的密码并解密
-    getPsw () {
-      const cookVal = cookies.get(`u_${this.loginForm.loginName}`)
-      this.loginForm.password = cookVal && Decrypt(cookVal)
+    getPsw() {
+      const cookVal = cookies.get(`u_${this.loginForm.loginName}`);
+      this.loginForm.password = cookVal && Decrypt(cookVal);
     },
     // 滑动条块的top控制
-    setTop (val) {
-      this.activeTop = val
+    setTop(val) {
+      this.activeTop = val;
     },
     // 检测大写锁定键是否开启
-    checkCapslock (e) {
-      const { key } = e
-      this.capsTooltip = key && key.length === 1 && key >= 'A' && key <= 'Z'
+    checkCapslock(e) {
+      const { key } = e;
+      this.capsTooltip = key && key.length === 1 && key >= "A" && key <= "Z";
     },
     // 查看密码
-    showPwd () {
-      if (this.passwordType === 'password') {
-        this.passwordType = ''
+    showPwd() {
+      if (this.passwordType === "password") {
+        this.passwordType = "";
       } else {
-        this.passwordType = 'password'
+        this.passwordType = "password";
       }
       this.$nextTick(() => {
-        this.$refs.password.focus()
-      })
+        this.$refs.password.focus();
+      });
     },
     // 滑动验证码
-    useVerify () {
-      this.$refs.loginForm.validate((valid) => {
+    useVerify() {
+      this.$refs.loginForm.validate(valid => {
         if (valid) {
-          this.$refs.verify.show()
+          this.$refs.verify.show();
         } else {
-          return false
+          return false;
         }
-      })
+      });
     },
     // 验证成功的回调
-    verifylogin (params) {
-      this.loginForm.verifyCode = params.captchaVerification
+    verifylogin(params) {
+      this.loginForm.verifyCode = params.captchaVerification;
       if (this.loginForm.verifyCode) {
-        this.loginApi()
+        this.loginApi();
       }
     },
     // 登录操作
-    handleLogin () {
-      this.$refs.loginForm.validate((valid) => {
+    handleLogin() {
+      this.$refs.loginForm.validate(valid => {
         if (valid) {
-          this.loading = true
+          this.loading = true;
           // 登录失败次数过多需要展示滑动验证码
           if (this.needCaptcha) {
-            this.useVerify()
-            return
+            this.useVerify();
+            return;
           }
-          this.loginApi()
+          this.loginApi();
         } else {
-          return false
+          return false;
         }
-      })
+      });
     },
-    async loginApi () {
+    async loginApi() {
       let obj = {
         loginName: this.loginForm.loginName,
         password: transPsw(this.loginForm.password),
-        verifyCode: '',
-      }
-      const { code, data } = await login(obj)
-      console.log(data)
-      this.loading = false
-      if (code != '200') return
-      setToken(data.token)
-      setAccessUser(data)
+        verifyCode: ""
+      };
+      const { code, data } = await login(obj);
+      this.loading = false;
+      if (code != "200") return;
+      setToken(data.token);
+      setAccessUser(data);
       // 选中记住密码时 把密码存到cookie里,时效15天
       this.rememberPsw &&
         cookies.set(
           `u_${this.loginForm.loginName}`,
           Encrypt(this.loginForm.password),
           { expires: 15 }
-        )
+        );
       if (data && data.captcha) {
-        this.needCaptcha = true
+        this.needCaptcha = true;
       } else {
-        this.needCaptcha = false
+        this.needCaptcha = false;
         this.$router.push({
-          path: this.redirect || '/index',
-          query: this.otherQuery,
-        })
+          path: this.redirect || "/index",
+          query: this.otherQuery
+        });
       }
     },
-    getOtherQuery (query) {
+    getOtherQuery(query) {
       return Object.keys(query).reduce((acc, cur) => {
-        if (cur !== 'redirect') {
-          acc[cur] = query[cur]
+        if (cur !== "redirect") {
+          acc[cur] = query[cur];
         }
-        return acc
-      }, {})
-    },
-  },
-}
+        return acc;
+      }, {});
+    }
+  }
+};
 </script>
 
 <style lang="scss">