From c407e091ff0320625ef2566a4bea362c697200c9 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 29 六月 2024 22:09:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Slicecage/slicecage.vue | 1171 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 804 insertions(+), 367 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 068a4da..a27ce75 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -1,10 +1,13 @@
<script lang="ts" setup>
+import { useI18n } from 'vue-i18n'
+ const { t } = useI18n()
+ let language = ref(localStorage.getItem('lang') || 'zh')
import {Search} from "@element-plus/icons-vue";
-import {reactive} from "vue";
import {useRouter} from "vue-router"
const router = useRouter()
+import request from "@/utils/request"
import { WebSocketHost ,host} from '@/utils/constants'
-import { ref, onMounted , onBeforeUnmount} from "vue";
+import { ref, onMounted , onBeforeUnmount, reactive} from "vue";
import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
import { ElMessage, ElMessageBox } from 'element-plus'
import { tr } from "element-plus/es/locale";
@@ -15,10 +18,30 @@
const tableDatab = ref([])
const tableDatac = ref([])
const tableDatad = ref([])
+const tableDataf = ref([])
const tableDatae = ref([])
const adjustedRects = ref([]);
-const height = ref([]);
-
+const project = ref([]);
+const adjustedRectsa = ref([]);
+const adjustedRectsb = ref([]);
+const adjustedRectsc = ref([]);
+const adjustedRectsd = ref([]);
+const adjustedRectse = ref([]);
+const adjustedRectsf = ref([]);
+const adjustedRectsg = ref([]);
+const currentRow = reactive({}); // 褰撳墠琛岀殑鏁版嵁
+const add = ref(false)
+const flowCardId = ref('');
+const gap = ref('');
+const glassId = ref('');
+const glassType = ref('');
+const height = ref('');
+const sequence = ref('');
+const state = ref('');
+const temperingFeedSequence = ref('');
+const temperingLayoutId = ref('');
+const thickness = ref('');
+const width = ref('');
const carposition1 = ref(60);
const carposition2 = ref(220);
const carposition3 = ref(60);
@@ -46,136 +69,10 @@
const cell6=ref(true);
const cell7=ref(true);
const cell8=ref(true);
-
+const selectedRow = ref(null); // 瀛樺偍閫変腑鐨勮鏁版嵁
const currentPage4 = ref(4)
const pageSize4 = ref(100)
-const dialogForm = () => {
- ElMessageBox.confirm(
- '纭畾瑕佹�ュ仠鍚�?',
- '鎻愮ず',
- {
- confirmButtonText: '鏄�',
- cancelButtonText: '鍚�',
- type: 'warning',
- }
- )
- .then(() => {
- ElMessage({
- type: 'success',
- message: '鎬ュ仠鎴愬姛锛�',
- })
- })
- .catch(() => {
- ElMessage({
- type: 'info',
- message: '鎬ュ仠澶辫触',
- })
- })
-}
-
- var timer=setInterval(() => {
- // console.log(million.value,million1.value);
- million.value+=1;
- if(million.value-million1.value!==12){
-
- if(million.value-million1.value>=2){
- if(carposition1.value==220){
- timers1.value=false;
- }else if(carposition1.value==60){
- timers1.value=true;
- }
- if(timers1.value==true){
- carposition1.value=carposition1.value+16;
- }else{
- carposition1.value=carposition1.value-16;
- }
-
-
- if(carposition2.value==220){
- timers2.value=false;
- }else if(carposition2.value==60){
- timers2.value=true;
- }
- if(timers2.value==true){
- carposition2.value+=16;
- }else{
- carposition2.value-=16;
- }
- }else{
-
- }
- }else{
- million1.value=million.value;
-
- if(cellshow1.value==true){
- cellshow1.value=false;
- }else{
- cellshow1.value=true;
- }
- if(cellshow2.value==true){
- cellshow2.value=false;
- }else{
- cellshow2.value=true;
- }
- }
-
- }, 1000);
-
- var timer=setInterval(() => {
- // console.log(million3.value,million4.value);
- million3.value+=1;
- if(million3.value-million4.value!==12){
-
- if(million3.value-million4.value>=2){
- if(carposition3.value==260){
- timers3.value=false;
- }else if(carposition3.value==60){
- timers3.value=true;
- }
- if(timers3.value==true){
- carposition3.value=carposition3.value+20;
- }else{
- carposition3.value=carposition3.value-20;
- }
-
-
- if(carposition4.value==260){
- timers4.value=false;
- }else if(carposition4.value==60){
- timers4.value=true;
- }
- if(timers4.value==true){
- carposition4.value+=20;
- }else{
- carposition4.value-=20;
- }
- }else{
-
- }
- }else{
- million4.value=million3.value;
- if(cellshow5.value==true){
- cellshow5.value=false;
-
- }else{
- cellshow5.value=true;
-
- }
- if(cellshow3.value==true){
- cellshow3.value=false;
- }else{
- cellshow3.value=true;
- }
- if(cellshow4.value==true){
- cellshow4.value=false;
- }else{
- cellshow4.value=true;
- }
- }
-
- }, 1000);
-
const getTableRow = (row,type) =>{
switch (type) {
case 'edit' :{
@@ -189,7 +86,289 @@
}
}
}
-
+const handleBindRack = (row) => {
+ selectedRow.value = row; // 鏇存柊閫変腑鐨勮鏁版嵁
+ currentRow.deviceId = row.deviceId; // 鐩存帴璁剧疆鍝嶅簲寮忓睘鎬�
+ currentRow.slot = row.slot;
+ console.log(row.deviceId);
+ console.log(row.slot);
+ window.localStorage.setItem('deviceId', row.deviceId)
+ window.localStorage.setItem('slot', row.slot)
+ add.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+
+};
+// 鎼滅储
+const searchout = async () => {
+ try {
+ const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/selectBigStorageCageDetails',{
+ glassId:glassId.value
+ });
+ if (response.code == 200) {
+ // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
+ tableDataf.value = response.data;
+ ElMessage.success(response.message);
+
+ } else {
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.message);
+ }
+ } catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+};
+// 鏄惁绂佺敤
+const toggleEnableState = async (row) => {
+ const newState = row.enableState === 1 ? 0 : 1;
+ console.log(row.slot);
+ console.log(row.enableState);
+ var url="/cacheVerticalGlass/bigStorageCage/updateStorageCageDisabled?slot="+row.slot + "&enableState=" + newState;
+ console.log(url);
+ const response = await request.get(url)
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.message);
+ }
+ row.enableState = newState;
+};
+ // 鍒犻櫎
+ const opena = async(row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.deletemessage'),
+ t('searchOrder.prompt'),
+ {
+ confirmButtonText: t('searchOrder.yes'),
+ cancelButtonText: t('searchOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/deleteBigStorageCageDetails",row)
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
+ ElMessage.error(response.message);
+ // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
+ }
+ }
+ } catch (error) {
+ // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
+ // 鐮存崯
+ const broke = async(row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.broke'),
+ t('searchOrder.prompt'),
+ {
+ confirmButtonText: t('searchOrder.yes'),
+ cancelButtonText: t('searchOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/damageBigStorageCageDetails?status="+0, row)
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.message);
+ }
+ }
+ } catch (error) {
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
+ // 鎷胯蛋
+ const brokec = async(row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.brokeb'),
+ t('searchOrder.prompt'),
+ {
+ confirmButtonText: t('searchOrder.yes'),
+ cancelButtonText: t('searchOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/damageBigStorageCageDetails?status="+1, row)
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.message);
+ }
+ }
+ } catch (error) {
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
+ // 鍑虹墖
+ const outfil = async(row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.outfil'),
+ t('searchOrder.prompt'),
+ {
+ confirmButtonText: t('searchOrder.yes'),
+ cancelButtonText: t('searchOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/outBigStorageCageDetails", row)
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.message);
+ }
+ }
+ } catch (error) {
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
+ // 鍑虹墖闃熷垪鐮存崯
+ const brokea = async(row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.broke'),
+ t('searchOrder.prompt'),
+ {
+ confirmButtonText: t('searchOrder.yes'),
+ cancelButtonText: t('searchOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ const response = await request.post("/cacheVerticalGlass/temperingGlassInfo/damageTemperingGlassInfo?status="+0, row)
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.message);
+ }
+ }
+ } catch (error) {
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
+// 鍑虹墖闃熷垪鎷胯蛋
+const brokeb = async(row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.brokeb'),
+ t('searchOrder.prompt'),
+ {
+ confirmButtonText: t('searchOrder.yes'),
+ cancelButtonText: t('searchOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ const response = await request.post("/cacheVerticalGlass/temperingGlassInfo/damageTemperingGlassInfo?status="+1, row)
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.message);
+ }
+ }
+ } catch (error) {
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
+// 鍑虹墖闃熷垪鍒犻櫎
+const deletea = async(row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.deletemessage'),
+ t('searchOrder.prompt'),
+ {
+ confirmButtonText: t('searchOrder.yes'),
+ cancelButtonText: t('searchOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ const dataToSend = {
+ ...row,
+ status: 1
+ };
+ const response = await request.post("/cacheVerticalGlass/temperingGlassInfo/deleteTemperingGlassInfo", dataToSend)
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.message);
+ }
+ }
+ } catch (error) {
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
+// 瀹屾垚浠诲姟
+const finish = async(row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.fin'),
+ t('searchOrder.prompt'),
+ {
+ confirmButtonText: t('searchOrder.yes'),
+ cancelButtonText: t('searchOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/finishBigStorageCageDetails", row)
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.message);
+ }
+ }
+ } catch (error) {
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
+// 纭娣诲姞
+const finisha = async(row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.sureadda'),
+ t('searchOrder.prompt'),
+ {
+ confirmButtonText: t('searchOrder.yes'),
+ cancelButtonText: t('searchOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ let deviceId = window.localStorage.getItem('deviceId')
+ let slot = window.localStorage.getItem('slot')
+ const dataToSend = {
+ ...row,
+ deviceId: deviceId,
+ slot: slot
+ };
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/insertBigStorageCageDetails", dataToSend)
+ if (response.code === 200) {
+ add.value = false;
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.message);
+ }
+ }
+ } catch (error) {
+ // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
+function handleRowClick(row) {
+ selectedRow.value = row; // 鏇存柊閫変腑鐨勮鏁版嵁
+}
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/slicecage`;
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
@@ -200,20 +379,52 @@
tableData.value = data.bigStorageCageInfo[0]
tableDatab.value = data.temperingGlassInfoList[0]
tableDatae.value = data.bigStorageCageUsage[0]
- adjustedRects.value = data.bigStorageCageInfo1[0]
- // adjustedRects.value = data.bigStorageCageInfo1[0].map(rect => ({
- // ...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
- // height: rect.length *0.5,
-
- // }));
+ // adjustedRects.value = data.bigStorageCageInfo1[0]
window.localStorage.setItem('length', data.bigStorageCageInfo1[0].length)
let length = window.localStorage.getItem('length')
- console.log(length);
-
+ adjustedRects.value = data.bigStorageCageInfo1[0].map(rect => ({
+ ...rect,
+ height: 20/length,
+ top: 29/length
+ }));
+ let small = data.bigStorageCageInfo1[0]
+ console.log(small[0].bigStorageCageDetails);
+adjustedRectsa.value = data.bigStorageCageInfo2[0].map(rect => ({
+ ...rect,
+ height: 20/length,
+ top: 29/length
+ }));
+adjustedRectsb.value = data.bigStorageCageInfo3[0].map(rect => ({
+ ...rect,
+ height: 20/length,
+ top: 29/length
+ }));
+adjustedRectsc.value = data.bigStorageCageInfo4[0].map(rect => ({
+ ...rect,
+ height: 20/length,
+ top: 29/length
+ }));
+adjustedRectsd.value = data.bigStorageCageInfo5[0].map(rect => ({
+ ...rect,
+ height: 20/length,
+ top: 29/length
+ }));
+adjustedRectse.value = data.bigStorageCageInfo6[0].map(rect => ({
+ ...rect,
+ height: 20/length,
+ top: 29/length
+ }));
+adjustedRectsf.value = data.bigStorageCageInfo7[0].map(rect => ({
+ ...rect,
+ height: 20/length,
+ top: 29/length
+ }));
+adjustedRectsg.value = data.bigStorageCageInfo8[0].map(rect => ({
+ ...rect,
+ height: 20/length,
+ top: 29/length
+ }));
};
-// function getRectHeight(length: number) {
-// return length > 0 ? 29 / length : 29;
-// }
// 鍒濆鍖� WebSocket锛屽苟浼犻�掓秷鎭鐞嗗嚱鏁�
onMounted(() => {
// fetchFlowCardId();
@@ -231,9 +442,9 @@
function getStatusText(enableState: number) {
switch (enableState) {
case 0:
- return '绂佺敤';
+ return t('searchOrder.disable');
case 1:
- return '鍚敤';
+ return t('searchOrder.enable');
}
}
function getStatusTypea(ishorizontal: number) {
@@ -247,9 +458,9 @@
function getStatusTexta(ishorizontal: number) {
switch (ishorizontal) {
case 0:
- return '涓嶆帴鍙�';
+ return t('searchOrder.noaccept');
case 1:
- return '鎺ュ彈';
+ return t('searchOrder.accept');
}
}
function getStatusTypeb(state: number) {
@@ -263,11 +474,11 @@
function getStatusTextb(state: number) {
switch (state) {
case 0:
- return '鍑虹墖瀹屾垚';
+ return t('searchOrder.filmcomplete');
case 1:
- return '绛夊緟涓�';
+ return t('searchOrder.waiting');
case 2:
- return '绛夊緟涓�';
+ return t('searchOrder.waiting');
}
}
onBeforeUnmount(() => {
@@ -277,31 +488,39 @@
</script>
<template>
- <div style="height: 700px;">
- <!-- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="primary" @click="dialogFormVisible = true">鎵嬪姩杩涚墖</el-button> -->
- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="primary" @click="dialogFormVisiblea = true">鐞嗙墖绗间俊鎭�</el-button>
- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="success" @click="dialogFormVisibleb = true">鍑虹墖闃熷垪</el-button>
- <!-- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="danger">缁堟杩涚墖</el-button> -->
- <!-- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="danger">缁堟鍑虹墖</el-button> -->
- <!-- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="danger" @click="dialogForm">杞�ュ仠</el-button> -->
-
+ <div style="height: 600px;">
+ <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="primary" @click="dialogFormVisiblea = true">{{ $t('searchOrder.cageinformation') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="success" @click="dialogFormVisibleb = true">{{ $t('searchOrder.productionqueue') }}</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="100%" ref="table"
:data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="bigStorageCageOutTask.glassId" align="center" label="鍑虹墖鐜荤拑ID" min-width="80" />
- <el-table-column prop="bigStorageCageOutTask.startSlot" align="center" label="璧峰浣嶇疆" min-width="120" />
- <el-table-column prop="bigStorageCageOutTask.endSlot" align="center" label="鐩爣浣嶇疆" min-width="120" />
- <el-table-column prop="bigStorageCageOutTask.trainNumber" align="center" label="杞︽" min-width="120" />
- <el-table-column prop="bigStorageCageOutTask.serialNumber" align="center" label="搴忓彿" min-width="120" />
- <el-table-column prop="bigStorageCageOutTask.taskState" align="center" label="浠诲姟鐘舵��" min-width="157">
- <template #default="scope">
- <el-tag type="success" >{{ scope.row.bigStorageCageOutTask.taskState==0?"绛夊緟杩涚墖":"杩涜涓�" }}</el-tag>
+ <el-table-column prop="bigStorageCageOutTask.glassId" align="center" :label="$t('searchOrder.outputglassID')" min-width="100" />
+ <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') }}</el-tag>
</template>
</el-table-column>
- <el-table-column fixed="right" label="缁撴潫浠诲姟" align="center" width="150">
+ <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="100"/>
+ <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="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"/>
+ <el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutID')" min-width="100"/>
+ <el-table-column prop="temperingFeedSequence" align="center" :label="$t('searchOrder.picturesequence')" min-width="120"/>
+ <el-table-column prop="gap" align="center" :label="$t('searchOrder.glassgaps')" min-width="100"/>
+ <el-table-column fixed="right" :label="$t('searchOrder.endtask')" align="center" width="150">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handleBindRack(scope.row)">瀹屾垚浠诲姟</el-button>
+ <el-button size="mini" type="text" plain @click="finish(scope.row)">{{ $t('searchOrder.completetask') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -312,18 +531,31 @@
<el-table height="100%" ref="table"
@selection-change="handleSelectionChange"
:data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="bigStorageCageFeedTask.glassId" align="center" label="杩涚墖鐜荤拑ID" min-width="80" />
- <el-table-column prop="bigStorageCageFeedTask.tragetSlot" align="center" label="鐩爣浣嶇疆" min-width="120" />
+ <el-table-column prop="bigStorageCageFeedTask.glassId" align="center" :label="$t('searchOrder.intoglassid')" min-width="100" />
+ <el-table-column prop="bigStorageCageFeedTask.targetSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" />
<!-- <el-table-column prop="task_type" align="center" label="浠诲姟绫诲瀷" min-width="120" />娌℃湁杩斿洖瀛楁 -->
- <el-table-column prop="bigStorageCageFeedTask.taskState" align="center" label="浠诲姟鐘舵��" min-width="120">
+ <el-table-column prop="bigStorageCageFeedTask.taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="120">
<template #default="scope">
- <el-tag type="success" >{{ scope.row.bigStorageCageFeedTask.taskState==0?"绛夊緟杩涚墖":"杩涜涓�" }}</el-tag>
+ <el-tag type="success" >{{ scope.row.bigStorageCageFeedTask.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag>
</template>
</el-table-column>
- <el-table-column prop="bigStorageCageFeedTask.line" align="center" label="绾胯矾" min-width="120" />
- <el-table-column fixed="right" label="缁撴潫浠诲姟" align="center" width="150">
+ <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="100"/>
+ <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="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"/>
+ <el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutID')" min-width="100"/>
+ <el-table-column prop="temperingFeedSequence" align="center" :label="$t('searchOrder.picturesequence')" min-width="120"/>
+ <el-table-column prop="gap" align="center" :label="$t('searchOrder.glassgaps')" min-width="100"/>
+ <el-table-column fixed="right" :label="$t('searchOrder.endtask')" align="center" width="150">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handleBindRack(scope.row)">瀹屾垚浠诲姟</el-button>
+ <el-button size="mini" type="text" plain @click="finish(scope.row)">{{ $t('searchOrder.completetask') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -333,17 +565,14 @@
<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>
<el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
- <span>浣跨敤鐜�</span><span>{{ item.percentage }}</span>
+ <span>{{ $t('searchOrder.Usage') }}</span><span>{{ item.percentage }}</span>
</el-col>
<hr style="width:80%;margin: 0 auto;" />
<el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
- <span>绌洪棽锛堟牸瀛愭暟锛�</span><span>{{ item.count }}</span>
+ <span>{{ $t('searchOrder.free') }}</span><span>{{ item.count }}</span>
</el-col>
</div>
</div>
- <!-- <div id="awatch">
- <img src="../../assets/cp.png" alt="" style="width: 70%;height: 70%;margin-left: 160px;">
-</div> -->
<!-- // 鐖剁骇妗� -->
<div class="img-dlpl" >
<div class="img-car1" :style="'z-index:999;left:247px;top:' + carposition1 + 'px;position:absolute;'">
@@ -359,191 +588,402 @@
<div class="img-car4" :style="'z-index:999;left:704px;top:' + carposition4 + 'px;position:absolute;'">
<div v-show="cellshow4" style="margin-top:10px;width:200px;height:5px;background-color:#409EFF;"></div>
</div>
- <div v-show="cell1" style="width: 227px;height: 29px;position: absolute;top:55px;left: 465px;">
+ <div style="position: relative;">
+ <div v-show="cell1" style="width: 227px;height: 29px;position: relative;top:55px;left: 465px;">
<div
- v-for="(item, index) in adjustedRects"
- :key="index"
+ v-for="(rect, index) in adjustedRects"
+ :key="rect.id"
:style="{
- top: `1px`, width: `227px`,
- backgroundColor: '#409EFF',
- height: `height`+ `px`
+
+ // display:'flex',
+ position: 'absolute',
+ width: '227px',
+ // backgroundColor: 'red',
+ left: '0px',
+ top: index*rect.top+`px`,
+ height: `${rect.height}px`,
}"
>
+ <div
+ v-for="(rects, index) in rect.bigStorageCageDetails"
+ :key="rects"
+ :style="{
+ float:'left',
+ width: '18px',
+ height: `${rect.height}px`,
+ backgroundColor: '#911005',
+ // border:'1px solid black',
+ top: '0px',
+ marginRight: rects.gap/5000*227+'px'
+ }"
+ >
+ </div>
</div>
- <!-- <div
- v-for="(item, index) in adjustedRects"
- height: `${rect.height}px`,
- :key="index"
- :style="{
- width: '227px',
- height: '1px',
- backgroundColor: '#409EFF',
- top: '1px'
- }"
- >
- </div> -->
</div>
- <!-- <div v-show="cell2" style="width: 227px;height: 29px;position: absolute;top:86px;left: 465px;background-color: #409EFF;">
+ <div v-show="cell2" style="width: 227px;height: 29px;position: relative;top:56px;left: 465px;">
+ <div
+ v-for="(rect, index) in adjustedRectsa"
+ :key="rect.id"
+ :style="{
+
+ // display:'flex',
+ position: 'absolute',
+ width: '227px',
+ // backgroundColor: 'red',
+ left: '0px',
+ top: index*rect.top+`px`,
+ height: `${rect.height}px`,
+ }"
+ >
+ <div
+ v-for="(rects, index) in rect.bigStorageCageDetails"
+ :key="rects"
+ :style="{
+ float:'left',
+ width: '18px',
+ height: `${rect.height}px`,
+ backgroundColor: '#911005',
+ // border:'1px solid black',
+ top: '0px',
+ marginRight: rects.gap/5000*227+'px'
+ }"
+ >
+ </div>
</div>
- <div v-show="cell3" style="width: 227px;height: 29px;position: absolute;top:117px;left: 465px;background-color: #409EFF;">
</div>
- <div v-show="cell4" style="width: 227px;height: 29px;position: absolute;top:148px;left: 465px;background-color: #409EFF;">
+ <div v-show="cell3" style="width: 227px;height: 29px;position: absolute;top:117px;left: 465px;">
+ <div
+ v-for="(rect, index) in adjustedRectsb"
+ :key="rect.id"
+ :style="{
+ // display:'flex',
+ position: 'absolute',
+ width: '227px',
+ // backgroundColor: 'red',
+ left: '0px',
+ top: index*rect.top+`px`,
+ height: `${rect.height}px`,
+ }"
+ >
+ <div
+ v-for="(rects, index) in rect.bigStorageCageDetails"
+ :key="rects"
+ :style="{
+ float:'left',
+ width: '18px',
+ height: `${rect.height}px`,
+ backgroundColor: '#911005',
+ // border:'1px solid black',
+ top: '0px',
+ marginRight: rects.gap/5000*227+'px'
+ }"
+ >
+ </div>
</div>
- <div v-show="cell5" style="width: 227px;height: 29px;position: absolute;top:208px;left: 465px;background-color: #409EFF;">
</div>
- <div v-show="cell6" style="width: 227px;height: 29px;position: absolute;top:238px;left: 465px;background-color: #409EFF;">
+ <div v-show="cell4" style="width: 227px;height: 29px;position: absolute;top:148px;left: 465px;">
+ <div
+ v-for="(rect, index) in adjustedRectsc"
+ :key="rect.id"
+ :style="{
+
+ // display:'flex',
+ position: 'absolute',
+ width: '227px',
+ // backgroundColor: 'red',
+ left: '0px',
+ top: index*rect.top+`px`,
+ height: `${rect.height}px`,
+ }"
+ >
+ <div
+ v-for="(rects, index) in rect.bigStorageCageDetails"
+ :key="rects"
+ :style="{
+ float:'left',
+ width: '18px',
+ height: `${rect.height}px`,
+ backgroundColor: '#911005',
+ // border:'1px solid black',
+ top: '0px',
+ marginRight: rects.gap/5000*227+'px'
+ }"
+ >
+ </div>
</div>
- <div v-show="cell7" style="width: 227px;height: 29px;position: absolute;top:269px;left: 465px;background-color: #409EFF;">
</div>
- <div v-show="cell8" style="width: 227px;height: 29px;position: absolute;top:300px;left: 465px;background-color: #409EFF;">
- </div> -->
+ <div v-show="cell5" style="width: 227px;height: 29px;position: absolute;top:208px;left: 465px;">
+ <div
+ v-for="(rect, index) in adjustedRectsd"
+ :key="rect.id"
+ :style="{
+
+ // display:'flex',
+ position: 'absolute',
+ width: '227px',
+ // backgroundColor: 'red',
+ left: '0px',
+ top: index*rect.top+`px`,
+ height: `${rect.height}px`,
+ }"
+ >
+ <div
+ v-for="(rects, index) in rect.bigStorageCageDetails"
+ :key="rects"
+ :style="{
+ float:'left',
+ width: '18px',
+ height: `${rect.height}px`,
+ backgroundColor: '#911005',
+ // border:'1px solid black',
+ top: '0px',
+ marginRight: rects.gap/5000*227+'px'
+ }"
+ >
+ </div>
+ </div>
+ </div>
+ <div v-show="cell6" style="width: 227px;height: 29px;position: absolute;top:238px;left: 465px;">
+ <div
+ v-for="(rect, index) in adjustedRectse"
+ :key="rect.id"
+ :style="{
+
+ // display:'flex',
+ position: 'absolute',
+ width: '227px',
+ // backgroundColor: 'red',
+ left: '0px',
+ top: index*rect.top+`px`,
+ height: `${rect.height}px`,
+ }"
+ >
+ <div
+ v-for="(rects, index) in rect.bigStorageCageDetails"
+ :key="rects"
+ :style="{
+ float:'left',
+ width: '18px',
+ height: `${rect.height}px`,
+ backgroundColor: '#911005',
+ // border:'1px solid black',
+ top: '0px',
+ marginRight: rects.gap/5000*227+'px'
+ }"
+ >
+ </div>
+ </div>
+ </div>
+ <div v-show="cell7" style="width: 227px;height: 29px;position: absolute;top:269px;left: 465px;">
+ <div
+ v-for="(rect, index) in adjustedRectsf"
+ :key="rect.id"
+ :style="{
+
+ // display:'flex',
+ position: 'absolute',
+ width: '227px',
+ // backgroundColor: 'red',
+ left: '0px',
+ top: index*rect.top+`px`,
+ height: `${rect.height}px`,
+ }"
+ >
+ <div
+ v-for="(rects, index) in rect.bigStorageCageDetails"
+ :key="rects"
+ :style="{
+ float:'left',
+ width: '18px',
+ height: `${rect.height}px`,
+ backgroundColor: '#911005',
+ // border:'1px solid black',
+ top: '0px',
+ marginRight: rects.gap/5000*227+'px'
+ }"
+ >
+ </div>
+ </div>
+ </div>
+ <div v-show="cell8" style="width: 227px;height: 29px;position: absolute;top:300px;left: 465px;">
+ <div
+ v-for="(rect, index) in adjustedRectsg"
+ :key="rect.id"
+ :style="{
+
+ // display:'flex',
+ position: 'absolute',
+ width: '227px',
+ // backgroundColor: 'red',
+ left: '0px',
+ top: index*rect.top+`px`,
+ height: `${rect.height}px`,
+ }"
+ >
+ <div
+ v-for="(rects, index) in rect.bigStorageCageDetails"
+ :key="rects"
+ :style="{
+ float:'left',
+ width: '18px',
+ height: `${rect.height}px`,
+ backgroundColor: '#911005',
+ // border:'1px solid black',
+ top: '0px',
+ marginRight: rects.gap/5000*227+'px'
+ }"
+ >
+ </div>
+ </div>
+ </div>
</div>
-
+</div>
</div>
-<el-dialog v-model="dialogFormVisible" top="12vh" width="85%" title="璇风‘璁ょ幓鐠冧俊鎭�" >
- <div style="margin-left: 50px;margin-bottom: 10px;">
- <div style="display: flex;">
- <p style="margin-top: 4px;">纭鐘舵��:</p>
- <el-button style="margin-left: 10px;size: mini;" type="success">鍏佽</el-button>
- <el-button style="margin-left: 10px;size: mini;" type="danger">涓嶅厑璁�</el-button>
- <p style="margin-left: 60px;margin-top: 4px;">褰撳墠鐘舵��:</p>
- <div style="margin-top: 4px; margin-left: 10px;">鎵嬪姩</div>
- <el-button style="margin-left: 10px;size: mini;" type="primary">鍒囨崲</el-button>
- <el-input placeholder="璇疯緭鍏ョ幓鐠僫d" style="width: 180px;size: mini;margin-left: 60px;"></el-input>
- <el-button style="margin-left: 10px;size: mini;" type="primary">娣诲姞</el-button>
- <p style="margin-left: 60px;margin-top: 4px;">鐜荤拑id:</p>
- <el-input style="width: 180px;size: mini;margin-left: 30px;"></el-input>
- </div>
- <div style="display: flex;">
- <p style="margin-left: 290px;margin-top: 20px;font-weight: bold;">涓婄墖浣�</p>
- <p style="margin-left: 630px;margin-top: 20px;font-weight: bold;">鎵爜浣�</p>
+ <el-dialog v-model="add" top="10vh" width="70%" :title="$t('searchOrder.addcage')" >
+ <div style="margin-bottom: 20px">
+ <el-form>
+ <el-row style="margin-top: -15px;margin-bottom: -2px;">
+ <el-col :span="4">
+ <div id="dt" style="font-size: 15px;">
+ <el-form-item :label="$t('searchOrder.tida')" style="width: 14vw">
+ {{ currentRow.deviceId }}
+ <!-- <el-input v-model="currentRow.id" autocomplete="off"></el-input> -->
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="5">
+ <div id="dta" style="font-size: 15px;">
+ <el-form-item :label="$t('searchOrder.gridnumbera')" style="width: 14vw">
+ {{ currentRow.slot }}
+ <!-- <el-input v-model="currentRow.slot" autocomplete="off"></el-input> -->
+ </el-form-item>
+ </div>
+ </el-col>
+ </el-row>
+ </el-form>
</div>
- <div style="display: flex;">
- <div style="margin-top: 20px;">
- <p style="margin-top: 10px;margin-left: 100px;margin-bottom: 20px;">褰撳墠淇℃伅</p>
- <el-form label-position="right" label-width="90px">
- <el-form-item style="width: 20vw" label="鐜荤拑id锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ョ幓鐠僫d"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="璁㈠崟缂栧彿锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="鍒楄〃缂栧彿锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ュ垪琛ㄧ紪鍙�"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="绠卞瓙缂栧彿锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ョ瀛愮紪鍙�"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="闀匡細">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ラ暱"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="瀹斤細">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ュ"></el-input>
- </el-form-item>
- </el-form>
- </div>
- <div style="margin-top: 20px;">
- <p style="margin-top: 10px;margin-left: 100px;margin-bottom: 20px;">淇敼淇℃伅</p>
- <el-form label-position="right" label-width="90px">
- <el-form-item style="width: 20vw" label="鐜荤拑id锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ョ幓鐠僫d"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="璁㈠崟缂栧彿锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="鍒楄〃缂栧彿锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ュ垪琛ㄧ紪鍙�"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="绠卞瓙缂栧彿锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ョ瀛愮紪鍙�"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="闀匡細">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ラ暱"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="瀹斤細">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ュ"></el-input>
- </el-form-item>
- </el-form>
- </div>
- <div style="margin-top: 20px;">
- <p style="margin-top: 10px;margin-left: 100px;margin-bottom: 20px;">淇敼淇℃伅</p>
- <el-form label-position="right" label-width="90px">
- <el-form-item style="width: 20vw" label="鐜荤拑id锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ョ幓鐠僫d"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="璁㈠崟缂栧彿锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="鍒楄〃缂栧彿锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ュ垪琛ㄧ紪鍙�"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="绠卞瓙缂栧彿锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ョ瀛愮紪鍙�"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="闀匡細">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ラ暱"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="瀹斤細">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ュ"></el-input>
- </el-form-item>
- </el-form>
- </div>
- <div style="margin-top: 20px;">
- <p style="margin-top: 10px;margin-left: 100px;margin-bottom: 20px;">褰撳墠淇℃伅</p>
- <el-form label-position="right" label-width="90px">
- <el-form-item style="width: 20vw" label="鐜荤拑id锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ョ幓鐠僫d"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="璁㈠崟缂栧彿锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="鍒楄〃缂栧彿锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ュ垪琛ㄧ紪鍙�"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="绠卞瓙缂栧彿锛�">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ョ瀛愮紪鍙�"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="闀匡細">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ラ暱"></el-input>
- </el-form-item>
- <el-form-item style="width: 20vw" label="瀹斤細">
- <el-input style="width: 180px" size="mini" placeholder="璇疯緭鍏ュ"></el-input>
- </el-form-item>
- </el-form>
- </div>
+ <div style="margin-top: -20px;margin-bottom: 40px;margin-left: 30px">
+ <el-input v-model="glassId" :placeholder="$t('searchOrder.inputid')" clearable style="width: 200px;">
+ </el-input>
+ <el-button type="primary" plain style="margin-left: 10px;" @click="searchout">{{ $t('searchOrder.search') }}</el-button>
</div>
- </div>
- <template #footer>
- <div id="dialog-footer">
- <el-button type="primary" @click="dialogFormVisible = false">
- 纭
- </el-button>
- <el-button @click="dialogFormVisible = false">鍙栨秷</el-button>
- </div>
- </template>
-</el-dialog>
-<el-dialog v-model="dialogFormVisiblea" top="10vh" width="85%" title="鐞嗙墖绗间俊鎭�" >
- <!-- <el-input placeholder="璇疯緭鍏ュ伐绋嬪彿" style="width: 180px;size: mini;"></el-input> -->
- <!-- <el-button style="margin-left: 10px;size: mini;" type="primary">鏌ヨ</el-button> -->
- <el-table ref="table" style="margin-top: 20px;height: 500px;"
- @selection-change="handleSelectionChange"
- :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="id" align="center" label="澶х悊鐗囩琛↖D" min-width="80" />
- <el-table-column prop="deviceId" align="center" label="鐞嗙墖绗煎彿" min-width="120" />
- <el-table-column prop="slot" align="center" label="鏍呮牸鍙�" min-width="120" />
+
+ <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 500px;">
+ <el-table height="100%" ref="table"
+ :data="tableDataf" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="120" />
+ <el-table-column prop="sequence" align="center" :label="$t('searchOrder.pieceingrid')" min-width="180" />
+ <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="150" />
+ <el-table-column prop="glassType" align="center" :label="$t('searchOrder.typeglass')" min-width="150"/>
+ <el-table-column prop="width" align="center" :label="$t('searchOrder.width')" min-width="150"/>
+ <el-table-column prop="height" align="center" :label="$t('searchOrder.height')" min-width="150"/>
+ <el-table-column prop="thickness" align="center" :label="$t('searchOrder.thickness')" min-width="150"/>
+ <el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutID')" min-width="150"/>
+ <el-table-column prop="temperingFeedSequence" align="center" :label="$t('searchOrder.picturesequence')" min-width="150"/>
+ <el-table-column
+ align="center"
+ :label="$t('searchOrder.startstatus')"
+ min-width="80"
+ prop="state"
+ >
+ <template #default="scope">
+ <el-tag
+ :type="scope.row.state === 1 ? 'success' : 'danger'"
+ >
+ {{ scope.row.state === 1 ? $t('searchOrder.enable') : $t('searchOrder.disable') }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="gap" align="center" :label="$t('searchOrder.glassgaps')" min-width="150"/>
+ <!-- <el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" 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>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-dialog>
+<el-dialog v-model="dialogFormVisiblea" top="5vh" width="97%" :title="$t('searchOrder.cageinformation')">
+ <el-table
+ :data="tableData"
+ @row-click="handleRowClick"
+ height="500"
+ @expand-change="handleExpandChange"
+ row-key="id"
+ default-expand-all
+ :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
+ >
+ <el-table-column type="expand">
+ <template #default="props">
+ <div v-if="props.row.bigStorageCageDetails && props.row.bigStorageCageDetails.length">
+ <el-table
+ :data="props.row.bigStorageCageDetails"
+ border
+ style="width: 100%;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="80"/>
+ <el-table-column prop="sequence" align="center" :label="$t('searchOrder.pieceingrid')" min-width="100" />
+ <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="120" />
+ <el-table-column prop="glassType" align="center" :label="$t('searchOrder.typeglass')" min-width="80" />
+ <el-table-column prop="width" align="center" :label="$t('searchOrder.width')" min-width="80" />
+ <el-table-column prop="height" align="center" :label="$t('searchOrder.height')" min-width="80" />
+ <el-table-column prop="thickness" align="center" :label="$t('searchOrder.thickness')" min-width="80" />
+ <el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutID')" min-width="100" />
+ <el-table-column prop="temperingFeedSequence" align="center" :label="$t('searchOrder.picturesequence')" min-width="120" />
<el-table-column
align="center"
- label="鍚敤鐘舵��"
+ :label="$t('searchOrder.startstatus')"
+ min-width="80"
+ prop="state"
+ >
+ <template #default="scope">
+ <el-tag :type="getStatusType(scope.row.state)">
+ {{ getStatusText(scope.row.state) }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <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" plain @click="outfil(scope.row)">{{ $t('searchOrder.outfilm') }}</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </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="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="150" />
+ <el-table-column
+ align="center"
+ :label="$t('searchOrder.startstatus')"
min-width="80"
prop="enableState"
>
<template #default="scope">
- <el-tag :type="getStatusType(scope.row.enableState)">
- {{ getStatusText(scope.row.enableState) }}
- </el-tag>
- </template>
+ <el-tag
+ :type="scope.row.enableState === 1 ? 'success' : 'danger'"
+ @click="toggleEnableState(scope.row)"
+ >
+ {{ scope.row.enableState === 1 ? $t('searchOrder.enable') : $t('searchOrder.disable')}}
+ </el-tag>
+ </template>
</el-table-column>
- <el-table-column prop="remainWidth" align="center" label="鍓╀綑瀹藉害" min-width="120" />
+ <el-table-column prop="remainWidth" align="center" :label="$t('searchOrder.remainingwidth')" min-width="120" />
+
+ <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>
+ </template>
+ </el-table-column>
</el-table>
<div id="demo-pagination-block">
<el-pagination
@@ -561,27 +1001,25 @@
/>
</div>
</el-dialog>
-<el-dialog v-model="dialogFormVisibleb" top="10vh" width="85%" title="鍑虹墖闃熷垪" >
- <div style="display: flex;">
+<el-dialog v-model="dialogFormVisibleb" top="5vh" width="85%" :title="$t('searchOrder.productionqueue')">
+ <!-- <div style="display: flex;">
<p style="margin-top: 3px;">闃熷垪鐘舵�侊細</p>
<p style="margin-top: 3px;">寮�濮�</p>
<el-button style="margin-left: 10px;size: mini;" type="danger">鍋滄</el-button>
<el-button style="margin-left: 10px;size: mini;" type="primary">娣诲姞</el-button>
- </div>
+ </div> -->
<el-table ref="table" style="margin-top: 20px;height: 500px;"
:data="tableDatab" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="id" fixed align="center" label="閽㈠寲灏忕墖淇℃伅琛╥d" min-width="150"/>
- <!-- <el-table-column prop="glass_id" align="center" label="鐜荤拑id" min-width="120" /> -->
- <el-table-column prop="flowcardId" fixed align="center" label="娴佺▼鍗�" min-width="120" />
- <el-table-column prop="glassType" align="center" label="娴佺▼鍗＄幓鐠冪被鍨�" min-width="150" />
- <el-table-column prop="width" align="center" label="瀹�" min-width="80" />
- <el-table-column prop="height" align="center" label="楂�" min-width="80" />
- <el-table-column prop="thickness" align="center" label="鍘氬害" min-width="80" />
- <el-table-column prop="filmsid" align="center" label="鑶滅郴" min-width="80" />
- <!-- <el-table-column prop="ishorizontal" align="center" label="閽㈠寲鏄惁鎺ュ彈妯斁" min-width="150" /> -->
+ <el-table-column prop="id" fixed align="center" :label="$t('searchOrder.sheetID')" min-width="150"/>
+ <el-table-column prop="flowcardId" fixed align="center" :label="$t('searchOrder.processcards')" min-width="120" />
+ <el-table-column prop="glassType" align="center" :label="$t('searchOrder.processcardtype')" min-width="150" />
+ <el-table-column prop="width" align="center" :label="$t('searchOrder.width')" min-width="80" />
+ <el-table-column prop="height" align="center" :label="$t('searchOrder.height')" min-width="80" />
+ <el-table-column prop="thickness" align="center" :label="$t('searchOrder.thickness')" min-width="80" />
+ <el-table-column prop="filmsid" align="center" :label="$t('searchOrder.coatingtypes')" min-width="80" />
<el-table-column
align="center"
- label="閽㈠寲鏄惁鎺ュ彈妯斁"
+ :label="$t('searchOrder.acceptshorizontal')"
min-width="150"
prop="ishorizontal"
>
@@ -591,15 +1029,14 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column prop="temperingLayoutId" align="center" label="閽㈠寲鐗堝浘id" min-width="120" />
- <el-table-column prop="temperingFeedSequence" align="center" label="閽㈠寲鐗堝浘鐗囧簭" min-width="120" />
- <el-table-column prop="xCoordinate" align="center" label="x鍧愭爣" min-width="80" />
- <el-table-column prop="yCoordinate" align="center" label="y鍧愭爣" min-width="80" />
- <el-table-column prop="angle" align="center" label="鏃嬭浆瑙掑害锛堥�嗘椂閽堬級" min-width="150" />
- <!-- <el-table-column prop="state" align="center" label="鐘舵��" min-width="80" /> -->
+ <el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutID')" min-width="120" />
+ <el-table-column prop="temperingFeedSequence" align="center" :label="$t('searchOrder.picturesequence')" min-width="120" />
+ <el-table-column prop="xCoordinate" align="center" :label="$t('searchOrder.xcoordinates')" min-width="80" />
+ <el-table-column prop="yCoordinate" align="center" :label="$t('searchOrder.ycoordinates')" min-width="80" />
+ <el-table-column prop="angle" align="center" :label="$t('searchOrder.rotationangle')" min-width="150" />
<el-table-column
align="center"
- label="鐘舵��"
+ :label="$t('searchOrder.state')"
min-width="80"
prop="state"
>
@@ -609,10 +1046,11 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column fixed="right" label="鎿嶄綔" align="center" 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="handleBindRack(scope.row)">娣诲姞</el-button>
- <el-button size="mini" type="text" plain @click="handleBindRacka(scope.row)">鍒犻櫎</el-button>
+ <el-button size="mini" type="text" plain @click="brokea(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
+ <el-button size="mini" type="text" plain @click="brokeb(scope.row)">{{ $t('searchOrder.takeout') }}</el-button>
+ <el-button size="mini" type="text" plain @click="deletea(scope.row)">{{ $t('searchOrder.delete') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -620,7 +1058,6 @@
</template>
<style scoped>
-
#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
#dialog-footer{
@@ -719,7 +1156,7 @@
}
.img-dlpl{
- margin-left: 200px;
+ margin-left: 80px;
background-image:url('../../assets/dlpl.png');
background-repeat: no-repeat;
background-attachment: local;
--
Gitblit v1.8.0