修改首页、登录页。

master
杨万里 2 weeks ago
parent 09952edfed
commit fc599c09fd

@ -6,12 +6,6 @@ import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.system.domain.RecordWarehousing;
import com.ruoyi.system.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@ -157,14 +151,15 @@ public class SysIndexController extends BaseController
{
Map map =new HashMap();
//查询库存、在用轮胎数量、车辆数量
int n = iBaseInventoryService.querytotal();
int m = iBaseInventoryService.queryInCar();
int k = iBaseInventoryService.queryCarTotal();
Map tireTypeTotal = iBaseInventoryService.querytotal();
List<Map> mapList = iRecordWarehousingService.selectRecord();
map.put("InventoryTotal",n);
map.put("TyreInCar",m);
map.put("CarTotal",k);
//规格占比
List<Map> mapListTyreModel = iRecordWarehousingService.selectTyreModel();
//新胎装车统计
List<Map> mapListInstall = iRecordWarehousingService.selectTyreInstall();
map.put("mapListInstall",mapListInstall);
map.put("mapListTyreModel",mapListTyreModel);
map.put("tireTypeTotal",tireTypeTotal);
map.put("mapList",mapList);
return AjaxResult.success(map);
}

@ -150,10 +150,10 @@ public class BaseCarController extends BaseController
}
@PostMapping("/PdaQueryCarList")
@ResponseBody
public List<BaseCar> PdaQueryCarList(BaseCar baseCar)
public AjaxResult PdaQueryCarList(BaseCar baseCar)
{
List<BaseCar> list = baseCarService.selectBaseCarList(baseCar);
return list;
return AjaxResult.success(list);
}
@PostMapping("/PdaBingCarRfid")

@ -123,6 +123,7 @@ public class BaseInventoryController extends BaseController
return toAjax(baseInventoryService.deleteBaseInventoryByIds(ids));
}
@Log(title = "手持添加库存", businessType = BusinessType.INSERT)
@PostMapping("/pdaAddInventory")
@ResponseBody
public AjaxResult pdaAddInventory(BaseInventory baseInventory, BaseTyre baseTyre)

@ -16,7 +16,7 @@ ruoyi:
# 开发环境配置
server:
# 服务器的HTTP端口默认为80
port: 80
port: 8020
servlet:
# 应用的访问路径
context-path: /

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 MiB

@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="renderer" content="webkit">
<title>若依系统首页</title>
<title>智能轮胎管理系统</title>
<!-- 避免IE使用兼容模式 -->
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<link th:href="@{favicon.ico}" rel="shortcut icon"/>

@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="renderer" content="webkit">
<title>若依系统首页</title>
<title>智能轮胎管理系统</title>
<!-- 避免IE使用兼容模式 -->
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<link th:href="@{favicon.ico}" rel="shortcut icon"/>
@ -26,7 +26,7 @@
</div>
<a th:href="@{/index}">
<li class="logo hidden-xs">
<span class="logo-lg">RuoYi</span>
<span class="logo-lg">智能轮胎管理系统</span>
</li>
</a>
<div class="sidebar-collapse">
@ -196,7 +196,7 @@
</a>
</div>
<ul class="nav navbar-top-links navbar-right welcome-message">
<li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="开发文档" href="http://doc.ruoyi.vip/ruoyi" target="_blank"><i class="fa fa-question-circle"></i> 文档</a></li>
<!-- <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="开发文档" href="http://doc.ruoyi.vip/ruoyi" target="_blank"><i class="fa fa-question-circle"></i> 文档</a></li>-->
<li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="锁定屏幕" href="javascript:;" id="lockScreen"><i class="fa fa-lock"></i> 锁屏</a></li>
<li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="全屏显示" href="javascript:;" id="fullScreen"><i class="fa fa-arrows-alt"></i> 全屏</a></li>
<li class="dropdown user-menu">

