From 41007a5040922d9cee4fd9bca2897a08d8c87e27 Mon Sep 17 00:00:00 2001
From: lichuanyang <1176537920@qq.com>
Date: Tue, 31 Dec 2024 09:20:45 +0800
Subject: [PATCH] =?UTF-8?q?ecg=E7=AA=97=E4=BD=93=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ECG/ECGForm.vue                     | 336 +++++++++---------
 src/views/tblist/patientexamlistECG/index.vue | 222 ++++++------
 2 files changed, 292 insertions(+), 266 deletions(-)

diff --git a/src/views/ECG/ECGForm.vue b/src/views/ECG/ECGForm.vue
index 94fe63f0..4e4f7e2d 100644
--- a/src/views/ECG/ECGForm.vue
+++ b/src/views/ECG/ECGForm.vue
@@ -1,5 +1,4 @@
 <template>
-  <!--  <div class="myArea"> -->
   <el-dialog
     :title="dialogTitle"
     v-model="dialogVisible"
@@ -14,7 +13,7 @@
       }
     "
   >
-    <div class="mycontainer">
+    <div id="ECGForm_main" class="mycontainer">
       <div class="myleft-box">
         <el-container>
           <!--头部 患者信息-->
@@ -205,145 +204,146 @@
       </div>
       <div class="myright-box">
         <el-form
-          :model="queryParams"
-          label-width="auto"
           id="elform"
+          :model="queryParams"
+          label-width="63.4px"
           style="max-width: 600px; margin-top: 10px; margin-left: 10px; height: 89vh"
         >
           <!-- 第一行 -->
-          <el-row :gutter="24" style="margin-right: 1px; height: 35px">
-            <el-col :span="12" style="padding: 1px">
+          <el-row style="margin-right: 1px; height: 35px">
+            <el-col :span="12" class="-ml-1px pr-9px">
               <el-form-item label="心率">
-                <el-input v-model="queryParams.hr" suffix-icon="el-icon-date" style="width: 150px">
-                  <template #append>bpm</template>
+                <el-input v-model="queryParams.hr" class="w-100%">
+                  <template #append>
+                    <div class="-ml-20px -mr-20px">bpm</div>
+                  </template>
                 </el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12" style="padding: 1px">
+            <el-col :span="12">
               <el-form-item label="P电轴">
-                <el-input
-                  v-model="queryParams.paxle"
-                  suffix-icon="el-icon-date"
-                  style="width: 150px"
-                >
-                  <template #append>°</template>
+                <el-input v-model="queryParams.paxle" class="w-100%">
+                  <template #append>
+                    <div class="-ml-20px -mr-20px">°</div>
+                  </template>
                 </el-input>
               </el-form-item>
             </el-col>
           </el-row>
 
           <!-- 第二行 -->
-          <el-row :gutter="24" style="margin-right: 1px; height: 35px">
-            <el-col :span="12" style="padding: 1px">
+          <el-row style="margin-right: 1px; height: 35px">
+            <el-col :span="12" class="-ml-1px pr-9px">
               <el-form-item label="QRS电轴">
-                <el-input
-                  v-model="queryParams.qrsAxle"
-                  suffix-icon="el-icon-date"
-                  style="width: 150px"
-                >
-                  <template #append>°</template>
+                <el-input v-model="queryParams.qrsAxle" class="w-100%">
+                  <template #append>
+                    <div class="-ml-20px -mr-20px">°</div>
+                  </template>
                 </el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12" style="padding: 1px">
-              <el-form-item label="T电轴" s>
-                <el-input
-                  v-model="queryParams.taxle"
-                  suffix-icon="el-icon-date"
-                  style="width: 150px"
-                >
-                  <template #append>°</template>
+            <el-col :span="12">
+              <el-form-item label="T电轴">
+                <el-input v-model="queryParams.taxle" class="w-100%">
+                  <template #append>
+                    <div class="-ml-20px -mr-20px">°</div>
+                  </template>
                 </el-input>
               </el-form-item>
             </el-col>
           </el-row>
 
           <!-- 第三行 -->
