From d1eff5950e525c5af6b972432209e84f1e398419 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 15 四月 2025 09:38:35 +0800
Subject: [PATCH] 中空一线、二线、三线领取任务
---
UI-Project/src/views/Slicecage/slicecage.vue | 362 +++++++++++---------------------------------------
1 files changed, 83 insertions(+), 279 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index ba10a0a..d289f6f 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -81,52 +81,10 @@
const printFlowCardId = ref('')
const printLayer = ref('')
const printGlassId = ref('')
-const dialogTableVisible1 = ref(false)
const open1 = async (row) => {
printFlowCardId.value = row.flowCardId;
printLayer.value = row.layer
printGlassId.value = row.glassId
-dialogTableVisible1.value = true;
-setTimeout(() => {
- printFlowCard1();
- //dialogTableVisible1.value = false;
-}, 1000);
-}
-const printFlowCard1 = () => {
- // 闇�瑕佹墦鍗扮殑灞�閮ㄥ尯鍩熻祴浜�"print-wrap"鐨刬d
- let el = document.getElementById("printFlowCard");
- let doc = document;
- let body = doc.body || doc.getElementsByTagName("body")[0];
- let printId = "print-" + Date.now();
- // 鍒涘缓鏃犲壇浣滅敤鐨勬墦鍗板鍣�(鍥犱笉纭畾椤甸潰鐨勬墦鍗板厓绱犳湁鏃犲叾瀹冩牱寮�)
- let content = doc.createElement("div");
- content.id = printId;
- // 鏍峰紡鎺у埗涓庢墦鍗版棤鍏崇殑鍏冪礌闅愯棌
- let style = doc.createElement("style");
- style.innerHTML =
- "body>#" +
- printId +
- "{display:none}@media print{" +
- "@page {" +
- " size: auto; " +
- " margin: 2mm 2mm 2mm 2mm; " +
- " }body>:not(#" +
- printId +
- "){display:none !important}body>#" +
- printId +
- "{display:block;padding-top:1px}}";
- //
- content.innerHTML = el.outerHTML;
- // // console.log("el.outerHTML", el.outerHTML);
- body.appendChild(style);
- // 涓巗tyle鍏冪礌璁剧疆鐨勬牱寮忕浉閰嶅悎
- // 鎶婃墦鍗板唴瀹圭殑鍏冪礌娣诲姞鍒癰ody(浣滀负body鐨勫瓙鍏冪礌锛屽彲鐢╞ody鐨勫瓙閫夋嫨鍣� '>' 鎺у埗鎵撳嵃鏍峰紡)
- body.appendChild(content);
- setTimeout(() => {
- window.print();
- body.removeChild(content);
- body.removeChild(style);
- }, 20);
}
// setInterval(() => {
// localStorage.clear(); // 娓呴櫎鎵�鏈塴ocalStorage鏁版嵁
@@ -149,7 +107,6 @@
}
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
- console.log(currentPage2.value);
window.localStorage.setItem('pagenumber', currentPage2.value)
fetchxiang(currentPage2.value);
};
@@ -174,7 +131,6 @@
ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
};
// 鏄惁绂佺敤
@@ -202,7 +158,6 @@
row.isDamage = newState;
}
catch (error) {
- console.error(error);
}
}
// 鍒犻櫎
@@ -227,7 +182,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
// 鐮存崯
@@ -251,88 +205,15 @@
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 鍘嗗彶浠诲姟
-// const handlehistorical = (row) => {
-// blindb.value = true;
-// historical()
-// };
-// 鍘嗗彶浠诲姟
-const historical = async () => {
- try {
- let startTime = window.localStorage.getItem('startTime')
- const response = await request.post("/cacheVerticalGlass/bigStorageCageHistoryTask/queryBigStorageCageHistoryTask", {
- glassId: glassId.value,
- startSlot: 0,
- targetSlot: 0,
- taskStateList: [],
- taskTypeList: [],
- beginDate: startTime,
- endDate: globalDate
- })
- if (response.code == 200) {
- ElMessage.success(response.message);
- tableDatax.value = response.data;
- } else {
- ElMessage.error(response.message);
- }
-}
-catch (error) {
- console.error(error);
- }
-}
-// 鍘嗗彶鏌ヨ
-const sethistorical = async () => {
- try {
- let startTime = window.localStorage.getItem('startTime')
- let celllist=[]
- let stateList=[]
- let pstartSlot= ''
- let ptargetSlot=''
- if(selectValuesa[0]!=null&&selectValuesa[0]!='undefined'){
- if(selectValuesa[0]!=""){
- celllist=[selectValuesa[0]];
- }
- }
- if(selectValuesa[1]!=null&&selectValuesa[1]!='undefined'){
- if(selectValuesa[1]!=""){
- stateList=[selectValuesa[1]];
- }
- }
- if(startSlot.value != ""){
- pstartSlot = startSlot.value
- }else{
- pstartSlot = '0'
- }
- if(targetSlot.value != ""){
- ptargetSlot = targetSlot.value
- }else{
- ptargetSlot = '0'
- }
- const response = await request.post("/cacheVerticalGlass/bigStorageCageHistoryTask/queryBigStorageCageHistoryTask", {
- glassId: glassId.value,
- startSlot: pstartSlot,
- targetSlot: ptargetSlot,
- taskStateList: celllist,
- taskTypeList: stateList,
- beginDate: startTime,
- endDate: globalDate
- })
- if (response.code == 200) {
- ElMessage.success(response.message);
- tableDatax.value = response.data;
- } else {
- ElMessage.error(response.message);
- }
-}
-catch (error) {
- console.error(error);
- }
-}
-
+const iframeUrl = ref('');
+const handlehistorical = (row) => {
+ blindb.value = true;
+ iframeUrl.value = `${window.location.origin}/#/Slicecage/slicecagehistory`;
+};
// 鎷胯蛋
const brokec = async(row) => {
try {
@@ -354,8 +235,7 @@
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 鍑虹墖
@@ -378,8 +258,7 @@
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 鍑虹墖闃熷垪鐮存崯
@@ -402,8 +281,7 @@
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 鎸囧畾閽㈠寲
@@ -430,8 +308,7 @@
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
handleganghua();
};
@@ -455,8 +332,7 @@
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 鍙栨秷鎸囧畾
@@ -472,17 +348,14 @@
}
);
if (confirmResult === 'confirm') {
- const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/appointEngineerId",{
- engineerId: ""
- });
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/cancelTemperingTask");
if (response.code === 200) {
ElMessage.success(response.message);
} else {
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 鎸囧畾娴佺▼鍗�
@@ -508,8 +381,7 @@
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 鍑虹墖闃熷垪鎷胯蛋
@@ -532,8 +404,7 @@
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 鍑虹墖闃熷垪鍒犻櫎
@@ -560,8 +431,7 @@
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 瀹屾垚浠诲姟
@@ -585,7 +455,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
// 纭娣诲姞
@@ -621,7 +490,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
const handleganghua = () => {
@@ -630,7 +498,7 @@
};
const handlexiang = () => {
dialogFormVisiblea.value = true;
- fetchxiang(1);
+ fetchxiang();
currentPage2.value = 1;
window.localStorage.setItem('pagenumber', currentPage2.value)
filmsId.value = ''
@@ -663,10 +531,10 @@
}
});
// 鐞嗙墖绗间俊鎭�
-const fetchxiang = async (page) => {
+const fetchxiang = async () => {
try {
const response = await request.post('/cacheVerticalGlass/bigStorageCage/querybigStorageCageDetail',{
- deviceId: page,
+ // deviceId: page,
filmsId: filmsId.value,
flowCardId: flowCardId.value,
})
@@ -728,7 +596,6 @@
}
catch (error) {
// 澶勭悊閿欒
- console.error(error);
}
}
// 绗煎唴璇︽儏
@@ -739,8 +606,6 @@
temperingLayoutId: temperingLayoutId,
})
if (response.code == 200) {
- console.log(response.data);
-
ElMessage.success(response.message);
tableDatacagedetails.value = response.data
} else {
@@ -748,8 +613,6 @@
}
}
catch (error) {
- // 澶勭悊閿欒
- console.error(error);
}
}
const fetchFlow = async () => {
@@ -776,8 +639,6 @@
}
}
catch (error) {
- // 澶勭悊閿欒
- console.error(error);
}
}
function handleRowClick(row) {
@@ -800,7 +661,6 @@
}
}
catch (error) {
- console.error(error);
}
}
// 璋冨害寮�鍏�
@@ -819,7 +679,6 @@
}
}
catch (error) {
- console.error(error);
}
}
// 浠诲姟閲嶇疆
@@ -842,19 +701,12 @@
ElMessage.error(response.msg);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/slicecage`;
const handleMessage = (data) => {
- if (cageInfo && cageInfo.createTime) {
- cageInfo.formattedCreateTime = formatTimestamp(cageInfo.createTime);
- }
- if (cageInfo && cageInfo.updateTime) {
- cageInfo.formattedupdateTime = formatTimestamp(cageInfo.updateTime);
- }
if(data.bigStorageSummary!=null){
tableDatass.value = data.bigStorageSummary[0]
}else{
@@ -899,6 +751,11 @@
adjusta.value = ''
}
if(data.bigStorageCageDetailsFeedTask!=null){
+ tableDatax.value = data.bigStorageCageDetailsFeedTask[0]
+ } else {
+ tableDatax.value = ''
+ }
+ if(data.bigStorageCageDetailsFeedTask!=null){
tableDatad.value = data.bigStorageCageDetailsFeedTask[0]
adjust.value = data.bigStorageCageDetailsFeedTask[0].filter(rect => rect.slot !== null && rect.slot !== undefined);
}else{
@@ -923,6 +780,11 @@
ganghua.value = data.temperingSwitch[0]
}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) => ({
@@ -1093,8 +955,7 @@
function parseAndSetTime() {
const backendTime = new Date(globalDate);
const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
- console.log(formatTimestamp(oneWeekAgo));
- console.log(oneWeekAgo);
+ oneWeekAgo.setHours(0, 0, 0, 0);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
}
@@ -1175,7 +1036,7 @@
}
function tableRowClassName({ row }) {
if (row.isSame === 1) {
- return 'row-red-background'; // 璁剧疆绾㈣壊鑳屾櫙
+ return 'row-red-background';
}
return '';
}
@@ -1216,24 +1077,9 @@
<i :style="{ marginTop: '2px', backgroundColor: outRequestEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
</div>
<div class="table-container">
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 300px;">
<el-table height="300px" ref="table"
- :data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="glassId" align="center" :label="$t('searchOrder.outputglassID')" min-width="140" />
- <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
- <el-table-column prop="targetSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" />
- <el-table-column prop="taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="157">
- <template #default="scope">
- <el-tag type="success" >{{ scope.row.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag>
- </template>
- </el-table-column>
- </el-table>
- </div>
- </el-card>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading">
- <el-table height="300px" ref="table"
- @selection-change="handleSelectionChange"
:row-class-name="tableRowClassName"
:data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="glassId" align="center" :label="$t('searchOrder.intoglassid')" min-width="140" />
@@ -1252,6 +1098,20 @@
</template>
</el-table-column>
</el-table>
+ </div>
+ </el-card>
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;">
+ <el-table height="300px" ref="table"
+ :data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="glassId" align="center" :label="$t('searchOrder.outputglassID')" min-width="140" />
+ <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
+ <el-table-column prop="targetSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" />
+ <el-table-column prop="taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="157">
+ <template #default="scope">
+ <el-tag type="success" >{{ scope.row.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag>
+ </template>
+ </el-table-column>
+ </el-table>
</el-card>
</div>
<div style="padding: 10px;display: flex;height:130px;">
@@ -1335,15 +1195,15 @@
</div>
</div>
</div>
-<el-card style="flex: 1;margin-left: 1220px;margin-top: -510px;" v-loading="loading">
+<el-card style="flex: 1;margin-left: 1220px;margin-top: -510px;">
<div style="width: 100%; height: calc(100% - 35px); overflow-y: auto;max-height: 420px;">
<el-table height="420px" ref="table" border
: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>
@@ -1406,13 +1266,13 @@
<el-table-column prop="gap" align="center" :label="$t('searchOrder.glassgaps')" min-width="150"/>
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="150">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="finisha(scope.row)">{{ $t('searchOrder.sureadd') }}</el-button>
+ <el-button type="text" plain @click="finisha(scope.row)">{{ $t('searchOrder.sureadd') }}</el-button>
</template>
</el-table-column>
</el-table>
</div>
</el-dialog>
-<el-dialog v-model="dialogFormVisiblea" top="2vh" width="97%" :title="$t('searchOrder.cageinformation')">
+<el-dialog v-model="dialogFormVisiblea" top="2vh" width="95%" :title="$t('searchOrder.cageinformation')">
<div style="display: flex;">
<el-input v-model="flowCardId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.incardnumber')" />
<el-input v-model="filmsId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('film.infilms')"/>
@@ -1434,12 +1294,12 @@
<el-table
:data="props.row.bigStorageCageDetails"
border
- style="width: 100%;margin-left: 20px;"
+ style="width: 98%;margin-left: 20px;"
row-key="id"
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
>
<!-- <el-table-column prop="menuName" label="浜岀骇鑿滃崟鏍�" align="center" min-width="140" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"/> -->
- <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" min-width="130"/>
+ <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" min-width="120"/>
<el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="130" />
<el-table-column prop="filmsId" align="center" :label="$t('searchOrder.coatingtypes')" min-width="80" />
<!-- <el-table-column prop="glassType" align="center" :label="$t('searchOrder.typeglass')" min-width="80" /> -->
@@ -1463,10 +1323,10 @@
<el-table-column prop="gap" align="center" :label="$t('searchOrder.glassgaps')" min-width="80" />
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" min-width="220">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="broke(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
- <el-button size="mini" type="text" plain @click="brokec(scope.row)">{{ $t('searchOrder.takeout') }}</el-button>
- <el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('searchOrder.delete') }}</el-button>
- <el-button size="mini" type="text"
+ <el-button type="text" plain @click="broke(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
+ <el-button type="text" plain @click="brokec(scope.row)">{{ $t('searchOrder.takeout') }}</el-button>
+ <el-button type="text" plain @click="opena(scope.row)">{{ $t('searchOrder.delete') }}</el-button>
+ <el-button type="text"
:disabled="!((props.row.bigStorageCageDetails[0].state !== 102 && scope.$index == 0 ) || (props.row.bigStorageCageDetails[(scope.$index - 1)<0?0:scope.$index-1].state==102)&&(scope.row.state!=102))"
plain @click="outfil(scope.row)">
{{ $t('searchOrder.outfilm') }}
@@ -1477,8 +1337,8 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="id" :label="$t('searchOrder.cagetableID')" align="center" min-width="100"/>
- <el-table-column prop="deviceId" align="center" :label="$t('searchOrder.cagenumber')" min-width="150" />
+ <el-table-column prop="id" :label="$t('searchOrder.cagetableID')" align="center" min-width="90"/>
+ <el-table-column prop="deviceId" align="center" :label="$t('searchOrder.cagenumber')" min-width="100" />
<el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="150" />
<el-table-column
align="center"
@@ -1499,12 +1359,12 @@
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.add') }}</el-button>
+ <el-button type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.add') }}</el-button>
</template>
</el-table-column>
</el-table>
<div>
- <div style="margin-top: 20px;margin-left: 40%;">
+ <!-- <div style="margin-top: 20px;margin-left: 40%;">
<el-pagination
background
size="large"
@@ -1513,71 +1373,19 @@
:current-page.sync="currentPage2"
@current-change="handlePageChange2"
/>
- </div>
+ </div> -->
</div>
</el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
-<el-dialog v-model="blindb" top="10vh" width="90%">
- <div style="display: flex;">
- <el-input v-model="glassId" style="margin-left: 10px;margin-bottom: 10px;width: 270px;" :placeholder="$t('searchOrder.inglassID')" />
- <el-input v-model="startSlot" style="margin-left: 10px;margin-bottom: 10px;width: 270px;" :placeholder="$t('film.originateslot')" />
- <el-input v-model="targetSlot" style="margin-left: 10px;margin-bottom: 10px;width: 270px;" :placeholder="$t('film.endslot')" />
- <el-select v-model="selectValuesa[0]" filterable :placeholder="$t('searchOrder.taskstatus')" clearable
- style="width: 270px;margin-left: 10px;">
- <el-option :label="$t('searchOrder.begin')" value="0"></el-option>
- <el-option :label="$t('searchOrder.finish')" value="2"></el-option>
- <el-option :label="$t('order.dilapidation')" value="3"></el-option>
- <el-option :label="$t('searchOrder.uncar')" value="4"></el-option>
- </el-select>
- <el-select v-model="selectValuesa[1]" filterable :placeholder="$t('film.enabletype')" clearable
- style="width: 270px;margin-left: 10px;">
- <el-option :label="$t('searchOrder.inkage')" value="1"></el-option>
- <el-option :label="$t('searchOrder.outfilm')" value="2"></el-option>
- <el-option :label="$t('film.dispatch')" value="3"></el-option>
- </el-select>
- <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" :start-placeholder="$t('reportmanage.starttime')"
- style="margin-left: 15px;" value-format = "YYYY-MM-DD hh:mm:ss"
- :end-placeholder="$t('reportmanage.endtime')">
- </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: 650px;" :data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="glassIdIn" align="center" :label="$t('searchOrder.intoglassid')" min-width="80" />
- <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('processCard.layer')" min-width="120" />
- <el-table-column
- align="center"
- :label="$t('film.taskstatus')"
- min-width="80"
- prop="taskState"
- >
- <template #default="scope">
- <el-tag :type="getStatusTypeb(scope.row.taskState)">
- {{ getStatusTextb(scope.row.taskState) }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column
- align="center"
- :label="$t('film.enabletype')"
- min-width="80"
- prop="taskType"
- >
- <template #default="scope">
- <el-tag :type="getStatusTypea(scope.row.taskType)">
- {{ getStatusTexta(scope.row.taskType) }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="createTime" align="center" :label="$t('film.createtime')" min-width="120" />
- <el-table-column prop="updateTime" align="center" :label="$t('sorter.updateTime')" min-width="120" />
- </el-table>
- <template #footer>
- <div id="dialog-footer">
- <el-button @click="blindb = false">{{ $t('large.close') }}</el-button>
- </div>
- </template>
+<el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
+ <iframe
+ :src="iframeUrl"
+ marginwidth="2000px"
+ marginheight="2000px"
+ width="100%"
+ height="750px"
+ frameborder="0"
+ ></iframe>
</el-dialog>
<!-- 閽㈠寲鏌ヨ -->
<el-dialog v-model="dialogFormVisiblec" top="5vh" width="85%" :title="$t('searchOrder.temperingqueries')">
@@ -1614,7 +1422,7 @@
</el-col>
<el-col :span="4">
<div id="dt" style="font-size: 15px;">
- <el-button size="mini" type="text" plain @click="broked()">{{ $t('searchOrder.undesignate') }}</el-button>
+ <el-button type="text" plain @click="broked()">{{ $t('searchOrder.undesignate') }}</el-button>
</div>
</el-col>
</el-row>
@@ -1632,11 +1440,11 @@
<el-table-column prop="damageCount" align="center" :label="$t('searchOrder.breakquantity')" min-width="150" />
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="500">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="brokee(scope.row,1)">{{ $t('searchOrder.specifytempering') }}</el-button>
- <el-button size="mini" type="text" plain @click="brokee(scope.row,0)">{{ $t('searchOrder.specifyout') }}</el-button>
- <el-button size="mini" type="text" plain @click="brokek(scope.row)">{{ $t('searchOrder.specifyengineerid') }}</el-button>
- <el-button size="mini" type="text" plain @click="handlelack(scope.row)">{{ $t('searchOrder.lacknumber') }}</el-button>
- <el-button size="mini" type="text" plain @click="handlecagedetails(scope.row)">{{ $t('searchOrder.cagedetails') }}</el-button>
+ <el-button type="text" plain @click="brokee(scope.row,1)">{{ $t('searchOrder.specifytempering') }}</el-button>
+ <el-button type="text" plain @click="brokee(scope.row,0)">{{ $t('searchOrder.specifyout') }}</el-button>
+ <el-button type="text" plain @click="brokek(scope.row)">{{ $t('searchOrder.specifyengineerid') }}</el-button>
+ <el-button type="text" plain @click="handlelack(scope.row)">{{ $t('searchOrder.lacknumber') }}</el-button>
+ <el-button type="text" plain @click="handlecagedetails(scope.row)">{{ $t('searchOrder.cagedetails') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -1779,11 +1587,11 @@
<el-table-column prop="damageCount" align="center" :label="$t('searchOrder.breakquantity')" min-width="150" />
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="500">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="brokee(scope.row,1)">{{ $t('searchOrder.specifytempering') }}</el-button>
- <el-button size="mini" type="text" plain @click="brokee(scope.row,0)">{{ $t('searchOrder.specifyout') }}</el-button>
- <el-button size="mini" type="text" plain @click="brokek(scope.row)">{{ $t('searchOrder.specifyengineerid') }}</el-button>
- <el-button size="mini" type="text" plain @click="handlelack(scope.row)">{{ $t('hellow.missingnumber') }}</el-button>
- <el-button size="mini" type="text" plain @click="handlecagedetails(scope.row)">{{ $t('searchOrder.cagedetails') }}</el-button>
+ <el-button type="text" plain @click="brokee(scope.row,1)">{{ $t('searchOrder.specifytempering') }}</el-button>
+ <el-button type="text" plain @click="brokee(scope.row,0)">{{ $t('searchOrder.specifyout') }}</el-button>
+ <el-button type="text" plain @click="brokek(scope.row)">{{ $t('searchOrder.specifyengineerid') }}</el-button>
+ <el-button type="text" plain @click="handlelack(scope.row)">{{ $t('hellow.missingnumber') }}</el-button>
+ <el-button type="text" plain @click="handlecagedetails(scope.row)">{{ $t('searchOrder.cagedetails') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -1794,15 +1602,11 @@
<el-table-column prop="count" align="center" :label="$t('searchOrder.numberglasses')" />
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" >
<template #default="scope">
- <el-button size="mini" type="text" plain @click="brokes(scope.row)">{{ $t('searchOrder.processcard') }}</el-button>
+ <el-button type="text" plain @click="brokes(scope.row)">{{ $t('searchOrder.processcard') }}</el-button>
</template>
</el-table-column>
</el-table> -->
</el-dialog>
- <el-dialog id="sizePrintCalrd1" v-model="dialogTableVisible1" destroy-on-close>
- <print-label id="printFlowCard" :printFlowCardId="printFlowCardId" :printLayer="printLayer"
- :printGlassId="printGlassId" style=""/>
- </el-dialog>
</template>
<style>
#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
--
Gitblit v1.8.0