From 62d03da068320f0c9ec99a33045dabc263c85986 Mon Sep 17 00:00:00 2001
From: zhuzhuxia233 <1837289056@qq.com>
Date: Fri, 14 Apr 2023 14:52:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AFdashboard=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E5=A4=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/ipo.ts                          |  3 ++-
 src/views/dashBoard/Header/index.vue       | 19 ++++++++++---------
 src/views/dashBoard/index.vue              | 18 +++++++++++++++---
 src/views/login/modelComponents/Drawer.vue | 16 +++++++---------
 4 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/stores/ipo.ts b/src/stores/ipo.ts
index 33bb232..5810a58 100644
--- a/src/stores/ipo.ts
+++ b/src/stores/ipo.ts
@@ -7,7 +7,8 @@ export const ipoStore = defineStore({
   id: 'app',
   state: () => ({
     //1代表英文 2代表繁体中文 3代表简体中文
-    locale:1
+    locale:1,
+
   }),
   getters: {
     localeLang(state) {
diff --git a/src/views/dashBoard/Header/index.vue b/src/views/dashBoard/Header/index.vue
index e4926ac..97a3ddb 100644
--- a/src/views/dashBoard/Header/index.vue
+++ b/src/views/dashBoard/Header/index.vue
@@ -1,13 +1,9 @@
 <template>
     <div class="headerWrap">
-        <el-drawer v-model="drawer" size="80%" direction="ltr" :show-close="false" :before-close="handleDrawer"
-            style="background-color: #1C3F56;" :with-header="false"  >
-            <Drawer />
-        </el-drawer>
         <div class="left">
             <div class="left-1">
                 <div class="menu">
-                    <img src="@/assets/1x/1x/source5.png" alt="menu" class="menuicon" @click="openDrawer">
+                    <img src="@/assets/1x/1x/source5.png" alt="menu" class="menuicon" @click="drawShow" >
                 </div>
              <span>{{ $t(i18n.global.t('dashboard.Dashboard')) }}</span>
             </div>
@@ -47,7 +43,7 @@ import Lang from "@/views/login/components/Lang.vue";
 import { conforms } from 'lodash';
 const { proxy } = (getCurrentInstance() as any)
 const value = ref(true)
-const drawer = ref(false)
+
 const lang = ref()
 const handleShowLang=(e:any)=>{
 console.log(1111)
@@ -64,7 +60,11 @@ onUnmounted(() => {
     document.documentElement.onclick = null
 })
 const props = defineProps({
-    time: [String, Number]
+    time: [String, Number],
+    openDrawer:{
+        required:true,
+        type:Function
+    }
 })
 const handlesearch = ()=>{
     proxy.$router.push("/home")
@@ -72,8 +72,9 @@ const handlesearch = ()=>{
 const handleDrawer = (done: () => void) => {
     done();
 }
-const openDrawer = () => {
-    drawer.value = true;
+const drawShow = () => {
+    console.log(1111);
+    props.openDrawer();
 }
 </script>
 
diff --git a/src/views/dashBoard/index.vue b/src/views/dashBoard/index.vue
index 58da8d7..cd8d0e6 100644
--- a/src/views/dashBoard/index.vue
+++ b/src/views/dashBoard/index.vue
@@ -1,13 +1,16 @@
 <template>
   <div class="login1">
+    <el-drawer v-model="drawer" size="80%" direction="ltr" :show-close="false" :before-close="handleDrawer"
+            style="background-color: #1C3F56;" :with-header="false"  >
+            <Drawer />
+        </el-drawer>
     <div class="wrap w">
       <div class="leftbox">
         <Item :data="data" />
         <Nav />
-
       </div>
       <div class="rightbox">
-        <Header :time="datatime" />
+        <Header :time="datatime" :openDrawer="openDrawer"/>
         <div class="content">
           <div class="content-topleft">
             <p class="content-title">{{ $t(i18n.global.t('dashboard.Milestones')) }}</p>
@@ -148,6 +151,7 @@
 
       </div>
     </div>
+   
   </div>
 </template>
 <script lang="ts">
@@ -168,11 +172,19 @@ import moment from 'moment';
 import i18n from '@/locales'
 import { ipoStore } from "@/stores/ipo"
 import { getCurrentInstance, onUnmounted } from 'vue'
-
+import Drawer from '@/views/login/modelComponents/Drawer.vue'
 import { getDataFromId } from "@/api/mock/home";
+const drawer = ref(false)
+const handleDrawer = (done: () => void) => {
+    done();
+}
+const openDrawer = () => {
+    drawer.value = true;
+}
 const { proxy } = (getCurrentInstance() as any)
 // console.log('getCurrentInstance()中的proxy:', proxy)
 const store = ipoStore()
+
 const main = ref() // 使用ref创建虚拟DOM引用，使用时用main.value
 const main1 = ref(); // 使用ref创建虚拟DOM引用，使用时用main.value
 const main2 = ref();
diff --git a/src/views/login/modelComponents/Drawer.vue b/src/views/login/modelComponents/Drawer.vue
index b599164..55cb4ef 100644
--- a/src/views/login/modelComponents/Drawer.vue
+++ b/src/views/login/modelComponents/Drawer.vue
@@ -1,6 +1,6 @@
 <template>
-    <div class="wrap">
-        <div class="imgWrap">
+    <div class="wrapddd">
+        <div class="imgWrap22222">
             <img src="@/assets/1x/1x/source8.png" alt="menu" >
         </div>
         <div class="nav">
@@ -73,18 +73,16 @@ const setState = (number: number) => {
 </script>
 
 <style lang="scss" scoped>
-.wrap {
+.wrapddd {
     width: 80vw;
     transform: translateX(-20rem);
-
-    .imgWrap {
+    display: flex;
+    flex-direction: column;
+    .imgWrap22222 {
         margin-top: 30rem;
         width: 25rem;
         height: 20rem;
-        margin-left: 15rem;
-
-
-
+        // margin-left: 15rem;
         img {
             width: 100%;
             height: 100%;