解决冲突

src/views/monitor/quartz/index.vue

@@ -189,6 +189,7 @@ async function handlerResume(record) {
   console.log(record.ntype, '类型');
   // await collectJob({ id: record.id }, reload);
   // } else await resumeJob({ id: record.id }, reload);
+  await resumeJob({ id: record.id }, reload);
 }
 
 /**

src/views/vent/home/configurable/components/gasInject/zqDetailCard.vue

@@ -2,10 +2,12 @@
   <div class="detail-card">
       <div class="card-title">{{ `${dataIndex}#数据` }}</div>
       <div class="card-content">
-        <div class="card-content-item" v-for="(item, index) in optionDetail" :key="index">
+        <div style="width:100%;height:100%;overflow-y: auto;">
+          <div class="card-content-item" v-for="(item, index) in optionDetail" :key="index">
           <div class="content-item-label">{{ item.label }}</div>
           <div class="content-item-value">{{ zqDetailData[item.value] }}</div>
         </div>
+        </div>
       </div>
    
   </div>
@@ -70,8 +72,8 @@ let props = defineProps({
     border-radius: 15px;
     /* 内阴影 */
     box-shadow: inset 0px 0px 15px rgba(34, 142, 220, 0.8);
-    padding:15px;
-    overflow-y: auto;
+    padding:10px 15px;
+  
   }
 
   .card-content-item {

src/views/vent/home/configurable/components/gasInject/zqMonitorDetail.vue

@@ -136,7 +136,7 @@ watch(() => props.isShowExport, (newV, oldV) => {
   --image-inject_zq_monitor: url('@/assets/images/gasInjection/9-3.png');
   --image-inject_zq_monitor1: url('@/assets/images/gasInjection/9-6.png');
   width: 100%;
-  height: 100%;
+  height: 650px;
   padding: 15px 30px;
   box-sizing: border-box;