@ -4,84 +4,171 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
<title>智能轮胎系统登录</title>
<meta name="description" content="若依后台管理框架">
<meta name="description" content="智能轮胎管理系统">
<!-- 原有CSS引用保持不变 -->
<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
<link href="../static/css/style.min.css" th:href="@{/css/style.min.css}" rel="stylesheet"/>
<link href="../static/css/login.min.css" th:href="@{/css/login.min.css}" rel="stylesheet"/>
<link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.8.3}" rel="stylesheet"/>
<link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.8.2}" rel="stylesheet"/>
<!-- 360浏览器急速模式 -->
<meta name="renderer" content="webkit">
<!-- 避免IE使用兼容模式 -->
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
<style type="text/css">label.error { position:inherit; }</style>
<!-- ⭐ 核心优化:自定义内联样式 (覆盖原有样式) -->
<style type="text/css">
/* 1. 全屏背景图设置 */
body.signin {
background: url('../img/img.png') no-repeat center center fixed; /* 确保图片路径正确 */
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
background-size: cover;
/* 如果背景图太亮,可以加一层半透明黑色遮罩,让白色登录框更突出 */
position: relative;
overflow: hidden;
}
body.signin::before {
content: '';
position: absolute;
top: 0; left: 0; right: 0; bottom: 0;
background: rgba(0, 0, 0, 0.3); /* 30%透明度的黑色遮罩 */
z-index: -1;
}
/* 2. 登录面板优化:增加磨砂玻璃质感和阴影 */
.signinpanel {
width: 400px;
margin: 10% auto;
padding: 30px 40px;
background: rgba(255, 255, 255, 0.92); /* 半透明白底 */
border-radius: 12px;
box-shadow: 0 15px 35px rgba(0, 0, 0, 0.3);
backdrop-filter: blur(10px); /* 磨砂效果,现代浏览器支持 */
border: 1px solid rgba(255, 255, 255, 0.2);
}
/* 3. 输入框优化 */
.form-control {
height: 48px;
border: 1px solid #ddd;
border-radius: 8px;
font-size: 16px;
padding: 10px 15px;
transition: all 0.3s ease;
}
.form-control:focus {
border-color: #4285f4; /* 蓝色边框 */
box-shadow: 0 0 10px rgba(66, 133, 244, 0.3);
transform: scale(1.02); /* 聚焦时轻微放大 */
}
/* 4. 按钮优化 */
.btn-success {
background-color: #1890ff; /* 阿里系蓝色,比默认绿更专业 */
border-color: #1890ff;
height: 48px;
font-size: 18px;
border-radius: 8px;
transition: all 0.3s ease;
font-weight: bold;
}
.btn-success:hover {
background-color: #409eff;
border-color: #409eff;
transform: translateY(-2px);
}
/* 5. 验证码区域优化 */
.imgcode {
border-radius: 8px;
cursor: pointer;
box-shadow: 0 2px 8px rgba(0,0,0,0.1);
transition: transform 0.3s ease;
}
.imgcode:hover {
transform: scale(1.05);
}
/* 6. 标题优化 */
h1[style] {
color: #333 !important;
text-shadow: 2px 2px 4px rgba(0,0,0,0.1);
}
</style>
<script>
if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location};
</script>
</head>
<body class="signin">
<div class="signinpanel">
<div class="row">
<!-- <div class="col-sm-7">-->
<!-- <div class="signin-info">-->
<!-- <div class="logopanel m-b">-->
<!-- <h1><img alt="[ 若依 ]" src="../static/ruoyi.png" th:src="@{/ruoyi.png}"></h1>-->
<!-- </div>-->
<!-- <div class="m-b"></div>-->
<!-- <h4>欢迎使用 <strong>若依 后台管理系统</strong></h4>-->
<!-- <ul class="m-b">-->
<!-- <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> SpringBoot</li>-->
<!-- <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Mybatis</li>-->
<!-- <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Shiro</li>-->
<!-- <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Thymeleaf</li>-->
<!-- <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Bootstrap</li>-->
<!-- </ul>-->
<!-- <strong th:if="${isAllowRegister}">还没有账号? <a th:href="@{/register}">立即注册&raquo;</a></strong>-->
<!-- </div>-->
<!-- </div>-->
<div class="col-sm-6">
<form id="signupForm" autocomplete="off">
<h1 class="no-margins" style="font-weight: bold;text-align: center;color: black">智能轮胎系统登录</h1>
<!-- <p class="m-t-md">你若不离不弃,我必生死相依</p>-->
<input type="text" name="username" class="form-control uname" placeholder="用户名" value="" />
<input type="password" name="password" class="form-control pword" placeholder="密码" value="" />
<div class="row m-t" th:if="${captchaEnabled==true}">
<div class="col-xs-6">
<input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" />
</div>
<div class="col-xs-6">
<a href="javascript:void(0);" title="点击更换验证码">
<img th:src="@{/captcha/captchaImage(type=${captchaType})}" class="imgcode" width="85%"/>
</a>
</div>
</div>
<div class="checkbox-custom" th:if="${isRemembered}" th:classappend="${captchaEnabled==false} ? 'm-t'">
<input type="checkbox" id="rememberme" name="rememberme"> <label for="rememberme">记住我</label>
</div>
<button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证登录,请稍候...">登录</button>
</form>
</div>
<!-- <div class="col-sm-6">-->
<!-- <img th:src="@{/img/logo_ll.png}" style="height: 50px;width: 350px">-->
<!--&lt;!&ndash; <img th:src="@{/captcha/captchaImage(type=${captchaType})}" class="imgcode" width="85%"/>&ndash;&gt;-->
<!--&lt;!&ndash; <img src="your-image.jpg" alt="示例图片">&ndash;&gt;-->
<!-- </div>-->
<div class="signinpanel">
<div class="row">
<!-- ⭐ 内容微调:去除了原本的注释,保持结构清晰 -->
<div class="col-sm-12">
<!-- Logo或系统名称 -->
<h1 class="no-margins text-center" style="font-weight: bold; color: #1890ff; margin-bottom: 30px;">
<i class="fa fa-car"></i> 智能轮胎管理系统
</h1>
<!-- 登录表单 -->
<form id="signupForm" autocomplete="off">
<!-- 用户名 -->
<div class="form-group">
<input type="text" name="username" class="form-control uname" placeholder="请输入用户名" value="" />
</div>
<!-- 密码 -->
<div class="form-group">
<input type="password" name="password" class="form-control pword" placeholder="请输入密码" value="" />
</div>
<!-- 验证码 (根据后端配置显示) -->
<div class="row m-t" th:if="${captchaEnabled==true}">
<div class="col-xs-6">
<input type="text" name="validateCode" class="form-control code" placeholder="请输入验证码" maxlength="5" />
</div>
<div class="col-xs-6">
<a href="javascript:void(0);" title="点击更换验证码" onclick="this.src='/captcha/captchaImage?type='+captchaType+'&d='+new Date().getTime()">
<img th:src="@{/captcha/captchaImage(type=${captchaType})}" class="imgcode" width="100%"/>
</a>
</div>
</div>
<!-- 记住我 & 忘记密码 -->
<div class="checkbox-custom m-t" th:if="${isRemembered}" style="float: left;">
<input type="checkbox" id="rememberme" name="rememberme">
<label for="rememberme" style="color: black">记住我</label>
</div>
<!-- 如果需要“忘记密码”链接,取消下面的注释 -->
<!-- <a href="#" style="float: right; margin-top: 10px;">忘记密码?</a> -->
<div class="clearfix"></div>
<!-- 登录按钮 -->
<button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证登录,请稍候...">
<i class="fa fa-sign-in"></i> 登 录
</button>
</form>
</div>
<!-- <div class="signup-footer">-->
<!-- <div class="pull-left">-->
<!-- Copyright © 2018-2026 ruoyi.vip All Rights Reserved. <br>-->
<!-- </div>-->
<!-- </div>-->
</div>
<script th:inline="javascript"> var ctx = [[@{/}]]; var captchaType = [[${captchaType}]]; var captchaEnabled = [[${captchaEnabled}]];</script>
</div>
<!-- 原有JS引用保持不变 -->
<script th:inline="javascript">
var ctx = [[@{/}]];
var captchaType = [[${captchaType}]];
var captchaEnabled = [[${captchaEnabled}]];
</script>
<!--[if lte IE 8]><script>window.location.href=ctx+'html/ie.html';</script><![endif]-->
<!-- 全局js -->
<script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
<script src="../static/ajax/libs/validate/jquery.validate.min.js" th:src="@{/ajax/libs/validate/jquery.validate.min.js}"></script>
<script src="../static/ajax/libs/layer/layer.min.js" th:src="@{/ajax/libs/layer/layer.min.js}"></script>
<script src="../static/ajax/libs/blockUI/jquery.blockUI.js" th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.8.3}"></script>
<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.8.2}"></script>
<script src="../static/ruoyi/login.js" th:src="@{/ruoyi/login.js}"></script>
</body>
</html>
</html>

