From a79edd57659a6a8b0333647293b295ae585a1686 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Thu, 10 Jul 2025 18:01:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat(login):=20=E9=87=8D=E6=9E=84=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=B9=B6=E6=B7=BB=E5=8A=A0=E6=96=B0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 重新设计了登录页面的布局和样式,增加了更多视觉元素 - 添加了记住密码功能,支持本地存储用户名和密码 - 实现了表单实时验证和错误提示 - 增加了用户协议弹窗和登录中动画效果 - 优化了键盘导航,支持Tab键在表单元素间切换- 调整了首页导航 --- WebContent/WEB-INF/views/login/login.jsp | 998 +++++++++++++++++++---- WebContent/WEB-INF/views/sys/index.jsp | 7 +- WebContent/static/css/ace/ace.min.css | 2 +- 3 files changed, 841 insertions(+), 166 deletions(-) diff --git a/WebContent/WEB-INF/views/login/login.jsp b/WebContent/WEB-INF/views/login/login.jsp index 7cbc75d..4ad5cf5 100644 --- a/WebContent/WEB-INF/views/login/login.jsp +++ b/WebContent/WEB-INF/views/login/login.jsp @@ -7,49 +7,38 @@ - + + - - -Insert title here - + +贵送机具管理系统 - 登录 <% - String uuid = UUID.randomUUID().toString().replaceAll("-", ""); request.getSession().setAttribute("randTxt", uuid); String sessionId = request.getSession().getId(); - response.setHeader("SET-COOKIE", "JSESSIONID="+sessionId+";secure;HttpOnly"); - - %> - - - - + - + - - - - + + + + + + + + - - + - - + + @@ -138,174 +127,859 @@ function showAgreement() { + - + +
+
+ + + + + +
+
-
-
- -
-
-
- " name="randSession" > -
- -
-

-
- -
-

-
- -
-
- - -
-
+ diff --git a/WebContent/WEB-INF/views/sys/index.jsp b/WebContent/WEB-INF/views/sys/index.jsp index 887380e..7dc4595 100644 --- a/WebContent/WEB-INF/views/sys/index.jsp +++ b/WebContent/WEB-INF/views/sys/index.jsp @@ -35,7 +35,8 @@ - + 贵送机具管理系统 +<%-- --%>
@@ -125,8 +126,8 @@ diff --git a/WebContent/static/css/ace/ace.min.css b/WebContent/static/css/ace/ace.min.css index a970694..b342e78 100644 --- a/WebContent/static/css/ace/ace.min.css +++ b/WebContent/static/css/ace/ace.min.css @@ -1252,7 +1252,7 @@ blockquote, blockquote.pull-right { padding-right: 0; min-height: 45px; position: relative; - background: #438eb9 + background: #1f77aa } .navbar>.container { From f4bd00b4fb8c94b8755701ec84a2094f1cab4d56 Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Thu, 10 Jul 2025 18:54:12 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/views/scrap/scrapAppointList.jsp | 19 ++++++---- WebContent/static/js/scrap/scrapAppoint.js | 5 +++ .../repairCheck/RepairCheckDetailsMapper.xml | 8 +++- .../mybatis/rm/ReturnMaterialTaskMapper.xml | 3 ++ .../mybatis/scrap/ScrapDetailsMapper.xml | 12 +++++- .../bonus/scrap/beans/ScrapDetailsBean.java | 38 +++++++++++++++++++ .../controller/ScrapDetailsController.java | 5 +++ .../scrap/service/ScrapDetailsServiceImp.java | 2 +- 8 files changed, 81 insertions(+), 11 deletions(-) diff --git a/WebContent/WEB-INF/views/scrap/scrapAppointList.jsp b/WebContent/WEB-INF/views/scrap/scrapAppointList.jsp index 64021e2..4f86d41 100644 --- a/WebContent/WEB-INF/views/scrap/scrapAppointList.jsp +++ b/WebContent/WEB-INF/views/scrap/scrapAppointList.jsp @@ -51,17 +51,22 @@ - - + - - - - - + + + + + + + + + + diff --git a/WebContent/static/js/scrap/scrapAppoint.js b/WebContent/static/js/scrap/scrapAppoint.js index ccae900..381ff9e 100644 --- a/WebContent/static/js/scrap/scrapAppoint.js +++ b/WebContent/static/js/scrap/scrapAppoint.js @@ -79,6 +79,7 @@ function getbaseList(init) { html += ""; html += ""; html += ""; + html += ""; if(l.scrapPerson == "" || l.scrapPerson == null){ l.scrapPerson = "尚未指派"; html += ""; @@ -93,7 +94,11 @@ function getbaseList(init) { } html += ""; + html += ""; + html += ""; html += ""; + html += ""; + html += ""; html += rowFunction(l.scrapPersonId,l.id,l.isActive); html += ""; } diff --git a/resources/mybatis/repairCheck/RepairCheckDetailsMapper.xml b/resources/mybatis/repairCheck/RepairCheckDetailsMapper.xml index bab0a2f..4331ce7 100644 --- a/resources/mybatis/repairCheck/RepairCheckDetailsMapper.xml +++ b/resources/mybatis/repairCheck/RepairCheckDetailsMapper.xml @@ -115,7 +115,9 @@ (sum( IFNULL(ROUND(wrc.ALCHECK_NUM),0) ) + sum( IFNULL(ROUND(wrc.ALSCRAP_NUM),0))) AS checkNum, mt.IS_COUNT AS isCount, - GROUP_CONCAT(DISTINCT wrc.REPAIR_ID) as repairIds + GROUP_CONCAT(DISTINCT wrc.REPAIR_ID) as repairIds, + MAX(wrc.CHECK_TIME) AS checkTime, + MAX(wrc.OPERATION_TIME) AS repairTime FROM wf_repair_check wrc LEFT JOIN mm_type mt ON mt.ID = wrc.MODEL_ID @@ -133,6 +135,10 @@ GROUP BY wrc.MODEL_ID )a WHERE a.checkNum > 0 + + AND LEFT(a.checkTime,10) BETWEEN #{startTime} and #{endTime} + + ORDER BY a.checkTime desc diff --git a/resources/mybatis/rm/ReturnMaterialTaskMapper.xml b/resources/mybatis/rm/ReturnMaterialTaskMapper.xml index a534ef2..7f4a550 100644 --- a/resources/mybatis/rm/ReturnMaterialTaskMapper.xml +++ b/resources/mybatis/rm/ReturnMaterialTaskMapper.xml @@ -81,6 +81,9 @@ WHERE wtr.IS_ACTIVE = 1 AND wtr.PROCESS_ID = 3 AND wtr.DEFINITION_ID = 8 AND wtr.IS_FINISH = #{isFinish} AND wtr.CHECKER_ID = #{checkerId} + + AND LEFT(wtr.OPERATION_TIME,10) BETWEEN #{startTime} and #{endTime} + ORDER BY wtr.OPERATION_TIME DESC diff --git a/resources/mybatis/scrap/ScrapDetailsMapper.xml b/resources/mybatis/scrap/ScrapDetailsMapper.xml index 8e9ee8b..8538f92 100644 --- a/resources/mybatis/scrap/ScrapDetailsMapper.xml +++ b/resources/mybatis/scrap/ScrapDetailsMapper.xml @@ -6,12 +6,18 @@ - update wf_scrap_details set SCRAP_PERSON = #{scrapPerson}, SCRAP_CHECKER = #{scrapPerson} + update wf_scrap_details set SCRAP_PERSON = #{scrapPerson}, SCRAP_CHECKER = #{scrapPerson},SPECIFY_TIME=NOW(),ASSIGNER=#{userId} where ID = #{id} @@ -281,6 +287,7 @@ SUM(wsd.SCRAP_NUM) as scrap, SUM(wsd.ALSCRAP_NUM) as alScrapNum , mt.IS_COUNT as isCount, + wsd.SCRAP_TIME as scrapTime, 0 as isFinish FROM wf_scrap_details wsd @@ -296,6 +303,7 @@ GROUP BY wsd.MODEL_ID HAVING alScrapNum > 0 + ORDER BY wsd.SCRAP_TIME DESC diff --git a/src/com/bonus/scrap/beans/ScrapDetailsBean.java b/src/com/bonus/scrap/beans/ScrapDetailsBean.java index c5fe8e9..142a2df 100644 --- a/src/com/bonus/scrap/beans/ScrapDetailsBean.java +++ b/src/com/bonus/scrap/beans/ScrapDetailsBean.java @@ -54,6 +54,20 @@ public class ScrapDetailsBean { private ScrapDetailsBean[] arr; private float paraNum; + + /** + * 指派时间 + */ + private String specifyTime; + /** + * 指派人 + */ + private String assigner; + /** + * 来源 + */ + private String source; + public String getUserId() { return userId; @@ -423,4 +437,28 @@ public class ScrapDetailsBean { this.paraNum = paraNum; } + public String getSpecifyTime() { + return specifyTime; + } + + public void setSpecifyTime(String specifyTime) { + this.specifyTime = specifyTime; + } + + public String getAssigner() { + return assigner; + } + + public void setAssignere(String assigner) { + this.assigner = assigner; + } + + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + } diff --git a/src/com/bonus/scrap/controller/ScrapDetailsController.java b/src/com/bonus/scrap/controller/ScrapDetailsController.java index 80c7407..3f5347c 100644 --- a/src/com/bonus/scrap/controller/ScrapDetailsController.java +++ b/src/com/bonus/scrap/controller/ScrapDetailsController.java @@ -16,6 +16,8 @@ import com.bonus.sys.AjaxRes; import com.bonus.sys.BaseController; import com.bonus.sys.GlobalConst; import com.bonus.sys.Page; +import com.bonus.sys.UserShiroHelper; +import com.bonus.sys.beans.UserBean; import com.sun.java_cup.internal.runtime.virtual_parse_stack; @Controller @@ -51,6 +53,9 @@ public class ScrapDetailsController extends BaseController { public AjaxRes update(ScrapDetailsBean o) { AjaxRes ar = getAjaxRes(); try { + UserBean user = UserShiroHelper.getRealCurrentUser(); + int userId = user.getId(); + o.setUserId(userId+""); service.update(o); ar.setSucceedMsg(GlobalConst.SAVE_SUCCEED); } catch (Exception e) { diff --git a/src/com/bonus/scrap/service/ScrapDetailsServiceImp.java b/src/com/bonus/scrap/service/ScrapDetailsServiceImp.java index af599dd..2b373e4 100644 --- a/src/com/bonus/scrap/service/ScrapDetailsServiceImp.java +++ b/src/com/bonus/scrap/service/ScrapDetailsServiceImp.java @@ -267,7 +267,7 @@ public class ScrapDetailsServiceImp extends BaseServiceImp imp // 修改维修报废数据 scrap_num + paraScrapNum, is_sure = 1 mtBean.setThisScrapNum(paraScrapNum); mtBean.setIsSure("1"); - mtBean.setScrapTime(DateTimeHelper.getNowDate()); + mtBean.setScrapTime(DateTimeHelper.getNowTime()); res = dao.updateScrapDetails(mtBean); if (res == 0) { From 8d6a68ee8e86fab0a761787a7d61991ef679c264 Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Mon, 14 Jul 2025 18:42:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/views/ma/machinelist.jsp | 7 ++--- WebContent/static/js/ma/machine.js | 1 + resources/mybatis/ma/MachineTypeMapper.xml | 27 ++++++++++++------- .../mybatis/repair/RepairDetailsMapper.xml | 5 ++-- 4 files changed, 25 insertions(+), 15 deletions(-) diff --git a/WebContent/WEB-INF/views/ma/machinelist.jsp b/WebContent/WEB-INF/views/ma/machinelist.jsp index 13911fe..56bba3b 100644 --- a/WebContent/WEB-INF/views/ma/machinelist.jsp +++ b/WebContent/WEB-INF/views/ma/machinelist.jsp @@ -57,9 +57,10 @@ - - - + + + + diff --git a/WebContent/static/js/ma/machine.js b/WebContent/static/js/ma/machine.js index 1ea38ad..22c36b1 100644 --- a/WebContent/static/js/ma/machine.js +++ b/WebContent/static/js/ma/machine.js @@ -199,6 +199,7 @@ function getbaseList(index) { html += ""; html += ""; html += ""; + html += ""; if(l.fileName == null || l.fileName == 'null' || l.fileName == ''){ html += ""; html += ""; diff --git a/resources/mybatis/ma/MachineTypeMapper.xml b/resources/mybatis/ma/MachineTypeMapper.xml index 1331714..00702b9 100644 --- a/resources/mybatis/ma/MachineTypeMapper.xml +++ b/resources/mybatis/ma/MachineTypeMapper.xml @@ -753,7 +753,7 @@ mat.UNIT AS unit, mat.LEASE_PRICE AS leasePrice, - ROUND(CONVERT ( ( mr.PAY_PRICE ), DECIMAL ( 10, 2 ) )) AS + ROUND(CONVERT ( ( mat.PAY_PRICE ), DECIMAL ( 10, 2 ) )) AS payPrice, ROUND(mat.BUY_PRICE) AS buyPrice, mat.IS_TEST AS isTest, @@ -815,15 +815,22 @@ - update mm_type - set `NAME` - = #{name}, - WEIGHT = #{weight}, - UNIT = #{unit}, - IS_COUNT = #{isCount}, - RFID_POWER=#{rfidPower} - - where id = #{id} + UPDATE mm_type + + `NAME` = #{name}, + + WEIGHT = #{weight}, + + UNIT = #{unit}, + IS_COUNT = #{isCount}, + + RFID_POWER = #{rfidPower}, + + LEASE_PRICE = #{leasePrice}, + BUY_PRICE = #{buyPrice}, + PAY_PRICE = #{payPrice} + + WHERE id = #{id} diff --git a/resources/mybatis/repair/RepairDetailsMapper.xml b/resources/mybatis/repair/RepairDetailsMapper.xml index 7cbbdff..35c68ce 100644 --- a/resources/mybatis/repair/RepairDetailsMapper.xml +++ b/resources/mybatis/repair/RepairDetailsMapper.xml @@ -543,7 +543,7 @@ mt2.`NAME` LIKE CONCAT('%',#{keyWord},'%') OR mt.`NAME` LIKE CONCAT('%',#{keyWord},'%') OR wir.`CODE` LIKE CONCAT('%',#{keyWord},'%') - + OR wir.REMARK LIKE CONCAT('%',#{keyWord},'%') ) ORDER BY wir.TIME DESC @@ -887,7 +887,8 @@ AND( mt2.`NAME` LIKE CONCAT('%',#{keyWord},'%') OR mt.`NAME` LIKE CONCAT('%',#{keyWord},'%') - OR wir.`CODE` LIKE CONCAT('%',#{keyWord},'%') + OR wir.`CODE` LIKE CONCAT('%',#{keyWord},'%') + OR mm.REMARK LIKE CONCAT('%',#{keyWord},'%') ) ORDER BY wir.TIME DESC From 41086c13531fe052c3e59a110df63abfbedc8db6 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Tue, 15 Jul 2025 18:16:08 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E9=99=86?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=A4=9A=E6=AC=A1=E8=A7=A6=E5=8F=91=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/views/login/login.jsp | 208 +++++++++++++++--- WebContent/static/js/ma/machineEdit.js | 2 +- WebContent/static/js/sys/login.js | 86 +++----- resources/spring/spring-mvc.xml | 2 +- .../bonus/bm/service/AreaTypeServiceImp.java | 3 - 5 files changed, 211 insertions(+), 90 deletions(-) diff --git a/WebContent/WEB-INF/views/login/login.jsp b/WebContent/WEB-INF/views/login/login.jsp index 4ad5cf5..b55ea2c 100644 --- a/WebContent/WEB-INF/views/login/login.jsp +++ b/WebContent/WEB-INF/views/login/login.jsp @@ -746,6 +746,8 @@ body::before {
+ 选择 序号序号 机具类型 机具规格机具数量报废人检验人申请时间操作机具数量报废来源报废人检验人指派人指派时间申请时间完成时间完成状态操作
"+ JY.Object.notEmpty(l.typeName) + ""+ JY.Object.notEmpty(l.modelName) + ""+ JY.Object.notEmpty(l.scrapNum) + ""+ JY.Object.notEmpty(l.source) + "" + l.scrapPerson + ""+ JY.Object.notEmpty(l.scrapChecker) + ""+ JY.Object.notEmpty(l.assigner) + ""+ JY.Object.notEmpty(l.specifyTime) + ""+ JY.Object.notEmpty(l.operationTime) + "" + (l.isSure === "1" ? JY.Object.notEmpty(l.scrapTime) : "") + "" + (l.isSure === "1" ? "已完成" : "未完成") + "
原编号 设备编码 资产属性合格证技术材料改造手续出厂日期合格证技术材料改造手续 操作手册 二维码 机具状态"+ JY.Object.notEmpty(l.originNum) + ""+ JY.Object.notEmpty(l.deviceCode) + ""+ JY.Object.notEmpty(l.companyName) + ""+ JY.Object.notEmpty(l.outFactortTime) + "上传上传