Merge branch 'master' of http://114.55.171.231:3000/lxd/ECG

src/views/ECG/ECGCompare.vue

@@ -2,8 +2,13 @@
   <el-dialog v-model="dialogVisible" title="历史对比" :fullscreen="true" @close="close">
     <div class="common-layout" style="height: 90vh">
       <el-container style="height: 99%">
-        <el-header height="85px">
+        <el-header height="92px" style="margin-bottom: 10px">
-          <span>历史数据</span>
+         
+            <span style="font-size: 20px"
+            >历史数据<span style="font-size: 15px; color: red"
+              >(红色的为当前数据,其余的则为历史数据)</span
+            ></span
+          >
           <div>
             <el-checkbox-group v-model="transfer" :min="0" :max="2" class="mycheckbox-group">
               <el-checkbox
@@ -12,6 +17,7 @@
                 :label="city['snapshotTime']"
                 :value="city['snapshotTime'] + '|' + city['ecgJsonDataFilePath']"
                 class="mycheckbox-item"
+                :class="{ highlight: city['snapshotTime'] === currenttime }"
                 @change="checkboxchage"
               >
                 {{ formattedDate(city['snapshotTime']) }}
@@ -22,6 +28,9 @@
             <el-button type="primary" @click="contrast" :disabled="checkes"> 对比</el-button>
             <el-button type="primary" @click="eliminate"> 清除</el-button>
           </div>
+
+   
+       
         </el-header>
         <el-container style="height: 99%">
           <el-aside width="48%">
@@ -53,7 +62,16 @@
             </el-tabs>
           </el-aside>
           <!--左侧心电按钮区-->
-          <div style="margin-top: 45px; margin-left: 5px; display: flex; flex-direction: column; align-items: center"   v-if="isChildVisible">
+          <div
+            style="
+              margin-top: 45px;
+              margin-left: 5px;
+              display: flex;
+              flex-direction: column;
+              align-items: center;
+            "
+            v-if="isChildVisible"
+          >
             <el-dropdown placement="bottom" trigger="click" @command="handlezsCommand">
               <el-button
                 style="width: 30px; height: 30px; margin-bottom: 10px"
@@ -104,9 +122,6 @@
             </el-button>
             <span style="font-size: 15px; margin-bottom: 10px">测量</span>
 
-
-  
-
             <el-button
               style="width: 30px; height: 30px; margin-bottom: 10px"
               type="primary"
@@ -146,7 +161,16 @@
             </el-tabs>
           </el-aside>
           <!--右侧心电按钮区-->
-          <div style="margin-top: 45px; margin-left: 5px; display: flex; flex-direction: column; align-items: center"   v-if="isChildVisible1">
+          <div
+            style="
+              margin-top: 45px;
+              margin-left: 5px;
+              display: flex;
+              flex-direction: column;
+              align-items: center;
+            "
+            v-if="isChildVisible1"
+          >
             <el-dropdown placement="bottom" trigger="click" @command="handlezsCommandr">
               <el-button
                 style="width: 30px; height: 30px; margin-bottom: 10px"
@@ -197,9 +221,6 @@
             </el-button>
             <span style="font-size: 15px; margin-bottom: 10px">测量</span>
 
-
-  
-
             <el-button
               style="width: 30px; height: 30px; margin-bottom: 10px"
               type="primary"
@@ -246,12 +267,13 @@ const Isgridl=ref(1)//网格
 const Isgridr = ref(1) //网格
 const Ismeasurel = ref(0) //测量
 const Ismeasurer = ref(0) //测量
+const currenttime = ref() //当前时间段
 
-
+const opencomparediag = async (row, Time) => {
-const opencomparediag = async (row) => {
   transfer.value = []
   snapshotTime.value = ''
   snapshotTime1.value = ''
+  currenttime.value = Time
   ecganalysisinfo.value = await EcganalysisparasApi.getlist(row.regId, row.orgId)
   dialogVisible.value = true
 }
@@ -362,6 +384,7 @@ defineOptions({ name: 'ECGWarningDialog' })
   display: flex;
   flex-direction: row;
   justify-content: flex-start;
+  margin-bottom: 2px;
 }
 .vertical-text {
   writing-mode: vertical-rl;
@@ -373,4 +396,9 @@ defineOptions({ name: 'ECGWarningDialog' })
   color: #79d3f5;
   margin-top: -18px;
 }
+
+.mycheckbox-item.highlight {
+  /* 当值等于 currenttime 时的样式 */
+  color: red; /* 例如，将文字颜色改为红色 */
+}
 </style>

src/views/ECG/ECGForm.vue

@@ -794,7 +794,7 @@ function openreprotdiag() {
 }
 //对比弹窗
 function opencomparediag() {
-  ECGCompare.value.opencomparediag(rowinfo.value)
+  ECGCompare.value.opencomparediag(rowinfo.value,queryParams.value.snapshotTime)
 }
 //纠错
 function iscorrect() {