From 3c1fc98c5e12ae577383aa7c2a88e77f9272acd3 Mon Sep 17 00:00:00 2001
From: zhangjunwen <zhangjunwen@inspur.com>
Date: Tue, 5 Nov 2024 14:40:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E8=A7=84=E5=88=99=E3=80=81?=
 =?UTF-8?q?=E7=BD=91=E5=85=B3=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E5=92=8C?=
 =?UTF-8?q?=E7=82=B9=E6=A3=80=E6=96=B9=E6=A1=88=E7=AE=A1=E7=90=86=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=A0=B7=E5=BC=8F=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/system/alarm/alarmrules/index.vue   | 195 ++++++++++--------
 imt-ui/src/views/system/gatewayinfo/index.vue |   4 +-
 .../src/views/system/inspectionPlan/index.vue |   4 +-
 3 files changed, 115 insertions(+), 88 deletions(-)

diff --git a/imt-ui/src/views/system/alarm/alarmrules/index.vue b/imt-ui/src/views/system/alarm/alarmrules/index.vue
index a953897..9bd63ad 100644
--- a/imt-ui/src/views/system/alarm/alarmrules/index.vue
+++ b/imt-ui/src/views/system/alarm/alarmrules/index.vue
@@ -502,90 +502,110 @@
       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.equipNo }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item
-            label="规则名称"
-            prop="alarmName"
-          >
-            {{ detailForm.alarmName }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item
-            label="规则单位"
-            prop="alarmInfoUnit"
-          >
-            {{ detailForm.alarmInfoUnit }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item
-            label="判断规则"
-            prop="referenceCon"
-          >
-            {{ detailForm.referenceCon }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item
-            label="规则描述"
-            prop="referenceName"
-          >
-            {{ detailForm.referenceName }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item
-            label="规则上限"
-            prop="alertUpperBound"
-          >
-            {{ detailForm.alertUpperBound }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item
-            label="规则下限"
-            prop="alertLowerBound"
-          >
-            {{ detailForm.alertLowerBound }}
-          </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-col :span="24">
-          <el-form-item
-            label="备注"
-            prop="remark"
-          >{{ detailForm.remark }}</el-form-item>
-        </el-col>
-      </el-form>
+      <el-card class="box-card">
+        <el-form
+          :model="detailForm"
+          v-loading="detailLoading"
+          label-width="100px"
+        >
+          <el-row>
+            <el-col :span="12">
+              <el-form-item
+                label="客户名称："
+                prop="customerName"
+                class="form-item-border"
+              >
+                {{ detailForm.customerName }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item
+                label="设备型号："
+                prop="equipNo"
+                class="form-item-border"
+              >
+                {{ detailForm.equipNo }}
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item
+                label="规则名称："
+                prop="alarmName"
+                class="form-item-border"
+              >
+                {{ detailForm.alarmName }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item
+                label="规则单位："
+                prop="alarmInfoUnit"
+                class="form-item-border"
+              >
+                {{ detailForm.alarmInfoUnit }}
+              </el-form-item>
+            </el-col></el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item
+                label="判断规则："
+                prop="referenceCon"
+                class="form-item-border"
+              >
+                {{ detailForm.referenceCon }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item
+                label="规则描述："
+                prop="referenceName"
+                class="form-item-border"
+              >
+                {{ detailForm.referenceName }}
+              </el-form-item>
+            </el-col></el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item
+                label="规则上限："
+                prop="alertUpperBound"
+                class="form-item-border"
+              >
+                {{ detailForm.alertUpperBound }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item
+                label="规则下限："
+                prop="alertLowerBound"
+                class="form-item-border"
+              >
+                {{ detailForm.alertLowerBound }}
+              </el-form-item>
+            </el-col></el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item
+                label="可能故障原因："
+                prop="reasonDescription"
+                class="form-item-border"
+                label-width="110px"
+              >
+                <div v-html="detailForm.reasonDescription" />
+              </el-form-item>
+            </el-col></el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item
+                label="备注："
+                prop="remark"
+                class="form-item-border"
+              >{{ detailForm.remark }}</el-form-item>
+            </el-col></el-row>
+        </el-form>
+      </el-card>
     </el-dialog>
   </div>
 </template>
@@ -769,3 +789,10 @@ export default {
   },
 };
 </script>
+<style scoped>
+.form-item-border {
+  border-bottom: 1px solid #e4e7ed; /* 你可以调整颜色和宽度 */
+  padding-bottom: 10px; /* 可选：增加底部间距 */
+  margin-bottom: 10px; /* 可选：增加外边距 */
+}
+</style>
diff --git a/imt-ui/src/views/system/gatewayinfo/index.vue b/imt-ui/src/views/system/gatewayinfo/index.vue
index 56d4710..fce9dbf 100644
--- a/imt-ui/src/views/system/gatewayinfo/index.vue
+++ b/imt-ui/src/views/system/gatewayinfo/index.vue
@@ -80,7 +80,7 @@
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <!-- <el-button
           type="warning"
           plain
           icon="el-icon-download"
@@ -88,7 +88,7 @@
           @click="handleExport"
           :loading="exportLoading"
           v-hasPermi="['imt:gateway-info:export']"
-        >导出</el-button>
+        >导出</el-button> -->
       </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
diff --git a/imt-ui/src/views/system/inspectionPlan/index.vue b/imt-ui/src/views/system/inspectionPlan/index.vue
index a04155c..24c754f 100644
--- a/imt-ui/src/views/system/inspectionPlan/index.vue
+++ b/imt-ui/src/views/system/inspectionPlan/index.vue
@@ -12,12 +12,12 @@
     >
       <el-form-item
         label="父级点检方案名"
-        label-width="90px"
+        label-width="110px"
         prop="inspectionName"
       >
         <el-input
           v-model="queryParams.inspectionName"
-          placeholder="请输入辅机点检方案名"
+          placeholder="请输入父级点检方案名"
           clearable
           @keyup.enter.native="handleQuery"
         />