From a6627e41a42e323a3d1e9e019de1b90587b63804 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 21 三月 2025 16:01:00 +0800
Subject: [PATCH] 上片表格显示，中空理片笼、钢化理片笼表格显示，Switch显示，中空一线。二线新增任务的配方信息及队列信息
---
UI-Project/src/lang/en.js | 10
UI-Project/src/lang/py.js | 10
UI-Project/src/lang/zh.js | 11
UI-Project/src/views/hollow/hollowequipment.vue | 26 -
UI-Project/src/views/Returns/upreturns.vue | 2
UI-Project/src/views/Slicecage/slicecage.vue | 7
UI-Project/src/views/hollow/hollowslicecage.vue | 6
UI-Project/src/views/Caching/cachingbeforehistory.vue | 2
UI-Project/src/views/Returns/upreturns2.vue | 2
UI-Project/src/views/hollow/hollowequipmenttwo.vue | 23 -
UI-Project/src/views/hollow/hellowquiptwohistory.vue | 198 +++++++++++++++
UI-Project/src/views/Caching/cachingunhistory.vue | 2
UI-Project/src/views/hollow/hellowquiphistory.vue | 443 +++++++++++++++++++++++++++++++++
13 files changed, 684 insertions(+), 58 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 41149f9..50890af 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -136,6 +136,7 @@
takeon:'The arrangement is complete',
},
searchOrder:{
+ furnfullTemp:'鐜荤拑鎬婚噺',
startCell:'鐩爣灞傚彿',
endCell:'棰勭暀灞傚彿',
begin:'寮�濮�',
@@ -739,6 +740,15 @@
finegrinding: '绮剧（',
},
hellow: {
+ totalPairQuantitya: '浠诲姟鎬婚厤瀵规暟',
+ pairQuantitya: '宸插嚭閰嶅鏁�',
+ waitingout: '绛夊緟鍑虹墖',
+ finishout: '鍑虹墖瀹屾垚',
+ hollowSequence: '涓┖椤哄簭',
+ isPair: '鏄惁閰嶅',
+ no: '鍚�',
+ listFormula: '閰嶆柟淇℃伅',
+ HollowGlass: '闃熷垪淇℃伅',
totalLayer: '鎬诲眰鏁�',
totalPairQuantity: '鎬婚厤瀵规暟閲�',
pairQuantity: '宸插畬鎴愰厤瀵规暟閲�',
diff --git a/UI-Project/src/lang/py.js b/UI-Project/src/lang/py.js
index 46e6bea..3116a90 100644
--- a/UI-Project/src/lang/py.js
+++ b/UI-Project/src/lang/py.js
@@ -135,6 +135,7 @@
takeaway: '袙蟹褟褌褜 胁褉褍褔薪褍褞',
},
searchOrder: {
+ furnfullTemp:'鐜荤拑鎬婚噺',
startCell:'鐩爣灞傚彿',
endCell:'棰勭暀灞傚彿',
begin:'寮�濮�',
@@ -710,6 +711,15 @@
finegrinding: '绮剧（',
},
hellow: {
+ totalPairQuantitya: '浠诲姟鎬婚厤瀵规暟',
+ pairQuantitya: '宸插嚭閰嶅鏁�',
+ waitingout: '绛夊緟鍑虹墖',
+ finishout: '鍑虹墖瀹屾垚',
+ hollowSequence: '涓┖椤哄簭',
+ isPair: '鏄惁閰嶅',
+ no: '鍚�',
+ listFormula: '閰嶆柟淇℃伅',
+ HollowGlass: '闃熷垪淇℃伅',
totalLayer: '鎬诲眰鏁�',
totalPairQuantity: '鎬婚厤瀵规暟閲�',
pairQuantity: '宸插畬鎴愰厤瀵规暟閲�',
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 875f0a2..31e3ca6 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -135,6 +135,7 @@
takeon:'鎽嗙墖瀹屾垚',
},
searchOrder:{
+ furnfullTemp:'鐜荤拑鎬婚噺',
startCell:'鐩爣灞傚彿',
endCell:'棰勭暀灞傚彿',
begin:'寮�濮�',
@@ -569,7 +570,6 @@
reportWorkQuantity:'瀹屽伐鏁伴噺',
reportWorkQuantityCount:'鐮存崯鏁伴噺',
processId:'娴佺▼鍗″彿',
-
historicaltasks1:'鍘熺墖浠撳偍',
historicaltasks2:'涓婄墖涓�绾�',
historicaltasks3:'涓婄墖浜岀嚎',
@@ -742,6 +742,15 @@
finegrinding: '绮剧（',
},
hellow: {
+ totalPairQuantitya: '浠诲姟鎬婚厤瀵规暟',
+ pairQuantitya: '宸插嚭閰嶅鏁�',
+ waitingout: '绛夊緟鍑虹墖',
+ finishout: '鍑虹墖瀹屾垚',
+ hollowSequence: '涓┖椤哄簭',
+ isPair: '鏄惁閰嶅',
+ no: '鍚�',
+ listFormula: '閰嶆柟淇℃伅',
+ HollowGlass: '闃熷垪淇℃伅',
totalLayer: '鎬诲眰鏁�',
totalPairQuantity: '鎬婚厤瀵规暟閲�',
pairQuantity: '宸插畬鎴愰厤瀵规暟閲�',
diff --git a/UI-Project/src/views/Caching/cachingbeforehistory.vue b/UI-Project/src/views/Caching/cachingbeforehistory.vue
index 2fa16af..6f0caae 100644
--- a/UI-Project/src/views/Caching/cachingbeforehistory.vue
+++ b/UI-Project/src/views/Caching/cachingbeforehistory.vue
@@ -57,7 +57,7 @@
<el-table-column prop="glassIdOut" align="center" :label="$t('searchOrder.outputglassID')" min-width="80" />
<el-table-column prop="currentCell" align="center" :label="$t('sorter.layernow')" min-width="80" />
<el-table-column prop="startCell" align="center" :label="$t('searchOrder.startCell')" min-width="80" />
- <el-table-column prop="endCell" align="center" :label="$t('searchOrder.endCell')" min-width="80" />
+ <!-- <el-table-column prop="endCell" align="center" :label="$t('searchOrder.endCell')" min-width="80" /> -->
<el-table-column
align="center"
:label="$t('film.taskstatus')"
diff --git a/UI-Project/src/views/Caching/cachingunhistory.vue b/UI-Project/src/views/Caching/cachingunhistory.vue
index 3578715..0b222b1 100644
--- a/UI-Project/src/views/Caching/cachingunhistory.vue
+++ b/UI-Project/src/views/Caching/cachingunhistory.vue
@@ -57,7 +57,7 @@
<el-table-column prop="glassIdOut" align="center" :label="$t('searchOrder.outputglassID')" min-width="80" />
<el-table-column prop="currentCell" align="center" :label="$t('sorter.layernow')" min-width="80" />
<el-table-column prop="startCell" align="center" :label="$t('searchOrder.startCell')" min-width="80" />
- <el-table-column prop="endCell" align="center" :label="$t('searchOrder.endCell')" min-width="80" />
+ <!-- <el-table-column prop="endCell" align="center" :label="$t('searchOrder.endCell')" min-width="80" /> -->
<el-table-column
align="center"
:label="$t('film.taskstatus')"
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index cf39725..4d10a18 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -497,7 +497,7 @@
<el-table-column prop="patternHeight" align="center" :label="$t('basicData.height')" min-width="80"/>
<el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80"/>
<el-table-column prop="remainQuantity" align="center" :label="$t('basicData.quantity')" min-width="80"/>
- <el-table-column prop="patternThickness" align="center" :label="$t('basicData.thickness')" min-width="80"/>
+ <el-table-column prop="patternThickness" align="center" :label="$t('basicData.thickness')" min-width="60"/>
<el-table-column fixed="right" :label="$t('film.operate')" align="center">
<template #default="scope">
<el-button size="mini" :disabled="(!scope.row.patternThickness)" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index 28e3c74..7adf21e 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -492,7 +492,7 @@
<el-table-column prop="patternHeight" align="center" :label="$t('basicData.height')" min-width="80"/>
<el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80"/>
<el-table-column prop="remainQuantity" align="center" :label="$t('basicData.quantity')" min-width="80"/>
- <el-table-column prop="patternThickness" align="center" :label="$t('basicData.thickness')" min-width="80"/>
+ <el-table-column prop="patternThickness" align="center" :label="$t('basicData.thickness')" min-width="60"/>
<el-table-column fixed="right" :label="$t('film.operate')" align="center">
<template #default="scope">
<el-button size="mini" :disabled="(!scope.row.patternThickness)" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 6704253..3e14d28 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -851,6 +851,11 @@
}else{
ganghua.value = ''
}
+if(data.dispatchSwitch!=null){
+ diaodu.value = data.dispatchSwitch[0]
+}else{
+ diaodu.value = ''
+ }
if(data.bigStorageCageInfos!=null){
adjustedRects.value = data.bigStorageCageInfos[0][1].map((rect, index) => ({
id: index + 1,
@@ -1269,9 +1274,9 @@
:data="tableDatass" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column fixed prop="engineerId" align="center" :label="$t('Mounting.project')" min-width="100" />
<el-table-column prop="countTemp" align="center" :label="$t('searchOrder.totalfurnaces')" min-width="68" />
+ <el-table-column prop="fullTemp" align="center" :label="$t('searchOrder.furnfullTemp')" min-width="82" />
<el-table-column prop="countGlass" align="center" :label="$t('searchOrder.cagesnumber')" min-width="82" />
<el-table-column prop="area" align="center" :label="$t('large.are')" min-width="70" />
- <el-table-column prop="fullTemp" align="center" :label="$t('searchOrder.fullfurnaces')" min-width="82" />
<el-table-column prop="countSlot" align="center" :label="$t('searchOrder.slotnumber')" min-width="96" />
<el-table-column prop="percent" align="center" :label="$t('searchOrder.progress')" min-width="80" />
</el-table>
diff --git a/UI-Project/src/views/hollow/hellowquiphistory.vue b/UI-Project/src/views/hollow/hellowquiphistory.vue
index 091675e..aa5f6a3 100644
--- a/UI-Project/src/views/hollow/hellowquiphistory.vue
+++ b/UI-Project/src/views/hollow/hellowquiphistory.vue
@@ -1,6 +1,6 @@
<template>
<div>
-<div style="display: flex;width: 1770px;">
+<div style="display: flex;width: 2000px;">
<el-input v-model="flowCardId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('searchOrder.processcards')" />
<el-select v-model="selectValuesa[0]" filterable :placeholder="$t('hellow.isForceList')" clearable
style="width: 200px;margin-left: 10px;">
@@ -19,7 +19,7 @@
</el-date-picker>
<el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="sethistorical()">{{$t('reportmanage.inquire')}}</el-button>
</div>
- <el-table ref="table" style="margin-top: 20px;height: 580px;width: 1770px;" :data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table ref="table" style="margin-top: 20px;height: 580px;width: 100%;" :data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.processcards')" min-width="80" />
<el-table-column prop="totalLayer" align="center" :label="$t('hellow.totalLayer')" min-width="80" />
<el-table-column prop="totalPairQuantity" align="center" :label="$t('hellow.totalPairQuantity')" min-width="80" />
@@ -49,6 +49,12 @@
</el-table-column>
<el-table-column prop="formattedCreateTime" align="center" :label="$t('reportmanage.starttime')" min-width="100" />
<el-table-column prop="formattedUpdateTime" align="center" :label="$t('reportmanage.endtime')" min-width="100" />
+ <el-table-column fixed="right" :label="$t('film.operate')" align="center">
+ <template #default="scope">
+ <el-button size="mini" type="text" plain @click="handleptask(scope.row)">{{ $t('hellow.listFormula') }}</el-button>
+ <el-button size="mini" type="text" plain @click="handlecagedetails(scope.row)">{{ $t('hellow.HollowGlass') }}</el-button>
+ </template>
+ </el-table-column>
</el-table>
<div style="margin-top: 20px;margin-left: 40%;">
<el-pagination
@@ -62,6 +68,292 @@
style="margin-top: 10px;"
/>
</div>
+ <el-dialog v-model="dialogFormVisiblef" top="5vh" width="65%" :title="$t('hellow.HollowGlass')">
+ <el-table ref="table" style="margin-top: 20px;height: 450px;"
+ :data="tableDatacagedetails" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="flowCardId" :label="$t('hellow.flowCardId')" align="center" width="140"/>
+ <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" width="140"/>
+ <el-table-column prop="hollowSequence" :label="$t('hellow.order')" align="center"/>
+ <el-table-column prop="thickness" :label="$t('hellow.thickness')" align="center"/>
+ <el-table-column prop="layer" :label="$t('hellow.layer')" align="center"/>
+ <el-table-column prop="filmsId" :label="$t('hellow.coatingtypes')" align="center"/>
+ <el-table-column prop="height" :label="$t('hellow.height')" align="center"/>
+ <el-table-column prop="width" :label="$t('hellow.width')" align="center"/>
+ <el-table-column prop="state" :label="$t('hellow.state')" align="center">
+ <template #default="scope">
+ {{ scope.row.state == -1 ? $t('hellow.waitingout') : $t('hellow.finishout') }}
+ </template>
+ </el-table-column>
+ </el-table>
+</el-dialog>
+ <el-dialog v-model="dialogFormVisiblea" top="15vh" width="65%" :title="$t('hellow.listFormula')">
+ <div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
+ <el-form size="mini" label-width="150px">
+ <el-form label-width="150px" label-position="right">
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 16vw;">
+ <el-input disabled v-model="formulaName" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 16vw;">
+ <el-select v-model="filmRemove" clearable style="width: 220px" disabled>
+ <el-option :label="$t('Mounting.removal')" value="1"></el-option>
+ <el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
+ </el-select>
+ </el-form-item>
+ </div>
+ </div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 16vw;">
+ <el-input disabled v-model="bottomRemove" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 16vw;">
+ <el-input disabled v-model="topRemove" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 16vw;">
+ <el-input disabled v-model="leftRemove" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 16vw;">
+ <el-input disabled v-model="rightRemove" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.casOneb')" :required="true" style="width: 16vw;">
+ <el-select v-model="casOne" clearable disabled style="width: 220px">
+ <el-option :label="$t('hellow.F')" value="0"></el-option>
+ <el-option :label="$t('hellow.Y')" value="1"></el-option>
+ </el-select>
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.casTwob')" style="width: 16vw;">
+ <el-select v-model="casTwo" clearable disabled style="width: 220px">
+ <el-option :label="$t('hellow.F')" value="0"></el-option>
+ <el-option :label="$t('hellow.Y')" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.casThreeb')" style="width: 16vw;">
+ <el-select v-model="casThree" clearable disabled style="width: 220px">
+ <el-option :label="$t('hellow.F')" value="0"></el-option>
+ <el-option :label="$t('hellow.Y')" value="1"></el-option>
+ </el-select>
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.casFourb')" style="width: 16vw;">
+ <el-select v-model="casFour" clearable disabled style="width: 220px">
+ <el-option :label="$t('hellow.F')" value="0"></el-option>
+ <el-option :label="$t('hellow.Y')" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.frameOneb')" :required="true" style="width: 16vw;">
+ <el-input disabled v-model="frameOne" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.frameTwob')" style="width: 16vw;">
+ <el-input disabled v-model="frameTwo" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.frameThreeb')" style="width: 16vw;">
+ <el-input disabled v-model="frameThree" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.frameFourb')" style="width: 16vw;">
+ <el-input disabled v-model="frameFour" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameHeightbOne')" :required="true" style="width: 16vw;">
+ <el-input disabled v-model="intervalFrameHeightOne" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameHeightbTwo')" style="width: 16vw;">
+ <el-input disabled v-model="intervalFrameHeightTwo" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameHeightbThree')" style="width: 16vw;">
+ <el-input disabled v-model="intervalFrameHeightThree" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameHeightbFour')" style="width: 16vw;">
+ <el-input disabled v-model="intervalFrameHeightFour" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameWidthbOne')" :required="true" style="width: 16vw;">
+ <el-input disabled v-model="intervalFrameWidthOne" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameWidthbTwo')" style="width: 16vw;">
+ <el-input disabled v-model="intervalFrameWidthTwo" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameWidthbThree')" style="width: 16vw;">
+ <el-input disabled v-model="intervalFrameWidthThree" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameWidthbFour')" style="width: 16vw;">
+ <el-input disabled v-model="intervalFrameWidthFour" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameTypedOne')" :required="true" style="width: 16vw;">
+ <el-select v-model="intervalFrameTypeOne" clearable style="width: 220px" disabled>
+ <el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
+ <el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
+ </el-select>
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameTypedTwo')" style="width: 16vw;">
+ <el-select v-model="intervalFrameTypeTwo" clearable style="width: 220px" disabled>
+ <el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
+ <el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
+ </el-select>
+ </el-form-item>
+ </div>
+ </div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameTypedThree')" style="width: 16vw;">
+ <el-select v-model="intervalFrameTypeThree" clearable style="width: 220px" disabled>
+ <el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
+ <el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
+ </el-select>
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.intervalFrameTypedFour')" style="width: 16vw;">
+ <el-select v-model="intervalFrameTypeFour" clearable style="width: 220px" disabled>
+ <el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
+ <el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
+ </el-select>
+ </el-form-item>
+ </div>
+ </div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.sealInsertb')" :required="true" style="width: 16vw;">
+ <el-input disabled v-model="sealInsert" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-form>
+ </div>
+</el-dialog>
</div>
</template>
<script lang="ts" setup>
@@ -87,6 +379,39 @@
const flowCardId = ref('');
const rawGlassfilmsId = ref('');
const slot = ref('');
+const formattedCreate = ref('')
+const formulaName = ref('')
+const filmRemove = ref('')
+const topRemove = ref('')
+const bottomRemove = ref('')
+const leftRemove = ref('')
+const rightRemove = ref('')
+const frameOne = ref('')
+const frameTwo = ref('')
+const frameThree = ref('')
+const frameFour = ref('')
+const sealInsert = ref('')
+const casOne = ref('')
+const casTwo = ref('')
+const casThree = ref('')
+const casFour = ref('')
+const intervalFrameTypeOne = ref('')
+const intervalFrameWidthOne = ref('')
+const intervalFrameHeightOne = ref('')
+const intervalFrameTypeTwo = ref('')
+const intervalFrameWidthTwo = ref('')
+const intervalFrameHeightTwo = ref('')
+const intervalFrameTypeThree = ref('')
+const intervalFrameWidthThree = ref('')
+const intervalFrameHeightThre = ref('')
+const intervalFrameTypeFour = ref('')
+const intervalFrameWidthFour = ref('')
+const intervalFrameHeightFour = ref('')
+const createTime = ref('')
+const updateTime = ref('')
+const tableDatacagedetails = ref([])
+const dialogFormVisiblea = ref(false)
+const dialogFormVisiblef = ref(false)
let getglobalDate = window.localStorage.getItem('getglobalDate')
const historical = async () => {
try {
@@ -214,6 +539,84 @@
console.error(error);
}
}
+// 閰嶆柟淇℃伅
+const handleptask = (row) => {
+ fetchcagedl(row);
+ dialogFormVisiblea.value = true;
+};
+const removalMethodMap = {
+ 1: t('Mounting.removal'),
+ 0: t('Mounting.noremoval')
+};
+const fetchcagedl = async (row) => {
+ try {
+ var url="/hollowGlass/hollowFormulaDetails/getFormulaDetailsById?id="+ row.formulaId;
+ const response = await request.get(url)
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ formulaName.value = response.data.formulaName
+ filmRemove.value = removalMethodMap[response.data.filmRemove];
+ topRemove.value = response.data.topRemove
+ bottomRemove.value = response.data.bottomRemove
+ leftRemove.value = response.data.leftRemove
+ rightRemove.value = response.data.rightRemove
+ frameOne.value = response.data.frameOne
+ frameTwo.value = response.data.frameTwo
+ frameThree.value = response.data.frameThree
+ frameFour.value = response.data.frameFour
+ sealInsert.value = response.data.sealInsert
+ casOne.value = response.data.casOne
+ casTwo.value = response.data.casTwo
+ casThree.value = response.data.casThree
+ casFour.value = response.data.casFour
+ intervalFrameTypeOne.value = response.data.intervalFrameTypeOne
+ intervalFrameWidthOne.value = response.data.intervalFrameWidthOne
+ intervalFrameHeightOne.value = response.data.intervalFrameHeightOne
+ intervalFrameTypeTwo.value = response.data.intervalFrameTypeTwo
+ intervalFrameWidthTwo.value = response.data.intervalFrameWidthTwo
+ intervalFrameHeightTwo.value = response.data.intervalFrameHeightTwo
+ intervalFrameTypeThree.value = response.data.intervalFrameTypeThree
+ intervalFrameWidthThree.value = response.data.intervalFrameWidthThree
+ intervalFrameHeightThre.value = response.data.intervalFrameHeightThre
+ intervalFrameTypeFour.value = response.data.intervalFrameTypeFour
+ intervalFrameWidthFour.value = response.data.intervalFrameWidthFour
+ intervalFrameHeightFour.value = response.data.intervalFrameHeightFour
+ } else {
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
+// 闃熷垪淇℃伅
+const handlecagedetails = (row) => {
+ const { id } = row;
+ fetchcagedetails(id);
+ dialogFormVisiblef.value = true;
+};
+const fetchcagedetails = async (id) => {
+ try {
+ var url="/hollowGlass/hollowGlassQueueInfo/queryHollowGlassQueueInfoByTask?taskId="+ id;
+ const response = await request.post(url)
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ const formattedData = response.data.map(record => ({
+ ...record,
+ formaCreateTime: formatTimestamp(record.createTime),
+ formaUpdateTime: formatTimestamp(record.updateTime),
+ }));
+ tableDatacagedetails.value = formattedData;
+ } else {
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
function formatTimestamp(timestamp) {
const date = new Date(timestamp);
@@ -272,10 +675,44 @@
return t('hellow.yesisForceList');
}
}
+function getStatustate(state: number) {
+switch (state) {
+ case 0:
+ return 'primary';
+ case 1:
+ return 'success';
+}
+}
+function getStatustatet(state: number) {
+switch (state) {
+ case 0:
+ return t('hellow.noisForceList');
+ case 1:
+ return t('hellow.yesisForceList');
+}
+}
+function getisPairstate(isPair: number) {
+switch (isPair) {
+ case 0:
+ return 'info';
+ case 1:
+ return 'success';
+}
+}
+function getisPairstatet(isPair: number) {
+switch (isPair) {
+ case 1:
+ return t('sorter.yes');
+ case 0:
+ return t('hellow.no');
+}
+}
onMounted(() => {
parseAndSetTime();
historical();
});
</script>
-<style scoped>
+<style scoped>
+#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
+#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/hollow/hellowquiptwohistory.vue b/UI-Project/src/views/hollow/hellowquiptwohistory.vue
index b112750..7a86fff 100644
--- a/UI-Project/src/views/hollow/hellowquiptwohistory.vue
+++ b/UI-Project/src/views/hollow/hellowquiptwohistory.vue
@@ -49,6 +49,12 @@
</el-table-column>
<el-table-column prop="formattedCreateTime" align="center" :label="$t('reportmanage.starttime')" min-width="100" />
<el-table-column prop="formattedUpdateTime" align="center" :label="$t('reportmanage.endtime')" min-width="100" />
+ <el-table-column fixed="right" :label="$t('film.operate')" align="center">
+ <template #default="scope">
+ <el-button size="mini" type="text" plain @click="handleptask(scope.row)">{{ $t('hellow.listFormula') }}</el-button>
+ <el-button size="mini" type="text" plain @click="handlecagedetails(scope.row)">{{ $t('hellow.HollowGlass') }}</el-button>
+ </template>
+ </el-table-column>
</el-table>
<div style="margin-top: 20px;margin-left: 40%;">
<el-pagination
@@ -62,6 +68,88 @@
style="margin-top: 10px;"
/>
</div>
+
+ <el-dialog v-model="dialogFormVisiblef" top="5vh" width="65%" :title="$t('hellow.HollowGlass')">
+ <el-table ref="table" style="margin-top: 20px;height: 450px;"
+ :data="tableDatacagedetails" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="flowCardId" :label="$t('hellow.flowCardId')" align="center" width="140"/>
+ <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" width="140"/>
+ <el-table-column prop="hollowSequence" :label="$t('hellow.order')" align="center"/>
+ <el-table-column prop="thickness" :label="$t('hellow.thickness')" align="center"/>
+ <el-table-column prop="layer" :label="$t('hellow.layer')" align="center"/>
+ <el-table-column prop="filmsId" :label="$t('hellow.coatingtypes')" align="center"/>
+ <el-table-column prop="height" :label="$t('hellow.height')" align="center"/>
+ <el-table-column prop="width" :label="$t('hellow.width')" align="center"/>
+ <el-table-column prop="state" :label="$t('hellow.state')" align="center">
+ <template #default="scope">
+ {{ scope.row.state == -1 ? $t('hellow.waitingout') : $t('hellow.finishout') }}
+ </template>
+ </el-table-column>
+ </el-table>
+</el-dialog>
+<el-dialog v-model="dialogFormVisiblea" top="23vh" width="55%" :title="$t('hellow.listFormula')" >
+ <div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
+ <el-form size="mini" label-width="150px">
+ <el-form label-width="150px" label-position="right">
+ <el-row style="margin-top: 10px;">
+ <el-col :span="8">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.formulaName')" style="width: 16vw;">
+ <el-input disabled v-model="formulaName" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="10">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('Mounting.removalmethoda')" style="width: 16vw;">
+ <el-select v-model="filmRemove" clearable style="width: 220px" disabled>
+ <el-option :label="$t('Mounting.removal')" value="1"></el-option>
+ <el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
+ </el-select>
+ </el-form-item>
+ </div>
+ </div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="8">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.bottomRemove')" style="width: 16vw;">
+ <el-input disabled v-model="bottomRemove" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="10">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.topRemove')" style="width: 16vw;">
+ <el-input disabled v-model="topRemove" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="8">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.leftRemove')" style="width: 16vw;">
+ <el-input disabled v-model="leftRemove" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="10">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('hellow.rightRemove')" style="width: 16vw;">
+ <el-input disabled v-model="rightRemove" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-form>
+ </div>
+ </el-dialog>
</div>
</template>
<script lang="ts" setup>
@@ -86,7 +174,37 @@
const rawGlassThickness = ref('');
const flowCardId = ref('');
const rawGlassfilmsId = ref('');
-const slot = ref('');
+const formattedCreate = ref('')
+const formulaName = ref('')
+const filmRemove = ref('')
+const topRemove = ref('')
+const bottomRemove = ref('')
+const leftRemove = ref('')
+const rightRemove = ref('')
+const frameOne = ref('')
+const frameTwo = ref('')
+const frameThree = ref('')
+const frameFour = ref('')
+const sealInsert = ref('')
+const casOne = ref('')
+const casTwo = ref('')
+const casThree = ref('')
+const casFour = ref('')
+const intervalFrameTypeOne = ref('')
+const intervalFrameWidthOne = ref('')
+const intervalFrameHeightOne = ref('')
+const intervalFrameTypeTwo = ref('')
+const intervalFrameWidthTwo = ref('')
+const intervalFrameHeightTwo = ref('')
+const intervalFrameTypeThree = ref('')
+const intervalFrameWidthThree = ref('')
+const intervalFrameHeightThre = ref('')
+const intervalFrameTypeFour = ref('')
+const intervalFrameWidthFour = ref('')
+const intervalFrameHeightFour = ref('')
+const tableDatacagedetails = ref([])
+const dialogFormVisiblea = ref(false)
+const dialogFormVisiblef = ref(false)
let getglobalDate = window.localStorage.getItem('getglobalDate')
const historical = async () => {
try {
@@ -168,6 +286,84 @@
console.error(error);
}
}
+// 閰嶆柟淇℃伅
+const handleptask = (row) => {
+ fetchcagedl(row);
+ dialogFormVisiblea.value = true;
+};
+const removalMethodMap = {
+ 1: t('Mounting.removal'),
+ 0: t('Mounting.noremoval')
+};
+const fetchcagedl = async (row) => {
+ try {
+ var url="/hollowGlass/hollowFormulaDetails/getFormulaDetailsById?id="+ row.formulaId;
+ const response = await request.get(url)
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ formulaName.value = response.data.formulaName
+ filmRemove.value = removalMethodMap[response.data.filmRemove];
+ topRemove.value = response.data.topRemove
+ bottomRemove.value = response.data.bottomRemove
+ leftRemove.value = response.data.leftRemove
+ rightRemove.value = response.data.rightRemove
+ frameOne.value = response.data.frameOne
+ frameTwo.value = response.data.frameTwo
+ frameThree.value = response.data.frameThree
+ frameFour.value = response.data.frameFour
+ sealInsert.value = response.data.sealInsert
+ casOne.value = response.data.casOne
+ casTwo.value = response.data.casTwo
+ casThree.value = response.data.casThree
+ casFour.value = response.data.casFour
+ intervalFrameTypeOne.value = response.data.intervalFrameTypeOne
+ intervalFrameWidthOne.value = response.data.intervalFrameWidthOne
+ intervalFrameHeightOne.value = response.data.intervalFrameHeightOne
+ intervalFrameTypeTwo.value = response.data.intervalFrameTypeTwo
+ intervalFrameWidthTwo.value = response.data.intervalFrameWidthTwo
+ intervalFrameHeightTwo.value = response.data.intervalFrameHeightTwo
+ intervalFrameTypeThree.value = response.data.intervalFrameTypeThree
+ intervalFrameWidthThree.value = response.data.intervalFrameWidthThree
+ intervalFrameHeightThre.value = response.data.intervalFrameHeightThre
+ intervalFrameTypeFour.value = response.data.intervalFrameTypeFour
+ intervalFrameWidthFour.value = response.data.intervalFrameWidthFour
+ intervalFrameHeightFour.value = response.data.intervalFrameHeightFour
+ } else {
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
+// 闃熷垪淇℃伅
+const handlecagedetails = (row) => {
+ const { id } = row;
+ fetchcagedetails(id);
+ dialogFormVisiblef.value = true;
+};
+const fetchcagedetails = async (id) => {
+ try {
+ var url="/hollowGlass/hollowGlassQueueInfo/queryHollowGlassQueueInfoByTask?taskId="+ id;
+ const response = await request.post(url)
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ const formattedData = response.data.map(record => ({
+ ...record,
+ formaCreateTime: formatTimestamp(record.createTime),
+ formaUpdateTime: formatTimestamp(record.updateTime),
+ }));
+ tableDatacagedetails.value = formattedData;
+ } else {
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
// 鍘嗗彶鏌ヨ鐐瑰嚮
const sethistorical = async () => {
try {
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index 1dd4c53..a872d2c 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -23,7 +23,6 @@
$t('hellow.stopproject')
}}
</el-button>
- <el-switch style="margin-top: 7px;margin-left: 10px;" v-model="ganghua" class="mb-2" :inactive-text="$t('hellow.schedulingswitch')" @change="handleChange" />
</div>
<div id="dotClass">
<!-- <div style="margin-bottom: -5px;margin-left: 5px;"> -->
@@ -70,7 +69,7 @@
<el-table-column prop="width" :label="$t('hellow.width')" align="center"/>
<el-table-column prop="state" :label="$t('hellow.state')" align="center">
<template #default="scope">
- {{ scope.row.state == -1 ? "绛夊緟鍑虹墖" : "鍑虹墖瀹屾垚" }}
+ {{ scope.row.state == -1 ? $t('hellow.waitingout') : $t('hellow.finishout') }}
</template>
</el-table-column>
</el-table>
@@ -986,7 +985,7 @@
</template>
</el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
- <el-dialog v-model="blindb" top="5vh" width="71%">
+ <el-dialog v-model="blindb" top="5vh" width="80%">
<iframe
:src="iframeUrl"
marginwidth="2000px"
@@ -1017,7 +1016,6 @@
const cell = ref('')
const cella = ref('')
const selectedProjectNo = ref('');
-const ganghua = ref(true)
const totalPairQuantity = ref('')
const totalPairQuantitya = ref('')
const bottomRemove = ref('')
@@ -1806,25 +1804,7 @@
console.error(error);
}
}
-// 璋冨害
-const handleChange = async () => {
- try {
- const body = {
- flag: ganghua.value,
- };
- var url="/hollowGlass/hollowGlassOutRelationInfo/dispatchHollowSwitch?flag="+ganghua.value;
- const response = await request.post(url)
- if (response.code == 200) {
- ElMessage.success(response.message);
- ganghua.value = response.data
- }else {
- ElMessage.error(response.message);
- }
-}
-catch (error) {
- console.error(error);
- }
-}
+
onBeforeUnmount(() => {
console.log("鍏抽棴浜�")
closeWebSocket();
diff --git a/UI-Project/src/views/hollow/hollowequipmenttwo.vue b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
index 649f692..dbd27ad 100644
--- a/UI-Project/src/views/hollow/hollowequipmenttwo.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
@@ -23,7 +23,6 @@
$t('hellow.stopproject')
}}
</el-button>
- <el-switch style="margin-top: 7px;margin-left: 10px;" v-model="ganghua" class="mb-2" :inactive-text="$t('hellow.schedulingswitch')" @change="handleChange" />
</div>
<div id="dotClass">
@@ -511,7 +510,6 @@
const cell = ref('')
const cella = ref('')
const selectedProjectNo = ref('');
-const ganghua = ref(true)
const totalPairQuantity = ref('')
const totalPairQuantitya = ref('')
const bottomRemove = ref('')
@@ -993,26 +991,7 @@
console.error(error);
}
}
-// 璋冨害
-const handleChange = async () => {
- try {
- const body = {
- flag: ganghua.value,
- };
-
- var url="/hollowGlass/hollowGlassOutRelationInfo/dispatchHollowSwitch?flag="+ganghua.value;
- const response = await request.post(url)
- if (response.code == 200) {
- ElMessage.success(response.message);
- ganghua.value = response.data
- }else {
- ElMessage.error(response.message);
- }
-}
-catch (error) {
- console.error(error);
- }
-}
+
onBeforeUnmount(() => {
console.log("鍏抽棴浜�")
closeWebSocket();
diff --git a/UI-Project/src/views/hollow/hollowslicecage.vue b/UI-Project/src/views/hollow/hollowslicecage.vue
index f853e1a..84fd9de 100644
--- a/UI-Project/src/views/hollow/hollowslicecage.vue
+++ b/UI-Project/src/views/hollow/hollowslicecage.vue
@@ -395,10 +395,10 @@
}else{
carPosition.value = []
}
-if(data.temperingSwitch!=null){
- ganghua.value = data.temperingSwitch[0]
+if(data.dispatchHollowSwitch!=null){
+ diaodu.value = data.dispatchHollowSwitch[0]
}else{
- ganghua.value = ''
+ diaodu.value = ''
}
if(data.bigStorageCageInfos!=null){
adjustedRects.value = data.bigStorageCageInfos[0][1].map((rect, index) => ({
--
Gitblit v1.8.0