提交

2 лет назад · 452375874b
--- a/index.html
+++ b/index.html
@@ -1,16 +1,23 @@
 <!--
 * @Author: zwq
 * @Date: 2021-10-13 10:27:28
 * @LastEditors: zwq
 * @LastEditTime: 2021-10-29 09:43:26
 * @Description:
 -->
 <!DOCTYPE html>
 <html lang="en">
 <head>
  <meta charset="UTF-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  <meta http-equiv="X-UA-Compatible" content="ie=edge">
  <title>智能立体仓库</title>
  <title>云洁科技</title>
  <% if (process.env.NODE_ENV === 'production') { %>
    <!-- 生产环境 -->
    <script>document.write('<script src="./config/index.js?t=' + new Date().getTime() +'"></script>')</script>
  <% }else { %>
    <!-- 开发环境 -->
    <link rel="shortcut icon" type="image/x-icon" href="./static/img/mentong1.png">
    <link rel="shortcut icon" type="image/x-icon" href="./static/img/logo.png">
    <script src="./static/config/index.js"></script>
    <script src="./static/plugins/mock-1.0.0-beta3/mock-min.js"></script>
    <script src="./static/plugins/echarts-3.8.5/echarts.common.min.js"></script>
@@ -22,4 +29,4 @@
 <body>
  <div id="app"></div>
 </body>
 </html>
 </html>
--- a/src/assets/img/logo.png
+++ b/src/assets/img/logo.png
--- a/src/icons/svg/yj.svg
+++ b/src/icons/svg/yj.svg
@@ -0,0 +1 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2196.8 2196.8"><defs><style>.cls-1{fill:#dc0606;}.cls-2{fill:#fff;}</style></defs><title>资源 15</title><g id="图层_2" data-name="图层 2"><g id="图层_1-2" data-name="图层 1"><rect class="cls-1" width="2196.8" height="2196.8" rx="254.99"/><polygon class="cls-2" points="1291.43 634.33 1065.93 634.33 791.87 1046.39 785.47 1046.39 511.4 634.33 285.9 634.33 664.9 1204.16 664.9 1682.84 914.61 1682.84 914.61 1200.88 1291.43 634.33"/><path class="cls-2" d="M1453.17,1687.63c-2.71,0-5.41,0-8.15-.06-2.12,0-4.26,0-6.36,0-102.32,0-184.27-29-243.7-86.19-30.41-29.27-55.06-66.23-73.27-109.85-17.61-42.18-29.66-91.75-35.82-147.35l-3.57-32.31L1301,1258.59l1.23,45.8c2,73.91,18.1,125.58,47.89,153.57,21.08,19.81,50.12,28.77,88.82,27.4l1.31,0,1.31,0c37.21,1.32,64.84-7.41,84.5-26.68,29.49-28.9,43.83-83.51,42.62-162.31V629.54h221.42v668.4c.87,66.93-6.41,126.06-21.65,175.79-15.92,52-41,95.23-74.38,128.6C1637.35,1659,1556.31,1687.63,1453.17,1687.63Z"/></g></g></svg>
--- a/src/views/common/login.vue
+++ b/src/views/common/login.vue
@@ -1,45 +1,13 @@
 <!--
 * @Author: zwq
 * @Date: 2021-10-13 10:27:23
 * @LastEditors: zwq
 * @LastEditTime: 2021-10-29 11:47:33
 * @Description:
 -->
 <template>
  <div class="site-wrapper site-page--login">
    <div class="site-content__wrapper">
      <div class="site-content">
        <div class="brand-info">
          <h2 class="brand-info__text">智能立体仓库</h2>
          <p class="brand-info__intro"></p>
        </div>
        <div class="login-main">
          <h3 class="login-title">管理员登录</h3>
          <el-form
            :model="dataForm"
            :rules="dataRule"
            ref="dataForm"
            @keyup.enter.native="dataFormSubmit()"
            status-icon
          >
            <el-form-item prop="userName">
              <el-input
                v-model="dataForm.userName"
                placeholder="帐号"
              ></el-input>
            </el-form-item>
            <el-form-item prop="password">
              <el-input
                v-model="dataForm.password"
                type="password"
                placeholder="密码"
              ></el-input>
            </el-form-item>
            <el-form-item>
              <el-button
                class="login-btn-submit"
                type="primary"
                @click="dataFormSubmit()"
                >登录</el-button
              >
            </el-form-item>
          </el-form>
        </div>
      </div>
    </div>
  <div class="loginbg">
    云洁科技
  </div>
 </template>

@@ -86,8 +54,8 @@ export default {
      }).then(({ data }) => {
        if (data && data.code === 0) {
          this.$cookie.set('token', data.token)
          this.loading.close()
          this.$router.replace({ name: 'home' })
          this.loading.close()
        } else {
          this.$message.error(data.msg)
        }
@@ -98,75 +66,13 @@ export default {
 </script>

 <style lang="scss">
 .site-wrapper.site-page--login {
  position: absolute;
  top: 0;
  right: 0;
  bottom: 0;
  left: 0;
  overflow: hidden;
  &:before {
    position: fixed;
    top: 0;
    left: 0;
    z-index: -1;
    width: 80%;
    height: 100%;
    content: "";
  }
  .site-content__wrapper {
    position: absolute;
    top: 0;
    right: 0;
    bottom: 0;
    left: 0;
    padding: 0;
    margin: 0;
    overflow-x: hidden;
    overflow-y: auto;
    background-color: transparent;
  }
  .site-content {
    min-height: 100%;
    padding: 30px 500px 30px 30px;
  }
  .brand-info {
    margin: 220px 100px 0 90px;
  }
  .brand-info__text {
    margin: 0 0 22px 30%;
    font-size: 48px;
    font-weight: 400;
    text-transform: uppercase;
  }
  .brand-info__intro {
    margin: 10px 0;
    font-size: 16px;
    line-height: 1.58;
    opacity: 0.6;
  }
  .login-main {
    position: absolute;
    top: 0;
    right: 0;
    padding: 150px 60px 180px;
    width: 470px;
    min-height: 100%;
    background-color: #fff;
  }
  .login-title {
    font-size: 16px;
  }
  .login-captcha {
    overflow: hidden;
    > img {
      width: 100%;
      cursor: pointer;
    }
  }
  .login-btn-submit {
    width: 100%;
    margin-top: 38px;
  }
 .loginbg{
  height: 100vh;
  width: 100vw;
  background-color: rgba(194, 233, 176, 0.993);
  text-align: center;
  line-height: 100vh;
  font-size: 100px;
  color: rgb(88, 88, 252);
 }
 </style>
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -1,10 +1,12 @@
 <template>
  <nav class="site-navbar" :class="'site-navbar--' + navbarLayoutType">
    <div class="site-navbar__header">
      <h1 class="site-navbar__brand" @click="$router.push({ name: 'home' })">
        <a class="site-navbar__brand-lg" href="javascript:;">智能立体仓库</a>
        <a class="site-navbar__brand-mini" href="javascript:;">仓库</a>
      </h1>
      <div class="site-navbar__brand" @click="$router.push({ name: 'home' })">
          <div class="site-navbar__brand-lg" href="javascript:;">
            <div style="line-height:18px;font-size:18px"><img src="../assets/img/logo.png" width="40" height="40" style="margin-left:20px;float:left"/>云洁科技  <br><span style="font-size:10px">YUN JIE TECHNOLOGY</span></div>
          </div>
        <a class="site-navbar__brand-mini" href="javascript:;"><img src="../assets/img/logo.png" width="40" height="40"/></a>
      </div>
    </div>
    <div class="site-navbar__body clearfix">
      <el-menu
--- a/static/img/logo.png
+++ b/static/img/logo.png