From c377d90fe2a01c2118f6c69c3c177f75be7c318b Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 29 十一月 2024 15:20:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Returns/returns.vue | 506 +++++++++++++++++++++++--------------------------------
1 files changed, 210 insertions(+), 296 deletions(-)
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index e7eabb7..f7a9744 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -1,12 +1,14 @@
<script lang="ts" setup>
-import {Search} from "@element-plus/icons-vue";
-import {reactive} from "vue";
+import {onBeforeUnmount, onMounted, onUnmounted, reactive, ref} from "vue";
import {useRouter} from "vue-router"
+import {ElMessage} from 'element-plus'
+import {useI18n} from 'vue-i18n'
+import {host, WebSocketHost} from '@/utils/constants'
+import request from "@/utils/request"
+import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
+
const router = useRouter()
-import type { TableColumnCtx } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { useI18n } from 'vue-i18n'
-const { t } = useI18n()
+const {t} = useI18n()
const dialogFormVisible = ref(false)
const blind = ref(false)
const blinda = ref(false)
@@ -28,49 +30,41 @@
const filmsId = ref('');
const patternThickness = ref('');
const number = ref('');
-import { WebSocketHost ,host} from '@/utils/constants'
-import request from "@/utils/request"
-const ida = ref(null);
-import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
-import { ref, onMounted, onUnmounted, onBeforeUnmount } from "vue";
-// 鍝嶅簲寮忔暟鎹�
-const selectedProjectNo = ref(''); // 褰撳墠閫変腑鐨勫伐绋嬪彿
-const selectedProjectNoa = ref(''); // 褰撳墠閫変腑鐨勫伐绋嬪彿
-const selectedValue = ref(''); // 褰撳墠閫変腑鐨勫
-const selectedValuea = ref('');
+const canSelectProject = ref(true);
+const canStartLoading = ref(false);
+const ida = ref(null);
+const selectedProjectNo = ref('');
+const selectedProjectNoa = ref('');
+const selectedValue = ref('');
+const selectedValuea = ref('');
const selectedValueb = ref('');
-const selectedValuec = ref('');
-// const upstatus = ref('涓婄墖鏈烘墜鍔ㄧ姸鎬侊細'); // 鍋囪杩欎釜鐢ㄤ簬鏄剧ず鑷姩/鎵嬪姩鐘舵��
+const selectedValuec = ref('');
const upstatus = ref(t('basicData.machineaa'));
-const cuttingMachine = ref(''); // 鍋囪杩欎釜鐢ㄤ簬瀛樺偍鍚庣杩斿洖鐨勭姸鎬佸�硷紙0鎴�1锛�
+const cuttingMachine = ref('');
const cuttingMachineStatusColor = ref('#911005'); // 鐢ㄤ簬鍔ㄦ�佽缃甶鏍囩鐨勮儗鏅壊
const inKageWord = ref(0); // 鐢ㄤ簬瀛樺偍瑕佷紶閫掔粰鎺ュ彛鐨刬nKageWord鍊�
-const options = ref<any[]>([]); // 涓嬫媺閫夐」鍒楄〃
-const selectOptions = ref<Array<any>>([]); // 涓嬫媺閫夐�夐」鏁扮粍
-const selectOptionsa = ref<Array<any>>([]); // 涓嬫媺閫夐�夐」鏁扮粍
-const selectOptionsb = ref<Array<any>>([]); // 涓嬫媺閫夐�夐」鏁扮粍
-const selectOptionsc = ref<Array<any>>([]); // 涓嬫媺閫夐�夐」鏁扮粍
- const tableDataa = ref([])
- const tableData = reactive([]);
- const fetchTableData = async () => {
+const options = ref<any[]>([]);
+const selectOptions = ref<Array<any>>([]);
+const selectOptionsa = ref<Array<any>>([]);
+const selectOptionsb = ref<Array<any>>([]);
+const selectOptionsc = ref<Array<any>>([]);
+const tableDataa = ref([])
+const tableData = reactive([]);
+const fetchTableData = async () => {
try {
const response = await request.get("/loadGlass/up-patten-usage/prioritylist");
- // 妫�鏌ュ搷搴旂姸鎬�
if (response.code === 200) {
- // 鏇存柊琛ㄦ牸鏁版嵁
console.log('鎴愬姛鑾峰彇琛ㄦ牸鏁版嵁:', response.data);
tableData.splice(0, tableData.length, ...response.data);
- // window.localStorage.setItem('engineeringId', response.data[0].engineeringId)
- // 鑾峰彇鍞竴鍊�
- const uniqueWidths = new Set(response.data.map(item => item.width));
- const uniqueHeights = new Set(response.data.map(item => item.height));
- const uniqueFilmsIds = new Set(response.data.map(item => item.filmsId));
+ const uniqueWidths = new Set(response.data.map(item => item.width));
+ const uniqueHeights = new Set(response.data.map(item => item.height));
+ const uniqueFilmsIds = new Set(response.data.map(item => item.filmsId));
const uniqueThicknesses = new Set(response.data.map(item => item.thickness));
- selectOptions.value = Array.from(uniqueWidths).map(width => ({
- value: width, // 鍋囪杩欐槸浣犳兂瑕佷綔涓簐alue鐨勫睘鎬�
- label: width, // 鍋囪杩欐槸浣犳兂瑕佹樉绀虹殑label
- }));
+ selectOptions.value = Array.from(uniqueWidths).map(width => ({
+ value: width,
+ label: width,
+ }));
selectOptionsa.value = Array.from(uniqueHeights).map(height => ({
value: height,
label: height,
@@ -92,8 +86,12 @@
}
};
const handlezhiban = () => {
- dialoglea.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+ dialoglea.value = true;
fetchFlowCardId();
+};
+const selectproject = () => {
+ dialogFormVisible.value = true;
+ selectgong();
};
// 鍊肩彮淇℃伅
const fetchFlowCardId = async () => {
@@ -105,14 +103,11 @@
if (response.code == 200) {
ElMessage.success(response.message);
tableDatax.value = response.data;
- console.log(tableDatax.value);
- console
} else {
ElMessage.error(response.message);
}
}
catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
}
@@ -125,13 +120,16 @@
ElMessage.error(response.message);
}
};
-onMounted(() => {
- list('');
+onMounted(() => {
+ list('');
fetchOptions('');
- initializeWebSocket(socketUrl, handleMessage);
+ socket = initializeWebSocket(socketUrl, handleMessage);
});
-onMounted(() => {
-});
+onUnmounted(() => {
+ if (socket) {
+ closeWebSocket(socket);
+ }
+});
const list = async () => {
try {
const response = await request.get('/loadGlass/LoadGlass/list');
@@ -158,76 +156,81 @@
console.error('Error fetching options:', error);
}
};
-// 鍋囪杩欐槸鎮ㄧ殑鍝嶅簲澶勭悊鍑芥暟
-// request.get("/loadGlass/LoadGlass/list").then((res) => {
-// if (res.code == 200) {
-// tableDataa.value = res.data
-// if (tableDataa.value.length === 4) {
-// if (tableDataa.value[0].patternHeight > 0) {
-// flake.value = true;
-// }
-// if (tableDataa.value[1].patternHeight > 0) {
-// flakea.value = true;
-// }
-// if (tableDataa.value[2].patternHeight > 0) {
-// flakeb.value = true;
-// }
-// if (tableDataa.value[3].patternHeight > 0) {
-// flakec.value = true;
-// }
-// }
-// } else {
-// ElMessage.warning(res.message)
-// // router.push("/login")
-// }
-// });
-//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
const titleSelectJson = ref({
processType: [],
})
const titleSelectJsona = ref({
processTypea: [],
})
+let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlass`;
-// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
- // 鏇存柊 tableData 鐨勬暟鎹�
if(data.prioritylist!=null){
tableData.splice(0, tableData.length, ...data.prioritylist[0]);
}
if(data.list!=null){
tableDataa.value = data.list[0]
}
+ if(data.engineering ){
+ if ( Array.isArray(data.engineering) && data.engineering.length !== 0) {
+ canSelectProject.value = false;
+ canStartLoading.value = true;
+ }else{
+ canSelectProject.value = true;
+ canStartLoading.value = false;
+ }
+}
+if (data.InkageStatus) {
+if(data.InkageStatus!=null){
+ const status = data.InkageStatus[0];
+ cuttingMachine.value = status;
+ upstatus.value = status === '1' ? t('basicData.machine') : t('basicData.machineaa');
+ cuttingMachineStatusColor.value = status === '1' ? 'green' : '#911005';
+ inKageWord.value = status === '1' ? 0 : 1;
+}
+}
};
const requestData = {
state: 100
};
-// 璋冪敤鎺ュ彛鑾峰彇閫夐」鏁版嵁鐨勫嚱鏁�
-const fetchOptions = async (queryString: string) => {
- try {
- // 鍙戦�佽姹傚埌鍚庣鎺ュ彛
- const response = await request.post('/loadGlass/optimizeProject/listByState', {
- ...requestData,
- query: queryString // 灏嗘煡璇㈠瓧绗︿覆浣滀负鍙傛暟浼犻��
- });
-
- if (response.code == 200) {
- titleSelectJson.value.processType = response.data;
- console.log(response.data);
-
- } else {
- ElMessage.warning(response.data);
+const selectgong = async (queryString: string) => {
+ try {
+ const response = await request.post('/loadGlass/optimizeProject/listByState',{
+ ...requestData,
+ projectNo: queryString
+ })
+ if (response.code == 200) {
+ titleSelectJson.value.processType = response.data;
+ } else {
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ console.error(error);
+ }
+}
+const fetchOptions = async (queryString: string) => {
+ try {
+ const response = await request.post('/loadGlass/optimizeProject/listByState', {
+ ...requestData,
+ query: queryString
+ });
+ if (response.code == 200) {
+ // titleSelectJson.value.processType = response.data;
+ console.log(response.data);
+ } else {
+ ElMessage.warning(response.data);
}
} catch (error) {
console.error('Error fetching options:', error);
}
-};
+};
// 澶勭悊鐢ㄦ埛杈撳叆鍙樺寲鐨勬柟娉�
const handleInputChange = async (value: string) => {
if (value) {
await fetchOptions(value);
- } else {
- options.value = []; // 娓呯┖閫夐」鍒楄〃
+ } else {
+ options.value = [];
}
};
// 澶勭悊鐢ㄦ埛杈撳叆鍙樺寲鐨勬柟娉�
@@ -243,38 +246,27 @@
});
// 娣诲姞
const handleBindRack = (row) => {
- workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
+ workstationId.value = row.workstationId;
ida.value = row.id;
- add.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+ add.value = true;
};
// 娣诲姞
- const handleConfirm = async () => {
- // console.log('id.value:', id.value);
- if ((ida.value === 2 || ida.value === 4) && (parseInt(selectedValuea.value, 10) >= 2700 )) {
+const handleConfirm = async () => {
+ if ((ida.value === 2 || ida.value === 4) && (parseInt(selectedValuea.value, 10) >= 2700)) {
try {
- const response = await request.post('/loadGlass/LoadGlass/updateGlassMessage', {
- id: workstationId.value,
- workstationId: workstationId.value,
- patternHeight: selectedValuea.value,
- patternWidth: selectedValue.value,
- filmsId: selectedValueb.value,
- patternThickness: selectedValuec.value,
- number: number.value
- });
- // window.localStorage.setItem('workstationId', workstationId.value)
- // window.localStorage.setItem('patternHeight', selectedValuea.value)
- // window.localStorage.setItem('patternWidth', selectedValue.value)
- // window.localStorage.setItem('number', number.value)
+ const response = await request.post('/loadGlass/LoadGlass/updateGlassMessage', {
+ id: workstationId.value,
+ workstationId: workstationId.value,
+ patternHeight: selectedValuea.value,
+ patternWidth: selectedValue.value,
+ filmsId: selectedValueb.value,
+ patternThickness: selectedValuec.value,
+ number: number.value
+ });
if (response.code == 200) {
- // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
- // window.location.reload()
add.value = false;
tableDataa.value = response.data;
- // let workstationId = window.localStorage.getItem('workstationId')
- // let patternHeight = window.localStorage.getItem('patternHeight')
- // let patternWidth = window.localStorage.getItem('patternWidth')
- // let number = window.localStorage.getItem('number')
if (selectedValuea.value !== '0' && selectedValue.value !== '0' && number.value !== '0' && workstationId.value === '1') {
flake.value = true
} else if (selectedValuea.value !== '0' && selectedValue.value !== '0' && number.value !== '0' && workstationId.value === '2'){
@@ -284,23 +276,13 @@
}else if (selectedValuea.value !== '0' && selectedValue.value !== '0' && number.value !== '0' && workstationId.value === '4'){
flakec.value = true
}
- // if (patternHeight !== '0' && patternWidth !== '0' && number !== '0' && workstationId === '1') {
- // flake.value = true
- // } else if (patternHeight !== '0' && patternWidth !== '0' && number !== '0' && workstationId === '2'){
- // flakea.value = true
- // }else if (patternHeight !== '0' && patternWidth !== '0' && number !== '0' && workstationId === '3'){
- // flakeb.value = true
- // }else if (patternHeight !== '0' && patternWidth !== '0' && number !== '0' && workstationId === '4'){
- // flakec.value = true
- // }
selectedValuea.value = '';
selectedValue.value = '';
selectedValueb.value = '';
selectedValuec.value = '';
number.value = '';
- list()
+ list()
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
} catch (error) {
@@ -319,9 +301,7 @@
number: number.value
});
if (response.code == 200) {
- // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
- // window.location.reload()
add.value = false;
tableDataa.value = response.data;
if (selectedValuea.value !== '0' && selectedValue.value !== '0' && number.value !== '0' && workstationId.value === '1') {
@@ -353,7 +333,6 @@
message: t('basicData.pause'),
})
}
-
};
// 鍒犻櫎
const handleConfirma = async () => {
@@ -365,31 +344,25 @@
filmsId: "",
patternThickness: 0,
number: 0
- });
-
+ });
if (response.code == 200) {
- // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
adda.value = false;
- tableDataa.value = response.data;
- // window.localStorage.setItem('workstationId', response.data.workstationId)
- // let workstationId = window.localStorage.getItem('workstationId')
+ tableDataa.value = response.data;
if (workstationId.value == '1') {
- flake.value = false
- } else if (workstationId.value == '2'){
- flakea.value = false
- }else if (workstationId.value == '3'){
- flakeb.value = false
- }else if (workstationId.value == '4'){
- flakec.value = false
- }
- list()
- } else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ flake.value = false
+ } else if (workstationId.value == '2') {
+ flakea.value = false
+ } else if (workstationId.value == '3') {
+ flakeb.value = false
+ } else if (workstationId.value == '4') {
+ flakec.value = false
+ }
+ list()
+ } else {
ElMessage.error(response.message);
}
} catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
};
@@ -401,9 +374,7 @@
})
window.localStorage.setItem('engineeringId', selectedProjectNo.value)
if (response.code == 200) {
- // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
- // window.location.reload()
dialogFormVisible.value = false;
tableData.splice(0, tableData.length, ...response.data);
selectedProjectNo.value = ''
@@ -413,7 +384,6 @@
const uniqueHeights = new Set(response.data.map(item => item.height));
const uniqueFilmsIds = new Set(response.data.map(item => item.filmsId));
const uniqueThicknesses = new Set(response.data.map(item => item.thickness));
-
selectOptions.value = Array.from(uniqueWidths).map(width => ({
value: width,
label: width,
@@ -431,41 +401,31 @@
label: thickness,
}));
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
- // ElMessage.error(response.msg);
}
}
catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
}
// 寮�濮嬩笂鐗�
const handle = async () => {
- if (markingMachineStatus.value === 'green' && cuttingMachineStatus.value === 'green') {
-
+ if (markingMachineStatus.value === 'green' && cuttingMachineStatus.value === 'green') {
try {
let engineeringId = window.localStorage.getItem('engineeringId')
-console.log(engineeringId);
-
const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
engineerId: engineeringId,
state: 1,
})
if (response.code == 200) {
- // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
- // window.location.reload()
blind.value = false;
selectedProjectNoa.value = '';
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
}
catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
} else if (markingMachineStatus.value === '#911005' || cuttingMachineStatus.value === '#911005') {
@@ -475,21 +435,20 @@
}
// 鏆傚仠
const handlea = async () => {
- try {
- let engineeringId = window.localStorage.getItem('engineeringId')
-console.log(engineeringId);
-if (engineeringId !== '') {
- const response = await request.post('/loadGlass/engineering/engineering/pauseTask', {
- engineeringId: engineeringId,
- state: 0,
- })
- if (response.code == 200) {
- ElMessage.success(response.message);
- blinda.value = false;
- // tableData.splice([]);
- } else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
- ElMessage.error(response.message);
+ try {
+ let engineeringId = window.localStorage.getItem('engineeringId')
+ console.log(engineeringId);
+ if (engineeringId !== '') {
+ const response = await request.post('/loadGlass/engineering/engineering/pauseTask', {
+ engineeringId: engineeringId,
+ state: 0,
+ })
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ blinda.value = false;
+ // tableData.splice([]);
+ } else {
+ ElMessage.error(response.message);
}
}
else {
@@ -500,7 +459,6 @@
}
}
catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
}
@@ -515,13 +473,9 @@
state: 0,
})
if (response.code == 200) {
- // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
- // window.location.reload()
blindb.value = false;
tableData.splice([]);
-
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
}
@@ -533,7 +487,6 @@
}
}
catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
}
@@ -564,7 +517,7 @@
}
// 寮�濮嬩笂鐗�
const handleBind = (row) => {
- blind.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+ blind.value = true;
};
// 鏆傚仠
const handleBinda = (row) => {
@@ -574,11 +527,10 @@
const handleBindb = (row) => {
blindb.value = true;
};
-
// 鍒犻櫎
const handleBindRacka = (row) => {
workstationId.value = row.workstationId;
- adda.value = true;
+ adda.value = true;
};
// 瀹氫箟涓�涓搷搴斿紡寮曠敤锛岀敤浜庡瓨鍌ㄩ鑹茬姸鎬�
const markingMachineStatus = ref('#911005');
@@ -599,107 +551,73 @@
const newState = row.state === 100 ? 0 : 100;
try {
// 鍙戦�佽姹傚埌鍚庣鏇存柊鐘舵��
- const response = await request.post('/loadGlass/up-patten-usage/updateGlassState', { id: row.id, state: newState });
- if (response.code === 200) {
- ElMessage.success(response.message);
- row.state = newState;
- } else {
- ElMessage.error(response.message);
- }
- } catch (error) {
+ const response = await request.post('/loadGlass/up-patten-usage/updateGlassState', { id: row.id, state: newState });
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ row.state = newState;
+ } else {
+ ElMessage.error(response.message);
+ }
+ } catch (error) {
// 澶勭悊璇锋眰閿欒
- ElMessage.error(t('basicData.glassnull'));
- }
-};
-const wsUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlass`;
-const ws = new WebSocket(wsUrl);
-ws.onopen = () => {
- console.log('WebSocket杩炴帴宸叉墦寮�');
-};
-
-// 鐩戝惉WebSocket鐨勯敊璇簨浠�
-ws.onerror = (error) => {
- console.error('WebSocket鍙戠敓閿欒:', error);
-};
-
-// 鐩戝惉WebSocket鐨勫叧闂簨浠�
-ws.onclose = (event) => {
- if (event.wasClean) {
- console.log('WebSocket杩炴帴宸叉甯稿叧闂�');
- } else {
- console.error('WebSocket杩炴帴寮傚父鍏抽棴');
- }
-};
-// 鐩戝惉WebSocket鐨勬秷鎭簨浠�
-ws.onmessage = (event) => {
- try {
-
- const data = JSON.parse(event.data.replace('<END>', '')); // 瑙ｆ瀽娑堟伅涓篔SON
-
- if (data && Array.isArray(data.InkageStatus) && data.InkageStatus.length > 0) {
-if(data.InkageStatus!=null){
- const status = data.InkageStatus[0];
- cuttingMachine.value = status;
- upstatus.value = status === '1' ? t('basicData.machine') : t('basicData.machineaa');
- cuttingMachineStatusColor.value = status === '1' ? 'green' : '#911005';
- inKageWord.value = status === '1' ? 0 : 1;
-}
- } else {
- // 澶勭悊閿欒鎯呭喌鎴栨棤鏁堟暟鎹�
- // console.error('鎺ユ敹鍒扮殑鏁版嵁鏃犳晥', data);
- }
- } catch (error) {
- // console.error('瑙ｆ瀽WebSocket娑堟伅鏃跺彂鐢熼敊璇�', error);
- }
-};
-const confirmCutting = async () => {
- try {
- const response = await request.post('/loadGlass/LoadGlass/updateMesInkageLoad',
- inKageWord.value
- );
- if (response.code == 200) {
- const status = response.data.status;
+ ElMessage.error(t('basicData.glassnull'));
+ }
+};
+const confirmCutting = async () => {
+ try {
+ const response = await request.post('/loadGlass/LoadGlass/updateMesInkageLoad',
+ inKageWord.value
+ );
+ if (response.code == 200) {
+ const status = response.data.status;
upstatus.value = status === '1' ? t('basicData.machine') : t('basicData.machineaa');
- cuttingMachineStatusColor.value = status === '1' ? 'green' : '#911005';
- // 鏄剧ず鎴愬姛娑堟伅
- ElMessage.success(response.message);
- } else {
- ElMessage.error(response.message || '璇锋眰澶辫触');
- }
- } catch (error) {
- // 澶勭悊閿欒
- console.error('璇锋眰鏃跺彂鐢熼敊璇�', error);
- ElMessage.error('璇锋眰鏃跺彂鐢熼敊璇�');
- }
+ cuttingMachineStatusColor.value = status === '1' ? 'green' : '#911005';
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.message || '璇锋眰澶辫触');
+ }
+ } catch (error) {
+ console.error('璇锋眰鏃跺彂鐢熼敊璇�', error);
+ ElMessage.error('璇锋眰鏃跺彂鐢熼敊璇�');
+ }
};
</script>
<template>
- <div>
- <div id="dotClass">
- <div>{{ $t('basicData.laserprinting') }}</div>
- <i :style="{ marginTop: '2px', backgroundColor: markingMachineStatus, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
- <el-button @click="confirmMarkingMachine" style="margin-left: 30px;margin-top: -3px;">{{ $t('basicData.yes') }}</el-button>
- <div style="margin-left: 70px;">{{ $t('basicData.cuttingmachine') }}</div>
- <i :style="{ marginTop: '2px', backgroundColor: cuttingMachineStatus, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
- <el-button @click="confirmCuttingMachine" style="margin-left: 30px;margin-top: -3px;" >{{ $t('basicData.yes') }}</el-button>
- <div style="margin-left: 70px;">{{ upstatus }} </div>
- <i :style="{ marginTop: '2px', backgroundColor: cuttingMachineStatusColor, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
- <el-button @click="confirmCutting" style="margin-left: 30px;margin-top: -3px;" >{{ $t('basicData.change') }}</el-button>
-
+ <div style="height: 500px;">
+ <div>
+ <div id="dotClass">
+ <div>{{ $t('basicData.laserprinting') }}</div>
+ <i :style="{ marginTop: '2px', backgroundColor: markingMachineStatus, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+ <el-button @click="confirmMarkingMachine" style="margin-left: 30px;margin-top: -3px;">{{
+ $t('basicData.yes')
+ }}
+ </el-button>
+ <div style="margin-left: 70px;">{{ $t('basicData.cuttingmachine') }}</div>
+ <i :style="{ marginTop: '2px', backgroundColor: cuttingMachineStatus, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+ <el-button @click="confirmCuttingMachine" style="margin-left: 30px;margin-top: -3px;">{{
+ $t('basicData.yes')
+ }}
+ </el-button>
+ <div style="margin-left: 70px;">{{ upstatus }}</div>
+ <i :style="{ marginTop: '2px', backgroundColor: cuttingMachineStatusColor, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+ <el-button @click="confirmCutting" style="margin-left: 30px;margin-top: -3px;">{{
+ $t('basicData.change')
+ }}
+ </el-button>
+
</div>
- <el-button style="margin-top: 5px;margin-left: 15px;" id="searchButton" type="primary" @click="dialogFormVisible = true">{{ $t('basicData.selectproject') }}</el-button>
- <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="primary" @click="handleBind">{{ $t('basicData.startloading') }}</el-button>
+ <el-button :disabled="!canSelectProject" style="margin-top: 5px;margin-left: 15px;" type="primary" @click="selectproject">{{ $t('basicData.selectproject') }}</el-button>
+ <el-button :disabled="!canSelectProject" :style="{ backgroundColor: canStartLoading ? 'green' : 'initial',color: canStartLoading ? 'white' : 'black', }" style="margin-top: 5px;margin-left: 20px;" @click="handleBind">{{ $t('basicData.startloading') }}</el-button>
<el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="warning" @click="handleBinda">{{ $t('basicData.stop') }}</el-button>
<el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlezhiban">{{ $t('searchOrder.dutyinformation') }}</el-button>
<!-- <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="handleBindb">鍋滄浠诲姟</el-button> -->
-
<el-card style="flex: 1;margin-left: 10px;margin-top: 15px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table
- height="150"
- ref="table"
- :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
- :data="tableData"
+ height="350"
+ ref="table"
+ :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
+ :data="tableData"
>
<el-table-column prop="layoutSequence" :label="$t('basicData.layoutSequence')" width="100" align="center"/>
<el-table-column prop="engineeringId" :label="$t('basicData.projectnumber')" width="200" align="center"/>
@@ -752,7 +670,6 @@
</div>
</template>
</el-dialog>
-
<el-dialog v-model="dialoglea" top="15vh" width="70%" :title="$t('searchOrder.dutyinformation')">
<el-table ref="table" style="margin-top: 20px;height: 300px;"
:data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
@@ -822,7 +739,6 @@
</el-table-column>
</el-table>
</div>
-
<el-dialog v-model="add" top="23vh" width="45%" :title="$t('basicData.addglass')" >
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
<el-form size="mini" label-width="150px">
@@ -953,23 +869,23 @@
<el-dialog v-model="dialogFormVisible" top="24vh" width="30%" :title="$t('basicData.project')" >
<div style="margin-left: 50px;margin-bottom: 10px;">
<el-form-item :label="$t('basicData.projectnumber')" :required="true">
- <el-select
- v-model="selectedProjectNo"
- filterable
- clearable
- :placeholder="$t('basicData.plselectproject')"
- style="width: 220px"
- @input="handleInputChange"
- >
- <el-option
- v-for="item in titleSelectJson['processType']"
- :key="item.id"
- :label="item.projectNo"
- :value="item.projectNo"
- />
- </el-select>
- </el-form-item>
- </div>
+ <el-select
+ v-model="selectedProjectNo"
+ filterable
+ clearable
+ :placeholder="$t('basicData.plselectproject')"
+ style="width: 220px"
+ @input="handleInputChange"
+ >
+ <el-option
+ v-for="item in titleSelectJson['processType']"
+ :key="item.id"
+ :label="item.projectNo"
+ :value="item.projectNo"
+ />
+ </el-select>
+ </el-form-item>
+ </div>
<template #footer>
<div id="dialog-footer">
<el-button type="primary" @click="handleup">
@@ -979,10 +895,9 @@
</div>
</template>
</el-dialog>
+ </div>
</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{
@@ -1037,5 +952,4 @@
margin-top: -45px;
margin-left: 703px;
}
-
</style>
\ No newline at end of file
--
Gitblit v1.8.0