-          <el-row :gutter="24" style="margin-right: 1px; height: 35px">
-            <el-col :span="12" style="padding: 1px">
+          <el-row style="margin-right: 1px; height: 35px">
+            <el-col :span="12" class="-ml-1px pr-9px">
               <el-form-item label="P波时限">
-                <el-input
-                  v-model="queryParams.ptimeLimit"
-                  suffix-icon="el-icon-date"
-                  style="width: 150px"
-                >
-                  <template #append>ms</template>
+                <el-input v-model="queryParams.ptimeLimit" class="w-100%">
+                  <template #append>
+                    <div class="-ml-20px -mr-20px">ms</div>
+                  </template>
                 </el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12" style="padding: 1px">
+            <el-col :span="12">
               <el-form-item label="PR间期">
-                <el-input v-model="queryParams.pr" suffix-icon="el-icon-date" style="width: 150px">
-                  <template #append>ms</template>
+                <el-input v-model="queryParams.pr" class="w-100%">
+                  <template #append>
+                    <div class="-ml-20px -mr-20px">ms</div>
+                  </template>
                 </el-input>
               </el-form-item>
             </el-col>
           </el-row>
 
           <!-- 第四行 -->
-          <el-row :gutter="24" style="margin-right: 1px; height: 35px">
-            <el-col :span="12" style="padding: 1px">
+          <el-row style="margin-right: 1px; height: 35px">
+            <el-col :span="12" class="-ml-1px pr-9px">
               <el-form-item label="QRS时限">
-                <el-input
-                  v-model="queryParams.qrsTimeLimit"
-                  suffix-icon="el-icon-date"
-                  style="width: 150px"
-                >
-                  <template #append>ms</template>
+                <el-input v-model="queryParams.qrsTimeLimit" class="w-100%">
+                  <template #append>
+                    <div class="-ml-20px -mr-20px">ms</div>
+                  </template>
                 </el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12" style="padding: 1px">
+            <el-col :span="12">
               <el-form-item label="QT间期">
-                <el-input v-model="queryParams.qt" suffix-icon="el-icon-date" style="width: 150px">
-                  <template #append>ms</template>
+                <el-input v-model="queryParams.qt" class="w-100%">
+                  <template #append>
+                    <div class="-ml-20px -mr-20px">ms</div>
+                  </template>
                 </el-input>
               </el-form-item>
             </el-col>
           </el-row>
 
           <!-- 第五行 -->
-          <el-row :gutter="24" style="margin-right: 1px; height: 35px">
-            <el-col :span="12" style="padding: 1px">
+          <el-row style="margin-right: 1px; height: 35px">
+            <el-col :span="12" class="-ml-1px pr-9px">
               <el-form-item label="QTc">
-                <el-input v-model="queryParams.qtc" suffix-icon="el-icon-date" style="width: 150px">
-                  <template #append>ms</template>
+                <el-input v-model="queryParams.qtc" class="w-100%">
+                  <template #append>
+                    <div class="-ml-20px -mr-20px">ms</div>
+                  </template>
                 </el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12" style="padding: 1px">
+            <el-col :span="12">
               <el-form-item label="RV5">
-                <el-input v-model="queryParams.rv5" suffix-icon="el-icon-date" style="width: 150px">
-                  <template #append>mV</template>
+                <el-input v-model="queryParams.rv5" class="w-100%">
+                  <template #append>
+                    <div class="-ml-20px -mr-20px">mV</div>
+                  </template>
                 </el-input>
               </el-form-item>
             </el-col>
           </el-row>
 
           <!-- 第六行 -->
-          <el-row :gutter="24" style="margin-right: 1px; height: 35px">
-            <el-col :span="12" style="padding: 1px">
+          <el-row style="margin-right: 1px; height: 35px">
+            <el-col :span="12" class="-ml-1px pr-9px">
               <el-form-item label="SV1">
-                <el-input v-model="queryParams.sv1" suffix-icon="el-icon-date" style="width: 150px">
-                  <template #append>mV</template>
+                <el-input v-model="queryParams.sv1" class="w-100%">
+                  <template #append>
+                    <div class="-ml-20px -mr-20px">mV</div>
+                  </template>
                 </el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12" style="padding: 1px">
