Merge branch 'sit'

src/views/dashboard/index.vue

@@ -1,115 +1,44 @@
 <template>
   <div class="dashboard-container">
-    <!-- <div class="dashboard-editor-container"> -->
-    <!-- <div class="info-container clearfix">
+    <div class="dashboard-editor-container">
+      <div class="info-container clearfix">
         <pan-thumb :image="avatar" :width="'130px'" :height="'130px'">
         </pan-thumb>
         
-        <span class="welcome-title">欢迎登录采销平台</span>
-      </div> -->
-    <!-- style="width: 60%; margin: -30px auto 0 auto" -->
-    <img :src="emptyGif" class="bg-img" />
-    <div class="duihua">
-      <!-- <img src="@/assets/img/duihuakuang.png" /> -->
-      <img class="bg" src="@/assets/img/duihua.png" />
-      <div class="neirong">
-        <img src="@/assets/img/neirong.png" />
+        <span class="welcome-title">欢迎登录采销平台结算系统</span>
       </div>
-
-      <!-- <div>
-        <p>开工了&nbsp;！</p>
-        <p>快干活&nbsp;！</p>
-      </div> -->
+      <img :src="emptyGif" style="width: 60%; margin: -30px auto 0 auto" />
     </div>
-    <div class="wudi">woody</div>
   </div>
 </template>
 
 <script>
-// import { mapGetters } from "vuex";
+import PanThumb from "@/components/PanThumb";
+import GithubCorner from "@/components/GithubCorner";
+import { mapGetters } from "vuex";
 
 export default {
   name: "dashboard",
+  components: { GithubCorner, PanThumb },
   data() {
     return {
       emptyGif: require("@/assets/img/welcome.gif"),
     };
   },
-  // computed: {
-  // ...mapGetters([
-  // 'name',
-  // "avatar",
-  // 'roles'
-  // ]),
-  // },
-  // mounted() {},
+  computed: {
+    ...mapGetters([
+      // 'name',
+      "avatar",
+      // 'roles'
+    ]),
+  },
+  created() {},
 };
 </script>
 <style lang="scss" scoped>
 .dashboard-container {
   // background-color: #f0f4fd;
   padding: 0 0 0 0;
-  position: relative;
-  width: 100%;
-  min-height: calc(100vh - 53px);
-  display: block;
-  overflow: hidden;
-  .bg-img {
-    width: 100%;
-    position: absolute;
-    display: block;
-    min-height: 100%;
-    height: 100%;
-  }
-  .duihua {
-    position: absolute;
-    top: 1%;
-    right: 12%;
-    z-index: 2;
-    width: 290px;
-    img.bg {
-      display: block;
-      width: 100%;
-    }
-    div.neirong {
-      display: block;
-      position: absolute;
-      top: 0;
-      left: 0;
-      height: 100%;
-      min-height: 100%;
-      width: 100%;
-      box-sizing: border-box;
-      text-align: center;
-      padding:60px 0 0 20px;
-      img {
-        display: inline-block;
-    //  width: 2;
-      }
-    }
-    // div {
-    //   position: absolute;
-    //   top: 0;
-    //   width: 100%;
-    //   padding: 23.5% 0 0 10%;
-    //   p {
-    //     text-align: center;
-    //     line-height: 50px;
-    //     font-size: 35px;
-    //     font-weight: bold;
-    //     letter-spacing: 1px;
-    //     color: #1f2d3d;
-    //   }
-    // }
-  }
-  .wudi {
-    position: absolute;
-    right: 0;
-    bottom: 0;
-    color: #fff;
-    z-index: 3;
-  }
-  // background-color: #e3e3e3;
 }
 .emptyGif {
   display: block;
@@ -118,11 +47,11 @@ export default {
 }
 
 .dashboard-editor-container {
-  position: relative;
-  min-height: 100%;
+  background-color: #e3e3e3;
+  min-height: calc(100vh - 84px);
   width: 100%;
   // display: flex;
-  // padding: 0 6% 0 0;
+  padding: 0 6% 0 0;
   text-align: center;
   // align-items: flex-start ;
   .info-container {