From e8f734121a04baa8fe89740ec5bd9ee4f9459d3f Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 26 二月 2025 09:42:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/largescreendisplay/screendisplay.vue | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index 1a8d2e1..ba9ef74 100644
--- a/UI-Project/src/views/largescreendisplay/screendisplay.vue
+++ b/UI-Project/src/views/largescreendisplay/screendisplay.vue
@@ -13,7 +13,6 @@
const {t} = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
const tableData = ref([])
-const timeRange = ref([])
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/edgTasks`;
const handleMessage = (data) => {
@@ -51,7 +50,7 @@
const endTime = dayjs().startOf('minute'); // 褰撳墠鏃堕棿锛岀簿纭埌鍒嗛挓
const startTime = endTime.subtract(1, 'day').startOf('minute'); // 褰撳墠鏃堕棿鐨勫墠涓�澶╋紝绮剧‘鍒板垎閽�
// 璁剧疆鏃堕棿鑼冨洿涓� [寮�濮嬫椂闂�, 缁撴潫鏃堕棿]
- timeRange.value = [startTime.format('YYYY-MM-DD HH:mm:ss'), endTime.format('YYYY-MM-DD HH:mm:ss')];
+ // timeRange.value = [startTime.format('YYYY-MM-DD HH:mm:ss'), endTime.format('YYYY-MM-DD HH:mm:ss')];
});
// onMounted(() => {
// socket = initializeWebSocket(socketUrl, handleMessage);
@@ -121,12 +120,12 @@
:value="item.value"
/>
</el-select>
- <span class="demonstration" style="margin-left: 20px;margin-top: 3px;">{{ $t('workOrder.time') }}</span>
+ <!-- <span class="demonstration" style="margin-left: 20px;margin-top: 3px;">{{ $t('workOrder.time') }}</span> -->
<!-- <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" :start-placeholder="$t('reportmanage.starttime')"
style="margin-left: 15px;" value-format = "YYYY-MM-DD hh:mm:ss"
:end-placeholder="$t('reportmanage.endtime')">
</el-date-picker> -->
- <el-date-picker
+ <!-- <el-date-picker
v-model="timeRange"
type="datetimerange"
range-separator="鑷�"
@@ -134,7 +133,7 @@
style="margin-left: 15px;"
value-format="YYYY-MM-DD hh:mm:ss"
:end-placeholder="$t('reportmanage.endtime')">
- </el-date-picker>
+ </el-date-picker> -->
<el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="sethistorical()">{{
$t('reportmanage.inquire')
}}</el-button>
--
Gitblit v1.8.0