Explorar o código

修复样式问题

chauncey hai 11 meses
pai
achega
14becd4e27

+ 7 - 1
src/App.vue

@@ -1,7 +1,9 @@
 <template>
   <div id="app" :style="{ backgroundImage: `url(${backgroundImg})` }">
     <Nav />
-    <router-view />
+    <div class="content">
+      <router-view />
+    </div>
   </div>
 </template>
 
@@ -25,4 +27,8 @@
     background-repeat: no-repeat;
     background-size: cover;
   }
+  .content {
+    flex: 1;
+    overflow-y: auto;
+  }
 </style>

+ 1 - 0
src/layout/MenuLayout.vue

@@ -78,6 +78,7 @@
     display: flex;
     gap: 10cpx;
     padding: 10cpx;
+    height: 100%;
   }
   .aside,
   .main {

+ 1 - 1
src/views/disaster/disaster-control/PageDisasterControl.vue

@@ -132,7 +132,7 @@
   ];
   const options = {
     emptyText: '暂无数据',
-    height: '63vh',
+    height: '60vh',
     loading: true,
     stripe: true,
   };

+ 1 - 1
src/views/disaster/disaster-warning/PageDefenseNotice.vue

@@ -151,7 +151,7 @@
   ];
   const options = {
     emptyText: '暂无数据',
-    height: '63vh',
+    height: '60vh',
     loading: true,
     stripe: true,
   };

+ 2 - 2
src/views/disaster/disaster-warning/PageWarningInfo.vue

@@ -6,7 +6,7 @@
     <main class="disaster-precaution-container__main">
       <div class="warning-info-container">
         <header class="warning-info-container__header">
-          <Search />
+          <Search :statusShow="true" />
         </header>
         <BasicTable
           :tableConfig="tableConfig"
@@ -131,7 +131,7 @@
   ];
   const options = {
     emptyText: '暂无数据',
-    height: '68vh',
+    height: '65vh',
     loading: true,
     stripe: true,
   };

+ 4 - 1
src/views/disaster/disaster-warning/src/components/Search.vue

@@ -13,7 +13,7 @@
           <el-option v-for="item in DISASTER_LEVEL" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </div>
-      <div class="select-box--item">
+      <div class="select-box--item" v-if="!statusShow">
         <span>生效状态:</span>
         <el-select v-model="selectStatus" placeholder="请选择状态">
           <el-option
@@ -36,6 +36,9 @@
   import { ref } from 'vue';
   import { ACTIVE_STATUS_OPTIONS_WARNING, DISASTER_TYPE } from '@/views/disaster/constant';
   import { DISASTER_LEVEL } from '@/views/disaster/constant';
+  defineProps<{
+    statusShow?: boolean;
+  }>();
   const selectDisasterType = ref('');
   const selectDisasterLevel = ref('');
   const selectStatus = ref('');