From b3e2b4cb1c3a311a1353356c837a26462fe2ceab Mon Sep 17 00:00:00 2001
From: zhangjunwen <zhangjunwen@inspur.com>
Date: Wed, 6 Nov 2024 09:01:43 +0800
Subject: [PATCH] =?UTF-8?q?=20=E6=8A=A5=E8=AD=A6=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E5=92=8C=E6=8A=A5=E8=AD=A6=E5=A4=84=E7=90=86=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/system/alarm/alarmdata/index.vue    | 210 +++++++++---------
 .../views/system/alarm/alarmrules/index.vue   |   8 +-
 2 files changed, 112 insertions(+), 106 deletions(-)

diff --git a/imt-ui/src/views/system/alarm/alarmdata/index.vue b/imt-ui/src/views/system/alarm/alarmdata/index.vue
index 2d8c36d..f7ced1b 100644
--- a/imt-ui/src/views/system/alarm/alarmdata/index.vue
+++ b/imt-ui/src/views/system/alarm/alarmdata/index.vue
@@ -369,7 +369,6 @@
             @click="handelPatrolPlan"
           >
             点检方案提交</el-button>
-          <el-button
           <el-button
             v-if="showExclusivePatrolPlanSubmit"
             type="success"
@@ -397,84 +396,86 @@
       width="40%"
       :close-on-click-modal="false"
     >
-      <el-form
-        :model="detailForm"
-        v-loading="detailLoading"
-        label-width="100px"
-      >
-        <el-col :span="12">
-          <el-form-item
-            label="客户名称"
-            prop="customerName"
-          >
-            {{ detailForm.customerName }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item
-            label="机床型号"
-            prop="equipNo"
-          >
-            {{ detailForm.modelName }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item
-            label="设备编号"
-            prop="equipNo"
-          >
-            {{ detailForm.equipNo }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item
-            label="规则参数"
-            prop="nameKey"
-          >
-            {{ detailForm.nameKey }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item
-            label="报警内容"
-            prop="content"
-          >
-            {{ detailForm.content }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item
-            label="报警值"
-            prop="alarmValue"
-          >
-            {{ detailForm.alarmValue }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item
-            label="首次报警时间"
-            prop="firstAlarmTime"
-          >
-            {{ parseTime(detailForm.firstAlarmTime) }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item
-            label="最新报警时间"
-            prop="lastAlarmTime"
-          >
-            {{ parseTime(detailForm.lastAlarmTime) }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item
-            label="可能故障原因"
-            prop="reasonDescription"
-          >
-            <div v-html="detailForm.reasonDescription" />
-          </el-form-item>
-        </el-col>
-      </el-form>
+      <el-card class="box-card">
+        <el-form
+          :model="detailForm"
+          v-loading="detailLoading"
+          label-width="110px"
+        >
+          <el-col :span="12">
+            <el-form-item
+              label="客户名称："
+              prop="customerName"
+            >
+              {{ detailForm.customerName }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="机床型号："
+              prop="equipNo"
+            >
+              {{ detailForm.modelName }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="设备编号："
+              prop="equipNo"
+            >
+              {{ detailForm.equipNo }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="规则参数："
+              prop="nameKey"
+            >
+              {{ detailForm.nameKey }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="报警内容："
+              prop="content"
+            >
+              {{ detailForm.content }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="报警值："
+              prop="alarmValue"
+            >
+              {{ detailForm.alarmValue }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="首次报警时间："
+              prop="firstAlarmTime"
+            >
+              {{ parseTime(detailForm.firstAlarmTime) }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="最新报警时间："
+              prop="lastAlarmTime"
+            >
+              {{ parseTime(detailForm.lastAlarmTime) }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item
+              label="可能故障原因："
+              prop="reasonDescription"
+            >
+              <div v-html="detailForm.reasonDescription" />
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-card>
     </el-dialog>
 
     <!--报警参数趋势查询弹窗-->
@@ -526,9 +527,18 @@
         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>
@@ -629,9 +639,9 @@ export default {
       datetimeRange: [],
       showOrderSubmit: false,
       cardOptions: [],
-      showPatrolPlanSubmit:false,
-      showExclusivePatrolPlanSubmit:false,
-      showMaintanenceSubmit:false,
+      showPatrolPlanSubmit: false,
+      showExclusivePatrolPlanSubmit: false,
+      showMaintanenceSubmit: false,
       inspectionId: null,
     };
   },
@@ -651,22 +661,24 @@ 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){
-            this.showPatrolPlanSubmit = true;
-          }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){
-            this.inspectionId = res.data.inspectionId;
-            this.showMaintanenceSubmit =true;
-          }
-        })
+      } 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) {
+              this.inspectionId = res.data.inspectionId;
+              this.showExclusivePatrolPlanSubmit = true;
+            } else if (res.data.status === 1 && res.data.isExclusive) {
+              this.inspectionId = res.data.inspectionId;
+              this.showMaintanenceSubmit = true;
+            }
+          });
       }
     },
     cardChange(e) {
@@ -790,7 +802,7 @@ export default {
     /**
      * 定制化点检方案提交
      */
-    handelExclusivePatrolPlan(){
+    handelExclusivePatrolPlan() {
       this.$refs.submitExclusivePatrolPlanForm.open(this.inspectionId);
     },
     /**
diff --git a/imt-ui/src/views/system/alarm/alarmrules/index.vue b/imt-ui/src/views/system/alarm/alarmrules/index.vue
index 9bd63ad..f49028d 100644
--- a/imt-ui/src/views/system/alarm/alarmrules/index.vue
+++ b/imt-ui/src/views/system/alarm/alarmrules/index.vue
@@ -789,10 +789,4 @@ export default {
   },
 };
 </script>
-<style scoped>
-.form-item-border {
-  border-bottom: 1px solid #e4e7ed; /* 你可以调整颜色和宽度 */
-  padding-bottom: 10px; /* 可选：增加底部间距 */
-  margin-bottom: 10px; /* 可选：增加外边距 */
-}
-</style>
+