From 963dc5dd7b480376e1da6893ee30183dbd5bef50 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 18 三月 2025 14:43:06 +0800
Subject: [PATCH] 大屏更改按钮样式
---
UI-Project/src/views/Returns/upreturns.vue | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index f85b453..8c06ef2 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -16,6 +16,7 @@
const blind = ref(false)
const blinda = ref(false)
const blindb = ref(false)
+const blindbd = ref(false)
const ReportData = ref(true);
const canSelectProjecta = ref(true);
const canSelectProjectb = ref(true);
@@ -26,6 +27,11 @@
const cuttingMachineStatusColor = ref('#911005');
const tableDataa = ref<any[]>([]);
const tableDatab = ref<any[]>([]);
+const stationInfos = reactive({});
+const buttonEnabledStatus = ref({});
+const globalDate = inject('globalDate');
+import { inject } from 'vue';
+import { tr } from "element-plus/es/locale";
const tableData = ref([])
const titleSelectJson = ref({
engineerId: [],
@@ -78,10 +84,17 @@
if (data.LoadOneState != null) {
cuttingMachineStatusColor.value = data.LoadOneState[0] == 1 ? 'green' : '#911005';
}
- if (data.list!=null) {
- tableDataa.value = data.list[0].slice(0, 2);
+if (data.stationOne!=null) {
+ const processedData = [...data.stationOne[0]];
+ if (processedData.length > 0) {
+ processedData[0] = { ...processedData[0], workstationId: 1 };
+ }
+ if (processedData.length > 1) {
+ processedData[1] = { ...processedData[1], workstationId: 2 };
+ }
+ tableDataa.value = processedData;
}else {
- tableDataa.value = ''
+ tableDataa.value = []
}
if(data.loadTask1!=null){
tableData.value = data.loadTask1[0]
@@ -145,7 +158,6 @@
console.error(error);
}
}
-
// 寮�濮嬩笂鐗�
const handleon = async () => {
let filmRemove = window.localStorage.getItem('filmRemove')
@@ -378,6 +390,12 @@
} catch (error) {
}
};
+// 鍘嗗彶浠诲姟
+const iframeUrl = ref('');
+const handlehistorical = (row) => {
+ blindbd.value = true;
+ iframeUrl.value = `${window.location.origin}/#/Returns/upreturnhistory`;
+};
function getStatusType2(filmRemove) {
switch (filmRemove) {
case 0:
@@ -422,6 +440,7 @@
<el-button :disabled="!canSelectProjectb" style="margin-top: 5px;margin-left: 20px;" type="success" @click="handleBind">{{ $t('basicData.startloading') }}</el-button>
<el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="warning" @click="handleBinda">{{ $t('basicData.stop') }}</el-button>
<el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="deleteTask">{{ $t('searchOrder.deleteTask') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlehistorical">{{ $t('searchOrder.historicaltasks') }}</el-button>
<el-select disabled v-model="selectValuesa[1]" clearable :placeholder="$t('Mounting.oneloadingline')"
style="margin-top: 5px;margin-left: 20px;">
<el-option :label="$t('Mounting.all')" value="0"></el-option>
@@ -480,7 +499,7 @@
<el-table-column prop="number" align="center" :label="$t('basicData.quantity')" min-width="80"/>
<el-table-column fixed="right" :label="$t('film.operate')" align="center">
<template #default="scope">
- <el-button size="mini" :disabled="scope.row.number == 0 || scope.row.number == ''" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
+ <el-button size="mini" :disabled="(!scope.row.patternThickness)" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}{{ scope.row.haspatternThickness}}</el-button>
</template>
</el-table-column>
</el-table>
@@ -584,6 +603,17 @@
</div>
</template>
</el-dialog>
+ <!-- 鍘嗗彶浠诲姟 -->
+<el-dialog v-model="blindbd" top="10vh" width="95%">
+ <iframe
+ :src="iframeUrl"
+ marginwidth="2000px"
+ marginheight="2000px"
+ width="100%"
+ height="700px"
+ frameborder="0"
+ ></iframe>
+ </el-dialog>
</div>
</template>
<style scoped>
--
Gitblit v1.8.0