@ -1,354 +1,636 @@
<!DOCTYPE html>
<html lang="zh-CN">
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>智能轮胎管理系统 - 首页看板</title>
<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
<link href="../static/css/style.min.css" th:href="@{/css/style.min.css}" rel="stylesheet"/>
<link href="../static/css/login.min.css" th:href="@{/css/login.min.css}" rel="stylesheet"/>
<link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.8.2}" rel="stylesheet"/>
<!-- 引入Tailwind CSS -->
<script src="https://cdn.tailwindcss.com"></script>
<!-- 引入Font Awesome图标 -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
<!-- 引入Chart.js -->
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
<!-- 自定义Tailwind配置 -->
<script>
tailwind.config = {
theme: {
extend: {
colors: {
primary: '#165DFF',
secondary: '#36CFC9',
warning: '#FF7D00',
danger: '#F53F3F',
success: '#00B42A',
dark: '#1D2129',
light: '#F2F3F5'
},
fontFamily: {
sans: ['Inter', 'system-ui', 'sans-serif'],
},
}
}
}
</script>
<style type="text/tailwindcss">
@layer utilities {
.card-shadow {
box-shadow: 0 2px 14px 0 rgba(0, 0, 0, 0.06);
}
.dashboard-grid {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
gap: 1.5rem;
}
}
</style>
<th:block th:include="include :: header('首页')" />
</head>
<body class="bg-gray-50 font-sans text-dark">
<!-- 主要内容区域 -->
<!-- 概览统计卡片 -->
<section class="dashboard-grid mb-6">
<!-- 总库存 -->
<div class="bg-white rounded-lg p-5 card-shadow">
<div class="flex justify-between items-start mb-4">
<div>
<p class="text-gray-500 text-sm">轮胎总库存</p>
<h2 class="text-3xl font-bold mt-1" id="tireStock">0</h2>
</div>
<div class="w-10 h-10 rounded-full bg-primary/10 flex items-center justify-center">
<i class="fa-solid fa-boxes-stacked text-primary"></i>
<body class="gray-bg">
<div class="wrapper wrapper-content">
<div class="row">
<div class="col-sm-12 search-collapse">
<!-- 左边部分 (占 30% -> 近似使用 col-sm-4 即 33%) -->
<div class="col-sm-3">
<div class="card-box" style="height: 50px; display: flex; align-items: center; justify-content: center;">
<!-- 时间显示区域 -->
<div id="clock" style="font-size: 20px; text-align: center; width: 100%;">
<!-- 内容由 JS 动态填充 -->
</div>
</div>
</div>
<!-- <div class="flex items-center text-sm">-->
<!-- <span class="text-success flex items-center">-->
<!-- <i class="fa-solid fa-arrow-up mr-1"></i>5.2%-->
<!-- </span>-->
<!-- <span class="text-gray-400 ml-2">较上月</span>-->
<!-- </div>-->
</div>
<!-- 在用轮胎 -->
<div class="bg-white rounded-lg p-5 card-shadow">
<div class="flex justify-between items-start mb-4">
<div>
<p class="text-gray-500 text-sm">在用轮胎数量</p>
<h2 class="text-3xl font-bold mt-1" id="tireInuse">0</h2>
</div>
<div class="w-10 h-10 rounded-full bg-secondary/10 flex items-center justify-center">
<i class="fa-solid fa-car-side text-secondary"></i>
</div>
</div>
<!-- <div class="flex items-center text-sm">-->
<!-- <span class="text-success flex items-center">-->
<!-- <i class="fa-solid fa-arrow-up mr-1"></i>2.8%-->
<!-- </span>-->
<!-- <span class="text-gray-400 ml-2">较上月</span>-->
<!-- </div>-->
</div>
<div class="col-sm-9">
<form id="formId">
<div class="select-list">
<li class="select-time">
<label>创建时间: </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="birthday"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>
<!-- 2. 分公司下拉框 (新增) -->
<li>
<label>分公司: </label>
<select id="branchCompany" name="branchCompany" class="form-control" onchange="handleCompanyChange()">
<option value="">-- 请选择 --</option>
<option value="one">一分公司</option>
<option value="three">三分公司</option>
</select>
</li>
<!-- 待保养轮胎 -->
<!-- <div class="bg-white rounded-lg p-5 card-shadow">-->
<!-- <div class="flex justify-between items-start mb-4">-->
<!-- <div>-->
<!-- <p class="text-gray-500 text-sm">待保养轮胎</p>-->
<!-- <h2 class="text-3xl font-bold mt-1">387</h2>-->
<!-- </div>-->
<!-- <div class="w-10 h-10 rounded-full bg-warning/10 flex items-center justify-center">-->
<!-- <i class="fa-solid fa-wrench text-warning"></i>-->
<!-- </div>-->
<!-- </div>-->
<!--&lt;!&ndash; <div class="flex items-center text-sm">&ndash;&gt;-->
<!--&lt;!&ndash; <span class="text-danger flex items-center">&ndash;&gt;-->
<!--&lt;!&ndash; <i class="fa-solid fa-arrow-up mr-1"></i>12.1%&ndash;&gt;-->
<!--&lt;!&ndash; </span>&ndash;&gt;-->
<!--&lt;!&ndash; <span class="text-gray-400 ml-2">较上月</span>&ndash;&gt;-->
<!--&lt;!&ndash; </div>&ndash;&gt;-->
<!-- </div>-->
<!-- 关联车辆数 -->
<div class="bg-white rounded-lg p-5 card-shadow">
<div class="flex justify-between items-start mb-4">
<div>
<p class="text-gray-500 text-sm">车辆总数</p>
<h2 class="text-3xl font-bold mt-1" id="carTotal"></h2>
</div>
<div class="w-10 h-10 rounded-full bg-success/10 flex items-center justify-center">
<i class="fa-solid fa-truck text-success"></i>
</div>
</div>
<!-- <div class="flex items-center text-sm">-->
<!-- <span class="text-success flex items-center">-->
<!-- <i class="fa-solid fa-arrow-up mr-1"></i>8.5%-->
<!-- </span>-->
<!-- <span class="text-gray-400 ml-2">较上月</span>-->
<!-- </div>-->
</div>
</section>
<!-- 图表区域 -->
<section class="grid grid-cols-1 lg:grid-cols-3 gap-6 mb-6">
<!-- 近一个月出入库统计 -->
<div class="bg-white rounded-lg p-5 card-shadow lg:col-span-2">
<div class="flex justify-between items-center mb-4">
<h3 class="font-bold text-lg">近一个月轮胎出入库统计</h3>
<!-- <div class="flex gap-2">-->
<!-- <button class="px-3 py-1 rounded bg-primary text-white text-sm">日</button>-->
<!-- <button class="px-3 py-1 rounded bg-light text-gray-500 text-sm hover:bg-gray-200 transition">周</button>-->
<!-- <button class="px-3 py-1 rounded bg-light text-gray-500 text-sm hover:bg-gray-200 transition">月</button>-->
<!-- </div>-->
</div>
<div class="h-[300px]">
<canvas id="inventoryChart"></canvas>
<!-- 3. 修理厂下拉框 (新增) -->
<li>
<label>修理厂: </label>
<select id="repairShop" name="repairShop" class="form-control" disabled>
<option value="">-- 请先选分公司 --</option>
</select>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
</div>
<!-- 轮胎类型分布 -->
<div class="bg-white rounded-lg p-5 card-shadow">
<h3 class="font-bold text-lg mb-4">轮胎类型分布</h3>
<div class="h-[300px] flex items-center justify-center">
<canvas id="tireTypeChart"></canvas>
</div>
<div class="row">
<!-- 左边部分 (占 30% -> 近似使用 col-sm-4 即 33%) -->
<div class="col-sm-6" style="margin-top: 20px">
<div class="ibox float-e-margins">
<div class="ibox-title">
<h5>实时库存统计</h5>
</div>
<div class="ibox-content">
<!-- ================= 第一部分:实时库存 (环形图 + 卡片) ================= -->
<div class="row" style="margin-bottom: 40px;">
<!-- 左侧:环形图 -->
<div class="col-sm-5 text-center" style="border-right: 1px solid #f0f0f0; position: relative; height: 240px;">
<h5 class="no-margins font-bold">实时库存</h5>
<div id="pieChart" style="height: 200px; width: 100%;"></div>
<!-- 中间文字覆盖 -->
<div id="pie-center-text" style="position: absolute; top: 45%; left: 50%; transform: translate(-50%, -50%); pointer-events: none;">
<!-- <div style="font-size: 14px; color: #666;">总数</div>-->
<!-- <div style="font-size: 24px; font-weight: bold; color: #333;">341</div>-->
</div>
</div>
<!-- 右侧:详细数据卡片 -->
<div class="col-sm-7">
<div class="row">
<!-- 新胎卡片 -->
<div class="col-sm-4">
<div class="panel panel-blue" style="border: 1px solid #e7eaec; box-shadow: none; margin-bottom: 15px;">
<div class="panel-body" style="padding: 10px;">
<div style="display: flex; align-items: center;">
<i class="fa fa-circle" style="color: #1ab394; margin-right: 5px;"></i>
<span style="font-weight: bold; font-size: 16px;">全新胎</span>
</div>
<h2 style="margin: 10px 0;" id="newTop">305</h2>
<small id="new">在库: 305</small>
</div>
</div>
</div>
<!-- 旧轮胎片 -->
<div class="col-sm-4">
<div class="panel panel-blue" style="border: 1px solid #e7eaec; box-shadow: none; margin-bottom: 15px;">
<div class="panel-body" style="padding: 10px;">
<div style="display: flex; align-items: center;">
<i class="fa fa-circle" style="color: #ed5565; margin-right: 5px;"></i>
<span style="font-weight: bold; font-size: 16px;">翻新胎</span>
</div>
<h2 style="margin: 10px 0;" id="renovateTop">35</h2>
<small id="renovate">在库: 34 </small>
</div>
</div>
</div>
<!-- 翻新胎卡片 -->
<div class="col-sm-4">
<div class="panel panel-blue" style="border: 1px solid #e7eaec; box-shadow: none; margin-bottom: 15px;">
<div class="panel-body" style="padding: 10px;">
<div style="display: flex; align-items: center;">
<i class="fa fa-circle" style="color: #f8ac59; margin-right: 5px;"></i>
<span style="font-weight: bold; font-size: 16px;">周转胎</span>
</div>
<h2 style="margin: 10px 0;" id="circulatingTop">1</h2>
<small id="circulating">在库: 1 </small>
</div>
</div>
</div>
<!-- 翻新胎卡片 -->
<div class="col-sm-4">
<div class="panel panel-blue" style="border: 1px solid #e7eaec; box-shadow: none; margin-bottom: 15px;">
<div class="panel-body" style="padding: 10px;">
<div style="display: flex; align-items: center;">
<i class="fa fa-circle" style="color: #3c5dbf; margin-right: 5px;"></i>
<span style="font-weight: bold; font-size: 16px;">实验胎</span>
</div>
<h2 style="margin: 10px 0;"id="experimentalTop">1</h2>
<small id="experimental" >在库: 1 </small>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- ================= 第二部分:近一个月出入库统计 (折线图) ================= -->
<div class="row">
<div class="col-sm-12">
<div style="border-top: 1px solid #f0f0f0; padding-top: 20px;">
<h5 class="font-bold"><i class="fa fa-line-chart"></i> 近一个月出入库统计</h5>
<!-- 折线图容器 -->
<div id="lineChart" style="height: 300px; width: 100%; margin-top: 15px;"></div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-sm-6" style="margin-top: 20px">
<div class="ibox float-e-margins">
<div class="ibox-title">
<h5>轮胎入库及装车统计</h5>
</div>
<div class="ibox-content">
<div class="card-box" style="height: 100%;">
<!-- 2. 选项卡切换 -->
<ul class="nav nav-tabs" style="margin-bottom: 20px;">
<li class="active"><a href="###" data-toggle="tab">入库统计</a></li>
</ul>
<!-- 3. 数字统计卡片 (4个) -->
<div class="row" style="margin-bottom: 25px;">
<div class="col-sm-3">
<div class="statistic-box" style="background: #f9f9f9; padding: 15px; border-radius: 5px; text-align: center;">
<h5>全新胎 <i class="fa fa-question-circle text-info"></i></h5>
<h2 class="font-bold text-info" id="right_new">93</h2>
</div>
</div>
<div class="col-sm-3">
<div class="statistic-box" style="background: #f9f9f9; padding: 15px; border-radius: 5px; text-align: center;">
<h5>翻新胎 <i class="fa fa-question-circle text-info"></i></h5>
<h2 class="font-bold text-primary" id="right_renovate">0</h2>
</div>
</div>
<div class="col-sm-3">
<div class="statistic-box" style="background: #f9f9f9; padding: 15px; border-radius: 5px; text-align: center;">
<h5>周转胎 <i class="fa fa-question-circle text-info"></i></h5>
<h2 class="font-bold text-warning" id="right_circulating">0</h2>
</div>
</div>
<div class="col-sm-3">
<div class="statistic-box" style="background: #f9f9f9; padding: 15px; border-radius: 5px; text-align: center;">
<h5>试验胎 <i class="fa fa-question-circle text-info"></i></h5>
<h2 class="font-bold text-danger" id="right_experimental">0</h2>
</div>
</div>
</div>
<!-- 4. 图表区域 -->
<div class="row">
<div class="col-sm-12">
<!-- 规格占比 -->
<div style="margin-bottom: 15px; font-weight: bold; font-size: 16px;">
规格占比 <small style="color: #999; font-weight: normal; margin-left: 10px;"></small>
</div>
<div id="specChart" style="height: 200px; width: 100%; margin-bottom: 30px;"></div>
<!-- 来源占比 -->
<div style="margin-bottom: 15px; font-weight: bold; font-size: 16px;">
新胎装车统计 <small style="color: #999; font-weight: normal; margin-left: 10px;"></small>
</div>
<div id="sourceChart" style="height: 200px; width: 100%;"></div>
</div>
</div>
</div>
</div>
</div>
</div>
</section>
<!-- 车辆与轮胎状态表格 -->
<!-- <section class="bg-white rounded-lg p-5 card-shadow">-->
<!-- <div class="flex justify-between items-center mb-4">-->
<!-- <h3 class="font-bold text-lg">车辆轮胎状态TOP10</h3>-->
<!--&lt;!&ndash; <button class="text-primary flex items-center hover:text-primary/80 transition">&ndash;&gt;-->
<!--&lt;!&ndash; 查看全部 <i class="fa-solid fa-angle-right ml-1"></i>&ndash;&gt;-->
<!--&lt;!&ndash; </button>&ndash;&gt;-->
<!-- </div>-->
<!-- <div class="overflow-x-auto">-->
<!-- <table class="w-full text-sm">-->
<!-- <thead>-->
<!-- <tr class="border-b border-gray-200">-->
<!-- <th class="text-left py-3 px-4 font-medium text-gray-500">车辆编号</th>-->
<!-- <th class="text-left py-3 px-4 font-medium text-gray-500">车牌号码</th>-->
<!-- <th class="text-left py-3 px-4 font-medium text-gray-500">轮胎数量</th>-->
<!-- <th class="text-left py-3 px-4 font-medium text-gray-500">待保养数</th>-->
<!-- <th class="text-left py-3 px-4 font-medium text-gray-500">胎压异常数</th>-->
<!-- <th class="text-left py-3 px-4 font-medium text-gray-500">最近检查时间</th>-->
<!-- </tr>-->
<!-- </thead>-->
<!-- <tbody>-->
<!-- <tr class="border-b border-gray-100 hover:bg-gray-50 transition">-->
<!-- <td class="py-3 px-4 font-medium">VEH-00128</td>-->
<!-- <td class="py-3 px-4">京A·88990</td>-->
<!-- <td class="py-3 px-4">12</td>-->
<!-- <td class="py-3 px-4"><span class="text-warning">2</span></td>-->
<!-- <td class="py-3 px-4"><span class="text-danger">1</span></td>-->
<!-- <td class="py-3 px-4">2026-02-05</td>-->
<!-- </tr>-->
<!-- <tr class="border-b border-gray-100 hover:bg-gray-50 transition">-->
<!-- <td class="py-3 px-4 font-medium">VEH-00129</td>-->
<!-- <td class="py-3 px-4">沪B·77889</td>-->
<!-- <td class="py-3 px-4">10</td>-->
<!-- <td class="py-3 px-4"><span class="text-warning">1</span></td>-->
<!-- <td class="py-3 px-4"><span class="text-gray-400">0</span></td>-->
<!-- <td class="py-3 px-4">2026-02-07</td>-->
<!-- </tr>-->
<!-- <tr class="border-b border-gray-100 hover:bg-gray-50 transition">-->
<!-- <td class="py-3 px-4 font-medium">VEH-00130</td>-->
<!-- <td class="py-3 px-4">粤C·66778</td>-->
<!-- <td class="py-3 px-4">14</td>-->
<!-- <td class="py-3 px-4"><span class="text-warning">3</span></td>-->
<!-- <td class="py-3 px-4"><span class="text-danger">2</span></td>-->
<!-- <td class="py-3 px-4">2026-02-03</td>-->
<!-- </tr>-->
<!-- <tr class="border-b border-gray-100 hover:bg-gray-50 transition">-->
<!-- <td class="py-3 px-4 font-medium">VEH-00131</td>-->
<!-- <td class="py-3 px-4">苏D·55667</td>-->
<!-- <td class="py-3 px-4">8</td>-->
<!-- <td class="py-3 px-4"><span class="text-gray-400">0</span></td>-->
<!-- <td class="py-3 px-4"><span class="text-gray-400">0</span></td>-->
<!-- <td class="py-3 px-4">2026-02-08</td>-->
<!-- </tr>-->
<!-- <tr class="hover:bg-gray-50 transition">-->
<!-- <td class="py-3 px-4 font-medium">VEH-00132</td>-->
<!-- <td class="py-3 px-4">浙E·44556</td>-->
<!-- <td class="py-3 px-4">10</td>-->
<!-- <td class="py-3 px-4"><span class="text-warning">1</span></td>-->
<!-- <td class="py-3 px-4"><span class="text-gray-400">0</span></td>-->
<!-- <td class="py-3 px-4">2026-02-06</td>-->
<!-- </tr>-->
<!-- </tbody>-->
<!-- </table>-->
<!-- </div>-->
<!-- </section>-->
<!-- 图表初始化脚本 -->
</div>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<th:block th:include="include :: echarts-js" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('tyre:tyre:edit')}]];
var removeFlag = [[${@permission.hasPermi('tyre:tyre:remove')}]];
var prefix = ctx + "tyre/tyre";
var datas = [[${@dict.getType('tyre_type')}]];
var shopData = {
'one': [], // 一分公司:空数组
'three': [ // 三分公司:包含两个选项
{ value: 'guangming', name: '光明修理厂' },
{ value: 'shiyan', name: '石岩修理厂' }
]
};
$(function() {
$("input[name='birthday']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
// 实时时间更新
function updateClock() {
const now = new Date();
const weekDays = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
const timeStr = now.toTimeString().substr(0, 8); // "11:14:10"
const dateStr = now.toLocaleDateString(); // "2026/4/15"
const weekStr = weekDays[now.getDay()];
// 这里的 HTML 结构完全模拟了你图片中的样式
$('#clock').html(`${timeStr} <small style="color:#999; margin: 0 10px;">|</small> ${dateStr} ${weekStr}`);
}
// ================= 1. 环形图逻辑 (保持原有逻辑) =================
var pieChart = echarts.init(document.getElementById('pieChart'));
function renderPieChart(data) {
var option = {
color: ['#1ab394', '#f8ac59', '#5B7CD9', '#ed5565', '#999'], // 配色方案
tooltip: {
trigger: 'item',
formatter: '{a} <br/>{b}: {c} ({d}%)'
},
series: [
{
name: '实时库存',
type: 'pie',
radius: ['60%', '75%'], // 环形
avoidLabelOverlap: false,
label: {
show: false
},
labelLine: {
show: false
},
data: [
{ value: data.new, name: '新胎' },
{ value: data.circulating, name: '周转胎' },
{ value: data.renovate, name: '翻新胎' },
{ value: data.experimental, name: '试验胎' }
// 注意如果后端返回0这里也要传0否则图表会少一块
]
}
]
};
pieChart.setOption(option);
$('#new').text(`在库: ${data.new}`);
$('#circulating').text(`在库: ${data.circulating}`);
$('#renovate').text(`在库: ${data.renovate}`);
$('#experimental').text(`在库: ${data.experimental}`);
$('#newTop').text(`${data.new}`);
$('#circulatingTop').text(`${data.circulating}`);
$('#renovateTop').text(`${data.renovate}`);
$('#experimentalTop').text(`${data.experimental}`);
$('#right_new').text(`${data.new}`);
$('#right_circulating').text(`${data.circulating}`);
$('#right_renovate').text(`${data.renovate}`);
$('#right_experimental').text(`${data.experimental}`);
// 3. 动态更新中间的文字覆盖层
// 获取DOM元素并更新文本
const clockDiv = document.getElementById('pie-center-text');
if (clockDiv) {
// 这里复用你原本的逻辑,或者直接用接口返回的 total
clockDiv.innerHTML = `总数<br><span style="font-size:24px;font-weight:bold">${data.total || 0}</span>`;
}
}
// 4. 发起 AJAX 请求获取数据
$.ajax({
type: "post",
url: ctx + "queryIndexData",
success: function(r) {
if (r.code == web_status.SUCCESS) {
document.getElementById('tireStock').innerText = r.data.InventoryTotal;
document.getElementById('tireInuse').innerText = r.data.TyreInCar;
document.getElementById('carTotal').innerText = r.data.CarTotal;
const mapList = r.data.mapList || [];
const inData = mapList.map(item => Number(item.type_0_count) || 0);
const outData = mapList.map(item => Number(item.type_1_count) || 0);
// 提取每个元素的 date 字段
const dates = mapList.map(item => {
// 若后端返回的 date 是完整日期(如 2026-03-02可格式化可选
// 示例:把 2026-03-02 转成 3/2
if (item.date && item.date.includes('-')) {
const [year, month, day] = item.date.split('-');
return `${month}/${day}`;
}
// 若后端已返回 3/2 格式,直接返回
return item.date || '';
});
// 3. 基于后端返回的 dates 生成图表数据(也可从 mapList 提取真实出入库数据)
// 如果你有真实的入库/出库数据,也可以从 mapList 提取,比如:
// const inData = mapList.map(item => item.inNum || 0);
// const outData = mapList.map(item => item.outNum || 0);
// 暂时保留随机数,仅替换 dates
// 等待DOM加载完成
// 1. 出入库统计图表
const inventoryCtx = document.getElementById('inventoryChart').getContext('2d');
new Chart(inventoryCtx, {
type: 'line',
data: {
labels: dates,
datasets: [
{
label: '入库数量',
data: inData,
borderColor: '#165DFF',
backgroundColor: 'rgba(22, 93, 255, 0.1)',
fill: true,
tension: 0.4
},
{
label: '出库数量',
data: outData,
borderColor: '#F53F3F',
backgroundColor: 'rgba(245, 63, 63, 0.1)',
fill: true,
tension: 0.4
}
]
},
options: {
responsive: true,
maintainAspectRatio: false,
plugins: {
legend: {
position: 'top',
},
tooltip: {
mode: 'index',
intersect: false
}
},
scales: {
y: {
beginAtZero: true,
grid: {
color: 'rgba(0, 0, 0, 0.05)'
}
},
x: {
grid: {
display: false
}
}
}
}
});
// 2. 轮胎类型分布图表
const tireTypeCtx = document.getElementById('tireTypeChart').getContext('2d');
new Chart(tireTypeCtx, {
type: 'doughnut',
data: {
labels: ['卡车轮胎', '客车轮胎', '轿车轮胎', '工程车轮胎', '其他'],
datasets: [{
data: [45, 25, 15, 10, 5],
backgroundColor: [
'#165DFF',
'#36CFC9',
'#FF7D00',
'#F53F3F',
'#86909C'
],
borderWidth: 0
}]
},
options: {
responsive: true,
maintainAspectRatio: false,
plugins: {
legend: {
position: 'bottom',
}
},
cutout: '70%'
}
});
url: ctx+'queryIndexData', // 你的接口地址
type: 'POST',
dataType: 'json',
success: function(res) {
if (res.code === 0) { // 假设 code 0 代表成功
// 调用渲染函数
renderPieChart(res.data.tireTypeTotal);
// --- 新增代码:渲染折线图 ---
// 假设 res.data.mapList 是包含日期和数量的数组
if (res.data.mapList && res.data.mapList.length > 0) {
renderLineChart(res.data.mapList);
} else {
// 处理空数据情况,防止报错
renderLineChart([]);
}
// --- 新增代码:渲染规格占比图 ---
// 假设接口返回的数据结构为 res.data.mapListTyreModel
if (res.data.mapListTyreModel && res.data.mapListTyreModel.length > 0) {
renderSpecChart(res.data.mapListTyreModel);
} else {
renderSpecChart([]); // 传空数组显示暂无数据
}
// --- 新增代码:渲染规格占比图 ---
// 假设接口返回的数据结构为 res.data.mapListTyreModel
if (res.data.mapListInstall && res.data.mapListInstall.length > 0) {
renderSourceChart(res.data.mapListInstall);
} else {
renderSourceChart([]); // 传空数组显示暂无数据
}
} else {
// 错误处理
console.error('数据加载失败:', res.msg);
// 即使失败,也渲染一个默认的空数据或者错误提示
renderPieChart({total: 0, new: 0, circulating: 0, renovate: 0, experimental: 0});
renderLineChart([]);
renderSpecChart([]); // 错误时也传空
renderSourceChart([]); // 错误时也传空
}
// $.modal.closeLoading();
},
error: function() {
console.error('网络请求出错');
renderPieChart({total: 0, new: 0, circulating: 0, renovate: 0, experimental: 0});
}
});
})
// ================= 2. 折线图逻辑 (新增) =================
var lineChart = echarts.init(document.getElementById('lineChart'));
function renderLineChart(mapList) {
// 1. 数据预处理:从 mapList 中提取 X轴(date) 和 Y轴数据
var dates = [];
var inData = []; // 入库数量 (type_0_count)
var outData = []; // 出库数量 (type_1_count)
mapList.forEach(function(item) {
dates.push(item.date); // X轴日期
inData.push(item.type_0_count); // Y轴入库
outData.push(item.type_1_count); // Y轴出库
});
var lineOption = {
tooltip: {
trigger: 'axis'
},
legend: {
data: ['入库数量', '出库数量'],
right: '10%'
},
grid: {
left: '3%',
right: '4%',
bottom: '3%',
containLabel: true
},
xAxis: {
type: 'category',
boundaryGap: false,
data: dates, // 使用接口返回的日期
axisLine: {
lineStyle: {
color: '#ccc'
}
}
},
yAxis: {
type: 'value',
axisLine: {
show: false
},
splitLine: {
lineStyle: {
type: 'dashed',
color: '#eee'
}
}
},
series: [
{
name: '入库数量',
type: 'line',
smooth: true,
symbol: 'circle',
symbolSize: 6,
itemStyle: {
color: '#1ab394' // 绿色
},
areaStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: 'rgba(26, 179, 148, 0.5)' },
{ offset: 0.8, color: 'rgba(26, 179, 148, 0.1)' }
])
},
data: inData // 使用接口返回的入库数据
},
{
name: '出库数量',
type: 'line',
smooth: true,
symbol: 'circle',
symbolSize: 6,
itemStyle: {
color: '#ed5565' // 红色
},
data: outData // 使用接口返回的出库数据
}
]
};
lineChart.setOption(lineOption);
}
// 窗口大小改变时重绘图表
window.addEventListener('resize', function() {
pieChart.resize();
lineChart.resize();
});
// ================= 规格占比图表 (修改版:支持异步数据) =================
var specChart = echarts.init(document.getElementById("specChart"));
// 1. 定义一个全局的颜色数组 (放在函数外面,避免 undefined 错误)
var specColors = ['#5B7CD9', '#8CC657', '#F7C763', '#E96966', '#73C0DE', '#45B97C', '#9A60B4', '#EA7E53'];
function renderSpecChart(modelData) {
// 1. 数据预处理
if (!modelData || modelData.length === 0) {
specChart.clear(); // 清空图表
specChart.setOption({
title: { text: '', left: 'center', top: 'center', textStyle: { fontSize: 16 } },
xAxis: { show: false },
yAxis: { show: false },
series: []
});
return;
}
// 2. 动态生成 Series 数据
// 使用 map 遍历后端传来的规格列表
var specSeries = modelData.map(function(item, index) {
// 使用 index % specColors.length 确保颜色循环使用,且不会越界
var color = specColors[index % specColors.length];
return {
name: item.tyreModel,
type: 'bar',
stack: 'total',
barWidth: 20,
label: { show: false },
itemStyle: {
color: color // 使用计算出的颜色
},
data: [item.total]
};
});
// 3. 生成图例数据
var legendData = modelData.map(item => item.tyreModel);
// 4. 设置图表 Option
var specOption = {
tooltip: {
trigger: 'axis',
axisPointer: { type: 'shadow' }
},
legend: {
bottom: 0,
data: legendData,
textStyle: { fontSize: 12 }
},
grid: {
left: '50',
right: '20',
bottom: '60',
top: '10',
containLabel: true
},
xAxis: {
type: 'value',
max: function(value) {
return Math.ceil(value.max * 1.2);
},
splitLine: { show: true, lineStyle: { type: 'dashed' } }
},
yAxis: {
type: 'category',
data: ['规格统计'] // 可以改为动态的,或者保持单维度
},
series: specSeries
};
specChart.setOption(specOption);
}
// 初始化时传空数据
renderSpecChart([]);
// ================= 来源占比图表 (修改版:支持异步数据) =================
var sourceChart = echarts.init(document.getElementById("sourceChart"));
function renderSourceChart(modelData) {
// 1. 数据预处理
if (!modelData || modelData.length === 0) {
sourceChart.clear(); // 清空图表
sourceChart.setOption({
title: { text: '', left: 'center', top: 'center', textStyle: { fontSize: 16 } },
xAxis: { show: false },
yAxis: { show: false },
series: []
});
return;
}
// 2. 动态生成 Series 数据
// 使用 map 遍历后端传来的规格列表
var sourceSeries = modelData.map(function(item, index) {
// 使用 index % specColors.length 确保颜色循环使用,且不会越界
var color = specColors[index % specColors.length];
return {
name: item.tyreModel,
type: 'bar',
stack: 'total',
barWidth: 20,
label: { show: false },
itemStyle: {
color: color // 使用计算出的颜色
},
data: [item.total]
};
});
// 3. 生成图例数据
var legendData = modelData.map(item => item.tyreModel);
// 4. 设置图表 Option
var sourceOption = {
tooltip: {
trigger: 'axis',
axisPointer: { type: 'shadow' }
},
legend: {
bottom: 0,
data: legendData,
textStyle: { fontSize: 12 }
},
grid: {
left: '50',
right: '20',
bottom: '60',
top: '10',
containLabel: true
},
xAxis: {
type: 'value',
max: function(value) {
return Math.ceil(value.max * 1.2);
},
splitLine: { show: true, lineStyle: { type: 'dashed' } }
},
yAxis: {
type: 'category',
data: ['装车统计'] // 可以改为动态的,或者保持单维度
},
series: sourceSeries
};
sourceChart.setOption(sourceOption);
}
renderSourceChart([])
// 窗口大小改变时自适应
window.addEventListener('resize', function() {
specChart.resize();
sourceChart.resize();
});
updateClock(); // 初始化
setInterval(updateClock, 1000); // 每秒刷新
});
// 分公司下拉框改变时触发的函数
function handleCompanyChange() {
var companyVal = $("#branchCompany").val(); // 获取选中的分公司值
var $shopSelect = $("#repairShop"); // 获取修理厂下拉框对象
// 1. 清空修理厂下拉框现有的选项
$shopSelect.empty();
if (!companyVal) {
// 如果没选分公司
$shopSelect.append('<option value="">-- 请先选分公司 --</option>');
$shopSelect.prop('disabled', true); // 禁用下拉框
} else {
// 获取对应的修理厂数据
var shops = shopData[companyVal];
if (shops && shops.length > 0) {
// 如果有数据,遍历添加
shops.forEach(function(item) {
$shopSelect.append('<option value="' + item.value + '">' + item.name + '</option>');
});
$shopSelect.prop('disabled', false); // 启用下拉框
} else {
// 如果是空数组(如一分公司)
$shopSelect.append('<option value="">-- 暂无数据 --</option>');
$shopSelect.prop('disabled', true); // 禁用下拉框
}
}
}
$.form.reset = function() {
$('form').each(function() {
this.reset();
});
// 手动触发一次 change 事件,确保修理厂下拉框回到初始禁用状态
handleCompanyChange();
};
</script>
</body>
</html>

