From 2935442d9bdb795fecaa704d3bce2f6249b208d4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 25 十二月 2024 16:12:48 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
UI-Project/src/views/Slicecage/slicecage.vue | 66 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 20 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 06b7e10..57a3c87 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -80,6 +80,7 @@
const selectedRow = ref(null); // 瀛樺偍閫変腑鐨勮鏁版嵁
const temperingtotal = ref(0);
const glasstotal = ref(0);
+const scheduletime = ref(0);
const fulltotals = ref(0);
const temperingengineerId=ref('');
// 褰撳墠椤电爜鍜屾瘡椤垫樉绀虹殑鏉℃暟
@@ -645,6 +646,7 @@
const handleganghua = () => {
dialogFormVisiblec.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
fetchFlow();
+ scheduleTime();
};
// 閽㈠寲鏌ヨ
@@ -675,6 +677,22 @@
}
}
+const scheduleTime = async () => {
+ try {
+ const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/scheduleTime')
+ if (response.code == 200) {
+ scheduletime.value = response.data
+
+
+ } else {
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
const fetchFlow = async () => {
try {
@@ -960,27 +978,25 @@
<el-button style="margin-top: 10px;margin-left: 10px;margin-bottom: 10px;" id="searchButton" type="primary"
@click="dialogFormVisibleaDownGlasss = true">鏍囩鎵撳嵃
</el-button>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 5px;" v-loading="loading">
- <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 100px;">
- <el-table height="100px" ref="table"
+ <div style="display: flex;">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 5px;" v-loading="loading">
+ <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 240px;">
+ <el-table height="240px" ref="table"
:data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="bigStorageCageOutTask.glassId" align="center" :label="$t('searchOrder.outputglassID')" min-width="140" />
<el-table-column prop="bigStorageCageOutTask.startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
<el-table-column prop="bigStorageCageOutTask.endSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" />
<el-table-column prop="bigStorageCageOutTask.trainNumber" align="center" :label="$t('searchOrder.trips')" min-width="120" />
<el-table-column prop="bigStorageCageOutTask.serialNumber" align="center" :label="$t('searchOrder.number')" min-width="120" />
- <el-table-column prop="bigStorageCageOutTask.taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="157">
- <!-- <template #default="scope">
- <el-tag type="success" >{{ scope.row.bigStorageCageOutTask.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}111</el-tag>
- </template> -->
- </el-table-column>
+ <!-- <el-table-column prop="bigStorageCageOutTask.taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="157">
+ </el-table-column> -->
<!-- <el-table-column prop="id" align="center" :label="$t('searchOrder.tabid')" min-width="150"/> -->
- <el-table-column prop="deviceId" align="center" :label="$t('searchOrder.tid')" min-width="100"/>
- <el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="100"/>
- <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="140"/>
- <el-table-column prop="sequence" align="center" :label="$t('searchOrder.pieceingrid')" min-width="150"/>
+ <!-- <el-table-column prop="deviceId" align="center" :label="$t('searchOrder.tid')" min-width="100"/> -->
+ <!-- <el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="100"/> -->
+ <!-- <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="140"/> -->
+ <!-- <el-table-column prop="sequence" align="center" :label="$t('searchOrder.pieceingrid')" min-width="150"/> -->
<el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="140"/>
- <el-table-column prop="glassType" align="center" :label="$t('searchOrder.typeglass')" min-width="100"/>
+ <!-- <el-table-column prop="glassType" align="center" :label="$t('searchOrder.typeglass')" min-width="100"/> -->
<el-table-column prop="width" align="center" :label="$t('searchOrder.width')" min-width="100"/>
<el-table-column prop="height" align="center" :label="$t('searchOrder.height')" min-width="100"/>
<el-table-column prop="thickness" align="center" :label="$t('searchOrder.thickness')" min-width="100"/>
@@ -996,8 +1012,8 @@
</div>
</el-card>
<el-card style="flex: 1;margin-left: 10px;margin-top: 3px;" v-loading="loading">
- <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 100px;">
- <el-table height="100px" ref="table"
+ <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 240px;">
+ <el-table height="240px" ref="table"
@selection-change="handleSelectionChange"
:data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="bigStorageCageFeedTask.glassId" align="center" :label="$t('searchOrder.intoglassid')" min-width="140" />
@@ -1010,12 +1026,12 @@
</el-table-column>
<el-table-column prop="bigStorageCageFeedTask.line" align="center" :label="$t('searchOrder.line')" min-width="120" />
<!-- <el-table-column prop="id" align="center" :label="$t('searchOrder.tabid')" min-width="150"/> -->
- <el-table-column prop="deviceId" align="center" :label="$t('searchOrder.tid')" min-width="100"/>
- <el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="100"/>
- <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="140"/>
- <el-table-column prop="sequence" align="center" :label="$t('searchOrder.pieceingrid')" min-width="150"/>
+ <!-- <el-table-column prop="deviceId" align="center" :label="$t('searchOrder.tid')" min-width="100"/> -->
+ <!-- <el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="100"/> -->
+ <!-- <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="140"/> -->
+ <!-- <el-table-column prop="sequence" align="center" :label="$t('searchOrder.pieceingrid')" min-width="150"/> -->
<el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="140"/>
- <el-table-column prop="glassType" align="center" :label="$t('searchOrder.typeglass')" min-width="100"/>
+ <!-- <el-table-column prop="glassType" align="center" :label="$t('searchOrder.typeglass')" min-width="100"/> -->
<el-table-column prop="width" align="center" :label="$t('searchOrder.width')" min-width="100"/>
<el-table-column prop="height" align="center" :label="$t('searchOrder.height')" min-width="100"/>
<el-table-column prop="thickness" align="center" :label="$t('searchOrder.thickness')" min-width="100"/>
@@ -1030,6 +1046,8 @@
</el-table>
</div>
</el-card>
+ </div>
+
<div style="padding: 10px;display: flex;height:130px;">
<div v-for="(item, index) in tableDatae" :key="index" id="occupy">
<el-col style="text-align:left;font-weight: bold;">#{{ item.device_id }}</el-col>
@@ -1589,6 +1607,13 @@
<div style="margin-bottom: 20px">
<el-form>
<el-row style="margin-top: -15px;margin-bottom: -2px;">
+ <el-col :span="5">
+ <div id="dta" style="font-size: 15px;">
+ <el-form-item :label="$t('searchOrder.scheduletime')" style="width: 14vw">
+ {{ scheduletime }}
+ </el-form-item>
+ </div>
+ </el-col>
<el-col :span="4">
<div id="dt" style="font-size: 15px;">
<el-form-item :label="$t('searchOrder.temperingtotal')" style="width: 14vw">
@@ -1631,6 +1656,7 @@
<el-table-column prop="tempering_layout_id" fixed align="center" :label="$t('searchOrder.layoutnumber')" min-width="120" />
<el-table-column prop="count2" align="center" :label="$t('searchOrder.allnumber')" min-width="150" />
<el-table-column prop="count1" align="center" :label="$t('searchOrder.numbercages')" min-width="150" />
+ <el-table-column prop="slots" align="center" :label="$t('searchOrder.numberslots')" min-width="150" />
<el-table-column prop="count3" align="center" :label="$t('searchOrder.missingquantity')" min-width="150" />
<el-table-column prop="count4" align="center" :label="$t('searchOrder.breakquantity')" min-width="150" />
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="250">
--
Gitblit v1.8.0