+            <el-col :span="12">
               <el-form-item label="RV5+SV1">
-                <el-input
-                  v-model="queryParams.rv5Sv1"
-                  suffix-icon="el-icon-date"
-                  style="width: 150px"
-                >
-                  <template #append>mV</template>
+                <el-input v-model="queryParams.rv5Sv1" class="w-100%">
+                  <template #append>
+                    <div class="-ml-20px -mr-20px">mV</div>
+                  </template>
                 </el-input>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-tag type="info" style="font-size: 16px; width: 100%; color: black"
-            >心电事件快照</el-tag
-          >
+
+          <el-tag type="info" style="font-size: 16px; width: 100%; color: black">
+            心电事件快照
+          </el-tag>
           <el-input
             v-model="snapshotTime"
             style="width: 100%"
@@ -351,7 +351,7 @@
             type="textarea"
             placeholder=""
           />
-          <el-tag type="info" style="font-size: 16px; width: 100%; color: black">智能词库</el-tag>
+          <el-tag type="info" style="font-size: 16px; width: 100%; color: black"> 智能词库 </el-tag>
           <el-input
             v-model="queryParams.autoDiagResult"
             style="width: 100%"
@@ -359,8 +359,9 @@
             type="textarea"
             placeholder=""
           />
-          <el-tag type="info" style="font-size: 16px; width: 100%; color: black"
-            >医生诊断结论 <el-button @click="zdmodle" type="primary" text>诊断模版</el-button>
+          <el-tag type="info" style="font-size: 16px; width: 100%; color: black">
+            医生诊断结论
+            <el-button @click="zdmodle" type="primary" text> 诊断模版 </el-button>
           </el-tag>
           <el-input
             class="your-component"
@@ -371,33 +372,34 @@
             ref="inputRef"
             :rows="eltextrow"
           />
+
           <div class="mybtnsty">
             <div>
               <el-button class="mybutwidth" type="warning" @click="insertValue('I')">I</el-button>
               <el-button class="mybutwidth" type="warning" @click="insertValue('II')">II</el-button>
-              <el-button class="mybutwidth" type="warning" @click="insertValue('III')"
-                >III</el-button
-              >
-              <el-button class="mybutwidth" type="warning" @click="insertValue('aVR')"
-                >aVR</el-button
-              >
-              <el-button class="mybutwidth" type="warning" @click="insertValue('aVL')"
-                >aVL</el-button
-              >
-              <el-button class="mybutwidth" type="warning" @click="insertValue('aVF')"
-                >aVF</el-button
-              >
+              <el-button class="mybutwidth" type="warning" @click="insertValue('III')">
+                III
+              </el-button>
+              <el-button class="mybutwidth" type="warning" @click="insertValue('aVR')">
+                aVR
+              </el-button>
+              <el-button class="mybutwidth" type="warning" @click="insertValue('aVL')">
+                aVL
+              </el-button>
+              <el-button class="mybutwidth" type="warning" @click="insertValue('aVF')">
+                aVF
+              </el-button>
             </div>
             <div>
-              <el-button class="mybutwidth" type="warning" @click="insertValue('V3R')"
-                >V3R</el-button
-              >
-              <el-button class="mybutwidth" type="warning" @click="insertValue('V4R')"
-                >V4R</el-button
-              >
-              <el-button class="mybutwidth" type="warning" @click="insertValue('V5R')"
-                >V5R</el-button
-              >
+              <el-button class="mybutwidth" type="warning" @click="insertValue('V3R')">
+                V3R
+              </el-button>
+              <el-button class="mybutwidth" type="warning" @click="insertValue('V4R')">
+                V4R
+              </el-button>
+              <el-button class="mybutwidth" type="warning" @click="insertValue('V5R')">
+                V5R
+              </el-button>
               <el-button class="mybutwidth" type="warning" @click="insertValue('V1')">V1</el-button>
               <el-button class="mybutwidth" type="warning" @click="insertValue('V2')">V2</el-button>
               <el-button class="mybutwidth" type="warning" @click="insertValue('V3')">V3</el-button>
