浏览代码

chore: 首页调整

cfofpp 3 月之前
父节点
当前提交
189e318996
共有 4 个文件被更改,包括 24 次插入22 次删除
  1. 2 2
      src/layout/components/Top/index.vue
  2. 9 9
      src/layout/index2.vue
  3. 2 2
      src/views/home/components/Header.vue
  4. 11 9
      src/views/home/index.vue

+ 2 - 2
src/layout/components/Top/index.vue

@@ -4,7 +4,7 @@
     <div class="profile">
       <div class="right-menu">
         <template v-if="device !== 'mobile'">
-          <el-tooltip
+          <!-- <el-tooltip
             class="back"
             effect="dark"
             content="首页"
@@ -14,7 +14,7 @@
               @click="() => $router.push('/index')"
               class="el-icon-full-screen back-icon"
             ></i>
-          </el-tooltip>
+          </el-tooltip> -->
           <search id="header-search" class="right-menu-item" />
           <screenfull id="screenfull" class="right-menu-item hover-effect" />
           <el-tooltip content="布局大小" effect="dark" placement="bottom">

+ 9 - 9
src/layout/index2.vue

@@ -4,22 +4,22 @@
     class="app-wrapper"
     :style="{ '--current-color': theme }"
   >
-    <!-- <div
+    <div
       v-if="device === 'mobile' && sidebar.opened"
       class="drawer-bg"
       @click="handleClickOutside"
-    /> -->
-    <!-- <sidebar v-if="!sidebar.hide" class="sidebar-container" /> -->
+    />
+    <sidebar v-if="!sidebar.hide" class="sidebar-container" />
     <!--    <Menu></Menu>-->
     <div
-      :class="{ hasTagsView: needTagsView, sidebarHide: true }"
+      :class="{ hasTagsView: needTagsView, sidebarHide: sidebar.hide }"
       class="main-container"
     >
-      <!-- <div :class="{ 'fixed-header': fixedHeader }">
-        <Top v-if="$route.path != '/index'"></Top>
-        <navbar v-if="$route.path != '/index'" />
-        <tags-view v-if="needTagsView && $route.path != '/index'" />
-      </div> -->
+      <div :class="{ 'fixed-header': fixedHeader }">
+        <!-- <Top></Top> -->
+        <!-- <navbar /> -->
+        <!-- <tags-view v-if="needTagsView" /> -->
+      </div>
       <app-main />
       <right-panel>
         <settings />

+ 2 - 2
src/views/home/components/Header.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="header">
     <slot></slot>
-    <el-tooltip class="back" effect="dark" content="返回" placement="bottom">
+    <!-- <el-tooltip class="back" effect="dark" content="返回" placement="bottom">
       <i
         @click="
           () => $router.push('/power-outage-control/target-display-board')
         "
         class="el-icon-full-screen"
       ></i>
-    </el-tooltip>
+    </el-tooltip> -->
   </div>
 </template>
 <script setup></script>

+ 11 - 9
src/views/home/index.vue

@@ -3,23 +3,25 @@
     <Header>配网安全精益管理辅助应用</Header>
     <el-row :gutter="10">
       <el-col :span="12" class="h-full-calc">
-        <el-card class="h-40">
+        <el-card class="h-48">
           <PointsRanking></PointsRanking>
         </el-card>
-        <el-card class="h-60 mt-10">
-          <MapHy></MapHy>
+        <el-card class="h-48 mt-10">
+          <TargetSituation height="100%"></TargetSituation>
+
           <!-- <MapView></MapView> -->
         </el-card>
       </el-col>
       <el-col :span="12" class="h-full-calc">
-        <el-card class="h-40">
-          <RiskIdentification height="95%"></RiskIdentification>
-          <!-- <TargetSituation height="100%"></TargetSituation> -->
+        <el-card>
+          <MapHy></MapHy>
         </el-card>
-        <el-card class="h-60 mt-10">
+        <!-- <el-card class="h-40">
+          <RiskIdentification height="95%"></RiskIdentification>
+        </el-card> -->
+        <!-- <el-card class="h-60 mt-10">
           <TargetSituation height="100%"></TargetSituation>
-          <!-- <TargetMonth height="100%"></TargetMonth> -->
-        </el-card>
+        </el-card> -->
       </el-col>
     </el-row>
   </div>