From 5457761b77273f9386415307ca5b3e5e3e9e32c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Sun, 20 Aug 2023 17:16:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/project/projectChecking/index.vue | 1 + .../views/project/projectChecking/projectCheckingDrawer.vue | 1 + .../src/views/work/emergencyDrill/emergencyDrillDrawer.vue | 3 ++- ruoyi-ui/src/views/work/emergencyDrill/index.vue | 3 ++- ruoyi-ui/src/views/work/workTrain/index.vue | 3 ++- ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue | 3 ++- .../com/yanzhu/jh/project/domain/SurProjectChecking.java | 1 + .../src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java | 6 ++++-- 8 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ruoyi-ui/src/views/project/projectChecking/index.vue b/ruoyi-ui/src/views/project/projectChecking/index.vue index d9636dd6..10c6f8ee 100644 --- a/ruoyi-ui/src/views/project/projectChecking/index.vue +++ b/ruoyi-ui/src/views/project/projectChecking/index.vue @@ -347,6 +347,7 @@ type="datetime" placeholder="选择日期时间" default-time="10:00:00" + value-format="yyyy-MM-dd HH:mm:ss" > diff --git a/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue b/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue index 2d52216d..eb2b87c3 100644 --- a/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue +++ b/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue @@ -263,6 +263,7 @@ type="datetime" placeholder="选择日期时间" default-time="10:00:00" + value-format="yyyy-MM-dd HH:mm:ss" > diff --git a/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue b/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue index 84554815..36b5a2ae 100644 --- a/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue +++ b/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue @@ -188,7 +188,7 @@ v-model="form.trainParticipants" placeholder="请输入工作参与者" controls-position="right" - style="width: 100%" + style="width: 100%; text-align: left" :min="1" /> @@ -199,6 +199,7 @@ type="datetime" placeholder="选择日期时间" default-time="10:00:00" + value-format="yyyy-MM-dd HH:mm:ss" > diff --git a/ruoyi-ui/src/views/work/emergencyDrill/index.vue b/ruoyi-ui/src/views/work/emergencyDrill/index.vue index b26fd76c..9e97600d 100644 --- a/ruoyi-ui/src/views/work/emergencyDrill/index.vue +++ b/ruoyi-ui/src/views/work/emergencyDrill/index.vue @@ -265,7 +265,7 @@ v-model="form.trainParticipants" placeholder="请输入工作参与者" controls-position="right" - style="width: 100%" + style="width: 100%; text-align: left" :min="1" /> @@ -276,6 +276,7 @@ type="datetime" placeholder="选择日期时间" default-time="10:00:00" + value-format="yyyy-MM-dd HH:mm:ss" > diff --git a/ruoyi-ui/src/views/work/workTrain/index.vue b/ruoyi-ui/src/views/work/workTrain/index.vue index d3adaeff..6cc3e70b 100644 --- a/ruoyi-ui/src/views/work/workTrain/index.vue +++ b/ruoyi-ui/src/views/work/workTrain/index.vue @@ -258,7 +258,7 @@ v-model="form.trainParticipants" placeholder="请输入参与人数" controls-position="right" - style="width: 100%" + style="width: 100%; text-align: left" :min="1" /> @@ -269,6 +269,7 @@ type="datetime" placeholder="选择日期时间" default-time="10:00:00" + value-format="yyyy-MM-dd HH:mm:ss" > diff --git a/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue b/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue index 16f1b8b8..20b5d06e 100644 --- a/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue +++ b/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue @@ -188,7 +188,7 @@ v-model="form.trainParticipants" placeholder="请输入工作参与者" controls-position="right" - style="width: 100%" + style="width: 100%; text-align: left" :min="1" /> @@ -199,6 +199,7 @@ type="datetime" placeholder="选择日期时间" default-time="10:00:00" + value-format="yyyy-MM-dd HH:mm:ss" > diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java index d4850cfb..d267c0ce 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java @@ -89,6 +89,7 @@ public class SurProjectChecking extends BaseEntity private String groupDeptUserName; /** 验收时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "验收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date checkingDate; diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java index 2f019367..2cee3405 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java @@ -49,11 +49,13 @@ public class WorkTrain extends BaseEntity private Long trainParticipants; /** 开始时间 */ - @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") private Date beginDate; /** 结束时间 */ - @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") private Date endDate; /** 删除标识 */