@@ -416,18 +418,18 @@
               style="width: 200px"
               type="primary"
               @click="getuporghiorgid(Primarykey, orgid)"
-              >申请诊断</el-button
-            >
-            <el-button style="width: 200px" type="primary" @click="save" :disabled="savedisabled"
-              >保存</el-button
             >
+              申请诊断
+            </el-button>
+            <el-button style="width: 200px" type="primary" @click="save" :disabled="savedisabled">
+              保存
+            </el-button>
           </div>
         </el-form>
       </div>
     </div>
   </el-dialog>
-  <!-- </div> -->
-  <!--抽屉 用于展示诊断模版-->
+
   <el-drawer v-model="drawer" :with-header="false" :modal="true" size="20%">
     <span>诊断数据模版</span>
     <el-tree
@@ -446,7 +448,7 @@
       :expand-on-click-node="false"
     />
   </el-drawer>
-  <!--打印弹窗(老)-->
+
   <el-dialog
     title=""
     v-if="false"
@@ -458,7 +460,7 @@
     :destroy-on-close="true"
     @close="printclose"
   >
-    <!--width: 1000px; height: 700px;-->
+    <!--打印弹窗(老)-->
     <ECGprint :imagebase64="imagebase64" />
   </el-dialog>
   <div style="position: fixed; top: 0; left: 0; z-index: -100">
@@ -487,7 +489,6 @@
       />
     </div>
   </div>
-  <!--打印弹窗(新)-->
   <el-dialog
     v-model="isdiagshow"
     :fullscreen="true"
@@ -496,6 +497,7 @@
     :destroy-on-close="true"
     @closed="printclose"
   >
+    <!--打印弹窗(新)-->
     <template #title>
       <div
         style="
@@ -594,6 +596,7 @@
       />
     </div>
   </div>
+
   <ECGWarningDialog ref="ECGDialog" />
   <ECGReport ref="ECGReportDialog" />
   <ECGCopmareDialog ref="ECGCompare" />
@@ -620,9 +623,9 @@ import { WarningApi, WarningVO } from '@/api/system/warning'
 import ECGCopmareDialog from '@/views/ECG/ECGCompare.vue'
 import ECGApplyforRepair from '@/views/ECG/ECGModify/ECGApplyforRepair.vue'
 import useClipboard from 'vue-clipboard3' //复制组件
-const { toClipboard } = useClipboard()
 import ECGSB from '@/views/ECG/ECGSB.vue'
-/** 提交表单 */
+
+const { toClipboard } = useClipboard()
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const message = useMessage() // 消息弹窗
 const dialogVisible = ref(false) // 弹窗的是否展示
@@ -632,7 +635,6 @@ const orgid = ref() //机构编码
 const Primarykey = ref() //主键ID
 const rowinfo = ref<any>({}) //当前患者数据行
 const snapshotTime = ref() //心电事件快照事件
-// 定义一个响应式变量来控制子组件的显示
 const isChildVisible = ref(false)
 const inputRef = ref() // 用于获取el-input的DOM引用
 const saveFormVO = ref<EcganalysisparasVO>({} as EcganalysisparasVO)
@@ -778,59 +780,69 @@ const queryParams = ref({
   ecgJsonDataFilePath: '',
   createDate: undefined
 })
