From e33068bf181a56eb3bba2e39cb0573cafb06584a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 25 三月 2025 15:02:39 +0800
Subject: [PATCH] 中空一线、二线websockect接收更改，空闲状态名称更改，新增中空三线页面，中空理片笼新增三线空闲状态
---
UI-Project/src/views/GlassStorage/rawfilmstorage.vue | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
index 984f488..8bbe6bf 100644
--- a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
+++ b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
@@ -95,6 +95,7 @@
function parseAndSetTime() {
const backendTime = new Date(globalDate);
const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
+ oneWeekAgo.setHours(0, 0, 0, 0);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
timeRangea.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
@@ -461,7 +462,7 @@
// }
// }
// 浠诲姟鎴愬姛澶勭悊
-const successfull = async(row) => {
+const successfull = async(row) => {
try {
const confirmResult = await ElMessageBox.confirm(
t('searchOrder.psuccessfullyprocessed'),
@@ -486,7 +487,7 @@
}
};
// 浠诲姟澶辫触澶勭悊
-const handleptask = async(row) => {
+const handleptask = async(row) => {
try {
const confirmResult = await ElMessageBox.confirm(
t('searchOrder.ptaskfailure'),
@@ -633,7 +634,12 @@
</template>
</el-table-column>
<el-table-column prop="createTime" align="center" :label="$t('film.createtime')" />
-
+ <el-table-column fixed="right" :label="$t('film.operate')" align="center">
+ <template #default="scope">
+ <el-button size="mini" :disabled="(scope.row.taskState !== 0)" type="text" plain @click="successfull(scope.row)">{{ $t('searchOrder.successfullyprocessed') }}</el-button>
+ <el-button size="mini" :disabled="(scope.row.taskState !== 0)" type="text" plain @click="handleptask(scope.row)">{{ $t('searchOrder.taskfailure') }}</el-button>
+ </template>
+ </el-table-column>
</el-table>
</div>
</el-card>
@@ -707,7 +713,7 @@
</el-table>
</el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
-<el-dialog v-model="blindb" top="10vh" width="95%">
+<el-dialog v-model="blindb" top="10vh" width="71%">
<iframe
:src="iframeUrl"
marginwidth="2000px"
--
Gitblit v1.8.0