From 7ea6f819494d8d85087e9c933a905eb1cf8bac4f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 03 十二月 2025 13:28:14 +0800
Subject: [PATCH] 1、历史任务查询默认日期为当前 2、理片笼信息条件查询时只显示符合的数据
---
UI-Project/src/views/StockBasicData/stockBasicData.vue | 58 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/UI-Project/src/views/StockBasicData/stockBasicData.vue b/UI-Project/src/views/StockBasicData/stockBasicData.vue
index 8dc1f41..b43c2da 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicData.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -1,7 +1,6 @@
<script setup>
import {onBeforeUnmount, onMounted, onUnmounted, reactive, ref} from "vue";
import {useRouter} from "vue-router"
-import {host, WebSocketHost} from '@/utils/constants'
import request from "@/utils/request"
import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
import {ElMessage, ElMessageBox} from 'element-plus'
@@ -11,6 +10,7 @@
const {t} = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
const tableData = ref([])
+const blindb = ref(false)
const slot = ref('')
const requestData = {
line: 2001
@@ -31,7 +31,6 @@
stateList=[selectValuesa[1]];
}
}
-console.log(timeRange.value[0],timeRange.value[1]);
const response = await request.post("/cacheGlass/edgGlassTaskInfo/setEdgGlassInfoRequest", {
cellList: celllist,
stateList: stateList,
@@ -69,8 +68,7 @@
ElMessage.error(response.msg);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 鎷胯蛋
@@ -99,13 +97,24 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/edgTasks`;
+const socketUrl = `ws://${window.ipConfig.serverUrl}/api/cacheGlass/api/talk/edgTasks`;
const handleMessage = (data) => {
- tableData.value = data.edgTasks[0]
+ const formattedTasks = data.edgTasks[0].map(cageInfo => {
+ if (cageInfo && cageInfo.createTime) {
+ cageInfo.formattedCreateTime = formatTimestamp(cageInfo.createTime);
+ }
+ return cageInfo;
+ });
+ tableData.value = formattedTasks
+};
+// 鍘嗗彶浠诲姟
+const iframeUrl = ref('');
+const handlehistorical = (row) => {
+ blindb.value = true;
+ iframeUrl.value = `${window.location.origin}/#/StockBasicData/stockhistory`;
};
onMounted(() => {
socket = initializeWebSocket(socketUrl, handleMessage);
@@ -135,16 +144,29 @@
return t('workOrder.finedging');
}
}
+function formatTimestamp(timestamp) {
+ const date = new Date(timestamp);
+ const year = date.getFullYear();
+ const month = String(date.getMonth() + 1).padStart(2, '0'); // 鏈堜唤浠�0寮�濮嬶紝闇�瑕佸姞1锛屽苟琛ラ浂
+ const day = String(date.getDate()).padStart(2, '0'); // 琛ラ浂
+ const hours = String(date.getHours()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
+ const minutes = String(date.getMinutes()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
+ const seconds = String(date.getSeconds()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+}
onBeforeUnmount(() => {
- console.log("鍏抽棴浜�")
closeWebSocket();
});
</script>
<template>
<div style="height: 500px;">
<div>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" >
<div style="display: flex;">
+ <!-- <el-button style="margin-left: 20px;" id="searchButton" type="success" @click="handlehistorical">{{
+ $t('searchOrder.historicaltasks')
+ }}
+ </el-button> -->
<el-select v-model="selectValuesa[0]" filterable :placeholder="$t('workOrder.cway')" clearable
style="margin-left: 20px;margin-bottom: 10px;">
<el-option :label="$t('workOrder.edgingone')" value="930"></el-option>
@@ -172,8 +194,9 @@
<el-table-column prop="width" align="center" :label="$t('workOrder.width')" min-width="120" />
<el-table-column prop="height" align="center" :label="$t('workOrder.height')" min-width="80" />
<el-table-column prop="thickness" align="center" :label="$t('workOrder.thickness')" min-width="120" />
- <el-table-column prop="glassType" align="center" :label="$t('workOrder.glasstype')" min-width="120" />
+ <el-table-column prop="filmsid" align="center" :label="$t('workOrder.glasstype')" min-width="120" />
<el-table-column prop="line" align="center" :label="$t('workOrder.line')" min-width="120" />
+ <el-table-column prop="formattedCreateTime" align="center" :label="$t('workOrder.time')" min-width="120" />
<el-table-column prop="state" :label="$t('workOrder.status')" align="center" width="200">
<!-- <template #default="scope">
{{ scope.row.status==0?"鏈（杈�":scope.row.status==1?"纾ㄨ竟涓�":"宸茬（杈�" }}
@@ -186,11 +209,11 @@
</el-table-column>
<el-table-column fixed="right" :label="$t('workOrder.operate')" align="center" width="200">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="open(scope.row)">{{
+ <el-button type="text" plain @click="open(scope.row)">{{
$t('workOrder.breakage')
}}
</el-button>
- <el-button size="mini" type="text" plain @click="opena(scope.row)">{{
+ <el-button type="text" plain @click="opena(scope.row)">{{
$t('workOrder.takeout')
}}
</el-button>
@@ -200,6 +223,17 @@
</div>
</el-card>
</div>
+ <!-- 鍘嗗彶浠诲姟 -->
+<el-dialog v-model="blindb" top="10vh" width="95%" @close="iframeUrl=''">
+ <iframe
+ :src="iframeUrl"
+ marginwidth="2000px"
+ marginheight="2000px"
+ width="100%"
+ height="700px"
+ frameborder="0"
+ ></iframe>
+ </el-dialog>
</div>
</template>
<style scoped>
--
Gitblit v1.8.0