This commit is contained in:
DESKTOP-369JRHT\12997 2024-08-01 14:21:58 +08:00
commit ca6d897805
37 changed files with 382 additions and 20 deletions

View File

@ -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时候的文字颜色*/

View File

@ -50,6 +50,8 @@
</div>
</div>
<div style="width: 100%;height: 68vh;overflow: auto">
<el-table
:data="tableData"
border
@ -157,6 +159,8 @@
</template>
</el-table-column>
</el-table>
</div>
<pagination
v-show="total>0"
:total="total"

View File

@ -31,7 +31,7 @@ export default {
roleCode: [
{required: true, message: '请选择登录权限', trigger: 'change'}
],
menuIds: [
checkedKeys: [
{required: true, message: '请选择菜单信息', trigger: 'change'}
],
},
@ -356,7 +356,7 @@ export default {
<!-- <el-radio :label="3">全部</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<el-form-item label="菜单功能权限" prop="menuIds">
<el-form-item label="菜单功能权限" prop="checkedKeys">
<el-checkbox v-model="checked" @change="chooseAllOrNo">全选</el-checkbox>
<el-checkbox v-model="isOpen" @change="openTable">展开</el-checkbox>
</el-form-item>

View File

@ -36,8 +36,7 @@
</el-col>
<el-col :span="18">
<el-card style="margin-bottom: 20px;border: none;
box-shadow: none;" shadow="never">
<el-card style="margin-bottom: 20px;border: none;box-shadow: none;height: 81.5vh;overflow: auto" shadow="never">
<!-- <el-tabs v-model="activeName" @tab-click="handleClick">-->
<!-- 用户信息 -->
<!-- <el-tab-pane label="用户信息" name="list">-->
@ -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; /* 只显示垂直滚动条 */
}

View File

@ -83,6 +83,7 @@
</el-form-item>
</el-form>
<div style="width: 100%;height: 65vh;overflow: auto">
<el-table ref="tables" border v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="订单号" align="center" prop="orderNo" width="220"/>
@ -149,6 +150,7 @@
</el-table>
</div>
<pagination
v-show="total>0"
:total="total"

View File

@ -1020,6 +1020,8 @@ export default {
.new-box {
width: 100%;
height: 80vh;
overflow: auto;
background: #fff;
box-sizing: border-box;
padding: 20px;

View File

@ -38,7 +38,7 @@
</div>
</div>
<div style="width: 100%;height: 64vh;overflow: auto">
<el-table ref="tables" border v-loading="loading" :data="list" @selection-change="handleSelectionChange"
:default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column
@ -102,6 +102,7 @@
</el-table-column>
</el-table>
</div>
<pagination
v-show="total>0"
:total="total"

View File

@ -116,6 +116,8 @@ export default {
box-sizing: border-box;
padding: 20px;
width: 98%;
height: 80vh;
overflow: auto;
margin: 20px auto;
}
.d-s{

View File

@ -68,7 +68,7 @@ export default {
.app-top{
width: 100%;
//margin-bottom: 20px;
height: 60px;
height: 50px;
box-sizing: border-box;
}
@ -86,7 +86,7 @@ background-color: #FFFFFF;
//border: 1px solid #EBEEF5;
}
.nbox{
margin-left: 30px;
margin-right: 30px;
}
.fount-box{
font-size: 14px;

View File

@ -343,6 +343,8 @@ export default {
.table-box {
width: 100%;
height: 45vh;
overflow: auto;
}
.wrap-boxs {

View File

@ -310,6 +310,8 @@ export default {
.table-box {
width: 100%;
height: 46vh;
overflow: auto;
}
.wrap-boxs {

View File

@ -102,7 +102,7 @@ background-color: #FFFFFF;
//border: 1px solid #EBEEF5;
}
.nbox{
margin-left: 30px;
margin-right: 30px;
}
.fount-box{
font-size: 14px;

View File

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div style="background: #f6f8f9;width: 100%;padding: 20px;height: 100vh">
<div style="background: #f6f8f9;width: 100%;padding: 20px;">
<div class="card-change">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
@ -273,6 +273,8 @@ import {getDuiZhangIntegralListApi} from "@/api/financialStatement/jiaoyiduizhan
.table-box{
width: 100%;
height: 65vh;
overflow: auto;
}

View File

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div style="background: #f6f8f9;width: 100%;padding: 20px;height: 100vh">
<div style="background: #f6f8f9;width: 100%;padding: 20px;">
<div class="card-change">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
@ -76,7 +76,7 @@
</el-form>
<!-- </el-card>-->
<!-- <el-card class="box-card">-->
<div class="table-box">
<div class="table-box" style="width: 100%;height: 65vh;overflow: auto">
<el-table
:data="orderList"
style="width: 100%">

View File

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div style="background: #f6f8f9;width: 100%;padding: 20px;height: 100vh">
<div style="background: #f6f8f9;width: 100%;padding: 20px;">
<div class="card-change">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
@ -272,6 +272,8 @@ import {getDuiZhangGoodsListApi} from "@/api/financialStatement/jiaoyiduizhang";
.table-box{
width: 100%;
height: 65vh;
overflow: auto;
}
</style>

View File

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div style="background: #f6f8f9;width: 100%;padding: 20px;height: 100vh" >
<div style="background: #f6f8f9;width: 100%;padding: 20px;" >
<div class="card-change">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
@ -276,6 +276,8 @@ import {getRunningWaterByTissueApi} from "@/api/allOrder";
.table-box{
width: 100%;
height: 66vh;
overflow: auto;
}
</style>

View File

@ -121,7 +121,7 @@ background-color: #FFFFFF;
//border: 1px solid #EBEEF5;
}
.nbox{
margin-left: 30px;
margin-right: 30px;
}
.fount-box{
font-size: 14px;

View File

@ -298,6 +298,8 @@ export default {
.table-box {
width: 100%;
height: 47vh;
overflow: auto;
}
.wrap-box {

View File

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div style="padding-top: 20px; padding-right: 40px; background: #f6f8f9;">
<div style="padding-top: 15px; padding-right: 40px; background: #f6f8f9;">
<el-card class="box-card" shadow="never">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<div class="d-s" style="justify-content: space-between;width: 100%">
@ -342,6 +342,8 @@ import {parseTime} from "@/utils/fuint";
.table-box{
width: 100%;
height: 47vh;
overflow: auto;
}
.wrap-box{
width: 100%;

View File

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div style="padding-top: 20px; padding-right: 40px; background: #f6f8f9;" shadow="never">
<div style="padding-top: 15px; padding-right: 40px; background: #f6f8f9;" shadow="never">
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px" >
<div class="d-s" style="justify-content: space-between;width: 100%">
@ -317,6 +317,8 @@ import {parseTime} from "@/utils/fuint";
.table-box{
width: 100%;
height: 47vh;
overflow: auto;
}
.wrap-box{
width: 100%;

View File

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div class="" style="padding-top: 20px; padding-right: 40px; background: #f6f8f9;min-height: 900px;">
<div class="" style="padding-top: 20px; padding-right: 40px; background: #f6f8f9;">
<el-card class="box-card" shadow="never">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
@ -239,6 +239,8 @@ import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/fina
.table-box{
width: 100%;
height: 49vh;
overflow: auto;
}
.wrap-box{
width: 100%;

View File

@ -45,6 +45,8 @@
<!-- &lt;!&ndash; 列表信息&ndash;&gt;-->
<!-- <el-card style="margin-top: 20px" >-->
<div style="height: 70vh;overflow: auto">
<el-table :data="tableData" style="width: 100%" border>
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="orgName" label="机构名称"></el-table-column>
@ -85,6 +87,7 @@
</template>
</el-table-column>
</el-table>
</div>
<pagination
v-show="total>0"
:total="total"
@ -345,6 +348,9 @@ export default {
width: 60px;
height: 50px;
line-height: 60px;
}
.app-container{
}
</style>

View File

@ -54,6 +54,7 @@
<!-- <el-card style="margin-top: 20px" >-->
<div style="height: 70vh;overflow: auto">
<el-table :data="tableData" style="width: 100%;" border>
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="bannerName" label="banner名称"></el-table-column>
@ -103,6 +104,7 @@
</template>
</el-table-column>
</el-table>
</div>
<pagination
v-show="total>0"
:total="total"

View File

@ -46,6 +46,7 @@
</el-form-item>
</el-form>
<div style="height: 70vh;overflow: auto">
<el-table :data="tableData" style="width: 100%" border>
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="name" label="商品名称"></el-table-column>
@ -104,6 +105,7 @@
</template>
</el-table-column>
</el-table>
</div>
<pagination
v-show="total>0"
:total="total"

View File

@ -37,6 +37,7 @@
</el-form-item>
</el-form>
<div style="height: 70vh;overflow: auto">
<el-table :data="tableData" border style="width: 100%">
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="messageId" label="短信模板ID"></el-table-column>
@ -81,6 +82,7 @@
</template>
</el-table-column>
</el-table>
</div>
<pagination
v-show="total>0"
:total="total"

View File

@ -61,6 +61,7 @@
<!-- &lt;!&ndash; 列表信息&ndash;&gt;-->
<!-- <el-card style="margin-top: 20px" >-->
<div style="height: 70vh;overflow: auto">
<el-table :data="tableData" style="width: 100%">
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="deptName" label="机构名称"></el-table-column>
@ -121,6 +122,7 @@
</template>
</el-table-column>
</el-table>
</div>
<pagination
v-show="total>0"
:total="total"

View File

@ -85,6 +85,7 @@
</el-form-item>
</el-form>
<div style="height: 65vh;overflow: auto">
<el-table :data="tableData" style="width: 100%" border>
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="createAccount" label="登录账号"></el-table-column>
@ -105,6 +106,7 @@
<el-table-column prop="ipAddr" label="IP地址"></el-table-column>
<el-table-column prop="createTime" label="操作时间"></el-table-column>
</el-table>
</div>
<pagination
v-show="total>0"
:total="total"

View File

@ -54,7 +54,6 @@ export default {
}
.container{
background: #F4F5F9;
height: 100vh;
box-sizing: border-box;
//padding: 20px;
}

View File

@ -48,6 +48,8 @@
<!-- </el-card>-->
<!-- &lt;!&ndash; 列表信息&ndash;&gt;-->
<!-- <el-card style="margin-top: 20px" >-->
<div style="height: 65vh;overflow: auto">
<el-table :data="tableData" style="width: 100%" border>
<el-table-column align="center" type="index" label="序号"></el-table-column>
<el-table-column align="center" prop="notificationName" label="通知名称"></el-table-column>
@ -82,6 +84,7 @@
</template>
</el-table-column>
</el-table>
</div>
<pagination
v-show="total>0"
:total="total"

View File

@ -49,6 +49,7 @@
<!-- &lt;!&ndash; &ndash;&gt;-->
<!-- &lt;!&ndash; 列表信息&ndash;&gt;-->
<!-- <el-card style="margin-top: 20px" >-->
<div style="height: 65vh;overflow: auto">
<el-table :data="tableData" style="width: 100%" border>
<el-table-column align="center" type="index" label="序号"></el-table-column>
<el-table-column align="center" prop="notificationName" label="通知名称"></el-table-column>
@ -85,6 +86,7 @@
</template>
</el-table-column>
</el-table>
</div>
<pagination
v-show="total>0"
:total="total"

View File

@ -0,0 +1,87 @@
package com.fuint.business.deviceManage.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.deviceManage.entity.OilEngineConfig;
import com.fuint.business.deviceManage.service.OilEngineConfigService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* 油机汽机配置(OilEngineConfig)表控制层
*
* @author makejava
* @since 2024-07-31 14:59:04
*/
@RestController
@RequestMapping("oilEngineConfig")
public class OilEngineConfigController extends BaseController {
/**
* 服务对象
*/
@Resource
private OilEngineConfigService oilEngineConfigService;
/**
* 根据条件分页查询首页轮播图
* @param oilEngineConfig
* @param pageNo
* @param pageSize
* @return
*/
@GetMapping
public ResponseObject lists(OilEngineConfig oilEngineConfig,
@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
Page page =new Page(pageNo,pageSize);
return getSuccessResult(oilEngineConfigService.queryPage(page,oilEngineConfig));
}
/**
* 通过主键查询单条数据
*
* @param id 主键
* @return 单条数据
*/
@GetMapping("{id}")
public ResponseObject queryById(@PathVariable("id") Integer id) {
return getSuccessResult(oilEngineConfigService.queryById(id));
}
/**
* 新增数据
*
* @param oilEngineConfig 实体
* @return 新增结果
*/
@PostMapping
public ResponseObject add(@RequestBody OilEngineConfig oilEngineConfig) {
return getSuccessResult(oilEngineConfigService.insert(oilEngineConfig));
}
/**
* 编辑数据
*
* @param oilEngineConfig 实体
* @return 编辑结果
*/
@PutMapping
public ResponseObject edit(@RequestBody OilEngineConfig oilEngineConfig) {
return getSuccessResult(oilEngineConfigService.update(oilEngineConfig));
}
/**
* 删除数据
*
* @param id 主键
* @return 删除是否成功
*/
@DeleteMapping("{id}")
public ResponseObject deleteById(@PathVariable Integer id) {
return getSuccessResult(oilEngineConfigService.deleteById(id));
}
}

View File

@ -0,0 +1,61 @@
package com.fuint.business.deviceManage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fuint.framework.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.io.Serializable;
/**
* 油机汽机配置(OilEngineConfig)实体类
*
* @author makejava
* @since 2024-07-31 14:59:07
*/
@Data
@TableName("oil_engine_config")
@ApiModel(value = "OilEngineConfig", description = "油机汽机配置")
public class OilEngineConfig extends BaseEntity implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@ApiModelProperty("自增ID")
@TableId(value = "ID", type = IdType.AUTO)
private Integer id;
/**
* 设备类型: 选项为BYDDLY
*/
private String deviceType;
/**
* 设备名称
*/
private String deviceName;
/**
* 设备id
*/
private String deviceId;
/**
* 创建时间
*/
private Date createTime;
/**
* 创建人
*/
private String createBy;
/**
* 更新时间
*/
private Date updateTime;
/**
* 更新人
*/
private String updateBy;
}

View File

@ -0,0 +1,27 @@
package com.fuint.business.deviceManage.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.deviceManage.entity.OilEngineConfig;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.domain.Pageable;
import java.util.List;
/**
* 油机汽机配置(OilEngineConfig)表数据库访问层
*
* @author makejava
* @since 2024-07-31 14:59:07
*/
public interface OilEngineConfigMapper extends BaseMapper<OilEngineConfig> {
/**
* 分页查询订单信息
* @param page
* @param oilEngineConfig
* @return
*/
IPage<OilEngineConfig> queryPage(Page page, @Param("entity") OilEngineConfig oilEngineConfig);
}

View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fuint.business.deviceManage.mapper.OilEngineConfigMapper">
<select id="queryPage" resultType="com.fuint.business.deviceManage.entity.OilEngineConfig">
SELECT * FROM oil_engine_config
ORDER BY create_time DESC
</select>
</mapper>

View File

@ -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<OilEngineConfig> 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);
}

View File

@ -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<OilEngineConfigMapper,OilEngineConfig> implements OilEngineConfigService {
@Override
public IPage<OilEngineConfig> 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);
}
}