部分修复

src/App.vue

@@ -422,17 +422,6 @@ table th.star div::before {
   color: white;
 }
 
-//.el-message {
-//  border: none;
-//  border-radius: 2px;
-//  background-color: white;
-//  padding: 10px 16px;
-//  box-shadow: 1px 3px 8px 4px rgb(0 0 0 / 10%);
-//
-//  .el-message__content {
-//    color: #333333;
-//  }
-//}
 
 .el-table .el_table__current {
   background-color: #a7d3ff;

src/components/xiao-chan/xc-table/XcTable.vue

@@ -1,33 +1,39 @@
 <template>
-  <el-table
-      ref="tableRef"
-      :data="tableData"
-      @cell-click="cellClick"
-      style="width: 100%"
-      @selection-change="selectionChange"
-      @row-click="rowClick"
-      @row-dblclick="rowDblClick"
-      :height="props.finalHeight === null ? visibleWindowSize.height - props.height : props.finalHeight"
-      highlight-current-row
-      @row-contextmenu="contextmenu"
-      :row-key="props.rowKey"
-      border
-      @select-all="selectAll"
-      :default-expand-all="props.defaultExpandAll"
-      stripe>
-    <slot/>
-  </el-table>
-  <el-pagination
-      v-if="props.openPaging"
-      style="margin-top: 8px"
-      :current-page="pageObject.currentPage"
-      :page-size="pageObject.pageSize"
-      :total="pageObject.total"
-      :layout="props.layout"
-      :small="props.small"
-      :page-sizes="props.pageSizes"
-      @current-change="currentChange"
-      @size-change="sizeChange"/>
+  <div class="cy_display_flex_y">
+    <div class="cy_flex_1-y">
+      <el-table
+          ref="tableRef"
+          :data="tableData"
+          @cell-click="cellClick"
+          style="width: 100%"
+          @selection-change="selectionChange"
+          @row-click="rowClick"
+          @row-dblclick="rowDblClick"
+          :height="props.finalHeight === null ? visibleWindowSize.height - props.height : props.finalHeight"
+          highlight-current-row
+          @row-contextmenu="contextmenu"
+          :row-key="props.rowKey"
+          border
+          @select-all="selectAll"
+          :default-expand-all="props.defaultExpandAll"
+          stripe>
+        <slot/>
+      </el-table>
+    </div>
+    <div>
+      <el-pagination
+          v-if="props.openPaging"
+          style="margin-top: 8px"
+          :current-page="pageObject.currentPage"
+          :page-size="pageObject.pageSize"
+          :total="pageObject.total"
+          :layout="props.layout"
+          :small="props.small"
+          :page-sizes="props.pageSizes"
+          @current-change="currentChange"
+          @size-change="sizeChange"/>
+    </div>
+  </div>
 </template>
 
 <script setup name='XcTable'>
@@ -37,7 +43,7 @@ import {visibleWindowSize} from "@/utils/window-size";
 
 const props = defineProps({
   finalHeight: {
-    type: Number,
+    type: [Number, String],
     default: null
   },
   data: {

src/layout/MenuV2/MenuV2.vue

@@ -46,6 +46,7 @@ import {treeSearch} from "@/utils/array-utils";
 import {useCompRef} from "@/utils/useCompRef";
 import {ElMenu} from "element-plus";
 import {useSystemStore} from "@/pinia/system-store";
+import {stringNotBlank} from "@/utils/blank-utils";
 
 const menuText: Ref<string> = ref('')
 const menuRef = useCompRef(ElMenu)
@@ -63,7 +64,10 @@ const searchInput: (val: string) => void = XEUtils.debounce(async (val: string)
   if (val) {
     searchData.value = treeSearch<{ metaTitle: string; }>(menuData.value, (item) => {
       const metaTitle: string = item.metaTitle
-      return metaTitle.includes(val);
+      if (stringNotBlank(metaTitle)) {
+        return metaTitle.includes(val);
+      }
+      return false
     });
     isSearch.value = true
     await nextTick()

src/views/data-modify/OrderQuash.vue

@@ -8,7 +8,6 @@ import XcTable from "@/components/xiao-chan/xc-table/XcTable.vue";
 import {getWindowSize} from "@/utils/window-size";
 import XEUtils from 'xe-utils'
 import {BizException, ExceptionEnum} from "@/utils/BizException";
-import CovidVaccinateAppointment from "@/views/reports/covid-vaccinate/CovidVaccinateAppointment.vue";
 import {needRule} from "@/utils/public";
 
 const dateRange = ref([])

src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/query-die/QueryDie.vue

@@ -30,28 +30,29 @@ const exportExcelClick = () => {
   Export(resData.value.data, title, `${getFormatDatetime(startTime, 'YYYY-MM-DD')}至${getFormatDatetime(endTime, 'YYYY-MM-DD')}`)
 }
 
-onMounted(() => {
-  // dateRange.value = ['2021-01-01', '2023-08-09']
-})
-
 </script>
 
 <template>
-  <el-header>
-    <el-date-picker type="daterange" v-model="dateRange" style="width: 250px" :clearable="false"/>
-    <el-button type="primary" v-el-btn="queryClick">查询</el-button>
-    <el-button type="primary" @click="exportExcelClick">Excel</el-button>
-  </el-header>
-  <el-tabs v-model="tabs">
-    <el-tab-pane name="dieEmr" label="死亡病历">
-      <DieEmr :res-data="resData"/>
-    </el-tab-pane>
-    <el-tab-pane name="analysisChart" label="分析图">
-      <AnalysisChart :res-data="resData"/>
-    </el-tab-pane>
-  </el-tabs>
+
+  <div class="cy_display_flex_y cy_main_card">
+    <div>
+      <el-date-picker type="daterange" v-model="dateRange" style="width: 250px" :clearable="false"/>
+      <el-button type="primary" v-el-btn="queryClick">查询</el-button>
+      <el-button type="primary" @click="exportExcelClick">Excel</el-button>
+    </div>
+    <div class="cy_flex_1-y">
+      <el-tabs v-model="tabs"
+               class="el-tabs_completely_fill">
+        <el-tab-pane name="dieEmr" label="死亡病历">
+          <DieEmr :res-data="resData"/>
+        </el-tab-pane>
+        <el-tab-pane name="analysisChart" label="分析图">
+          <AnalysisChart :res-data="resData"/>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+  </div>
+
 </template>
 
-<style scoped lang="scss">
 
-</style>

src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/query-die/comp/AnalysisChart.vue

@@ -59,7 +59,7 @@ const establishDiv = async (el, value, name) => {
 
 <template>
   <el-container>
-    <el-main style="overflow: auto" :style="{height: window.innerHeight / 1.1 + 'px'}">
+    <el-main style="overflow: auto;height: 100%">
       <el-row>
         <el-col :span="12" v-for="(value, key) in resData.analysis"
                 style="height: 200px;">

src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/query-die/comp/DieEmr.vue

@@ -6,19 +6,17 @@ import {QueryDieReturn} from "@/api/emr-control/query-die";
 const {resData} = defineProps<{
   resData: QueryDieReturn
 }>()
-
-const innerHeight = window.innerHeight
-
 </script>
 
 <template>
-  <el-main style="height: 100%">
-    <xc-table :local-data="resData.data" :final-height="innerHeight / 1.15">
-      <el-table-column v-for="item in resData.header" :label="item" :prop="item" show-overflow-tooltip/>
-    </xc-table>
-  </el-main>
+  <xc-table :local-data="resData.data"
+            final-height="100%">
+    <el-table-column
+        v-for="item in resData.header"
+        :label="item"
+        :prop="item"
+        show-overflow-tooltip
+    />
+  </xc-table>
 </template>
 
-<style scoped lang="scss">
-
-</style>