Merge remote-tracking branch 'origin/master'

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblEquipmentSenesor.java

@@ -36,4 +36,6 @@ public class TblEquipmentSenesor extends BaseEntity {
      */
     private Long sensorId;
 
+    private Integer isDelete;
+
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblSensorSbookBo.java

@@ -149,5 +149,5 @@ public class TblSensorSbookBo extends BaseEntity {
 //    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr2;
 
-
+    private Integer isDelete;
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblEquipmentSbookVo.java

@@ -197,4 +197,6 @@ public class TblEquipmentSbookVo implements Serializable {
     private Date createTime;
 
     private Date updateTime;
+
+    private Integer isDelete;
 }

ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblEquipmentSbookServiceImpl.java

@@ -116,6 +116,7 @@ public class TblEquipmentSbookServiceImpl implements ITblEquipmentSbookService {
         QueryWrapper<TblEquipmentSbook> wrapper = Wrappers.query();
         wrapper.like(StringUtils.isNotBlank(tblEquipmentSbook.getName()), "u.name", tblEquipmentSbook.getName())
             .like(StringUtils.isNotBlank(tblEquipmentSbook.getSn()), "u.sn", tblEquipmentSbook.getSn())
+            .eq("u.is_delete",0)
             .and(ObjectUtil.isNotNull(tblEquipmentSbook.getEquipmentTreeId()), w -> {
                 List<TblEquipmentOrganizational> equipmentList = tblEquipmentOrganizationalMapper.selectList(new LambdaQueryWrapper<TblEquipmentOrganizational>()
                     .select(TblEquipmentOrganizational::getId)

ruoyi-ui-vue3/src/views/device/equipmentdash/index.vue

@@ -94,7 +94,7 @@
                           </el-icon>
                         </el-tooltip>
                       </el-button>
-                      <el-popconfirm title="确定删除该标签?">
+                      <el-popconfirm title="确定删除该标签?" @confirm="deleteDevice(scope.row)">
                         <template #reference>
                           <el-button link><el-tooltip effect="dark" content="删除"><el-icon>
                                 <Delete />
@@ -260,6 +260,10 @@ const getTypeName = (scope) => {
   }
 }
 
+const deleteDevice = (scope) => {
+              console.log(scope)
+}
+
 getTreedata();
 getlistEquipmentSbook();
 getDictsData();