Browse Source

修复样式问题

lighter 1 year ago
parent
commit
5e37ee39bf

+ 2 - 0
src/css/layout.scss

@@ -59,6 +59,7 @@
     flex: 1;
     width: 100%;
     height: 0;
+    overflow: auto;
   }
 
 }
@@ -74,6 +75,7 @@
     width: 0;
     height: 100%;
     flex: 1;
+    overflow: auto;
   }
 }
 

+ 5 - 8
src/views/hospitalization/adverse-event/AllAdverseEvent.vue

@@ -1,7 +1,6 @@
 <template>
-
-  <div class="layout_display_flex_y">
-    <div class="m-b_8px">
+  <div class="layout_container">
+    <header class="round-header">
       <el-date-picker
           v-model="dateRange"
           type="daterange"
@@ -17,9 +16,9 @@
       <el-divider direction="vertical"></el-divider>
       <el-button type="primary" icon="Refresh" @click="fetchReports">检索数据</el-button>
       <el-button type="primary" icon="Upload" @click="exportExcel">导出Excel</el-button>
-    </div>
-    <div class="layout_flex_1-y">
-      <el-table :data="reports" stripe highlight-current-row height="100%">
+    </header>
+    <div class="layout_main layout_el-table">
+      <el-table :data="reports" stripe highlight-current-row>
         <el-table-column prop="occurDatetime" label="发生时间" sortable></el-table-column>
         <el-table-column prop="category" label="事件类型"></el-table-column>
         <el-table-column prop="submitDatetime" label="提交时间"></el-table-column>
@@ -49,8 +48,6 @@
           </template>
         </el-table-column>
       </el-table>
-    </div>
-    <div>
       <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"

+ 8 - 8
src/views/hospitalization/adverse-event/DealAdverseEvent.vue

@@ -1,14 +1,14 @@
 <template>
 
-  <div class="layout_display_flex_y">
-    <div style="margin-bottom: 8px">
+  <div class="layout_container">
+    <header class="round-header">
       <el-button type="primary" icon="Edit" @click="modifyReport" :disabled="report.handled === 1">修改此报告</el-button>
       <el-button type="primary" icon="Upload" @click="dealReport" :disabled="report.handled === 1">提交处理内容</el-button>
       <el-button type="primary" icon="Printer" @click="toPrintPage" :disabled="report.handled !== 1">打印</el-button>
-    </div>
-    <div class="layout_display_flex">
-      <div>
-        <el-table :data="reports" stripe highlight-current-row height="100%" @row-click="fetchReportDetail">
+    </header>
+    <div class="layout_main layout_container layout-horizontal">
+      <aside>
+        <el-table :data="reports" stripe highlight-current-row @row-click="fetchReportDetail">
           <el-table-column prop="occurDatetime" label="发生时间"></el-table-column>
           <el-table-column prop="userName" label="提交人" width="70"></el-table-column>
           <el-table-column prop="submitDatetime" label="提交时间"></el-table-column>
@@ -24,9 +24,9 @@
             </template>
           </el-table-column>
         </el-table>
-      </div>
+      </aside>
 
-      <div class="layout_flex_1-x">
+      <div class="layout_main">
         <el-tag>事件信息</el-tag>
         <div class="report-column-div">
           事件类型:{{ report.category }} <span style="margin-left: 20px">发生时间:{{ report.occurDatetime }}</span>

+ 7 - 15
src/views/hospitalization/adverse-event/FillAderverseEvent.vue

@@ -1,7 +1,6 @@
 <template>
-
-  <div class="layout_display_flex_y">
-    <div style="margin-bottom: 8px">
+  <div class="layout_container">
+    <header class="round-header">
       <el-button
           type="primary"
           icon="RefreshLeft"
@@ -17,15 +16,14 @@
       >
         提交/修改当前报告
       </el-button>
-    </div>
+    </header>
 
-    <div class="layout_display_flex">
-      <div>
+    <div class="layout_main layout_container layout-horizontal">
+      <aside>
         <el-table
             :data="histories"
             stripe
             highlight-current-row
-            height="100%"
             @row-click="fetchReportDetail">
           <el-table-column prop="submitDatetime" label="提交时间" width="130"></el-table-column>
           <el-table-column prop="category" label="事件类型"></el-table-column>
@@ -40,9 +38,9 @@
             </template>
           </el-table-column>
         </el-table>
-      </div>
+      </aside>
 
-      <div class="layout_flex_1-x">
+      <div class="layout_main">
         <el-row :gutter="5">
           <el-col :span="12">
             <el-tag>事件信息</el-tag>
@@ -342,9 +340,3 @@ function filterHandled(val) {
   return val === 1 ? '<span style="color:green">已处理</span>' : '<span style="color:red">未处理</span>'
 }
 </script>
-
-<style scoped>
-.adverse-event-row {
-  margin-top: 10px;
-}
-</style>