imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/alarm/EquipAlarmDataMapper.java

@@ -116,7 +116,6 @@ public interface EquipAlarmDataMapper extends BaseMapperX<EquipAlarmDataDO> {
                 .leftJoin(ComponentInfoDO.class, ComponentInfoDO::getComponentId, EquipAlarmDataDO::getComponentId)
                 .eq(EquipAlarmDataDO::getEquipId, equipId)
                 .eq(EquipAlarmDataDO::getAlarmType, alarmType)
-                .eq(EquipAlarmDataDO::getStatus, 0)
         );
     }
 

imt-ui/src/views/system/alarm/alarmdata/index.vue

@@ -369,6 +369,7 @@
             @click="handelPatrolPlan"
           >
             点检方案提交</el-button>
+          <el-button
           <el-button
             v-if="showExclusivePatrolPlanSubmit"
             type="success"
@@ -396,15 +397,14 @@
       width="40%"
       :close-on-click-modal="false"
     >
-      <el-card class="box-card">
       <el-form
         :model="detailForm"
         v-loading="detailLoading"
-          label-width="110px"
+        label-width="100px"
       >
         <el-col :span="12">
           <el-form-item
-              label="客户名称："
+            label="客户名称"
             prop="customerName"
           >
             {{ detailForm.customerName }}
@@ -412,7 +412,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item
-              label="机床型号："
+            label="机床型号"
             prop="equipNo"
           >
             {{ detailForm.modelName }}
@@ -420,7 +420,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item
-              label="设备编号："
+            label="设备编号"
             prop="equipNo"
           >
             {{ detailForm.equipNo }}
@@ -428,7 +428,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item
-              label="规则参数："
+            label="规则参数"
             prop="nameKey"
           >
             {{ detailForm.nameKey }}
@@ -436,7 +436,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item
-              label="报警内容："
+            label="报警内容"
             prop="content"
           >
             {{ detailForm.content }}
@@ -444,7 +444,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item
-              label="报警值："
+            label="报警值"
             prop="alarmValue"
           >
             {{ detailForm.alarmValue }}
@@ -452,7 +452,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item
-              label="首次报警时间："
+            label="首次报警时间"
             prop="firstAlarmTime"
           >
             {{ parseTime(detailForm.firstAlarmTime) }}
@@ -460,7 +460,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item
-              label="最新报警时间："
+            label="最新报警时间"
             prop="lastAlarmTime"
           >
             {{ parseTime(detailForm.lastAlarmTime) }}
@@ -468,14 +468,13 @@
         </el-col>
         <el-col :span="24">
           <el-form-item
-              label="可能故障原因："
+            label="可能故障原因"
             prop="reasonDescription"
           >
             <div v-html="detailForm.reasonDescription" />
           </el-form-item>
         </el-col>
       </el-form>
-      </el-card>
     </el-dialog>
 
     <!--报警参数趋势查询弹窗-->
@@ -527,18 +526,9 @@
         style="height:500px"
       ></div>
     </el-dialog>
-    <alarm-submit-maintenance-patrol-plan-form
-      ref="submitPatrolPlanForm"
-      @child-event="showSubmitButton"
-    />
-    <alarm-submit-maintenance-exclusive-patrol-plan-form
-      ref="submitExclusivePatrolPlanForm"
-      @child-event="showSubmitButton"
-    />
-    <alarm-submit-maintenance-order-form
-      ref="submitOrderForm"
-      @child-event="showSubmitButton"
-    />
+    <alarm-submit-maintenance-patrol-plan-form ref="submitPatrolPlanForm" @child-event="showSubmitButton"/>
+    <alarm-submit-maintenance-exclusive-patrol-plan-form ref="submitExclusivePatrolPlanForm" @child-event="showSubmitButton"/>
+    <alarm-submit-maintenance-order-form ref="submitOrderForm" @child-event="showSubmitButton" />
 
   </div>
 </template>
@@ -639,9 +629,9 @@ export default {
       datetimeRange: [],
       showOrderSubmit: false,
       cardOptions: [],
-      showPatrolPlanSubmit: false,
-      showExclusivePatrolPlanSubmit: false,
-      showMaintanenceSubmit: false,
+      showPatrolPlanSubmit:false,
+      showExclusivePatrolPlanSubmit:false,
+      showMaintanenceSubmit:false,
       inspectionId: null,
     };
   },
@@ -661,24 +651,22 @@ export default {
       this.showExclusivePatrolPlanSubmit = false;
       this.showMaintanenceSubmit = false;
       this.inspectionId = null;
-      if (flag === "0") {
+      if (flag === "0"){
         this.$store.dispatch("tagsView/delView", this.$router.currentRoute);
         //跳转到前一个页面
         this.$router.push("/alarm/equipalarm");
-      } else {
-        inspectionInfoApi
-          .isSubmitInspection(this.$route.query.equipAlarmId)
-          .then((res) => {
-            if (res.data === null) {
+      }else {
+        inspectionInfoApi.isSubmitInspection(this.$route.query.equipAlarmId).then(res=>{
+          if (res.data === null){
             this.showPatrolPlanSubmit = true;
-            } else if (res.data.status === 1 && !res.data.isExclusive) {
+          }else if (res.data.status === 1 && !res.data.isExclusive){
             this.inspectionId = res.data.inspectionId;
             this.showExclusivePatrolPlanSubmit = true;
-            } else if (res.data.status === 1 && res.data.isExclusive) {
+          }else if (res.data.status === 1 && res.data.isExclusive){
             this.inspectionId = res.data.inspectionId;
-              this.showMaintanenceSubmit = true;
+            this.showMaintanenceSubmit =true;
           }
-          });
+        })
       }
     },
     cardChange(e) {
@@ -802,7 +790,7 @@ export default {
     /**
      * 定制化点检方案提交
      */
-    handelExclusivePatrolPlan() {
+    handelExclusivePatrolPlan(){
       this.$refs.submitExclusivePatrolPlanForm.open(this.inspectionId);
     },
     /**

imt-ui/src/views/system/alarm/alarmrules/index.vue

@@ -789,4 +789,10 @@ export default {
   },
 };
 </script>
-
+<style scoped>
+.form-item-border {
+  border-bottom: 1px solid #e4e7ed; /* 你可以调整颜色和宽度 */
+  padding-bottom: 10px; /* 可选：增加底部间距 */
+  margin-bottom: 10px; /* 可选：增加外边距 */
+}
+</style>