sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

时间格式修改

dev_xds
姜玉琦 2023-08-20 17:16:37 +08:00
parent fd2b3b66f5
commit 5457761b77
8 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-ui/src/views/project/projectChecking/index.vue
View File

@ -347,6 +347,7 @@
type="datetime" type="datetime"
placeholder="选择日期时间" placeholder="选择日期时间"
default-time="10:00:00" default-time="10:00:00"
value-format="yyyy-MM-dd HH:mm:ss"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>

1
ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue
View File

@ -263,6 +263,7 @@
type="datetime" type="datetime"
placeholder="选择日期时间" placeholder="选择日期时间"
default-time="10:00:00" default-time="10:00:00"
value-format="yyyy-MM-dd HH:mm:ss"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>

3
ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue
View File

@ -188,7 +188,7 @@
v-model="form.trainParticipants" v-model="form.trainParticipants"
placeholder="请输入工作参与者" placeholder="请输入工作参与者"
controls-position="right" controls-position="right"
style="width: 100%" style="width: 100%; text-align: left"
:min="1" :min="1"
/> />
</el-form-item> </el-form-item>
@ -199,6 +199,7 @@
type="datetime" type="datetime"
placeholder="选择日期时间" placeholder="选择日期时间"
default-time="10:00:00" default-time="10:00:00"
value-format="yyyy-MM-dd HH:mm:ss"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>

3
ruoyi-ui/src/views/work/emergencyDrill/index.vue
View File

@ -265,7 +265,7 @@
v-model="form.trainParticipants" v-model="form.trainParticipants"
placeholder="请输入工作参与者" placeholder="请输入工作参与者"
controls-position="right" controls-position="right"
style="width: 100%" style="width: 100%; text-align: left"
:min="1" :min="1"
/> />
</el-form-item> </el-form-item>
@ -276,6 +276,7 @@
type="datetime" type="datetime"
placeholder="选择日期时间" placeholder="选择日期时间"
default-time="10:00:00" default-time="10:00:00"
value-format="yyyy-MM-dd HH:mm:ss"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>

3
ruoyi-ui/src/views/work/workTrain/index.vue
View File

@ -258,7 +258,7 @@
v-model="form.trainParticipants" v-model="form.trainParticipants"
placeholder="请输入参与人数" placeholder="请输入参与人数"
controls-position="right" controls-position="right"
style="width: 100%" style="width: 100%; text-align: left"
:min="1" :min="1"
/> />
</el-form-item> </el-form-item>
@ -269,6 +269,7 @@
type="datetime" type="datetime"
placeholder="选择日期时间" placeholder="选择日期时间"
default-time="10:00:00" default-time="10:00:00"
value-format="yyyy-MM-dd HH:mm:ss"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>

3
ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue
View File

@ -188,7 +188,7 @@
v-model="form.trainParticipants" v-model="form.trainParticipants"
placeholder="请输入工作参与者" placeholder="请输入工作参与者"
controls-position="right" controls-position="right"
style="width: 100%" style="width: 100%; text-align: left"
:min="1" :min="1"
/> />
</el-form-item> </el-form-item>
@ -199,6 +199,7 @@
type="datetime" type="datetime"
placeholder="选择日期时间" placeholder="选择日期时间"
default-time="10:00:00" default-time="10:00:00"
value-format="yyyy-MM-dd HH:mm:ss"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>

1
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java
View File

@ -89,6 +89,7 @@ public class SurProjectChecking extends BaseEntity
private String groupDeptUserName; private String groupDeptUserName;
/** 验收时间 */ /** 验收时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "验收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "验收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date checkingDate; private Date checkingDate;

6
yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java
View File

@ -49,11 +49,13 @@ public class WorkTrain extends BaseEntity
private Long trainParticipants; 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; 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; private Date endDate;
/** 删除标识 */ /** 删除标识 */