@ -5,7 +5,10 @@ import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import javax.validation.constraints.NotBlank;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
/**
* base_car

@ -5,7 +5,10 @@ import com.ruoyi.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import javax.validation.constraints.NotBlank;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
/**
* base_tyre

@ -2,7 +2,10 @@ package com.ruoyi.system.domain.vo;
import com.ruoyi.common.annotation.Excel;
import javax.validation.constraints.NotBlank;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
public class BaseTyreVo {
private static final long serialVersionUID = 1L;

@ -4,7 +4,7 @@ import java.util.List;
public class InStoreSpinnerVo {
private List<String> tyreBrandList;
private List<String> tyreSizeList;
private List<tyreSizeVo> tyreSizeList;
private List<String> levelList;
private List<String> patternList;
private List<String> kindList;
@ -26,11 +26,11 @@ public class InStoreSpinnerVo {
this.tyreBrandList = tyreBrandList;
}
public List<String> getTyreSizeList() {
public List<tyreSizeVo> getTyreSizeList() {
return tyreSizeList;
}
public void setTyreSizeList(List<String> tyreSizeList) {
public void setTyreSizeList(List<tyreSizeVo> tyreSizeList) {
this.tyreSizeList = tyreSizeList;
}
@ -57,4 +57,5 @@ public class InStoreSpinnerVo {
public void setKindList(List<String> kindList) {
this.kindList = kindList;
}
}

@ -0,0 +1,22 @@
package com.ruoyi.system.domain.vo;
public class tyreSizeVo {
private String label;
private String value;
public String getLabel() {
return label;
}
public void setLabel(String label) {
this.label = label;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
}

@ -5,6 +5,7 @@ package com.ruoyi.system.mapper;
import com.ruoyi.system.domain.BaseInventory;
import java.util.List;
import java.util.Map;
/**
* Mapper
@ -66,7 +67,7 @@ public interface BaseInventoryMapper
int updateBaseInventoryByEpc(BaseInventory baseInventory);
int querytotal();
Map querytotal();
int queryInCar();

@ -64,4 +64,8 @@ public interface RecordWarehousingMapper
public int deleteRecordWarehousingByIds(String[] ids);
List<Map> selectRecord();
List<Map> selectTyreModel();
List<Map> selectTyreInstall();
}

@ -6,6 +6,7 @@ import com.ruoyi.system.domain.BaseTyre;
import java.util.List;
import java.util.Map;
/**
* Service
@ -67,7 +68,7 @@ public interface IBaseInventoryService
AjaxResult OutInventoryByPda(BaseInventory baseInventory, BaseTyre baseTyre);
int querytotal();
Map querytotal();
int queryInCar();

@ -63,4 +63,8 @@ public interface IRecordWarehousingService
public int deleteRecordWarehousingById(Long id);
List<Map> selectRecord();
List<Map> selectTyreModel();
List<Map> selectTyreInstall();
}

@ -14,10 +14,13 @@ import com.ruoyi.system.mapper.BaseTyreMapper;
import com.ruoyi.system.mapper.RecordWarehousingMapper;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.service.IBaseInventoryService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* Service
@ -38,6 +41,8 @@ public class BaseInventoryServiceImpl implements IBaseInventoryService
@Autowired
private SysUserMapper sysUserMapper;
private static final Logger log = LoggerFactory.getLogger(BaseInventoryServiceImpl.class);
/**
*
*
@ -120,63 +125,45 @@ public class BaseInventoryServiceImpl implements IBaseInventoryService
//查询登录人的部门信息
SysUser sysUser = sysUserMapper.selectUserByLoginName(baseInventory.getCreateBy());
int m=0,t=0;
if (isbaseInventory!=null){
return AjaxResult.error("该轮胎已在仓库!");
}else {
//插入库存表以及基础信息表
baseInventory.setStatus("0");
baseInventory.setNumber(1L);
baseInventory.setCreateTime(DateUtils.getNowDate());
baseInventory.setUpdateTime(DateUtils.getNowDate());
m = baseInventoryMapper.insertBaseInventory(baseInventory);
//添加入库记录
RecordWarehousing recordWarehousing = new RecordWarehousing();
recordWarehousing.setTyreRfid(baseInventory.getTyreRfid());
recordWarehousing.setType("0");
recordWarehousing.setCreateTime(DateUtils.getNowDate());
recordWarehousing.setCreateBy(baseInventory.getCreateBy());
t= recordWarehousingMapper.insertRecordWarehousing(recordWarehousing);
//查询此轮胎是否在基础信息表里面
BaseTyre baseTyres = baseTyreMapper.selectBaseTyreByEpc(baseTyre);
//查找用户所在的车队
String team = baseTyreMapper.getTeamByUser(baseInventory.getCreateBy());
String patternDepth = null;
switch (baseTyre.getTyreModel().toString().trim()){
case "215/75R17.5 16PR LFL866":
patternDepth = "20";
break;
case "265/70R19.5-18 F820":
patternDepth = "17";
break;
case "11R22.5 16PR LAU802":
patternDepth = "16";
break;
case "245/70R19.5 18PR LAU609":
patternDepth = "20";
break;
case "255/70R22.5 16PR LAU609":
patternDepth = "14";
break;
case "275/70R22.5 18PR LAU802":
patternDepth = "15";
break;
}
if (baseTyres==null){
baseTyre.setTyreNo(baseInventory.getTyreOutsideId());
baseTyre.setCreateTime(DateUtils.getNowDate());
baseTyre.setTeam(team);
baseTyre.setCreateBy(baseInventory.getCreateBy());
baseTyre.setDeptId(sysUser.getDeptId());
baseTyre.setPatternDepth(patternDepth);
baseTyreMapper.insertBaseTyre(baseTyre);
try {
if (isbaseInventory!=null){
return AjaxResult.error("该轮胎已在仓库!");
}else {
baseTyre.setTyreId(baseTyres.getTyreId());
baseTyre.setUpdateTime(DateUtils.getNowDate());
baseTyre.setTeam(team);
baseTyre.setUpdateBy(baseInventory.getCreateBy());
baseTyre.setDeptId(sysUser.getDeptId());
baseTyreMapper.updateBaseTyre(baseTyre);
//插入库存表以及基础信息表
baseInventory.setStatus("0");
baseInventory.setNumber(1L);
baseInventory.setCreateTime(DateUtils.getNowDate());
baseInventory.setUpdateTime(DateUtils.getNowDate());
m = baseInventoryMapper.insertBaseInventory(baseInventory);
//添加入库记录
RecordWarehousing recordWarehousing = new RecordWarehousing();
recordWarehousing.setTyreRfid(baseInventory.getTyreRfid());
recordWarehousing.setType("0");
recordWarehousing.setCreateTime(DateUtils.getNowDate());
recordWarehousing.setCreateBy(baseInventory.getCreateBy());
t= recordWarehousingMapper.insertRecordWarehousing(recordWarehousing);
//查询此轮胎是否在基础信息表里面
BaseTyre baseTyres = baseTyreMapper.selectBaseTyreByEpc(baseTyre);
//查找用户所在的车队
String team = baseTyreMapper.getTeamByUser(baseInventory.getCreateBy());
if (baseTyres==null){
baseTyre.setTyreNo(baseInventory.getTyreOutsideId());
baseTyre.setCreateTime(DateUtils.getNowDate());
baseTyre.setTeam(team);
baseTyre.setCreateBy(baseInventory.getCreateBy());
baseTyre.setDeptId(sysUser.getDeptId());
baseTyreMapper.insertBaseTyre(baseTyre);
}else {
baseTyre.setTyreId(baseTyres.getTyreId());
baseTyre.setUpdateTime(DateUtils.getNowDate());
baseTyre.setTeam(team);
baseTyre.setUpdateBy(baseInventory.getCreateBy());
baseTyre.setDeptId(sysUser.getDeptId());
baseTyreMapper.updateBaseTyre(baseTyre);
}
}
}catch (Exception e){
log.error(e.getMessage());
}
if (m>0&&t>0){
return AjaxResult.success("入库成功");
@ -221,7 +208,7 @@ public class BaseInventoryServiceImpl implements IBaseInventoryService
}
@Override
public int querytotal() {
public Map querytotal() {
return baseInventoryMapper.querytotal();
}

@ -123,6 +123,7 @@ public class RecordTyreInstallServiceImpl implements IRecordTyreInstallService
baseTyre.setCarNo(recordTyreInstall.getCarNo());
baseTyre.setWheelPostion(recordTyreInstall.getWheelPostion());
baseTyre.setSelfNo(recordTyreInstall.getSelfNo());
baseTyre.setTyreNo(recordTyreInstall.getTyreNo());
int m = baseTyreMapper.updateBaseTyre(baseTyre);
if (n>0&&m>0){
return AjaxResult.success("安装成功!");

@ -104,4 +104,14 @@ public class RecordWarehousingServiceImpl implements IRecordWarehousingService
public List<Map> selectRecord() {
return recordWarehousingMapper.selectRecord();
}
@Override
public List<Map> selectTyreModel() {
return recordWarehousingMapper.selectTyreModel();
}
@Override
public List<Map> selectTyreInstall() {
return recordWarehousingMapper.selectTyreInstall();
}
}

@ -5,6 +5,7 @@ import java.util.List;
import com.ruoyi.system.domain.vo.CheckInfoSpinnerVo;
import com.ruoyi.system.domain.vo.InStoreSpinnerVo;
import com.ruoyi.system.domain.vo.tyreSizeVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.common.core.domain.entity.SysDictData;
@ -133,7 +134,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService
List<String> strings = new ArrayList<>();
List<String> string_pattern = new ArrayList<>();
List<String> string_level = new ArrayList<>();
List<String> string_size = new ArrayList<>();
List<tyreSizeVo> string_size = new ArrayList<>();
List<String> string_brand = new ArrayList<>();
List<String> string_grooves = new ArrayList<>();
InStoreSpinnerVo inStoreSpinnerVo =new InStoreSpinnerVo();
@ -154,11 +155,15 @@ public class SysDictDataServiceImpl implements ISysDictDataService
}
if (sizeList!=null){
for (SysDictData s: sizeList){
string_size.add(s.getDictLabel());
tyreSizeVo tyreSizeVo = new tyreSizeVo();
tyreSizeVo.setLabel(s.getDictLabel());
tyreSizeVo.setValue(s.getRemark());
string_size.add(tyreSizeVo);
}
}
if (brandList!=null){
for (SysDictData s:brandList){
string_brand.add(s.getDictLabel());
}
}

@ -54,15 +54,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="number != null "> and number = #{number}</if>
</where>
</select>
<select id="querytotal" resultType="java.lang.Integer">
SELECT COUNT(*) FROM `base_inventory` WHERE `status` = '0'
</select>
<select id="queryInCar" resultType="java.lang.Integer">
SELECT COUNT(*) FROM `base_tyre` WHERE `car_no` is not null
</select>
<select id="queryCarTotal" resultType="java.lang.Integer">
SELECT COUNT(*) FROM `base_car`
</select>
<select id="querytotal" resultType="java.util.Map">
SELECT
COUNT(bi.id) AS total,
COUNT(CASE WHEN bt.tyre_type IN ('全新胎', 'new') THEN 1 END) AS new,
COUNT(CASE WHEN bt.tyre_type IN ('circulating') THEN 1 END) AS circulating,
COUNT(CASE WHEN bt.tyre_type IN ('renovate') THEN 1 END) AS renovate,
COUNT(CASE WHEN bt.tyre_type IN ('experimental') THEN 1 END) AS experimental
FROM base_inventory bi
INNER JOIN base_tyre bt ON bi.tyre_rfid = bt.tyre_epc
WHERE bi.status = '0';
</select>
<insert id="insertBaseInventory" parameterType="BaseInventory">
insert into base_inventory

@ -54,6 +54,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
GROUP BY DATE(create_time)
ORDER BY date;
</select>
<select id="selectTyreModel" resultType="java.util.Map">
SELECT
bt.tyre_model AS tyreModel, -- 规格名称
COUNT(bi.id) AS total -- 该规格的库存总数
FROM
base_inventory bi
INNER JOIN base_tyre bt ON bi.tyre_rfid = bt.tyre_epc
WHERE
bi.status = '0' -- 仅统计在库状态
GROUP BY
bt.tyre_model -- 按规格分组统计
ORDER BY
total DESC; -- 按数量降序排列(可选)
</select>
<select id="selectTyreInstall" resultType="java.util.Map">
SELECT
bt.tyre_model AS tyreModel, -- 规格名称
COUNT(bt.tyre_id) AS total -- 该规格的库存总数
FROM
base_tyre bt
WHERE
bt.car_no is not null -- 仅统计在库状态
GROUP BY
bt.tyre_model -- 按规格分组统计
ORDER BY
total DESC; -- 按数量降序排列(可选)
</select>
<insert id="insertRecordWarehousing" parameterType="RecordWarehousing">
insert into record_warehousing

Loading…
Cancel
Save