Browse Source

界面 首页UI

shihang 6 years ago
parent
commit
b69c80a675

+ 2 - 2
src/dashoo.cn/frontend_web/nuxt.config.js

@@ -159,8 +159,8 @@ module.exports = {
   },
 
   axios: {
-    baseURL: '//localhost:9081/api/' // 本机开发使用
-    // baseURL: '//52.80.133.197:9081/api/' // BioBank on AWS发布使用
+    // baseURL: '//localhost:9081/api/' // 本机开发使用
+    baseURL: '//52.80.133.197:9081/api/' // BioBank on AWS发布使用
     // baseURL: '//188.188.30.89:9081/api/' //临沂使用
     // baseURL: '//api09.labsop.cn/api/'
     // baseURL: '//192.168.0.211:10091/api/' // 花生所系统

+ 2 - 2
src/dashoo.cn/frontend_web/src/components/Headbar.vue

@@ -13,7 +13,7 @@
     <nav class="toolbar" style="margin-top: 3px;">
       <img src="../assets/img/title_biobank.png" style="height:35px;padding-top:5px;" />
       <div style="margin: 10px 0px 0px 20px;"></div>
-      <!-- <el-tag type="text" size="mini" style="margin-top:12px">{{department}}</el-tag> -->
+      <el-tag type="text" size="mini" style="margin-top:12px">{{department}}</el-tag>
 
       <ul class="list" style="background: #FFF;color: blue">
         <li class="item" style="background: #FFF">
@@ -62,7 +62,7 @@
 
         fullscreen: false,
         sampcode: '',
-        department: ''
+        department: '欢迎使用'
       }
     },
     created() {},

+ 26 - 16
src/dashoo.cn/frontend_web/src/pages/login.vue

@@ -1,5 +1,22 @@
 <template>
-  <div >
+  <div class="nav">
+    <!-- <header>
+      <a href="/" class="nav-logo leftpadding" alt="egg"><img src="../assets/img/logo2.png" style="height:45px;"></a>
+      <ul class="nav-item">
+        <li>
+          <form id="search-form">
+            <input type="text" id="search-query" class="search-query st-default-search-input">
+          </form>
+        </li>
+        <li><a href="/zh-cn/intro/" alt="介绍">biobank</a></li>
+        <li><a href="/api/" alt="API">LIMS</a></li>
+        <li><a href="/zh-cn/tutorials/index.html" alt="其他">智能婴儿床</a></li>
+        <li><a href="https://github.com/search?q=topic%3Aegg-plugin&type=Repositories" alt="其他">其他</a></li>
+        <li>
+        <li class="translations">
+        </li>
+      </ul>
+    </header> -->
 
     <div class="container">
       <el-row>
@@ -9,7 +26,7 @@
         </el-col>
         <el-col :span="9">
           <el-card class="box-card">
-         <el-form class="login-form" auto-complete="off" :model="model" :rules="rules" ref="user" label-position="top">
+         <el-form class="login-form" auto-complete="off" :model="model" :rules="rules" ref="login-form">
             <h2 class="heading">登录</h2>
             <el-form-item label="用户名" prop="username">
               <el-input type="text" v-model="model.username" placeholder="请输入用户名">
@@ -109,16 +126,9 @@
                 password: this.model.password.replace(/(^\s*)|(\s*$)/g, "")
               }
             })
-            if (process.env.appclient == 'lims') {
-              this.$router.push(this.$route.query.page || '/indexlims')
-            } else if (process.env.appclient == 'cellbank') {
-              this.$router.push(this.$route.query.page || '/indexdqm')
-            } else {
-              this.$router.push(this.$route.query.page || '/')
-            }
+            this.$router.push(this.$route.query.page || '/')
           }
         } catch (e) {
-          // this.$message.warning(e.message)
           this.$message.warning('账号或密码错误')
         } finally {
           this.logging = false
@@ -156,11 +166,11 @@
     min-width: 1300px;
     margin: 0 auto;
   }
-      .heading {
-        margin: 0 0 1rem;
-        font-weight: 400;
-        font-size: 1.5rem;
-      }
+      // .heading {
+      //   margin: 0 0 1rem;
+      //   font-weight: 400;
+      //   font-size: 1.5rem;
+      // }
 
   .nav ul.nav-item {
     height: 32px;
@@ -299,7 +309,7 @@
     max-width: 1136px;
     margin: 0 auto;
     padding-top: 0px;
-    padding-bottom: 30px;
+    padding-bottom: 0px;
   }
   .box-card {
       margin-top: 140px;