Browse Source

新增首页,优化登录页

wyh 1 year ago
parent
commit
08559e1b45

BIN
itdmWeb/src/assets/backg2.png


BIN
itdmWeb/src/assets/logo2.png


+ 47 - 5
itdmWeb/src/components/layouts/UserLayout.vue

@@ -1,7 +1,24 @@
 <template>
   <div id="userLayout" :class="['user-layout-wrapper', device]">
     <div class="container">
-      <div class="top">
+      <div class="cen">
+        <div class="cen2">
+          <div class="top">
+            <div class="header">
+              <a href="/">
+                <img src="~@/assets/logo2.png" class="logo" alt="logo">
+                <span class="title">天工试验场</span>
+              </a>
+            </div>
+            <div class="desc">
+              致力于航空航天环境试验领域的数智化解决方案
+            </div>
+          </div>
+
+          <route-view></route-view>
+        </div>
+      </div>
+      <!-- <div class="top">
         <div class="header">
           <a href="/">
             <img src="~@/assets/logo.png" class="logo" alt="logo">
@@ -13,7 +30,7 @@
         </div>
       </div>
 
-      <route-view></route-view>
+      <route-view></route-view> -->
 
       <div class="footer">
 <!--        <div class="links">-->
@@ -65,11 +82,32 @@
     .container {
       width: 100%;
       min-height: 100%;
-      background: #f0f2f5 url(~@/assets/background.svg) no-repeat 50%;
+      // background: #f0f2f5 url(~@/assets/background.svg) no-repeat 50%;
+      background: url('../../assets/backg2.png') no-repeat center center;
       background-size: 100%;
       padding: 110px 0 144px;
       position: relative;
 
+      .cen{
+        height: 100%;
+        width: 35%;
+        // border: 1px solid red;
+        background-color: #6064e191;
+        border-radius: 7px;
+        box-shadow: 0px 0px 20px 0px #4e52c6e6;
+        margin-left: 57%;
+        // padding: 3% 0 3% 0;
+        padding: 0.7% 0.7% 0.7% 0.7%;
+      }
+      .cen2{
+        height: 100%;
+        width: 100%;
+        background-color: rgba(104, 108, 226, 0.655);
+        border-radius: 5px;
+        // box-shadow: 0px 0px 20px 0px #3a41b9;
+        padding: 8% 0 8% 0;
+      }
+
       a {
         text-decoration: none;
       }
@@ -95,21 +133,25 @@
             height: 44px;
             vertical-align: top;
             margin-right: 16px;
+            margin-top: 3px;
             border-style: none;
           }
 
           .title {
             font-size: 33px;
-            color: rgba(0, 0, 0, .85);
+            // color: rgba(0, 0, 0, .85);
+            color: rgba(255, 255, 255, 0.933);
             font-family: "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
             font-weight: 600;
             position: relative;
             top: 2px;
+            letter-spacing: 3px;
           }
         }
         .desc {
           font-size: 14px;
-          color: rgba(0, 0, 0, 0.45);
+          color: rgba(192, 192, 192, 0.818);
+          // color: rgba(0, 0, 0, 0.45);
           margin-top: 12px;
           margin-bottom: 40px;
         }

+ 5 - 0
itdmWeb/src/config/router.config.js

@@ -323,6 +323,11 @@ export const constantRouterMap = [
     ]
   },
   {
+    path: '/firstIndex',
+    name: 'firstIndex',
+    component: () => import(/* webpackChunkName: "user" */ '@/views/user/firstIndex.vue'),
+  },
+  {
     path: '/itdmScreen/itdmScreenIndex',
     name: 'itdmScreen',
     component: () => import(/* webpackChunkName: "user" */ '@/views/module-iTDM/itdmScreen/itdmScreenIndex.vue'),

+ 3 - 1
itdmWeb/src/permission.js

@@ -51,7 +51,9 @@ router.beforeEach((to, from, next) => {
                   next({ ...to, replace: true })
                 } else {
                   // 跳转到目的路由
-                  next({ path: redirect })
+                  // next({ path: redirect })
+                  console.log(wyh222)
+                  next({ path: '/firstIndex' })
                 }
               })
             })

+ 3 - 1
itdmWeb/src/views/exception/ExceptionPage.vue

@@ -31,7 +31,9 @@
     },
     methods: {
       handleToHome () {
-        this.$router.push({ name: 'dashboard' })
+        // this.$router.push({ name: 'dashboard' })
+        // wyh首页改之后
+        this.$router.push({ name: 'firstIndex' })
       }
     }
   }

+ 24 - 1
itdmWeb/src/views/user/Login.vue

@@ -384,6 +384,26 @@ export default {
 </script>
 
 <style lang="less" scoped>
+::v-deep .ant-tabs-nav .ant-tabs-tab-active{
+  color: rgba(255, 255, 255, 0.774) !important;
+}
+// input
+::v-deep .ant-form-item{
+  color: #ffffff;
+}
+::v-deep .ant-input{
+  // border-radius: 20px;
+  // background-color: #443f8ea0 !important;
+  // background-color: #ffffffdb !important;
+  border-color: #ff41bd00 !important;
+}
+// 触发验证
+::v-deep .has-error .ant-input-affix-wrapper .ant-input, .has-error .ant-input-affix-wrapper .ant-input:hover{
+  border-color: #ff4174;
+}
+::v-deep .has-error .ant-form-explain, .has-error .ant-form-split{
+  color: #ff4174 !important;
+}
 
 .user-layout-login {
   label {
@@ -401,10 +421,13 @@ export default {
   }
 
   button.login-button {
-    padding: 0 15px;
+    // padding: 0 15px;
     font-size: 16px;
     height: 40px;
     width: 100%;
+    // background-color: #3AA0FC;
+    // background-image:linear-gradient(120deg, #3634F8, #786EDB);
+    // border-color: #00000000;
   }
 
   .user-login-other {

+ 35 - 0
itdmWeb/src/views/user/firstIndex.vue

@@ -0,0 +1,35 @@
+<template>
+    <div style="display: flex;">
+        <div class="box" @click="iTDM">1</div>
+        <div class="box">2</div>
+        <div class="box">3</div>
+        <div class="box">4</div>
+        <div class="box">5</div>
+        <div class="box">6</div>
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            
+        }
+    },
+    methods: {
+        iTDM(){
+            console.log(11111)
+            this.$router.push({path: '/dashboard/analysis'})
+        }
+    }
+}
+</script>
+
+<style scoped>
+.box{ 
+    height: 30px;
+    width: 70px;
+    border: 1px solid rgb(0, 0, 0);
+    margin-left: 5px;
+}
+</style>