submit

.gitignore

@@ -1,6 +1,6 @@
 .DS_Store
 node_modules/
-dist/
+ehpt/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*

package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",
-    "build:prod": "vue-cli-service build",
+    "build": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
     "new": "plop",

src/layout/components/Navbar.vue

@@ -1,8 +1,7 @@
 <template>
   <div class="navbar">
     <div class="hos-name">
-      <!-- <img :src="logo" alt="logo"> -->
-      <h1>节约型医院</h1>
+      <img :src="logo" alt="logo">
       <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
       <span v-if="userData.ocName" class="tag">{{ userData.ocName }}</span>
       <countdown v-if="userData.licExpiredTime" :end-time="userData.licExpiredTime">
@@ -87,7 +86,7 @@ export default {
 
   data() {
     return {
-      logo: require('@/assets/images/logo/logo_csat.png'),
+      logo: require('@/assets/images/logo/logo.png'),
       sideMenuTabIndex: 0,
       sideMenus: [],
       sideMenuTabList: [
@@ -216,10 +215,10 @@ export default {
     line-height: 1;
     font-weight: 600;
     padding-left: 5px;
-    margin-top: 15px;
+    margin-top: 10px;
     &.authorization{
       font-size: 12px;
-      margin-top: 20px;
+      margin-top: 15px;
       color: #a33e3e;
       // color: rgba(255, 255, 255, 0.7);
     }

src/views/login/index.vue

@@ -6,7 +6,7 @@
     <div class="login-form-wrap">
       <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left">
         <div class="title-container">
-          <h3 class="form-title">用户登录</h3>
+          <h3 class="form-title">欢迎登录</h3>
         </div>
 
         <el-form-item prop="username">
@@ -52,7 +52,7 @@
           <span>*</span> 忘记密码可咨询管理人员重新获取
         </p>
 
-        <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">
+        <el-button :loading="loading" type="primary" style="width:100%;height:48px" @click.native.prevent="handleLogin">
           登录
         </el-button>
 
@@ -93,7 +93,7 @@ export default {
       capsTooltip: false,
       showDialog: false,
       redirect: undefined,
-      logoImage: require('@/assets/images/logo/logo_csat.png'),
+      logoImage: require('@/assets/images/logo/logo.png'),
       otherQuery: {}
     }
   },
@@ -226,8 +226,8 @@ $bg: #2d3a4b;
     .login-container {
         min-height: 100%;
         width: 100%;
-        background-image: url("../../assets/images/login/login_ornament.png");
-        background-size: 910px 870px;
+        background-image: url("../../assets/images/login/login_bg.png");
+        background-size:100% 100%;
         background-repeat: no-repeat;
         background-color: #071A29;
         background-position:344px 106px;
@@ -236,21 +236,22 @@ $bg: #2d3a4b;
         .login-form-wrap {
             position: absolute;
             background: rgba(255, 255, 255, .08);
-            right: 10%;
-            top: 30%;
-            padding: 10px;
+            left: 50%;
+            top: 50%;
+            transform: translate(-50%,-50%);
+            // padding: 10px;
         }
 
         .login-form {
-            width: 367px;
-            height: 319px;
+            width: 420px;
+            height: 437px;
             max-width: 100%;
             padding: 30px;
             margin: 0 auto;
             overflow: hidden;
-            background: rgba(255, 255, 255, .08);
             border-radius: 5px;
-
+            background: linear-gradient(0deg, #1C2D46 0%, #304564 100%);
+            box-shadow: 0px 5px 30px 0px #05081B80;
             .icon-image {
                 width: 20px;
                 height: 20px;
@@ -262,16 +263,18 @@ $bg: #2d3a4b;
                 font-size: 14px;
                 font-weight: bold;
                 color: #FFFFFF;
-                text-align: center;
-                margin-top: 0;
                 margin-bottom: 34px;
+                font-family: Be Vietnam;
+                font-size: 28px;
+                font-weight: 700;
+                line-height: 41px;
             }
 
             .tip-text {
                 font-size: 12px;
                 font-weight: bold;
                 color: #7C878E;
-                margin-bottom: 20px;
+                margin-bottom: 32px;
 
                 span {
                     color: #E41111;