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/EquipInfoRespVO.java

@@ -71,4 +71,6 @@ public class EquipInfoRespVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
+    @Schema(description = "运行状态")
+    private Integer runStatus;
 }

imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java

@@ -29,7 +29,8 @@ public interface EquipInfoMapper extends BaseMapperX<EquipInfoDO> {
                 .eqIfPresent(EquipInfoDO::getCustomerId, reqVO.getCustomerId())
                 .likeIfPresent(EquipInfoDO::getEquipNo, reqVO.getEquipNo())
                 .eqIfPresent(EquipInfoDO::getStatus, reqVO.getStatus())
-                .orderByDesc(EquipInfoDO::getCreateTime));
+                .groupBy(EquipInfoDO::getCustomerId, EquipInfoDO::getModelId)
+        );
     }
 
     default List<EquipSelectionVO> selection(){

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

@@ -164,17 +164,22 @@
         align="center"
         prop="modelName"
       />
+      <el-table-column
+        label="机床名称"
+        align="center"
+        prop="equipName"
+      />
       <el-table-column
         label="机床编号"
         align="center"
         prop="equipNo"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="机床组件"
         align="center"
         prop="componentName"
-      />
-      <el-table-column
+      /> -->
+      <!-- <el-table-column
         label="报警等级"
         align="center"
         prop="alarmLevel"
@@ -185,8 +190,8 @@
             :value="scope.row.alarmLevel"
           />
         </template>
-      </el-table-column>
-      <el-table-column
+      </el-table-column> -->
+      <!-- <el-table-column
         label="首次报警时间"
         align="center"
         prop="firstAlarmTime"
@@ -205,7 +210,7 @@
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.latestAlarmTime) }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <!-- <el-table-column
         label="状态"
         align="center"
@@ -219,14 +224,14 @@
         </template>
       </el-table-column> -->
       <el-table-column
-        label="状态"
+        label="轴承状态"
         align="center"
-        prop="equipAnalyseStatus"
+        prop="status"
       >
         <template v-slot="scope">
           <dict-tag
             :type="DICT_TYPE.TREND_ANALY_STATUS"
-            :value="scope.row.equipAnalyseStatus"
+            :value="scope.row.status"
           />
         </template>
       </el-table-column>
@@ -279,6 +284,7 @@
   <script>
 import * as EquipAlarmDataApi from "@/api/system/alarm/equipalarmdata";
 import EquipAlarmDataForm from "./EquipAlarmDataForm.vue";
+import * as EquipInfoApi from "@/api/system/equip/equipInfo";
 import {
   getEquipCascader,
   getEquipSelection,
@@ -339,9 +345,10 @@ export default {
     async getList() {
       try {
         this.loading = true;
-        const res = await EquipAlarmDataApi.getEquipAlarmDataPage(
-          this.queryParams
-        );
+        // const res = await EquipAlarmDataApi.getEquipAlarmDataPage(
+        //   this.queryParams
+        // );
+        const res = await EquipInfoApi.getEquipInfoPage(this.queryParams);
         await getEquipCascader().then((res) => {
           res.forEach((item) => {
             if (item.children == null) {