From 417b82d7b892426f99f256014426366e16a7366a Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期一, 23 九月 2024 16:03:02 +0800 Subject: [PATCH] 钢化模块进炉中新增人工拿走按钮,原片仓储更改时间选择器 --- UI-Project/src/views/GlassStorage/rawfilmstorage.vue | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue index f78f2ff..a4e1d04 100644 --- a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue +++ b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue @@ -17,7 +17,7 @@ const dialogFormVisiblea = ref(false) const dialogFormVisibleb = ref(false) const dialogFormVisiblec = ref(false) -const timeRange = ref(["2022-01-01", "2025-01-01"]) +const timeRange = ref(["2022-01-01 00:00:00", "2025-01-01 00:00:00"]) const selectValuesa = reactive([]); let webSocket: WebSocket | null = null; const value = ref('') @@ -51,8 +51,8 @@ console.log(data.tasks[0]); } - if(data.rack !=null){ - tableDatab.value = data.rack[0] + if(data.rawStationDetailsList !=null){ + tableDatab.value = data.rawStationDetailsList[0] } }; // 鍒犻櫎 @@ -227,8 +227,12 @@ <div style="display: flex; flex-direction: row; align-items: center; margin-top: 20px;"> <el-button style="margin-left: 20px;" id="searchButton" type="success" @click="dialogFormVisiblea = true">{{ $t('film.mes') }}</el-button> <el-button style="margin-left: 20px;" id="searchButton" type="success" @click="dialogFormVisibleb = true">{{ $t('film.warehousing') }}</el-button> - <el-date-picker style="margin-left: 10px;" v-model="timeRange" type="daterange" format="YYYY/MM/DD" value-format="YYYY-MM-DD" - :start-placeholder="$t('film.starttime')" :end-placeholder="$t('film.endtime')" :default-time="defaultTime" /> + <el-date-picker style="margin-left: 10px;" v-model="timeRange" type="datetimerange" + format="YYYY/MM/DD HH:mm:ss" + value-format="YYYY-MM-DD HH:mm:ss" + :start-placeholder="$t('film.starttime')" + :end-placeholder="$t('film.endtime')" + :default-time="defaultTime" /> <el-select v-model="selectValuesa[0]" clearable :placeholder="$t('film.taskstatus')" style="margin-left: 10px;" > <el-option :label="$t('film.built')" value="1"></el-option> <el-option :label="$t('film.execution')" value="2"></el-option> -- Gitblit v1.8.0