Merge pull request '1' (#182) from pc-master into portal

Reviewed-on: #182

src/assets/css/main.css

@@ -409,12 +409,31 @@ textarea {
   position: relative;
   width: 373px;
   height: 78px;
+  display: flex;
+  align-items: center;
+  padding: 10px;
 }
 
-.index .header .header-left > img {
+.index .header .header-left .logo-img {
+  position: relative;
+  z-index: 2;
+  margin-right: 10px;
+}
+
+.index .header .header-left .logo-bg {
   width: 373px;
   height: 99px;
   cursor: pointer;
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: 1;
+}
+
+.index .header .header-left .logo-title {
+  position: relative;
+  z-index: 2;
+  font-size: 35px;
 }
 
 .index .header .header-center {

src/assets/css/main.scss

@@ -423,11 +423,26 @@ textarea{
             position: relative;
             width: 373px;
             height: 78px;
-
+            display: flex;
-            >img {
+            align-items: center;
+            padding: 10px;
+            .logo-img{
+                position: relative;
+                z-index: 2;
+                margin-right: 10px;
+            }
+            .logo-bg {
                 width: 373px;
                 height: 99px;
                 cursor: pointer;
+                position: absolute;
+                left: 0;
+                top: 0;
+                z-index: 1;
+            }
+            .logo-title{
+                position: relative;z-index: 2;
+                font-size: 35px;
             }
 
         }

src/views/index.vue

@@ -2,7 +2,11 @@
     <div class="index">
         <div class="header">
             <div class="header-left">
-                <img src="../assets/image/logo.png" alt="">
+                <img class="logo-img" src="../assets/image/logo-img.png" alt="">
+                <img class="logo-bg" src="../assets/image/logo.png" alt="">
+                <div class="logo-title" v-if="mainData">
+                    {{mainData.projectName}}
+                </div>
             </div>
 
             <div class="header-center">
@@ -146,6 +150,7 @@ export default {
             limitUserId: [],
             statusData: [],
             roleId:2,
+            mainData:null,
         }
     },
     watch: {
@@ -230,6 +235,8 @@ export default {
                 ] },
             ]
             }
+            this.mainData=res.data.data.project
+
         }
       })
         },