From 8b63f4b2f84185ce7201307b5e7d07dcb1c9ae01 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 26 六月 2024 14:49:36 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/Slicecage/slicecage.vue | 821 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 574 insertions(+), 247 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 15839b1..2a42c23 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -1,4 +1,11 @@
<script lang="ts" setup>
+// import zhCn from 'element-plus/lib/locale/lang/zh-cn'
+// import en from 'element-plus/dist/locale/en.mjs'
+// const { locale } = useI18n()
+
+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"
@@ -18,6 +25,7 @@
const tableDatad = ref([])
const tableDatae = ref([])
const adjustedRects = ref([]);
+const adjustedRectsa = ref([]);
// const height = ref([]);
const add = ref(false)
const flowCardId = ref('');
@@ -58,111 +66,112 @@
const cell6=ref(true);
const cell7=ref(true);
const cell8=ref(true);
+const selectedRow = ref(null); // 瀛樺偍閫変腑鐨勮鏁版嵁
const currentPage4 = ref(4)
const pageSize4 = ref(100)
- var timer=setInterval(() => {
- // console.log(million.value,million1.value);
- million.value+=1;
- if(million.value-million1.value!==12){
+ // 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(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{
+ // 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;
+ // }
+ // }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;
- }
- }
+ // if(cellshow1.value==true){
+ // cellshow1.value=false;
+ // }else{
+ // cellshow1.value=true;
+ // }
+ // if(cellshow2.value==true){
+ // cellshow2.value=false;
+ // }else{
+ // cellshow2.value=true;
+ // }
+ // }
- }, 1000);
+ // }, 1000);
- var timer=setInterval(() => {
- // console.log(million3.value,million4.value);
- million3.value+=1;
- if(million3.value-million4.value!==12){
+ // 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(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{
+ // 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{
+ // million4.value=million3.value;
+ // if(cellshow5.value==true){
+ // cellshow5.value=false;
- }else{
- cellshow5.value=true;
+ // }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;
- }
- }
+ // }
+ // if(cellshow3.value==true){
+ // cellshow3.value=false;
+ // }else{
+ // cellshow3.value=true;
+ // }
+ // if(cellshow4.value==true){
+ // cellshow4.value=false;
+ // }else{
+ // cellshow4.value=true;
+ // }
+ // }
- }, 1000);
+ // }, 1000);
const getTableRow = (row,type) =>{
switch (type) {
@@ -178,24 +187,35 @@
}
}
const handleBindRack = (row) => {
+ selectedRow.value = row; // 鏇存柊閫変腑鐨勮鏁版嵁
add.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
};
-// 娣诲姞
-const handleConfirm = async () => {
+async function handleConfirm() {
+ if (!selectedRow.value) {
+ // 澶勭悊娌℃湁閫変腑琛岀殑鎯呭喌...
+ return;
+ }
+
+ // 鏋勯�犱綘鐨凱OST璇锋眰鏁版嵁锛屽寘鍚�変腑鐨勮鏁版嵁鍜岃〃鍗曟暟鎹�
+ const postData = {
+ ...selectedRow.value, // 閫変腑琛岀殑鏁版嵁
+ };
+
try {
const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/insertBigStorageCageDetails', {
- flowCardId: flowCardId.value,
- gap: gap.value,
- glassId: glassId.value,
- glassType: glassType.value,
- height: height.value,
- sequence: sequence.value,
- state: state.value,
- temperingFeedSequence: temperingFeedSequence.value,
- temperingLayoutId: temperingLayoutId.value,
- thickness: thickness.value,
- width: width.value,
- });
+ 'flowCardId': flowCardId.value,
+ 'gap': gap.value,
+ 'glassId': glassId.value,
+ 'glassType': glassType.value,
+ 'height': height.value,
+ 'sequence': sequence.value,
+ 'state': state.value,
+ 'temperingFeedSequence': temperingFeedSequence.value,
+ 'temperingLayoutId': temperingLayoutId.value,
+ 'thickness': thickness.value,
+ 'width': width.value,
+ body: JSON.stringify(postData),
+ });
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
@@ -203,13 +223,43 @@
tableData.value = response.data;
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
- ElMessage.error(response.msg);
+ ElMessage.error(response.message);
}
- } catch (error) {
- // 澶勭悊閿欒
- console.error(error);
- }
-};
+ } catch (error) {
+ // 澶勭悊閿欒...
+ console.error(error);
+ }
+}
+// 娣诲姞
+// const handleConfirm = async () => {
+// try {
+// const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/insertBigStorageCageDetails', {
+// 'bigStorageCageOutTask.flowCardId': flowCardId.value,
+// 'bigStorageCageOutTask.gap': gap.value,
+// 'bigStorageCageOutTask.glassId': glassId.value,
+// 'bigStorageCageOutTask.glassType': glassType.value,
+// 'bigStorageCageOutTask.height': height.value,
+// 'bigStorageCageOutTask.sequence': sequence.value,
+// 'bigStorageCageOutTask.state': state.value,
+// 'bigStorageCageOutTask.temperingFeedSequence': temperingFeedSequence.value,
+// 'bigStorageCageOutTask.temperingLayoutId': temperingLayoutId.value,
+// 'bigStorageCageOutTask.thickness': thickness.value,
+// 'bigStorageCageOutTask.width': width.value,
+// });
+// if (response.code == 200) {
+// // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
+// ElMessage.success(response.message);
+// add.value = false;
+// tableData.value = response.data;
+// } else {
+// // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+// ElMessage.error(response.msg);
+// }
+// } catch (error) {
+// // 澶勭悊閿欒
+// console.error(error);
+// }
+// };
// 鏄惁绂佺敤
const toggleEnableState = async (row) => {
const newState = row.enableState === 1 ? 0 : 1;
@@ -233,26 +283,24 @@
// ]);
// 鍒犻櫎
const opena = async(row) => {
- try {
+ try {
const confirmResult = await ElMessageBox.confirm(
- '鏄惁鍒犻櫎璇ユ潯淇℃伅?',
- '鎻愮ず',
+ t('searchOrder.deletemessage'),
+ t('searchOrder.prompt'),
{
- confirmButtonText: '鏄�',
- cancelButtonText: '鍙栨秷',
+ confirmButtonText: t('searchOrder.yes'),
+ cancelButtonText: t('searchOrder.cancel'),
type: 'warning',
- }
- );
+ }
+ );
if (confirmResult === 'confirm') {
// 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
- const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/deleteBigStorageCageDetails", {
- menuId: row.id,
- })
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/deleteBigStorageCageDetails",row)
if (response.code === 200) {
ElMessage.success(response.message);
} else {
// 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
- ElMessage.error(response.msg);
+ ElMessage.error(response.message);
// alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
@@ -261,6 +309,229 @@
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 dataToSend = {
+ // ...row,
+ // status: 0
+ // };
+ // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/damageBigStorageCageDetails?status="+0, row)
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
+ ElMessage.error(response.message);
+ // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
+ }
+ }
+ } catch (error) {
+ // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
+ 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 dataToSend = {
+ // ...row,
+ // status: 1
+ // };
+ // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/damageBigStorageCageDetails?status="+1, row)
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
+ ElMessage.error(response.message);
+ // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
+ }
+ }
+ } catch (error) {
+ // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
+ 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);
+ // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
+ }
+ }
+ } catch (error) {
+ // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
+ 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 dataToSend = {
+ // ...row,
+ // status: 0
+ // };
+ const response = await request.post("/cacheVerticalGlass/temperingGlassInfo/damageTemperingGlassInfo?status="+0, row)
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
+ ElMessage.error(response.message);
+ // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
+ }
+ }
+ } catch (error) {
+ // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
+ 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 dataToSend = {
+ // ...row,
+ // status: 1
+ // };
+ const response = await request.post("/cacheVerticalGlass/temperingGlassInfo/damageTemperingGlassInfo?status="+1, row)
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
+ ElMessage.error(response.message);
+ // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
+ }
+ }
+ } catch (error) {
+ // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
+ 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);
+ // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
+ }
+ }
+ } catch (error) {
+ // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
+ 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 dataToSend = {
+ // ...row,
+ // status: 1
+ // };
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/finishBigStorageCageDetails", row)
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
+ ElMessage.error(response.message);
+ // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
+ }
+ }
+ } catch (error) {
+ // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
+function handleRowClick(row) {
+ selectedRow.value = row; // 鏇存柊閫変腑鐨勮鏁版嵁
+}
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/slicecage`;
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
@@ -271,15 +542,20 @@
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,
-
- // }));
- window.localStorage.setItem('length', data.bigStorageCageInfo1[0].length)
- let length = window.localStorage.getItem('length')
- console.log(length);
+ // adjustedRects.value = data.bigStorageCageInfo1[0]
+ adjustedRects.value = data.bigStorageCageInfo1[0].map(rect => ({
+ ...rect,
+ // width: rect.remainWidth *0.04,
+ top: rect.id *2,
+ }));
+console.log(data.bigStorageCageInfo1[0]);
+adjustedRectsa.value = data.bigStorageCageInfo2[0].map(rect => ({
+ ...rect,
+ // width: rect.remainWidth *0.04,
+ top: rect.id *2,
+ }));
+ // window.localStorage.setItem('length', data.bigStorageCageInfo1[0].length)
+ // let length = window.localStorage.getItem('length')
};
// function getRectHeight(length: number) {
@@ -302,9 +578,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) {
@@ -318,9 +594,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) {
@@ -334,11 +610,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(() => {
@@ -348,26 +624,39 @@
</script>
<template>
- <div style="height: 700px;">
- <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>
+ <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>
@@ -378,18 +667,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.targetSlot" 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>
@@ -399,11 +701,11 @@
<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>
@@ -425,33 +727,39 @@
<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 v-show="cell1" style="width: 227px;position: relative;height: 29px;top:55px;left: 465px;background-color: #911005;">
<div
- v-for="(item, index) in adjustedRects"
- :key="index"
+ v-for="(rect, index) in adjustedRects"
+ :key="rect"
:style="{
- top: `1px`, width: `227px`,
- backgroundColor: '#409EFF',
- height: `height`+ `px`
+ position: 'absolute',
+ width: '227px',
+ height: '0.8px',
+ backgroundColor: '#409EFF',
+ left: '0px',
+ top: `${rect.top}px`,
}"
>
+
</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:86px;left: 465px;background-color: #911005;">
+ <div
+ v-for="(rect, index) in adjustedRectsa"
+ :key="rect"
+ :style="{
+ position: 'absolute',
+ width: '227px',
+ height: '0.8px',
+ backgroundColor: '#409EFF',
+ left: '0px',
+ top: `${rect.top}px`,
+ }"
+ >
+
</div>
- <div v-show="cell3" style="width: 227px;height: 29px;position: absolute;top:117px;left: 465px;background-color: #409EFF;">
+ </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>
@@ -465,24 +773,33 @@
</div> -->
</div>
</div>
- <el-dialog v-model="add" top="20vh" width="60%" title="娣诲姞鐞嗙墖绗间俊鎭�" >
+ <el-dialog v-model="add" top="10vh" width="65%" :title="$t('searchOrder.addcage')" >
+ <div style="margin-top: -20px;margin-bottom: 40px;margin-left: 30px">
+ <el-input :placeholder="$t('searchOrder.inputid')" clearable style="width: 200px;">
+ </el-input>
+ <el-button type="primary" plain style="margin-left: 10px;">{{ $t('searchOrder.search') }}</el-button>
+
+ <!-- <span style="margin-right: 10px">绂佺敤璇�</span>
+ <el-input clearable placeholder="璇疯緭鍏ョ鐢ㄨ瘝" size="mini"
+ style="margin-right: 50px; width: 200px;" /> -->
+ </div>
<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-form size="mini" label-width="180px">
+ <el-form label-width="180px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item label="鐜荤拑ID锛�" :required="true" style="width: 20vw;">
- <el-input placeholder="璇疯緭鍏ョ幓鐠僆D" v-model="glassId" autocomplete="off" />
+ <el-form-item :label="$t('searchOrder.glassIDa')" :required="true" style="width: 24vw;">
+ <el-input :placeholder="$t('searchOrder.inglassID')" v-model="glassId" 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="灏忕墖鍦ㄦ牸鍐呯殑椤哄簭锛�" :required="true" style="width: 20vw;">
- <el-input placeholder="璇疯緭鍏ュ皬鐗囧湪鏍煎唴鐨勯『搴�" v-model="sequence" autocomplete="off" />
+ <el-form-item :label="$t('searchOrder.pieceingrida')" :required="true" style="width: 24vw;">
+ <el-input :placeholder="$t('searchOrder.inpieceingrid')" v-model="sequence" autocomplete="off" />
</el-form-item></div>
</div>
</el-col>
@@ -491,15 +808,15 @@
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item label="娴佺▼鍗″彿锛�" :required="true" style="width: 20vw;">
- <el-input placeholder="璇疯緭鍏ユ祦绋嬪崱鍙�" v-model="flowCardId" autocomplete="off" />
+ <el-form-item :label="$t('searchOrder.cardnumbera')" :required="true" style="width: 24vw;">
+ <el-input :placeholder="$t('searchOrder.incardnumber')" v-model="flowCardId" 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="鐜荤拑绫诲瀷锛�" :required="true" style="width: 20vw;">
- <el-input placeholder="璇疯緭鍏ョ幓鐠冪被鍨�" v-model="glassType" autocomplete="off" />
+ <el-form-item :label="$t('searchOrder.typeglassa')" :required="true" style="width: 24vw;">
+ <el-input :placeholder="$t('searchOrder.intypeglass')" v-model="glassType" autocomplete="off" />
</el-form-item></div></div>
</el-col>
</el-row>
@@ -507,15 +824,15 @@
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item label="瀹斤細" :required="true" style="width: 20vw;">
- <el-input placeholder="璇疯緭鍏ュ" v-model="width" autocomplete="off" />
+ <el-form-item :label="$t('searchOrder.widtha')" :required="true" style="width: 24vw;">
+ <el-input :placeholder="$t('searchOrder.inwidth')" v-model="width" 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="楂橈細" :required="true" style="width: 20vw;">
- <el-input placeholder="璇疯緭鍏ラ珮" v-model="height" autocomplete="off" />
+ <el-form-item :label="$t('searchOrder.heighta')" :required="true" style="width: 24vw;">
+ <el-input :placeholder="$t('searchOrder.inheight')" v-model="height" autocomplete="off" />
</el-form-item></div></div>
</el-col>
</el-row>
@@ -523,15 +840,15 @@
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item label="鍘氬害锛�" :required="true" style="width: 20vw;">
- <el-input placeholder="璇疯緭鍏ュ帤搴�" v-model="thickness" autocomplete="off" />
+ <el-form-item :label="$t('searchOrder.thicknessa')" :required="true" style="width: 24vw;">
+ <el-input :placeholder="$t('searchOrder.inthickness')" v-model="thickness" 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="閽㈠寲鐗堝浘ID锛�" :required="true" style="width: 20vw;">
- <el-input placeholder="璇疯緭鍏ラ挗鍖栫増鍥綢D" v-model="temperingLayoutId" autocomplete="off" />
+ <el-form-item :label="$t('searchOrder.layoutIDa')" :required="true" style="width: 24vw;">
+ <el-input :placeholder="$t('searchOrder.inlayoutID')" v-model="temperingLayoutId" autocomplete="off" />
</el-form-item></div></div>
</el-col>
</el-row>
@@ -539,15 +856,15 @@
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item label="閽㈠寲鐗堝浘鐗囧簭锛�" :required="true" style="width: 20vw;">
- <el-input placeholder="璇疯緭鍏ラ挗鍖栫増鍥剧墖搴�" v-model="temperingFeedSequence" autocomplete="off" />
+ <el-form-item :label="$t('searchOrder.picturesequencea')" :required="true" style="width: 24vw;">
+ <el-input :placeholder="$t('searchOrder.inpicturesequence')" v-model="temperingFeedSequence" 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="鍚敤鐘舵�侊細" :required="true" style="width: 20vw;">
- <el-input placeholder="璇疯緭鍏ュ惎鐢ㄧ姸鎬�" v-model="state" autocomplete="off" />
+ <el-form-item :label="$t('searchOrder.startstatusa')" :required="true" style="width: 24vw;">
+ <el-input :placeholder="$t('searchOrder.instartstatus')" v-model="state" autocomplete="off" />
</el-form-item></div></div>
</el-col>
</el-row>
@@ -555,8 +872,15 @@
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item label="鐜荤拑闂撮殭锛�" :required="true" style="width: 20vw;">
- <el-input placeholder="璇疯緭鍏ョ幓鐠冮棿闅�" v-model="gap" autocomplete="off" />
+ <el-form-item :label="$t('searchOrder.glassgapsa')" :required="true" style="width: 24vw;">
+ <el-input :placeholder="$t('searchOrder.inglassgaps')" v-model="gap" 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('searchOrder.gridnumbera')" :required="true" style="width: 24vw;">
+ <el-input :placeholder="$t('searchOrder.grid')" v-model="state" autocomplete="off" />
</el-form-item></div></div>
</el-col>
</el-row>
@@ -566,16 +890,17 @@
<template #footer>
<div id="dialog-footer">
<el-button type="primary" @click="handleConfirm">
- 纭
+ {{ $t('searchOrder.sure') }}
</el-button>
- <el-button @click="add = false">鍙栨秷</el-button>
+ <el-button @click="add = false">{{ $t('searchOrder.cancel') }}</el-button>
</div>
</template>
</el-dialog>
-<el-dialog v-model="dialogFormVisiblea" top="5vh" width="90%" title="鐞嗙墖绗间俊鎭�" >
+<el-dialog v-model="dialogFormVisiblea" top="5vh" width="97%" :title="$t('searchOrder.cageinformation')">
<el-table
:data="tableData"
- height="600"
+ @row-click="handleRowClick"
+ height="500"
@expand-change="handleExpandChange"
row-key="id"
default-expand-all
@@ -592,18 +917,18 @@
: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="鐜荤拑ID" align="center" min-width="100"/>
- <el-table-column prop="sequence" align="center" label="灏忕墖鍦ㄦ牸鍐呯殑椤哄簭" min-width="120" />
- <el-table-column prop="flowCardId" align="center" label="娴佺▼鍗″彿" min-width="120" />
- <el-table-column prop="glassType" align="center" label="鐜荤拑绫诲瀷" min-width="100" />
- <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="temperingLayoutId" align="center" label="閽㈠寲鐗堝浘ID" min-width="100" />
- <el-table-column prop="temperingFeedSequence" align="center" label="閽㈠寲鐗堝浘鐗囧簭" min-width="120" />
+ <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"
>
@@ -613,24 +938,25 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column prop="gap" align="center" label="鐜荤拑闂撮殭" min-width="80" />
- <el-table-column fixed="right" label="鎿嶄綔" align="center" min-width="180">
+ <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="handleEdit(scope.row)">鐮存崯</el-button>
- <el-button size="mini" type="text" plain @click="opena(scope.row)">鍒犻櫎</el-button>
- <el-button size="mini" type="text" plain @click="opena(scope.row)">鍑虹墖</el-button>
+ <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="澶х悊鐗囩琛↖D" align="center" min-width="100"/>
- <el-table-column prop="deviceId" align="center" label="鐞嗙墖绗煎彿" min-width="150" />
- <el-table-column prop="slot" align="center" label="鏍呮牸鍙�" min-width="150" />
+ <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="鍚敤鐘舵��"
+ :label="$t('searchOrder.startstatus')"
min-width="80"
prop="enableState"
>
@@ -639,15 +965,15 @@
:type="scope.row.enableState === 1 ? 'success' : 'danger'"
@click="toggleEnableState(scope.row)"
>
- {{ scope.row.enableState === 1 ? '鍚敤' : '绂佺敤' }}
+ {{ 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="鎿嶄綔" align="center">
+ <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)">娣诲姞</el-button>
+ <el-button size="mini" type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.add') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -667,7 +993,7 @@
/>
</div>
</el-dialog>
-<el-dialog v-model="dialogFormVisibleb" top="10vh" width="85%" title="鍑虹墖闃熷垪" >
+<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>
@@ -676,16 +1002,16 @@
</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="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="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"
>
@@ -695,14 +1021,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="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"
>
@@ -712,10 +1038,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>
@@ -822,7 +1149,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