-//
-async function save() {
-  saveFormVO.value.id = queryParams.value.id
-  saveFormVO.value.hr = queryParams.value.hr
-  saveFormVO.value.paxle = queryParams.value.paxle
-  saveFormVO.value.qrsAxle = queryParams.value.qrsAxle
-  saveFormVO.value.taxle = queryParams.value.taxle
-  saveFormVO.value.ptimeLimit = queryParams.value.ptimeLimit
-  saveFormVO.value.pr = queryParams.value.pr
-  saveFormVO.value.qrsTimeLimit = queryParams.value.qrsTimeLimit
-  saveFormVO.value.qt = queryParams.value.qt
-  saveFormVO.value.qtc = queryParams.value.qtc
-  saveFormVO.value.rv5 = queryParams.value.rv5
-  saveFormVO.value.sv1 = queryParams.value.sv1
-  saveFormVO.value.rv5Sv1 = queryParams.value.rv5Sv1
-  saveFormVO.value.autoDiagResult = queryParams.value.autoDiagResult
-  saveFormVO.value.doctorDiagResult = queryParams.value.doctorDiagResult
-  saveFormVO.value.doctorName = Profilevo.value.doctorname
-  saveFormVO.value.doctorId = Profilevo.value.doctorID
-  // saveFormVO.value.departId=queryParams.value.departId
-  // saveFormVO.value.departName=queryParams.value.departName
-  const ret = await EcganalysisparasApi.SaveEcganalysisparas(saveFormVO.value)
-  if (ret) {
-    //更新主表数据
-    examineFormVO.value.id = keyid.value
-    examineFormVO.value.diagDoctor = Profilevo.value.doctorname
-    examineFormVO.value.diagDoctorId = Profilevo.value.doctorID
-    examineFormVO.value.reportstatus = '已分析'
-    await PatientexamlistApi.examineupdatelist(examineFormVO.value)
 
-    const data = await EcganalysisparasApi.getexamIDdata(rowinfo.value.examId, orgid.value)
-    queryParams.value = data
+const save = async () => {
+  const loading = ElLoading.service({
+    target: 'ECGForm_main',
+    lock: true,
+    text: '数据保存中...'
+  })
+  try {
+    saveFormVO.value.id = queryParams.value.id
+    saveFormVO.value.hr = queryParams.value.hr
+    saveFormVO.value.paxle = queryParams.value.paxle
+    saveFormVO.value.qrsAxle = queryParams.value.qrsAxle
+    saveFormVO.value.taxle = queryParams.value.taxle
+    saveFormVO.value.ptimeLimit = queryParams.value.ptimeLimit
+    saveFormVO.value.pr = queryParams.value.pr
+    saveFormVO.value.qrsTimeLimit = queryParams.value.qrsTimeLimit
+    saveFormVO.value.qt = queryParams.value.qt
+    saveFormVO.value.qtc = queryParams.value.qtc
+    saveFormVO.value.rv5 = queryParams.value.rv5
+    saveFormVO.value.sv1 = queryParams.value.sv1
+    saveFormVO.value.rv5Sv1 = queryParams.value.rv5Sv1
+    saveFormVO.value.autoDiagResult = queryParams.value.autoDiagResult
+    saveFormVO.value.doctorDiagResult = queryParams.value.doctorDiagResult
+    saveFormVO.value.doctorName = Profilevo.value.doctorname
+    saveFormVO.value.doctorId = Profilevo.value.doctorID
+    // saveFormVO.value.departId=queryParams.value.departId
+    // saveFormVO.value.departName=queryParams.value.departName
+    const ret = await EcganalysisparasApi.SaveEcganalysisparas(saveFormVO.value)
+    if (ret) {
+      //更新主表数据
+      examineFormVO.value.id = keyid.value
+      examineFormVO.value.diagDoctor = Profilevo.value.doctorname
+      examineFormVO.value.diagDoctorId = Profilevo.value.doctorID
+      examineFormVO.value.reportstatus = '已分析'
+      await PatientexamlistApi.examineupdatelist(examineFormVO.value)
 
-   
-    //生成pdf
-    saveFormVO.value.regId = id.value
-    saveFormVO.value.examId = rowinfo.value.examId
-    saveFormVO.value.orgId = orgid.value
-    saveFormVO.value.name = rowinfo.value.pname
-    saveFormVO.value.gender = rowinfo.value.gender
-    saveFormVO.value.age = age.value
-    saveFormVO.value.diagtime = queryParams.value.doctorDiagTime
-    saveFormVO.value.ecgJsonDataFilePath = queryParams.value.ecgJsonDataFilePath
-    await EcganalysisparasApi.SaveEcgPdf(saveFormVO.value)
-    //查询主表数据
-    await getPatientexamlist(keyid.value)
-    message.alertSuccess('保存成功')
-    emit('success')
+      const data = await EcganalysisparasApi.getexamIDdata(rowinfo.value.examId, orgid.value)
+      queryParams.value = data
 
-    //ElMessage.info('开始保存pdf')
-    // setTimeout(() => {
-    //   isprintimage.value = true
-    // }, 900)
+      //生成pdf
+      saveFormVO.value.regId = id.value
+      saveFormVO.value.examId = rowinfo.value.examId
+      saveFormVO.value.orgId = orgid.value
+      saveFormVO.value.name = rowinfo.value.pname
+      saveFormVO.value.gender = rowinfo.value.gender
+      saveFormVO.value.age = age.value
+      saveFormVO.value.diagtime = queryParams.value.doctorDiagTime
+      saveFormVO.value.ecgJsonDataFilePath = queryParams.value.ecgJsonDataFilePath
+      await EcganalysisparasApi.SaveEcgPdf(saveFormVO.value)
+      //查询主表数据
+      await getPatientexamlist(keyid.value)
+      loading.close()
+      message.alertSuccess('保存成功')
+      emit('success')
+
+      //ElMessage.info('开始保存pdf')
+      // setTimeout(() => {
+      //   isprintimage.value = true
+      // }, 900)
+    }
+  } catch {
+  } finally {
+    loading.close()
   }
 }
 
@@ -1137,6 +1149,10 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 </script>
 
 <style lang="scss" scoped>
+#elform :deep(.el-form-item__label) {
+  padding-right: 5px;
+}
+
 .mycontainer {
   display: flex;
   width: 100%;
diff --git a/src/views/tblist/patientexamlistECG/index.vue b/src/views/tblist/patientexamlistECG/index.vue
index 4d54c498..4a1d7a82 100644
--- a/src/views/tblist/patientexamlistECG/index.vue
+++ b/src/views/tblist/patientexamlistECG/index.vue
@@ -1,75 +1,66 @@
 <template>
-  <ContentWrap style="height: 145px">
-    <!-- 搜索工作栏 超声工作站-->
+  <ContentWrap>
     <el-form
-      class="-mb-15px"
-      :model="queryParams"
       ref="queryFormRef"
-      :inline="true"
-      label-width="100px"
+      :model="queryParams"
+      size="default"
+      label-width="74px"
+      label-position="right"
+      class="-mb-15px"
     >
-      <el-row :gutter="8">
-        <!-- 检查ID和患者姓名共一行 -->
-        <el-col :span="24">
-          <el-row :gutter="8">
-            <el-col :span="4">
-              <el-form-item label="检查单号" prop="examId">
-                <el-input
-                  v-model="queryParams.examId"
-                  placeholder="检查单号"
-                  clearable
-                  @keyup.enter="handleQuery"
-                  class="!w-160px"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item label="患者姓名" prop="pName">
-                <el-input
-                  v-model="queryParams.pname"
-                  placeholder="请输入患者姓名"
-                  clearable
-                  @keyup.enter="handleQuery"
-                  class="!w-160px"
-                />
-              </el-form-item>
-            </el-col>
-
-            <!-- 报告状态 -->
-            <el-col :span="4">
-              <el-form-item label="报告状态" prop="reportstatus">
-                <el-select
-                  v-model="queryParams.reportstatus"
-                  placeholder="请选择报告状态"
-                  clearable
-                  class="!w-160px"
-                >
-                  <el-option label="已分检" value="已分检" />
-                  <el-option label="已分析" value="已分析" />
-                  <el-option label="待分析" value="待分析" />
-                  <el-option label="已审核" value="已审核" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <!-- 检查项目 -->
-            <el-col :span="4">
-              <el-form-item label="检查项目" prop="examItemName">
-                <el-input
-                  v-model="queryParams.examItemName"
-                  placeholder="请输入检查项"
-                  clearable
-                  @keyup.enter="handleQuery"
-                  class="!w-160px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="检查单号" prop="examId" class="item-style">
+            <el-input
+              v-model="queryParams.examId"
+              placeholder="请输入检查单号"
+              clearable
+              @keyup.enter="handleQuery"
+              class="item-width"
+            />
+          </el-form-item>
         </el-col>
-
-        <!-- 检查日期独占一行 -->
-        <el-col :span="24">
-          <el-form-item label="检查日期" prop="examDate">
-            <!-- aaaaa -->
+        <el-col :span="6">
+          <el-form-item label="患者姓名" prop="pName" class="item-style">
+            <el-input
+              v-model="queryParams.pname"
+              placeholder="请输入患者姓名"
+              clearable
+              @keyup.enter="handleQuery"
+              class="item-width"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="报告状态" prop="reportstatus" class="item-style">
+            <el-select
+              v-model="queryParams.reportstatus"
+              placeholder="请选择报告状态"
+              clearable
+              class="item-width"
+            >
+              <el-option label="已分检" value="已分检" />
+              <el-option label="已分析" value="已分析" />
+              <el-option label="待分析" value="待分析" />
+              <el-option label="已审核" value="已审核" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="检查项目" prop="examItemName" class="item-style">
+            <el-input
+              v-model="queryParams.examItemName"
+              placeholder="请输入检查项目"
+              clearable
+              @keyup.enter="handleQuery"
+              class="item-width"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="20">
+          <el-form-item label="检查日期" prop="examDate" class="item-style">
             <el-radio-group
               ref="examDate_radio"
               v-model="examDate_radio_value"
@@ -90,32 +81,36 @@
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
                   :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-                  class="!w-240px"
+                  class="!w-260px"
                 />
               </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
+        <el-col :span="4" style="text-align: right">
+          <el-button
+            @click="handleQuery"
+            style="
+              margin-right: 0px;
+              margin-left: auto;
+              background-color: rgba(56, 119, 246, 1);
+              font-size: 14px;
+              color: rgba(255, 255, 255, 1);
+            "
+          >
+            <Icon icon="ep:search" class="mr-5px" />
+            搜索
+          </el-button>
+          <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" />重置</el-button>
+        </el-col>
       </el-row>
     </el-form>
-    <el-form-item>
-      <el-button
-        @click="handleQuery"
-        style="
-          margin-right: 0px;
-          margin-left: auto;
-          background-color: rgba(56, 119, 246, 1);
-          font-size: 14px;
-          color: rgba(255, 255, 255, 1);
-        "
-        ><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button
-      >
-      <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-    </el-form-item>
   </ContentWrap>
-  <ContentWrap style="height: 65px">
-    <el-form-item>
-      <!--     <el-button
+
+  <ContentWrap style="height: 64px">
+    <div style="text-align: right">
+      <!--     
+    <el-button
       type="primary"
       plain
       @click="openForm('create')"
@@ -123,7 +118,8 @@
       v-if="false"
     >
       <Icon icon="ep:plus" class="mr-5px" /> 新增
-    </el-button> -->
+    </el-button>
+    -->
       <el-button
         style="
           margin-right: 0px;
@@ -136,32 +132,39 @@
         :loading="exportLoading"
         v-hasPermi="['tblist:patientexamlist:export']"
       >
-        <Icon icon="ep:download" class="mr-5px" /> 导出
+        <Icon icon="ep:download" class="mr-5px" />
+        导出
       </el-button>
       <el-button
         @click="dicomDataSync"
         style="background-color: rgb(28, 176, 117); font-size: 14; color: rgb(255, 255, 255)"
-        ><Icon icon="ep:refresh" class="mr-5px" /> 同步</el-button
       >
+        <Icon icon="ep:refresh" class="mr-5px" />
+        同步
+      </el-button>
       <el-button
         @click="selectcollect"
         style="background-color: rgb(28, 176, 117); font-size: 14; color: rgb(255, 255, 255)"
-        ><Icon icon="ep:search" class="mr-5px" /> 查询收藏</el-button
       >
-    </el-form-item>
+        <Icon icon="ep:search" class="mr-5px" />
+        查询收藏
+      </el-button>
+    </div>
   </ContentWrap>
-  <!-- 列表 -->
+
   <ContentWrap>
     <el-table
       v-loading="loading"
       :data="list"
+      border
       :stripe="true"
       :show-overflow-tooltip="true"
       @row-dblclick="handleEdit"
       :header-cell-style="{ background: 'rgb(235, 241, 250)', height: '56px', color: '#333333' }"
-      :row-style="{ height: '56px' }"
+      :row-style="{ height: '40px' }"
+      height="max(calc(100vh - 474px),80px)"
     >
-      <el-table-column type="index" width="50px" />
+      <el-table-column type="index" label="序号" align="center" width="54px" />
       <el-table-column label="" width="100px" v-if="false">
         <template #default="scope">
           <el-image :src="scope.row.thumbnailImgUrl" />
@@ -170,7 +173,7 @@
       <el-table-column label="主键" align="center" prop="id" v-if="false" />
       <el-table-column label="检查项目名称" align="center" prop="examItemName" width="160px" />
       <el-table-column label="检查单号" align="center" prop="examId" width="140px" />
-      <el-table-column label="患者姓名" align="center" prop="pname" />
+      <el-table-column label="患者姓名" align="center" prop="pname" width="160px" />
       <el-table-column label="性别" align="center" prop="gender" />
       <el-table-column label="出生日期" align="center" prop="birthday" v-if="false" />
       <el-table-column
@@ -180,9 +183,7 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="设备类型" align="center" prop="deviceType" />
-      <el-table-column label="序列/数量" align="center" prop="seDc" width="100px" />
-
+      <el-table-column label="类型" align="center" prop="deviceType" />
       <el-table-column label="报告状态" align="center" prop="reportstatus" width="100px">
         <template #default="scope">
           <!-- 使用Flexbox布局将内容垂直排列 -->
@@ -199,15 +200,14 @@
               </el-tag>
             </div>
             <!--如果有危急值显示红心-->
-            <div v-if="scope.row.warning==='1'" >
-              <el-tag type="danger" >
+            <div v-if="scope.row.warning === '1'">
+              <el-tag type="danger">
                 <span> 危急值</span>
               </el-tag>
             </div>
           </div>
         </template>
       </el-table-column>
-
       <el-table-column
         label="申请日期"
         align="center"
@@ -285,7 +285,6 @@
         </template>
       </el-table-column>
     </el-table>
-    <!-- 分页 -->
     <Pagination
       :total="total"
       v-model:page="queryParams.pageNo"
@@ -294,7 +293,6 @@
     />
   </ContentWrap>
 
-  <!-- 表单弹窗：超声组件 -->
   <ECGForm ref="ECG" @success="getList" />
 </template>
 
@@ -304,7 +302,7 @@ import download from '@/utils/download'
 import { PatientexamlistApi, PatientexamlistVO } from '@/api/tblist/patientexamlist'
 import ECGForm from '/src/views/ECG/ECGForm.vue'
 
-/** PACS检查列表 列表 */
+/** PatientexamlistECG 列表 */
 defineOptions({ name: 'PatientexamlistECG' })
 
 const message = useMessage() // 消息弹窗
@@ -340,14 +338,14 @@ const queryParams = reactive({
   thumbnailImgUrl: undefined,
   createTime: [],
   isFavourite: '',
-  pdfurl:''
+  pdfurl: ''
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 
 /** 超声组件 */
 const ECG = ref()
-const openultrForm = (row:any) => {
+const openultrForm = (row: any) => {
   ECG.value.open(row)
 }
 /** 表格行点击 */
@@ -555,9 +553,21 @@ onMounted(() => {
 })
 </script>
 
-<style>
+<style scoped>
 /* 为了防止 el-form-item 的标签文本换行，可以添加以下CSS样式 */
 .el-form-item__label {
   white-space: nowrap;
 }
+
+.item-style {
+  margin-bottom: 8px;
+}
+
+.item-width {
+  width: 100%;
+}
+
+.date-picker :deep(.item-width) {
+  width: 100%;
+}
 </style>