Просмотр исходного кода

Merge branch 'fix-hetong-wyf' into 'dev'

fix: 修复演添加字段产生的bug

See merge request product-group-fe/sfy-safety-group/sfy-safety!265
ai0197 5 месяцев назад
Родитель
Сommit
cc70704c44

+ 1 - 1
src/views/emergency/emergency-drill/components/DrillPlanRecordItem.vue

@@ -105,7 +105,7 @@
           )
           )
         ).join(',') +
         ).join(',') +
         ']';
         ']';
-      innerFormData.drillImagesFile = undefined;
+      // innerFormData.drillImagesFile = undefined;
       if (!innerFormData.drillPlanId) innerFormData.drillPlanId = Number(id);
       if (!innerFormData.drillPlanId) innerFormData.drillPlanId = Number(id);
 
 
       await submitEmergencyDrillRecord(innerFormData);
       await submitEmergencyDrillRecord(innerFormData);

+ 8 - 0
src/views/emergency/emergency-drill/components/DrillPlanViewRecords.vue

@@ -28,6 +28,14 @@
       <span class="label">演练效果评估:</span>
       <span class="label">演练效果评估:</span>
       <span class="text">{{ recordData.drillEffectAssess }}</span>
       <span class="text">{{ recordData.drillEffectAssess }}</span>
     </div>
     </div>
+    <div class="item">
+      <span class="label">演练问题分析:</span>
+      <span class="text">{{ recordData.drillProblemAnalyse }}</span>
+    </div>
+    <div class="item">
+      <span class="label">演练改进措施:</span>
+      <span class="text">{{ recordData.drillImproveMethod }}</span>
+    </div>
   </div>
   </div>
   <div v-else class="empty">
   <div v-else class="empty">
     <img :src="EmptyImg" alt="empty" />
     <img :src="EmptyImg" alt="empty" />

+ 2 - 2
src/views/emergency/emergency-drill/components/DrillSignRecordItem.vue

@@ -114,8 +114,8 @@
   }
   }
   .text {
   .text {
     flex: 1;
     flex: 1;
-    word-break: break-all;
-    white-space: pre;
+    white-space: pre-wrap;
+    /* word-break: break-all; */
   }
   }
   .empty {
   .empty {
     display: flex;
     display: flex;

+ 2 - 0
src/views/emergency/emergency-plan/PageManagementDetail.vue

@@ -123,6 +123,7 @@
       eventType: formData.eventType,
       eventType: formData.eventType,
       deptId: formData.deptId,
       deptId: formData.deptId,
       deptName: formData.deptName,
       deptName: formData.deptName,
+      professionalTestSite: formData.professionalTestSite,
       approvalTemplateId: formData.approvalTemplateId,
       approvalTemplateId: formData.approvalTemplateId,
       appendix: JSON.stringify(attachmentListRes),
       appendix: JSON.stringify(attachmentListRes),
     };
     };
@@ -137,6 +138,7 @@
       eventType: formData.eventType,
       eventType: formData.eventType,
       deptId: formData.deptId,
       deptId: formData.deptId,
       deptName: formData.deptName,
       deptName: formData.deptName,
+      professionalTestSite: formData.professionalTestSite,
       approvalTemplateId: formData.approvalTemplateId,
       approvalTemplateId: formData.approvalTemplateId,
       appendix: JSON.stringify(attachmentListRes),
       appendix: JSON.stringify(attachmentListRes),
     };
     };