From 503c45f8fd117ca58d56dcaceb44d8f95b3e2527 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 16 八月 2024 12:19:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/StockBasicData/stockBasicData.vue | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/UI-Project/src/views/StockBasicData/stockBasicData.vue b/UI-Project/src/views/StockBasicData/stockBasicData.vue
index 2ba2936..fbd4a54 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicData.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -20,8 +20,7 @@
const requestData = {
line: 2001
};
-const now = new Date();
-const timeRange = ref([new Date(now.setHours(0, 0, 0, 0)), new Date(now.setHours(23, 59, 59, 999))])
+const timeRange = ref([])
const selectValuesa = reactive([]);
// request.post("/cacheGlass/taskCache/selectEdgTask",{
// ...requestData,
@@ -52,8 +51,7 @@
stateList=[selectValuesa[1]];
}
}
-
-
+console.log(timeRange.value[0],timeRange.value[1]);
const response = await request.post("/cacheGlass/edgGlassTaskInfo/setEdgGlassInfoRequest", {
cellList: celllist,
stateList: stateList,
@@ -168,7 +166,8 @@
<el-option label="宸茬（杈�" value="2"></el-option>
</el-select>
<span class="demonstration" style="margin-left: 20px;">鏃堕棿娈�</span>
- <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" style="margin-left: 20px;"
+ <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" style="margin-left: 20px;" value-format = "YYYY-MM-DD hh:mm:ss"
+
end-placeholder="缁撴潫鏃ユ湡">
</el-date-picker>
<el-button type="primary" style="margin-left: 10px;" @click="setEdgGlassInfoRequest()">{{
--
Gitblit v1.8.0