diff --git a/fuintAdmin_zt/src/assets/styles/element-ui.scss b/fuintAdmin_zt/src/assets/styles/element-ui.scss index 44f149632..439ba75ca 100644 --- a/fuintAdmin_zt/src/assets/styles/element-ui.scss +++ b/fuintAdmin_zt/src/assets/styles/element-ui.scss @@ -127,6 +127,7 @@ } .el-pagination.is-background .el-pager li:not(.disabled).active{ background-color: #FF9655 !important; + color: white !important; } .el-pagination.is-background .el-pager li:hover{ color: #FF9655 !important;/*hover时候的文字颜色*/ diff --git a/fuintAdmin_zt/src/views/Service/index.vue b/fuintAdmin_zt/src/views/Service/index.vue index 63f9bc7df..b66175e00 100644 --- a/fuintAdmin_zt/src/views/Service/index.vue +++ b/fuintAdmin_zt/src/views/Service/index.vue @@ -50,6 +50,8 @@ +
+ + +
全部--> - + 全选 展开 diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue index 712998414..02c033598 100644 --- a/fuintAdmin_zt/src/views/Site/index.vue +++ b/fuintAdmin_zt/src/views/Site/index.vue @@ -36,8 +36,7 @@ - + @@ -2175,12 +2174,12 @@ export default { .app-container{ width: 100%; - height: 100vh; + height: 100%; background: #f6f8f9; } .left-box{ box-sizing: border-box; - height: 85vh; + height: 77vh; padding: 15px; overflow-y: auto; /* 只显示垂直滚动条 */ } diff --git a/fuintAdmin_zt/src/views/components/Service/allOrder.vue b/fuintAdmin_zt/src/views/components/Service/allOrder.vue index f4bc9fb40..54feb3fc9 100644 --- a/fuintAdmin_zt/src/views/components/Service/allOrder.vue +++ b/fuintAdmin_zt/src/views/components/Service/allOrder.vue @@ -83,6 +83,7 @@ +
@@ -149,6 +150,7 @@ +
- +
+
+ { + + /** + * 分页查询订单信息 + * @param page + * @param oilEngineConfig + * @return + */ + IPage queryPage(Page page, @Param("entity") OilEngineConfig oilEngineConfig); +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deviceManage/mapper/xml/OilEngineConfigMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deviceManage/mapper/xml/OilEngineConfigMapper.xml new file mode 100644 index 000000000..d91e4edf9 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deviceManage/mapper/xml/OilEngineConfigMapper.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deviceManage/service/OilEngineConfigService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deviceManage/service/OilEngineConfigService.java new file mode 100644 index 000000000..06ecb7316 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deviceManage/service/OilEngineConfigService.java @@ -0,0 +1,56 @@ +package com.fuint.business.deviceManage.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.deviceManage.entity.OilEngineConfig; +import org.springframework.data.domain.PageRequest; + +/** + * 油机汽机配置(OilEngineConfig)表服务接口 + * + * @author makejava + * @since 2024-07-31 14:59:09 + */ +public interface OilEngineConfigService { + + /** + * 分页查询订单信息 + * @param page + * @param oilEngineConfig + * @return + */ + IPage queryPage(Page page,OilEngineConfig oilEngineConfig); + + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + OilEngineConfig queryById(Integer id); + + /** + * 新增数据 + * + * @param oilEngineConfig 实例对象 + * @return 实例对象 + */ + int insert(OilEngineConfig oilEngineConfig); + + /** + * 修改数据 + * + * @param oilEngineConfig 实例对象 + * @return 实例对象 + */ + int update(OilEngineConfig oilEngineConfig); + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 是否成功 + */ + int deleteById(Integer id); + +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deviceManage/service/impl/OilEngineConfigServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deviceManage/service/impl/OilEngineConfigServiceImpl.java new file mode 100644 index 000000000..d480d3aaf --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deviceManage/service/impl/OilEngineConfigServiceImpl.java @@ -0,0 +1,72 @@ +package com.fuint.business.deviceManage.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fuint.business.deviceManage.entity.OilEngineConfig; +import com.fuint.business.deviceManage.mapper.OilEngineConfigMapper; +import com.fuint.business.deviceManage.service.OilEngineConfigService; +import org.springframework.stereotype.Service; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.PageRequest; + +import javax.annotation.Resource; + +/** + * 油机汽机配置(OilEngineConfig)表服务实现类 + * + * @author makejava + * @since 2024-07-31 14:59:09 + */ +@Service("oilEngineConfigService") +public class OilEngineConfigServiceImpl extends ServiceImpl implements OilEngineConfigService { + + @Override + public IPage queryPage(Page page, OilEngineConfig oilEngineConfig) { + return baseMapper.queryPage(page,oilEngineConfig); + } + + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + @Override + public OilEngineConfig queryById(Integer id) { + return baseMapper.selectById(id); + } + + /** + * 新增数据 + * + * @param oilEngineConfig 实例对象 + * @return 实例对象 + */ + @Override + public int insert(OilEngineConfig oilEngineConfig) { + return baseMapper.insert(oilEngineConfig); + } + + /** + * 修改数据 + * + * @param oilEngineConfig 实例对象 + * @return 实例对象 + */ + @Override + public int update(OilEngineConfig oilEngineConfig) { + return baseMapper.updateById(oilEngineConfig); + } + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 是否成功 + */ + @Override + public int deleteById(Integer id) { + return baseMapper.deleteById(id); + } +} diff --git a/fuintBackend/fuint-repository/src/main/resources/mapper/TPlatformMapper.xml b/fuintBackend/fuint-repository/src/main/resources/mapper/OilEngineConfigMapper.xml similarity index 100% rename from fuintBackend/fuint-repository/src/main/resources/mapper/TPlatformMapper.xml rename to fuintBackend/fuint-repository/src/main/resources/mapper/OilEngineConfigMapper.xml