Merge remote-tracking branch 'origin/master'

imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/equip/vo/EquipInfoPageReqVO.java

@@ -19,6 +19,9 @@ public class EquipInfoPageReqVO extends PageParam {
     @Schema(description = "机床设备编号")
     private String equipNo;
 
+    @Schema(description = "机床设备名称")
+    private String equipName;
+
     @Schema(description = "机床状态")
     private Integer status;
 

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

@@ -116,6 +116,7 @@ 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-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java

@@ -27,6 +27,7 @@ public interface EquipInfoMapper extends BaseMapperX<EquipInfoDO> {
         return selectPage(reqVO, new LambdaQueryWrapperX<EquipInfoDO>()
                 .eqIfPresent(EquipInfoDO::getModelId, reqVO.getModelId())
                 .eqIfPresent(EquipInfoDO::getCustomerId, reqVO.getCustomerId())
+                .likeIfPresent(EquipInfoDO::getEquipName, reqVO.getEquipName())
                 .likeIfPresent(EquipInfoDO::getEquipNo, reqVO.getEquipNo())
                 .eqIfPresent(EquipInfoDO::getStatus, reqVO.getStatus())
                 .groupBy(EquipInfoDO::getCustomerId, EquipInfoDO::getModelId)

imt-ui/src/assets/icons/svg/maintenance.svg

@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1730448684446" class="icon" viewBox="0 0 1027 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1133" xmlns:xlink="http://www.w3.org/1999/xlink" width="200.5859375" height="200"><path d="M835.707408 791.0893c8.945488 8.935549 8.945488 23.039602-0.268365 32.52182-8.667184 8.408759-22.771238 8.408759-31.99503-0.546669l-140.434229-140.145985c-8.667184-8.935549-8.667184-23.039602 0.546669-32.253456 8.677124-8.677124 23.317907-8.677124 32.531759 0L835.707408 791.0893zM773.625718 0c14.640783 0 29.55987 1.083398 44.190713 4.601957 15.455816 2.713465 29.54993 7.325361 43.107315 13.020655 18.974375 8.130455 28.198167 30.633328 19.789408 50.154372a39.638453 39.638453 0 0 1-7.86209 11.927318c-29.013201 29.003261-58.016462 57.748098-86.761299 86.751359l4.880261 17.354247 4.343532 17.622613 17.890977 4.88026 17.354247 4.611897c28.734897-29.003261 57.748098-57.479733 86.751359-86.761299 14.650722-14.909147 39.042087-14.909147 54.2196 0 4.343532 4.611896 7.593726 10.307191 9.223792 16.27085a195.558317 195.558317 0 0 1 11.658953 38.495418v0.546669h0.268365c2.703525 13.825749 4.343532 28.734897 4.343532 44.459078 0 60.998292-25.216338 117.116322-65.610188 157.788476-40.125485 40.39385-96.52182 65.341823-157.788477 65.341823-4.343532 0-8.677124-0.268365-13.020655-0.268364l-42.292282 41.745612L950.935238 721.145519l1.888492 2.166797a156.715018 156.715018 0 0 1 44.190713 109.254232c0 40.125485-15.177512 80.519335-46.089144 111.152663l-0.546669 0.546669c-30.901693 30.374903-70.490449 45.552415-110.615934 45.552415s-81.056065-15.177512-111.152663-46.099084l-233.159187-232.880882-237.741264 238.307812c-49.617642 49.607703-109.532536 53.951235-158.60351 32.810063-18.974375-7.86209-36.050318-19.789408-50.154371-33.893461h-0.268365c-14.094114-14.362479-25.753067-31.179997-33.615158-49.886007-21.141171-49.070974-16.807579-109.254232 33.078429-158.593571v-0.546669L313.290884 473.892219l-97.05855-97.058549-86.214629-25.753067a37.740022 37.740022 0 0 1-24.401305-21.419475L22.930269 135.822333c-7.593726-14.094114-5.148626-32.53176 6.778692-44.459078L64.407517 56.933064 98.569343 22.771238c10.575555-10.565616 27.114769-14.640783 41.755552-8.130455l196.283895 83.769529a37.571051 37.571051 0 0 1 21.68784 24.401305l25.484703 86.214629 97.058549 97.05855 69.675415-69.138686c-0.268365-4.880261-0.546669-9.492157-0.546668-13.010716h0.268364c0-62.08169 24.947973-118.19972 65.341824-158.325206v-0.278304c40.383911-40.115546 96.511881-65.331884 158.046901-65.331884z m-109.532536 542.752601l-114.402857 114.412797 232.602578 232.602578c15.455816 15.724181 36.865352 23.854636 57.469793 23.854636s41.487187-8.130455 56.943004-23.586271l0.536729-0.268365c15.724181-15.177512 23.049542-36.596987 23.049542-57.201428 0-20.067712-7.325361-40.39385-21.966144-55.581302l-1.620127-1.620127-232.612518-232.612518zM366.963814 420.209349l59.914894-59.636589-103.837242-104.105607a38.525237 38.525237 0 0 1-10.297251-18.974375l-22.502873-76.185743L134.082932 95.428483l-15.992545 15.72418-15.992546 16.260911 66.425222 156.158409 78.620903 23.049542c6.510328 1.898431 11.927318 5.148626 16.27085 10.028887L366.963814 420.209349zM768.208728 76.454108a146.248796 146.248796 0 0 0-98.688616 43.375679 145.562976 145.562976 0 0 0-43.37568 104.105607h0.546669v10.575555l1.083398 8.945488c2.703525 11.927318-1.083398 24.938034-10.30719 34.430191L102.097841 792.987731h-0.268364c-23.854636 24.669669-26.568101 52.599472-16.807579 75.639074 4.065228 8.935549 10.307191 17.890977 17.622612 25.474764 7.86209 7.593726 16.539214 13.557385 26.031371 17.622612 23.039602 10.028886 50.701041 7.315422 75.092406-16.539214l264.060879-264.05094 1.083398-1.083398 168.085728-168.354092 1.083398-1.351763 80.7877-80.250971h0.268364c7.86209-8.677124 20.067712-13.010716 32.263395-11.112284 3.796863 0.536729 7.315422 1.083398 11.390589 1.083398 2.703525 0.268365 6.500388 0.546669 10.84392 0.546669 40.672154 0 77.537506-16.539214 104.105606-42.560646v-0.546669c25.216338-24.938034 41.208883-59.914894 42.570586-98.688616-16.539214 16.807579-33.078428 33.078428-49.617643 50.154371-9.482218 10.565616-23.854636 14.909147-38.495418 11.658954l-38.495419-10.575556-39.042087-10.565615c-13.020655-3.528498-23.586271-13.020655-27.11477-27.11477l-10.297251-39.042087-10.575555-39.042087c-2.981829-11.927318-0.268365-26.568101 10.038826-36.060258 17.056065-17.344308 34.141948-34.420252 51.496195-51.774499z" fill="#717071" p-id="1134"></path></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1730682092013" class="icon" viewBox="0 0 1027 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2386" xmlns:xlink="http://www.w3.org/1999/xlink" width="200.5859375" height="200"><path d="M835.707408 791.0893c8.945488 8.935549 8.945488 23.039602-0.268365 32.52182-8.667184 8.408759-22.771238 8.408759-31.99503-0.546669l-140.434229-140.145985c-8.667184-8.935549-8.667184-23.039602 0.546669-32.253456 8.677124-8.677124 23.317907-8.677124 32.531759 0L835.707408 791.0893zM773.625718 0c14.640783 0 29.55987 1.083398 44.190713 4.601957 15.455816 2.713465 29.54993 7.325361 43.107315 13.020655 18.974375 8.130455 28.198167 30.633328 19.789408 50.154372a39.638453 39.638453 0 0 1-7.86209 11.927318c-29.013201 29.003261-58.016462 57.748098-86.761299 86.751359l4.880261 17.354247 4.343532 17.622613 17.890977 4.88026 17.354247 4.611897c28.734897-29.003261 57.748098-57.479733 86.751359-86.761299 14.650722-14.909147 39.042087-14.909147 54.2196 0 4.343532 4.611896 7.593726 10.307191 9.223792 16.27085a195.558317 195.558317 0 0 1 11.658953 38.495418v0.546669h0.268365c2.703525 13.825749 4.343532 28.734897 4.343532 44.459078 0 60.998292-25.216338 117.116322-65.610188 157.788476-40.125485 40.39385-96.52182 65.341823-157.788477 65.341823-4.343532 0-8.677124-0.268365-13.020655-0.268364l-42.292282 41.745612L950.935238 721.145519l1.888492 2.166797a156.715018 156.715018 0 0 1 44.190713 109.254232c0 40.125485-15.177512 80.519335-46.089144 111.152663l-0.546669 0.546669c-30.901693 30.374903-70.490449 45.552415-110.615934 45.552415s-81.056065-15.177512-111.152663-46.099084l-233.159187-232.880882-237.741264 238.307812c-49.617642 49.607703-109.532536 53.951235-158.60351 32.810063-18.974375-7.86209-36.050318-19.789408-50.154371-33.893461h-0.268365c-14.094114-14.362479-25.753067-31.179997-33.615158-49.886007-21.141171-49.070974-16.807579-109.254232 33.078429-158.593571v-0.546669L313.290884 473.892219l-97.05855-97.058549-86.214629-25.753067a37.740022 37.740022 0 0 1-24.401305-21.419475L22.930269 135.822333c-7.593726-14.094114-5.148626-32.53176 6.778692-44.459078L64.407517 56.933064 98.569343 22.771238c10.575555-10.565616 27.114769-14.640783 41.755552-8.130455l196.283895 83.769529a37.571051 37.571051 0 0 1 21.68784 24.401305l25.484703 86.214629 97.058549 97.05855 69.675415-69.138686c-0.268365-4.880261-0.546669-9.492157-0.546668-13.010716h0.268364c0-62.08169 24.947973-118.19972 65.341824-158.325206v-0.278304c40.383911-40.115546 96.511881-65.331884 158.046901-65.331884z m-109.532536 542.752601l-114.402857 114.412797 232.602578 232.602578c15.455816 15.724181 36.865352 23.854636 57.469793 23.854636s41.487187-8.130455 56.943004-23.586271l0.536729-0.268365c15.724181-15.177512 23.049542-36.596987 23.049542-57.201428 0-20.067712-7.325361-40.39385-21.966144-55.581302l-1.620127-1.620127-232.612518-232.612518zM366.963814 420.209349l59.914894-59.636589-103.837242-104.105607a38.525237 38.525237 0 0 1-10.297251-18.974375l-22.502873-76.185743L134.082932 95.428483l-15.992545 15.72418-15.992546 16.260911 66.425222 156.158409 78.620903 23.049542c6.510328 1.898431 11.927318 5.148626 16.27085 10.028887L366.963814 420.209349zM768.208728 76.454108a146.248796 146.248796 0 0 0-98.688616 43.375679 145.562976 145.562976 0 0 0-43.37568 104.105607h0.546669v10.575555l1.083398 8.945488c2.703525 11.927318-1.083398 24.938034-10.30719 34.430191L102.097841 792.987731h-0.268364c-23.854636 24.669669-26.568101 52.599472-16.807579 75.639074 4.065228 8.935549 10.307191 17.890977 17.622612 25.474764 7.86209 7.593726 16.539214 13.557385 26.031371 17.622612 23.039602 10.028886 50.701041 7.315422 75.092406-16.539214l264.060879-264.05094 1.083398-1.083398 168.085728-168.354092 1.083398-1.351763 80.7877-80.250971h0.268364c7.86209-8.677124 20.067712-13.010716 32.263395-11.112284 3.796863 0.536729 7.315422 1.083398 11.390589 1.083398 2.703525 0.268365 6.500388 0.546669 10.84392 0.546669 40.672154 0 77.537506-16.539214 104.105606-42.560646v-0.546669c25.216338-24.938034 41.208883-59.914894 42.570586-98.688616-16.539214 16.807579-33.078428 33.078428-49.617643 50.154371-9.482218 10.565616-23.854636 14.909147-38.495418 11.658954l-38.495419-10.575556-39.042087-10.565615c-13.020655-3.528498-23.586271-13.020655-27.11477-27.11477l-10.297251-39.042087-10.575555-39.042087c-2.981829-11.927318-0.268365-26.568101 10.038826-36.060258 17.056065-17.344308 34.141948-34.420252 51.496195-51.774499z" fill="#ffffff" p-id="2387"></path></svg>

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,14 +396,15 @@
       width="40%"
       :close-on-click-modal="false"
     >
+      <el-card class="box-card">
         <el-form
           :model="detailForm"
           v-loading="detailLoading"
-        label-width="100px"
+          label-width="110px"
         >
           <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,13 +468,14 @@
           </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>
 
     <!--报警参数趋势查询弹窗-->
@@ -526,9 +527,18 @@
         style="height:500px"
       ></div>
     </el-dialog>
-    <alarm-submit-maintenance-patrol-plan-form ref="submitPatrolPlanForm" @child-event="showSubmitButton"/>
+    <alarm-submit-maintenance-patrol-plan-form
-    <alarm-submit-maintenance-exclusive-patrol-plan-form ref="submitExclusivePatrolPlanForm" @child-event="showSubmitButton"/>
+      ref="submitPatrolPlanForm"
-    <alarm-submit-maintenance-order-form ref="submitOrderForm" @child-event="showSubmitButton" />
+      @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>
@@ -656,7 +666,9 @@ export default {
         //跳转到前一个页面
         this.$router.push("/alarm/equipalarm");
       } else {
-        inspectionInfoApi.isSubmitInspection(this.$route.query.equipAlarmId).then(res=>{
+        inspectionInfoApi
+          .isSubmitInspection(this.$route.query.equipAlarmId)
+          .then((res) => {
             if (res.data === null) {
               this.showPatrolPlanSubmit = true;
             } else if (res.data.status === 1 && !res.data.isExclusive) {
@@ -666,7 +678,7 @@ export default {
               this.inspectionId = res.data.inspectionId;
               this.showMaintanenceSubmit = true;
             }
-        })
+          });
       }
     },
     cardChange(e) {

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

@@ -502,90 +502,110 @@
       width="40%"
       :close-on-click-modal="false"
     >
+      <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="客户名称"
+                label="客户名称："
                 prop="customerName"
+                class="form-item-border"
               >
                 {{ detailForm.customerName }}
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item
-            label="设备型号"
+                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="规则名称"
+                label="规则名称："
                 prop="alarmName"
+                class="form-item-border"
               >
                 {{ detailForm.alarmName }}
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item
-            label="规则单位"
+                label="规则单位："
                 prop="alarmInfoUnit"
+                class="form-item-border"
               >
                 {{ detailForm.alarmInfoUnit }}
               </el-form-item>
-        </el-col>
+            </el-col></el-row>
+          <el-row>
             <el-col :span="12">
               <el-form-item
-            label="判断规则"
+                label="判断规则："
                 prop="referenceCon"
+                class="form-item-border"
               >
                 {{ detailForm.referenceCon }}
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item
-            label="规则描述"
+                label="规则描述："
                 prop="referenceName"
+                class="form-item-border"
               >
                 {{ detailForm.referenceName }}
               </el-form-item>
-        </el-col>
+            </el-col></el-row>
+          <el-row>
             <el-col :span="12">
               <el-form-item
-            label="规则上限"
+                label="规则上限："
                 prop="alertUpperBound"
+                class="form-item-border"
               >
                 {{ detailForm.alertUpperBound }}
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item
-            label="规则下限"
+                label="规则下限："
                 prop="alertLowerBound"
+                class="form-item-border"
               >
                 {{ detailForm.alertLowerBound }}
               </el-form-item>
-        </el-col>
+            </el-col></el-row>
+          <el-row>
             <el-col :span="24">
               <el-form-item
-            label="可能故障原因"
+                label="可能故障原因："
                 prop="reasonDescription"
+                class="form-item-border"
+                label-width="110px"
               >
                 <div v-html="detailForm.reasonDescription" />
               </el-form-item>
-        </el-col>
+            </el-col></el-row>
+          <el-row>
             <el-col :span="24">
               <el-form-item
-            label="备注"
+                label="备注："
                 prop="remark"
+                class="form-item-border"
               >{{ detailForm.remark }}</el-form-item>
-        </el-col>
+            </el-col></el-row>
         </el-form>
+      </el-card>
     </el-dialog>
   </div>
 </template>
@@ -769,3 +789,4 @@ export default {
   },
 };
 </script>
+

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

@@ -11,6 +11,54 @@
       style="text-align:right"
     >
       <el-form-item
+        label="机床设备名称"
+        prop="equipName"
+        label-width="100px"
+      >
+        <el-input
+          v-model="queryParams.equipName"
+          placeholder="请输入机床设备名称"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item
+        label="客户信息"
+        prop="customerId"
+      >
+        <el-select
+          v-model="queryParams.customerId"
+          placeholder="请选择客户信息"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="item in customerSelection"
+            :key="item.customerId"
+            :label="item.customerName"
+            :value="item.customerId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="机床轴承状态"
+        prop="status"
+        label-width="100px"
+      >
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择机床状态"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="dict in this.getDictDatas(DICT_TYPE.EQUIP_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- <el-form-item
         label="机床设备"
         prop="equipId"
       >
@@ -21,7 +69,7 @@
           clearable
           @change="cascaderChange"
         ></el-cascader>
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item
         label="机床组件id"
         prop="componentId"
@@ -38,7 +86,7 @@
           />
         </el-select>
       </el-form-item> -->
-      <el-form-item
+      <!-- <el-form-item
         label="报警等级"
         prop="alarmLevel"
       >
@@ -71,7 +119,7 @@
           end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']"
         />
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item
         label="最新报警时间"
         prop="latestAlarmTime"
@@ -285,6 +333,7 @@
 import * as EquipAlarmDataApi from "@/api/system/alarm/equipalarmdata";
 import EquipAlarmDataForm from "./EquipAlarmDataForm.vue";
 import * as EquipInfoApi from "@/api/system/equip/equipInfo";
+import { getCustomerSelection } from "@/api/system/baseData/customerInfo";
 import {
   getEquipCascader,
   getEquipSelection,
@@ -318,22 +367,32 @@ export default {
       queryParams: {
         pageNo: 1,
         pageSize: 10,
-        equipId: null,
+        customerId: null,
-        componentId: null,
+        equipNo: null,
-        alarmLevel: null,
-        alarmType: 1,
-        firstAlarmTime: [],
-        latestAlarmTime: [],
         status: null,
-        equipAnalyseStatus: null,
+        // equipId: null,
+        // componentId: null,
+        // alarmLevel: null,
+        // alarmType: 1,
+        // firstAlarmTime: [],
+        // latestAlarmTime: [],
+        // status: null,
+        // equipAnalyseStatus: null,
       },
       equipSelection: [],
+      customerSelection: [],
     };
   },
   created() {
     this.getList();
+    this.getCustomerSelect();
   },
   methods: {
+    getCustomerSelect() {
+      getCustomerSelection().then((res) => {
+        this.customerSelection = res;
+      });
+    },
     cascaderChange(value) {
       if (value.length > 0) {
         this.queryParams.equipId = value[1];
@@ -348,6 +407,7 @@ export default {
         // const res = await EquipAlarmDataApi.getEquipAlarmDataPage(
         //   this.queryParams
         // );
+        console.log("查询参数：", this.queryParams);
         const res = await EquipInfoApi.getEquipInfoPage(this.queryParams);
         await getEquipCascader().then((res) => {
           res.forEach((item) => {

imt-ui/src/views/system/data/monitordatadashboard/index.vue

@@ -337,9 +337,20 @@ export default {
     };
   },
   created() {
-    this.queryParams.equipId = this.$route.query.equipId;
+    // this.queryParams.equipId = this.$route.query.equipId;
-    this.getParamsTree(this.$route.query.equipId);
+    // this.getParamsTree(this.$route.query.equipId);
-    this.getEquipInfo(this.$route.query.equipId);
+    // this.getEquipInfo(this.$route.query.equipId);
+  },
+  watch: {
+    "$route.query.equipId": {
+      handler(newId) {
+        console.log("跳转equipId:", newId);
+        this.queryParams.equipId = newId;
+        this.getParamsTree(newId);
+        this.getEquipInfo(newId);
+      },
+      immediate: true, // 立即执行一次
+    },
   },
   methods: {
     /** 查询列表 */

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"

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"
         />