From 07ca2d96c6f38a2a38f958d1771b6b9848f0ce0d Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期五, 15 十二月 2023 15:43:11 +0800
Subject: [PATCH] bug修改

---
 src/views/homePage.vue |   72 ++++++++++++++++-------------------
 1 files changed, 33 insertions(+), 39 deletions(-)

diff --git a/src/views/homePage.vue b/src/views/homePage.vue
index f76cacb..ac24b1e 100644
--- a/src/views/homePage.vue
+++ b/src/views/homePage.vue
@@ -3,7 +3,7 @@
 <!--    <img class="pics1" src="src/assets/images/login-data.png">-->
 <!--    <img class="pics2" src="src/assets/images/login-search.png">-->
     <div class="main-content">
-      <div class="top">
+      <div class="top" style="z-index: 1">
         <div class="top-cont">
           <div class="logo blueFont">智慧安评</div>
           <div class="time">
@@ -18,7 +18,7 @@
         </div>
       </div>
 
-      <div class="nav blueBg">
+      <div class="nav blueBg" style="z-index: 1">
         <div class="nav-cont">
           <div :class="state.activeMenu == 1?'active': ''" @click="changeTab(1)">
             <HomeFilled style="width: 1em; height: 1em; margin-right: 8px" />
@@ -34,16 +34,16 @@
           </div>
           <div :class="state.activeMenu == 4?'active': ''" @click="changeTab(4)">
             <List style="width: 1em; height: 1em; margin-right: 8px" />
-            <div>信息公示</div>
+            <div>机构公示</div>
           </div>
         </div>
       </div>
       <div class="content">
-        <Home v-if="state.activeMenu==1" ref="homeRef" @toMore="changeTab"/>
-        <Notice v-if="state.activeMenu==2" ref="noticeRef"/>
-        <Laws v-if="state.activeMenu==3" ref="lawsRef"/>
-        <Publish v-if="state.activeMenu==4" ref="publishRef"/>
-        <Details ref="detailsRef"></Details>
+        <Home v-if="state.activeMenu==1" ref="homeRef" @toMore="changeTab" @openDetails="openDetails"/>
+        <Notice v-if="state.activeMenu==2" ref="noticeRef" @openDetails="openDetails"/>
+        <Laws v-if="state.activeMenu==3" ref="lawsRef" @openDetails="openDetails"/>
+        <Publish v-if="state.activeMenu==4" ref="publishRef" @openDetails="openDetails"/>
+        <Details v-if="state.activeMenu==0" ref="detailsRef" @backJump="changeTab"></Details>
       </div>
     </div>
     <!--  底部  -->
@@ -60,8 +60,8 @@
 import Notice from './components/notice'
 import Laws from './components/laws'
 import Publish from './components/publish'
-import Details from './components/details'
-
+import Details from './components/details.vue'
+const { proxy } = getCurrentInstance()
 const route = useRoute()
 const router = useRouter()
 // 时间格式化
@@ -79,7 +79,7 @@
 const noticeRef = ref(null)
 const lawsRef = ref(null)
 const publishRef = ref(null)
-
+const detailsRef = ref(null)
 const state = reactive({
   activeMenu: 1,
   date: '',
@@ -130,21 +130,15 @@
 
 const changeTab=(num)=>{
   state.activeMenu = num
-  console.log(state.activeMenu)
-  // if(num == 1){
-  //   homeRef.value.getNoticeList()
-  //   homeRef.value.getLawsList()
-  //   homeRef.value.getPubList()
-  // }
-  // if(num == 2){
-  //   noticeRef.value.getData()
-  // }
-  // if(num == 3){
-  //   lawsRef.value.getData()
-  // }
-  // if(num == 4){
-  //   publishRef.value.getData()
-  // }
+}
+
+const openDetails=(type,id)=>{
+  state.activeMenu = 0
+  nextTick(() => {
+    proxy.$refs.detailsRef.openDetail(type,id)
+  })
+  // detailsRef.value.openDetail(type,id)
+
 }
 
 </script>
@@ -173,7 +167,7 @@
       justify-content: center;
       .top-cont{
         width: 1200px;
-        height: 90px;
+        height: 80px;
         display: flex;
         align-items: center;
         justify-content: space-between;
@@ -182,14 +176,14 @@
         .logo{
           font-size: 2rem;
           font-weight: 800;
-          height: 90px;
-          line-height: 90px;
+          height: 80px;
+          line-height: 80px;
           font-family: "PingFang SC";
         }
 
         .time{
           font-size: 16px;
-          height: 90px;
+          height: 80px;
           display: flex;
           flex-direction: column;
           justify-content: center;
@@ -205,13 +199,13 @@
 
     .nav{
       width: 100%;
-      height: 80px;
+      height: 70px;
       position: fixed;
-      top: 90px;
+      top: 80px;
       left: 0;
       .nav-cont{
         width: 1200px;
-        height: 80px;
+        height: 70px;
         margin: 0 auto;
         display: flex;
         align-items: center;
@@ -221,7 +215,7 @@
           height: 100%;
           padding: 0 50px;
           color: #ffffff;
-          background-color: #5175C0;
+          background-color: #385ca7;
           font-size: 20px;
           text-decoration: none;
           display: flex;
@@ -230,11 +224,11 @@
           cursor: pointer;
 
           &:hover{
-            background: #425f9f;
+            background: #294582;
           }
         }
         .active{
-          background: #425f9f;
+          background: #294582;
         }
       }
     }
@@ -256,14 +250,14 @@
 }
 
 .el-login-footer {
-  height: 60px;
-  line-height: 60px;
+  height: 40px;
+  line-height: 40px;
   position: fixed;
   bottom: 0;
   width: 100%;
   text-align: center;
   color: #fff;
-  background: #5175C0;
+  background: #385ca7;
   font-family: "PingFang SC";
   font-size: 12px;
   letter-spacing: 1px;

--
Gitblit v1.9.2