Merge branch 'master' of https://172.16.32.165/lighter/vue-intergration-platform

src/views/clinic/triage/AllTriages.vue

@@ -11,7 +11,7 @@
       <el-button type="primary" icon="el-icon-search" @click="fetchAllPatients">检索</el-button>
     </el-header>
     <el-main>
-      <el-table :data="patients" stripe highlight-current-row :height="tableHeight">
+      <el-table :data="patients" stripe highlight-current-row :height="tableHeight" size="middle">
         <el-table-column fixed prop="ghNo" label="队列号" sortable width="80"></el-table-column>
         <el-table-column fixed label="姓名" width="100">
           <template #default="scope">

src/views/clinic/triage/Treated.vue

@@ -7,7 +7,7 @@
           <template #prepend>检索患者</template>
         </el-input>
       </div>
-      <el-table :data="cptPatients.slice((currentPage - 1) * pageSize, currentPage * pageSize)" stripe highlight-current-row :height="tableHeight">
+      <el-table :data="cptPatients.slice((currentPage - 1) * pageSize, currentPage * pageSize)" stripe highlight-current-row :height="tableHeight" size="middle">
         <el-table-column fixed prop="fzNo" label="分诊号" sortable></el-table-column>
         <el-table-column fixed prop="name" label="姓名"></el-table-column>
         <el-table-column prop="patientId" label="id号"></el-table-column>

src/views/clinic/triage/Triaged.vue

@@ -2,7 +2,7 @@
   <el-container>
     <el-main>
       <div style="height: 10px"></div>
-      <el-table :data="patients.slice((currentPage - 1) * pageSize, currentPage * pageSize)" stripe highlight-current-row :height="tableHeight">
+      <el-table :data="patients.slice((currentPage - 1) * pageSize, currentPage * pageSize)" stripe highlight-current-row :height="tableHeight" size="middle">
         <el-table-column fixed prop="fzNo" label="分诊号" sortable></el-table-column>
         <el-table-column fixed prop="name" label="姓名"></el-table-column>
         <el-table-column prop="patientId" label="id号"></el-table-column>

src/views/clinic/triage/Untriaged.vue

@@ -2,7 +2,7 @@
   <el-container>
     <el-main>
       <div style="height: 10px"></div>
-      <el-table :data="patients" stripe highlight-current-row :height="tableHeight">
+      <el-table :data="patients" stripe highlight-current-row :height="tableHeight" size="middle">
         <el-table-column fixed prop="ghNo" label="队列号" sortable width="100"></el-table-column>
         <el-table-column fixed prop="name" label="姓名" width="100"></el-table-column>
         <el-table-column prop="patientId" label="id号" width="100"></el-table-column>
@@ -141,7 +141,7 @@
 import { ref } from '@vue/reactivity'
 import store from '@/store'
 import { fenZhen, fetchVitalSign, getChosenDept, getRooms, getUnTriagedPatient, saveMzVitalSigns } from '@/api/triage/triage'
-import { onActivated, onDeactivated, onMounted } from 'vue'
+// import { onActivated, onDeactivated } from 'vue'
 import { ElMessage } from 'element-plus'
 export default {
   setup() {
@@ -213,6 +213,7 @@ export default {
       row.fuzhenFlag = currentPatient.value.fuzhenFlag
       fenZhen(row).then((res) => {
         showTriageDialog.value = false
+        fetchUnTriagedPatient()
         ElMessage({
           message: res,
           type: 'success',
@@ -244,13 +245,11 @@ export default {
     const showTriageDialog = ref(false)
 
     const fetchInteval = ref(null)
-    onMounted(() => {
-      fetchUnTriagedPatient()
-    })
     onActivated(() => {
+      fetchUnTriagedPatient()
       fetchInteval.value = setInterval(() => {
         fetchUnTriagedPatient()
-      }, 1000 * 120)
+      }, 1000 * 90)
     })
     onDeactivated(() => {
       clearInterval(fetchInteval.value)