From 629c9fe88af3cd7a2d1177fc1af0177505787491 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期二, 23 一月 2024 14:30:17 +0800
Subject: [PATCH] 修改-过站采集/数据采集日期格式调整
---
jcdm-ui/src/views/main/da/passingStationCollection/index.vue | 31 ++++---------------------------
jcdm-ui/src/views/main/da/paramCollection/index.vue | 12 ++----------
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java | 3 +--
jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java | 12 ++++++------
4 files changed, 13 insertions(+), 45 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
index 7077b10..37b5841 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
@@ -65,8 +65,7 @@
private String paramStandard;
/** 閲囬泦鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "閲囬泦鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = "閲囬泦鏃堕棿")
private Date collectionTime;
/** 棰勭暀瀛楁1 */
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java
index faf27ba..f0f2348 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java
@@ -45,13 +45,13 @@
private String equipmentNo;
/** 鍏ョ珯鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍏ョ珯鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+// @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鍏ョ珯鏃堕棿")
private Date inboundTime;
/** 鍑虹珯鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍑虹珯鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+// @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鍑虹珯鏃堕棿")
private Date outboundTime;
/** 鍏ョ珯鏄惁鍚堟牸 */
@@ -71,8 +71,8 @@
private String outMsgSign;
/** 閲囬泦鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "閲囬泦鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+// @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "閲囬泦鏃堕棿")
private Date collectionTime;
/** 棰勭暀瀛楁1 */
diff --git a/jcdm-ui/src/views/main/da/paramCollection/index.vue b/jcdm-ui/src/views/main/da/paramCollection/index.vue
index f997702..c4cded5 100644
--- a/jcdm-ui/src/views/main/da/paramCollection/index.vue
+++ b/jcdm-ui/src/views/main/da/paramCollection/index.vue
@@ -83,9 +83,9 @@
<el-table-column label="鍙傛暟鍊�" align="center" prop="paramValue"></el-table-column>
<el-table-column label="鍙傛暟涓婇檺" align="center" prop="paramUpper"></el-table-column>
<el-table-column label="鍙傛暟涓嬮檺" align="center" prop="paramLower"></el-table-column>
- <el-table-column label="閲囬泦鏃堕棿" align="center" prop="collectionTime" width="100">
+ <el-table-column label="閲囬泦鏃堕棿" align="center" prop="collectionTime" width="160">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.collectionTime, '{y}-{m}-{d}') }}</span>
+ <span>{{ parseTime(scope.row.collectionTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="鐘舵��" align="center" prop="state"></el-table-column>
@@ -163,14 +163,6 @@
</el-form-item>
<el-form-item label="鏍囧噯鍊�" prop="paramStandard">
<el-input v-model="form.paramStandard" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
- </el-form-item>
- <el-form-item label="閲囬泦鏃堕棿" prop="collectionTime">
- <el-date-picker clearable
- v-model="form.collectionTime"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨閲囬泦鏃堕棿">
- </el-date-picker>
</el-form-item>
<el-form-item label="鐘舵��" prop="state">
<el-input v-model="form.state" placeholder="璇疯緭鍏ョ姸鎬�" />
diff --git a/jcdm-ui/src/views/main/da/passingStationCollection/index.vue b/jcdm-ui/src/views/main/da/passingStationCollection/index.vue
index d4f1e1e..0b6aa0f 100644
--- a/jcdm-ui/src/views/main/da/passingStationCollection/index.vue
+++ b/jcdm-ui/src/views/main/da/passingStationCollection/index.vue
@@ -83,29 +83,24 @@
</el-table-column>
<el-table-column label="宸ヤ綅缂栧彿" align="center" prop="locationCode">
</el-table-column>
-<!-- <el-table-column label="璁惧缂栧彿" align="center" prop="equipmentNo">
- </el-table-column>-->
<el-table-column label="鍏ョ珯鏃堕棿" align="center" prop="inboundTime" width="100">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.inboundTime, '{y}-{m}-{d}') }}</span>
+ <span>{{ parseTime(scope.row.inboundTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="鍑虹珯鏃堕棿" align="center" prop="outboundTime" width="100">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.outboundTime, '{y}-{m}-{d}') }}</span>
+ <span>{{ parseTime(scope.row.outboundTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
-<!-- <el-table-column label="鍏ョ珯鏄惁鍚堟牸" align="center" prop="inRsSign">
- </el-table-column>
- <el-table-column label="鍏ョ珯NG鍘熷洜" align="center" prop="inMsgSign">
- </el-table-column>-->
+
<el-table-column label="鏄惁鍚堟牸" align="center" prop="outRsSign">
</el-table-column>
<el-table-column label="NG鍘熷洜" align="center" prop="outMsgSign">
</el-table-column>
<el-table-column label="閲囬泦鏃堕棿" align="center" prop="collectionTime" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.collectionTime, '{y}-{m}-{d}') }}</span>
+ <span>{{ parseTime(scope.row.collectionTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="鑺傛媿鏃堕棿" align="center" prop="beatTime">
@@ -183,12 +178,6 @@
placeholder="璇烽�夋嫨鍑虹珯鏃堕棿">
</el-date-picker>
</el-form-item>
-<!-- <el-form-item label="鍏ョ珯鏄惁鍚堟牸" prop="inRsSign">
- <el-input v-model="form.inRsSign" placeholder="璇疯緭鍏ュ叆绔欐槸鍚﹀悎鏍�" />
- </el-form-item>
- <el-form-item label="鍏ョ珯NG鍘熷洜" prop="inMsgSign">
- <el-input v-model="form.inMsgSign" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
- </el-form-item>-->
<el-form-item label="鏄惁鍚堟牸" prop="outRsSign">
<el-input v-model="form.outRsSign" placeholder="璇疯緭鍏ュ嚭绔欐槸鍚﹀悎鏍�" />
</el-form-item>
@@ -203,18 +192,6 @@
placeholder="璇烽�夋嫨閲囬泦鏃堕棿">
</el-date-picker>
</el-form-item>
-<!-- <el-form-item label="棰勭暀瀛楁1" prop="spareField1">-->
-<!-- <el-input v-model="form.spareField1" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="棰勭暀瀛楁2" prop="spareField2">-->
-<!-- <el-input v-model="form.spareField2" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">-->
-<!-- <el-input v-model="form.createUser" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="鏇存敼鐢ㄦ埛" prop="updateUser">-->
-<!-- <el-input v-model="form.updateUser" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />-->
-<!-- </el-form-item>-->
<el-form-item label="鑺傛媿鏃堕棿" prop="beatTime">
<el-input v-model="form.beatTime" placeholder="璇疯緭鍏ヨ妭鎷嶆椂闂�" />
</el-form-item>
--
Gitblit v1.9.3