From 3124ce87407fe85f6780b3ba1a219d8d9e8d7475 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 30 十月 2025 13:21:32 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/YiWuProject
---
UI-Project/src/views/Slicecage/slicecage.vue | 1206 +++++++++++++++++++++++++++++---------------------------
1 files changed, 619 insertions(+), 587 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index e2422ac..aa87387 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -3,24 +3,23 @@
import {useRouter} from "vue-router"
import request from "@/utils/request"
import {host, WebSocketHost} from '@/utils/constants'
-import {computed, onBeforeUnmount, onMounted, onUnmounted, reactive, ref} from "vue";
+import {onBeforeUnmount, onMounted, onUnmounted, reactive, ref} from "vue";
import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
import {ElMessage, ElMessageBox} from 'element-plus'
-import PrintLabel from "@/views/UnLoadGlass/PrintCustomLabelSemi1.vue";
-const dialogFormVisibleaDownGlasss = ref(false)
const scanGlass = ref([])
const {t} = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
+import { inject } from 'vue';
const router = useRouter()
-const dialogFormVisible = ref(false)
-const dialoglea = ref(false)
+const timeRange = ref([])
const dialogFormVisiblea = ref(false)
-const dialogFormVisibleb = ref(false)
const dialogFormVisiblec = ref(false)
const dialogFormVisibled = ref(false)
const dialogFormVisiblee = ref(false)
const dialogFormVisiblef = ref(false)
const dialogFormVisibles = ref(false)
+const isLoading = ref(true)
+const blindb = ref(false)
const inkageEntity = ref('#911005');
const requestEntity = ref('#911005');
const mesReplyEntity = ref('#911005');
@@ -33,51 +32,54 @@
const tableDatad = ref([])
const tableDataf = ref([])
const tableDatae = ref([])
-const tableDatax = ref([])
const tableDatas = ref([])
+const tableDatass = ref([])
+const tableDatax = ref([]);
const tableDatalack = ref([])
const tableDataspecify = ref([])
const tableDatacagedetails = ref([])
+const selectValuesa = reactive([]);
const carPosition = ref([])
const ganghua = ref('')
const diaodu = ref('')
const flowCardId = ref('')
const filmsId = ref('')
-const adjustedRects = ref([]);
-const project = ref([]);
const adjust = ref([]);
const adjusta = ref([]);
+const adjustedRects = ref([]);
const adjustedRectsa = ref([]);
const adjustedRectsb = ref([]);
const adjustedRectsc = ref([]);
-const adjustedRectsd = ref([]);
-const adjustedRectse = ref([]);
-const adjustedRectsf = ref([]);
-const adjustedRectsg = ref([]);
-const adjustedRectsh = ref([]);
+const subRectsCounts = ref([]);
+const subRectsCountsa = ref([]);
+const subRectsCountsb = ref([]);
+const subRectsCountsc = ref([]);
const currentRow = reactive({}); // 褰撳墠琛岀殑鏁版嵁
+const showAlert = ref(false)
+const alertMessage = ref('')
+const alarmData = ref<any>(null)
+const showModal = ref(false)
+const currentAlarm = ref<any>(null)
+const tableDataAlert = ref([])
+const alertText = ref('')
const currentPage2 = ref(1)
+const globalDate = inject('globalDate');
const inputValuesa = reactive({});
const add = ref(false)
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 startSlot = ref('');
+const targetSlot = ref('');
+const taskStateList = ref('');
+const taskTypeList = ref('');
+const beginDate = ref('');
+const endDate = ref('');
const thickness = ref('');
const width = ref('');
const cell1=ref(true);
const cell2=ref(true);
const cell3=ref(true);
const cell4=ref(true);
-const cell5=ref(true);
-const cell6=ref(true);
-const cell7=ref(true);
-const cell8=ref(true);
-const cell9=ref(true);
const canEdit = ref(true);
const selectedRow = ref(null);
const temperingtotal = ref(0);
@@ -87,52 +89,10 @@
const printFlowCardId = ref('')
const printLayer = ref('')
const printGlassId = ref('')
-const dialogTableVisible1 = ref(false)
const open1 = async (row) => {
printFlowCardId.value = row.flowCardId;
printLayer.value = row.layer
printGlassId.value = row.glassId
-dialogTableVisible1.value = true;
-setTimeout(() => {
- printFlowCard1();
- //dialogTableVisible1.value = false;
-}, 1000);
-}
-const printFlowCard1 = () => {
- // 闇�瑕佹墦鍗扮殑灞�閮ㄥ尯鍩熻祴浜�"print-wrap"鐨刬d
- let el = document.getElementById("printFlowCard");
- let doc = document;
- let body = doc.body || doc.getElementsByTagName("body")[0];
- let printId = "print-" + Date.now();
- // 鍒涘缓鏃犲壇浣滅敤鐨勬墦鍗板鍣�(鍥犱笉纭畾椤甸潰鐨勬墦鍗板厓绱犳湁鏃犲叾瀹冩牱寮�)
- let content = doc.createElement("div");
- content.id = printId;
- // 鏍峰紡鎺у埗涓庢墦鍗版棤鍏崇殑鍏冪礌闅愯棌
- let style = doc.createElement("style");
- style.innerHTML =
- "body>#" +
- printId +
- "{display:none}@media print{" +
- "@page {" +
- " size: auto; " +
- " margin: 2mm 2mm 2mm 2mm; " +
- " }body>:not(#" +
- printId +
- "){display:none !important}body>#" +
- printId +
- "{display:block;padding-top:1px}}";
- //
- content.innerHTML = el.outerHTML;
- // // console.log("el.outerHTML", el.outerHTML);
- body.appendChild(style);
- // 涓巗tyle鍏冪礌璁剧疆鐨勬牱寮忕浉閰嶅悎
- // 鎶婃墦鍗板唴瀹圭殑鍏冪礌娣诲姞鍒癰ody(浣滀负body鐨勫瓙鍏冪礌锛屽彲鐢╞ody鐨勫瓙閫夋嫨鍣� '>' 鎺у埗鎵撳嵃鏍峰紡)
- body.appendChild(content);
- setTimeout(() => {
- window.print();
- body.removeChild(content);
- body.removeChild(style);
- }, 20);
}
// setInterval(() => {
// localStorage.clear(); // 娓呴櫎鎵�鏈塴ocalStorage鏁版嵁
@@ -155,7 +115,6 @@
}
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
- console.log(currentPage2.value);
window.localStorage.setItem('pagenumber', currentPage2.value)
fetchxiang(currentPage2.value);
};
@@ -180,7 +139,6 @@
ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
};
// 鏄惁绂佺敤
@@ -208,7 +166,6 @@
row.isDamage = newState;
}
catch (error) {
- console.error(error);
}
}
// 鍒犻櫎
@@ -233,7 +190,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
// 鐮存崯
@@ -257,10 +213,15 @@
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
+// 鍘嗗彶浠诲姟
+const iframeUrl = ref('');
+const handlehistorical = (row) => {
+ blindb.value = true;
+ iframeUrl.value = `${window.location.origin}/#/Slicecage/slicecagehistory`;
+};
// 鎷胯蛋
const brokec = async(row) => {
try {
@@ -282,8 +243,7 @@
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 鍑虹墖
@@ -306,8 +266,7 @@
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 鍑虹墖闃熷垪鐮存崯
@@ -330,8 +289,7 @@
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 鎸囧畾閽㈠寲
@@ -358,8 +316,7 @@
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
handleganghua();
};
@@ -375,21 +332,18 @@
type: 'warning',
}
);
- if (confirmResult === 'confirm') {
- const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/appointTemperingEngineerId",{
- engineerId: row.engineer_id
- });
+ if (confirmResult === 'confirm') {
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/appointTemperingEngineerId?engineerId=" + row.engineerId);
if (response.code === 200) {
ElMessage.success(response.message);
} else {
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
-// 鎸囧畾宸ョ▼
+// 鍙栨秷鎸囧畾
const broked = async() => {
try {
const confirmResult = await ElMessageBox.confirm(
@@ -402,17 +356,14 @@
}
);
if (confirmResult === 'confirm') {
- const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/appointEngineerId",{
- engineerId: ""
- });
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/cancelTemperingTask");
if (response.code === 200) {
ElMessage.success(response.message);
} else {
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 鎸囧畾娴佺▼鍗�
@@ -438,8 +389,7 @@
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 鍑虹墖闃熷垪鎷胯蛋
@@ -462,8 +412,7 @@
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 鍑虹墖闃熷垪鍒犻櫎
@@ -490,8 +439,7 @@
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 瀹屾垚浠诲姟
@@ -515,7 +463,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
// 纭娣诲姞
@@ -551,20 +498,16 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
-};
-const handlezhiban = () => {
- dialoglea.value = true;
- fetchFlowCardId();
};
const handleganghua = () => {
dialogFormVisiblec.value = true;
fetchFlow();
};
const handlexiang = () => {
+ isLoading.value = true; // 寮�鍚姞杞界姸鎬�
dialogFormVisiblea.value = true;
- fetchxiang(1);
+ fetchxiang();
currentPage2.value = 1;
window.localStorage.setItem('pagenumber', currentPage2.value)
filmsId.value = ''
@@ -582,6 +525,19 @@
fetchcagedetails(engineerId, temperingLayoutId);
dialogFormVisiblef.value = true;
};
+// 璀︽姤鍙屽嚮寮圭獥
+const handleDoubleClick = () => {
+ showModal.value = true;
+};
+const getAlertText = (alarmCode) => {
+ const codeMap = {
+ sizeSame: 'hellow.sizeSame',
+ idSame: 'hellow.idSame'
+ };
+ return alarmCode in codeMap
+ ? t(codeMap[alarmCode])
+ : t('hellow.unknownAlert');
+};
// 閽㈠寲鏌ヨ
onMounted(async () => {
try {
@@ -597,21 +553,27 @@
}
});
// 鐞嗙墖绗间俊鎭�
-const fetchxiang = async (page) => {
- try {
+const fetchxiang = async () => {
+ isLoading.value = true;
+ try {
const response = await request.post('/cacheVerticalGlass/bigStorageCage/querybigStorageCageDetail',{
- deviceId: page,
+ // deviceId: page,
filmsId: filmsId.value,
flowCardId: flowCardId.value,
})
- if (response.code === 200) {
+ // 妯℃嫙鏈�灏忓姞杞芥椂闂�
+ await new Promise(resolve => setTimeout(resolve, 300));
+ if (response.code === 200) {
ElMessage.success(response.message);
tableDataa.value = response.data
} else {
ElMessage.warning(response.msg)
}
} catch (error) {
- }
+ } finally {
+ isLoading.value = false;
+ }
+
}
const fetchxianga = async () => {
let page = window.localStorage.getItem('pagenumber')
@@ -662,7 +624,6 @@
}
catch (error) {
// 澶勭悊閿欒
- console.error(error);
}
}
// 绗煎唴璇︽儏
@@ -673,8 +634,6 @@
temperingLayoutId: temperingLayoutId,
})
if (response.code == 200) {
- console.log(response.data);
-
ElMessage.success(response.message);
tableDatacagedetails.value = response.data
} else {
@@ -682,8 +641,6 @@
}
}
catch (error) {
- // 澶勭悊閿欒
- console.error(error);
}
}
const fetchFlow = async () => {
@@ -710,38 +667,8 @@
}
}
catch (error) {
- // 澶勭悊閿欒
- console.error(error);
}
}
-// 鍊肩彮淇℃伅
-const fetchFlowCardId = async () => {
- try {
- const response = await request.post('/cacheVerticalGlass/work_assignment/selectWorkAssignment',{
- line: 4001,
- workingProcedure : '閽㈠寲'
- })
- if (response.code == 200) {
- ElMessage.success(response.message);
- tableDatax.value = response.data;
- console.log(tableDatax.value);
- } else {
- ElMessage.error(response.message);
- }
-}
-catch (error) {
- console.error(error);
- }
-}
-const handleConfirm = async () => {
- const response = await request.post("/cacheVerticalGlass/work_assignment/updateWorkAssignment", tableDatax.value)
- if (response.code === 200) {
- ElMessage.success(response.message);
- dialoglea.value = false;
- } else {
- ElMessage.error(response.message);
- }
-};
function handleRowClick(row) {
selectedRow.value = row; // 鏇存柊閫変腑鐨勮鏁版嵁
}
@@ -762,7 +689,6 @@
}
}
catch (error) {
- console.error(error);
}
}
// 璋冨害寮�鍏�
@@ -781,12 +707,89 @@
}
}
catch (error) {
- console.error(error);
}
}
+// 浠诲姟閲嶇疆
+// const handleptask = async() => {
+// try {
+// const confirmResult = await ElMessageBox.confirm(
+// t('searchOrder.partasks'),
+// t('workOrder.prompt'),
+// {
+// confirmButtonText: t('workOrder.yes'),
+// cancelButtonText: t('workOrder.cancel'),
+// type: 'warning',
+// }
+// );
+// if (confirmResult === 'confirm') {
+// const response = await request.post('/cacheVerticalGlass/bigStorageCage/resetCage')
+// if (response.code === 200) {
+// ElMessage.success(response.message);
+// } else {
+// ElMessage.error(response.msg);
+// }
+// }
+// } catch (error) {
+// }
+// };
+// 璀︽姤纭
+const handleSure = async (row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('hellow.clickmakesure'),
+ t('productStock.prompt'),
+ {
+ confirmButtonText: t('productStock.yes'),
+ cancelButtonText: t('productStock.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ const response = await request.post('/hollowGlass/productAlarmInfo/updateAlarmInfo', {
+ id: row.id
+ })
+ if (response.code === 200) {
+ showModal.value = false;
+ showAlert.value = false;
+
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.msg);
+ }
+ }
+ } catch (error) {
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/slicecage`;
const handleMessage = (data) => {
+ // 鎶ヨ淇℃伅
+ if (data.alarmInfo[0] !=null && data.alarmInfo[0].length > 0) {
+ const alert = data.alarmInfo[0]
+ const { id,alarmMessage, ...rest } = alert[0];
+ alertMessage.value = `${alarmMessage}`;
+ alertMessage.value = `${alert[0].alarmMessage}`;
+ // 鍔ㄦ�佺炕璇戦�昏緫锛氭牴鎹產larmCode閫夋嫨缈昏瘧閿�
+ alertText.value = alert[0].alarmCode === 'sizeSame'
+ ? t('hellow.sizeSame')
+ : t('hellow.idSame');
+ alarmData.value = data; // 瀛樺偍瀹屾暣鏁版嵁鐢ㄤ簬寮圭獥
+ showAlert.value = true;
+ }
+ const formattedData = data.alarmInfo[0].map(record => ({
+ ...record,
+ formattedCreateTime: formatTimestamp(record.createTime),
+ alarmCode: record.alarmCode,
+ alarmMessage: record.alarmMessage
+ }));
+ tableDataAlert.value = formattedData;
+
+ if(data.bigStorageSummary!=null){
+ tableDatass.value = data.bigStorageSummary[0]
+ }else{
+ tableDatass.value = ''
+ }
if (data.inkageEntity != null) {
inkageEntity.value = data.inkageEntity[0] == true ? 'green' : '#911005';
}
@@ -815,8 +818,8 @@
}
}
//褰撳墠鎸囧畾宸ョ▼
- if(data.bigStorageCageDetailsOutTask!=null){
- temperingengineerId.value=data.temperingengineerId[0];
+ if(data.temperingEngineerId!=null){
+ temperingengineerId.value=data.temperingEngineerId[0];
}
if(data.bigStorageCageDetailsOutTask!=null){
tableDatac.value = data.bigStorageCageDetailsOutTask[0]
@@ -824,6 +827,11 @@
} else {
tableDatac.value = '',
adjusta.value = ''
+ }
+ if(data.bigStorageCageDetailsFeedTask!=null){
+ tableDatax.value = data.bigStorageCageDetailsFeedTask[0]
+ } else {
+ tableDatax.value = ''
}
if(data.bigStorageCageDetailsFeedTask!=null){
tableDatad.value = data.bigStorageCageDetailsFeedTask[0]
@@ -851,35 +859,187 @@
}else{
ganghua.value = ''
}
+if(data.dispatchSwitch!=null){
+ diaodu.value = data.dispatchSwitch[0]
+}else{
+ diaodu.value = ''
+ }
if(data.bigStorageCageInfos!=null){
- window.localStorage.setItem('length', data.bigStorageCageInfos[0][1].length)
- let length = window.localStorage.getItem('length')
- adjustedRects.value = data.bigStorageCageInfos[0][1].map(rect => ({
- ...rect,
- height: 20/length,
- top: 29/length
- }));
-adjustedRectsa.value = data.bigStorageCageInfos[0][2].map(rect => ({
- ...rect,
- height: 20/length,
- top: 29/length
- }));
-adjustedRectsb.value = data.bigStorageCageInfos[0][3].map(rect => ({
- ...rect,
- height: 20/length,
- top: 29/length
- }));
-adjustedRectsc.value = data.bigStorageCageInfos[0][4].map(rect => ({
- ...rect,
- height: 20/length,
- top: 29/length
- }));
+ adjustedRects.value = data.bigStorageCageInfos[0][1].map((rect, index) => ({
+ id: index + 1,
+ height: 20/55,
+ top: 53/55,
+ }));
+subRectsCounts.value = data.bigStorageCageInfos[0][1].map(rect => rect.count);
+adjustedRectsa.value = data.bigStorageCageInfos[0][2].map((rect, index) => ({
+ id: index + 1,
+ height: 20/55,
+ top: 53/55,
+ }));
+subRectsCountsa.value = data.bigStorageCageInfos[0][2].map(rect => rect.count);
+adjustedRectsb.value = data.bigStorageCageInfos[0][3].map((rect, index) => ({
+ id: index + 1,
+ height: 20/55,
+ top: 53/55,
+ }));
+subRectsCountsb.value = data.bigStorageCageInfos[0][3].map(rect => rect.count);
+adjustedRectsc.value = data.bigStorageCageInfos[0][4].map((rect, index) => ({
+ id: index + 1,
+ height: 20/55,
+ top: 53/55,
+ }));
+subRectsCountsc.value = data.bigStorageCageInfos[0][4].map(rect => rect.count);
}else{
- adjustedRects.value = ''
+ adjustedRects.value = '',
+ adjustedRectsa.value = '',
+ adjustedRectsb.value = '',
+ adjustedRectsc.value = ''
}
};
-onMounted(() => {
+// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
+const rectStyle = (rect, index) => ({
+ position: 'absolute',
+ width: '170px',
+ right: '0px',
+ top: `${index*rect.top}px`,
+ height: `${rect.height}px`,
+});
+// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡鍜屾暟閲�
+const getSubRects = (rectIndex) => {
+ const count = subRectsCounts.value[rectIndex];
+ const subRects = [];
+ for (let i = 0; i < count; i++) {
+ subRects.push({});
+ }
+ return subRects;
+};
+// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
+const subRectStyle = (rectIndex, subIndex) => {
+ const width = '18px';
+ const marginRight = '8px';
+ const totalWidth = 6 * (parseInt(width) + parseInt(marginRight));
+ const right = `${(subIndex * (parseInt(width) + parseInt(marginRight))) / totalWidth * 100}%`;
+ return {
+ position: 'absolute',
+ width,
+ height: '100%',
+ marginRight,
+ top: '0px',
+ backgroundColor: '#911005',
+ right,
+ };
+};
+// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
+const rectStylea = (rect, index) => ({
+ position: 'absolute',
+ width: '170px',
+ right: '0px',
+ top: `${index*rect.top}px`,
+ height: `${rect.height}px`,
+});
+// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡鍜屾暟閲�
+const getSubRectsa = (rectIndex) => {
+ const count = subRectsCountsa.value[rectIndex];
+ const subRects = [];
+ for (let i = 0; i < count; i++) {
+ subRects.push({});
+ }
+ return subRects;
+};
+// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
+const subRectStylea = (rectIndex, subIndex) => {
+ const width = '18px';
+ const marginRight = '8px';
+ const totalWidth = 6 * (parseInt(width) + parseInt(marginRight));
+ const right = `${(subIndex * (parseInt(width) + parseInt(marginRight))) / totalWidth * 100}%`;
+ return {
+ position: 'absolute',
+ width,
+ height: '100%',
+ marginRight,
+ top: '0px',
+ backgroundColor: '#911005',
+ right,
+ };
+};
+// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
+const rectStyleb = (rect, index) => ({
+ position: 'absolute',
+ width: '170px',
+ right: '0px',
+ top: `${index*rect.top}px`,
+ height: `${rect.height}px`,
+});
+// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡鍜屾暟閲�
+const getSubRectsb = (rectIndex) => {
+ const count = subRectsCountsb.value[rectIndex];
+ const subRects = [];
+ for (let i = 0; i < count; i++) {
+ subRects.push({});
+ }
+ return subRects;
+};
+// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
+const subRectStyleb = (rectIndex, subIndex) => {
+ const width = '18px';
+ const marginRight = '8px';
+ const totalWidth = 6 * (parseInt(width) + parseInt(marginRight));
+ const right = `${(subIndex * (parseInt(width) + parseInt(marginRight))) / totalWidth * 100}%`;
+ return {
+ position: 'absolute',
+ width,
+ height: '100%',
+ marginRight,
+ top: '0px',
+ backgroundColor: '#911005',
+ right,
+ };
+};
+// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
+const rectStylec = (rect, index) => ({
+ position: 'absolute',
+ width: '170px',
+ right: '0px',
+ top: `${index*rect.top}px`,
+ height: `${rect.height}px`,
+});
+// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡鍜屾暟閲�
+const getSubRectsc = (rectIndex) => {
+ const count = subRectsCountsc.value[rectIndex];
+ const subRects = [];
+ for (let i = 0; i < count; i++) {
+ subRects.push({});
+ }
+ return subRects;
+};
+// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
+const subRectStylec = (rectIndex, subIndex) => {
+ const width = '18px';
+ const marginRight = '8px';
+ const totalWidth = 6 * (parseInt(width) + parseInt(marginRight));
+ const right = `${(subIndex * (parseInt(width) + parseInt(marginRight))) / totalWidth * 100}%`;
+ return {
+ position: 'absolute',
+ width,
+ height: '100%',
+ marginRight,
+ top: '0px',
+ backgroundColor: '#911005',
+ right,
+ };
+};
+// 鏍煎紡鍖栧悗绔椂闂村苟璁＄畻涓�鍛ㄥ墠鐨勬椂闂�
+const defaultTime = ref<[Date, Date]>([new Date(), new Date()]);
+function parseAndSetTime() {
+ const backendTime = new Date(globalDate);
+ const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
+ oneWeekAgo.setHours(0, 0, 0, 0);
+ timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
+ window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
+}
+ onMounted(() => {
socket = initializeWebSocket(socketUrl, handleMessage);
+ parseAndSetTime();
});
onUnmounted(() => {
if (socket) {
@@ -936,22 +1096,104 @@
return t('searchOrder.waiting');
}
}
+function getcasOnea(isSame) {
+ switch (isSame) {
+ case 1:
+ return 'danger';
+ case 0:
+ return 'info';
+ }
+}
+function getStatuscasOnea(isSame) {
+ switch (isSame) {
+ case 1:
+ return t('searchOrder.same');
+ case 0:
+ return t('searchOrder.notsame');
+ }
+}
+function tableRowClassName({ row }) {
+ if (row.isSame === 1) {
+ return 'row-red-background';
+ }
+ return '';
+}
+// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
+function formatTimestamp(timestamp) {
+ const date = new Date(timestamp);
+ const year = date.getFullYear();
+ const month = String(date.getMonth() + 1).padStart(2, '0'); // 鏈堜唤浠�0寮�濮嬶紝闇�瑕佸姞1锛屽苟琛ラ浂
+ const day = String(date.getDate()).padStart(2, '0'); // 琛ラ浂
+ const hours = String(date.getHours()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
+ const minutes = String(date.getMinutes()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
+ const seconds = String(date.getSeconds()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+}
+const svg = `
+ <path class="path" d="
+ M 30 15
+ L 28 17
+ M 25.61 25.61
+ A 15 15, 0, 0, 1, 15 30
+ A 15 15, 0, 1, 1, 27.99 7.5
+ L 15 15
+ " style="stroke-width: 4px; fill: rgba(0, 0, 0, 0)"/>
+ `
onBeforeUnmount(() => {
closeWebSocket();
});
</script>
<template>
<div style="height: 600px;">
+ <div v-if="showAlert" class="global-alert-bar" @dblclick="handleDoubleClick">
+ <div class="alert-content">
+ <el-icon><WarnTriangleFilled /></el-icon>
+ <span class="alert-text">
+ {{ alertText }} (id:{{ alertMessage }})
+ </span>
+ </div>
+ <button @click="showAlert = false" class="close-btn">脳</button>
+ </div>
+ <el-dialog
+ v-model="showModal"
+ width="40%"
+ center
+ >
+ <el-table
+ ref="table"
+ border
+ :data="tableDataAlert"
+ max-height="calc(500px - 35px)"
+ style="width: 100%;"
+ >
+ <el-table-column prop="formattedCreateTime" align="center" :label="$t('film.createtime')" min-width="100" />
+ <el-table-column
+ :label="$t('hellow.content')"
+ align="center"
+ min-width="220"
+ >
+ <template #default="scope">
+ <span>
+ {{ getAlertText(scope.row.alarmCode) }}
+ (id:{{ scope.row.alarmMessage }})
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column fixed="right" :label="$t('film.operate')" align="center" width="100">
+ <template #default="scope">
+ <el-button type="text" plain
+ @click="handleSure(scope.row)">{{ $t('basicData.yes') }}</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-dialog>
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="primary" @click="handlexiang">{{ $t('searchOrder.cageinformation') }}</el-button>
- <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="success" @click="dialogFormVisibleb = true">{{ $t('searchOrder.productionqueue') }}</el-button>
+ <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="success" @click="handlehistorical">{{ $t('searchOrder.historicaltasks') }}</el-button>
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="warning" @click="handleganghua">{{ $t('searchOrder.temperingqueries') }}</el-button>
- <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="info" @click="handlezhiban">{{ $t('searchOrder.dutyinformation') }}</el-button>
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="info" @click="dialogFormVisibles=true;fetchFlows()">{{ $t('searchOrder.searchlayout') }}</el-button>
+ <!-- <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="danger" @click="handleptask()">{{ $t('searchOrder.partask') }}</el-button> -->
<el-switch style="margin-top: 7px;margin-left: 10px;" v-model="ganghua" class="mb-2" :inactive-text="$t('searchOrder.temperedswitch')" @change="handleChange" />
<el-switch style="margin-top: 7px;margin-left: 10px;" v-model="diaodu" class="mb-2" :inactive-text="$t('searchOrder.Schedulingswitch')" @change="handlediaodu" />
- <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="primary"
- @click="dialogFormVisibleaDownGlasss = true">{{ $t('searchOrder.Labelprinting') }}
- </el-button>
<div id="dotClass">
<div>{{ $t('searchOrder.inkageEntity') }}</div>
<i :style="{ marginTop: '2px', backgroundColor: inkageEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
@@ -964,52 +1206,9 @@
<div style="margin-left: 70px;">{{ $t('searchOrder.outRequestEntity') }}</div>
<i :style="{ marginTop: '2px', backgroundColor: outRequestEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
</div>
- <div class="table-container">
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading">
- <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 300px;">
- <el-table height="300px" ref="table"
- :data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="glassId" align="center" :label="$t('searchOrder.outputglassID')" min-width="140" />
- <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
- <el-table-column prop="targetSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" />
- <el-table-column prop="taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="157">
- <template #default="scope">
- <el-tag type="success" >{{ scope.row.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag>
- </template>
- </el-table-column>
- </el-table>
- </div>
- </el-card>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading">
- <el-table height="300px" ref="table"
- @selection-change="handleSelectionChange"
- :data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="glassId" align="center" :label="$t('searchOrder.intoglassid')" min-width="140" />
- <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
- <el-table-column prop="targetSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" />
- <el-table-column prop="taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="120">
- <template #default="scope">
- <el-tag type="success" >{{ scope.row.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag>
- </template>
- </el-table-column>
- </el-table>
- </el-card>
- </div>
- <div style="padding: 10px;display: flex;height:130px;">
- <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>{{ $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>{{ $t('searchOrder.free') }}</span><span>{{ item.count }}</span>
- </el-col>
- </div>
- </div>
<!-- // 鐖剁骇妗� -->
<div class="img-dlpl" >
- <div class="img-car1" :style="'z-index:999;left:270px;top:' + 350*carPosition[0] + 'px;position:absolute;'">
+ <div class="img-car1" :style="'z-index:999;left:240px;top:' + 350*carPosition[0] + 'px;position:absolute;'">
<div
v-for="(rect, index) in adjusta"
:key="rect.id"
@@ -1023,7 +1222,7 @@
>
</div>
</div>
- <div class="img-car4" :style="'z-index:999;left:740px;top:' + 350*carPosition[1] + 'px;position:absolute;'">
+ <div class="img-car4" :style="'z-index:999;left:630px;top:' + 350*carPosition[1] + 'px;position:absolute;'">
<div
v-for="(rect, index) in adjust"
:key="rect.id"
@@ -1038,255 +1237,110 @@
</div>
</div>
<div style="position: relative;">
- <div v-show="cell1" style="width: 227px;height: 29px;position: relative;top:50px;left: 495px;">
- <div
- v-for="(rect, index) in adjustedRects"
- :key="rect"
- :style="{
- position: 'absolute',
- width: '227px',
- 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',
- top: '0px',
- marginRight: rects.gap/5000*227+'px'
- }"
- >
- </div>
+ <div v-show="cell1" style="width: 170px;height: 53px;position: relative;top:63px;left: 445px;">
+ <div v-for="(rect, rectIndex) in adjustedRects" :key="rect.id" :style="rectStyle(rect, rectIndex)">
+ <div
+ v-for="(subRect, subIndex) in getSubRects(rectIndex)"
+ :key="subIndex"
+ :style="subRectStyle(rectIndex, subIndex)"
+ ></div>
</div>
</div>
- <div v-show="cell2" style="width: 227px;height: 29px;position: relative;top:51px;left: 495px;">
- <div
- v-for="(rect, index) in adjustedRectsa"
- :key="rect.id"
- :style="{
- position: 'absolute',
- width: '227px',
- 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',
- top: '0px',
- marginRight: rects.gap/5000*227+'px'
- }"
- >
- </div>
+ <div v-show="cell2" style="width: 170px;height: 53px;position: relative;top:72px;left: 445px;">
+ <div v-for="(rect, rectIndex) in adjustedRectsa" :key="rect.id" :style="rectStylea(rect, rectIndex)">
+ <div
+ v-for="(subRect, subIndex) in getSubRectsa(rectIndex)"
+ :key="subIndex"
+ :style="subRectStylea(rectIndex, subIndex)"
+ ></div>
</div>
</div>
- <div v-show="cell3" style="width: 227px;height: 29px;position: absolute;top:110px;left: 495px;">
- <div
- v-for="(rect, index) in adjustedRectsb"
- :key="rect.id"
- :style="{
- position: 'absolute',
- width: '227px',
- 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',
- top: '0px',
- marginRight: rects.gap/5000*227+'px'
- }"
- >
- </div>
+ <div v-show="cell3" style="width: 170px;height: 53px;position: relative;top:81px;left: 445px;">
+ <div v-for="(rect, rectIndex) in adjustedRectsb" :key="rect.id" :style="rectStyleb(rect, rectIndex)">
+ <div
+ v-for="(subRect, subIndex) in getSubRectsb(rectIndex)"
+ :key="subIndex"
+ :style="subRectStyleb(rectIndex, subIndex)"
+ ></div>
</div>
</div>
- <div v-show="cell4" style="width: 227px;height: 29px;position: absolute;top:140px;left: 495px;">
- <div
- v-for="(rect, index) in adjustedRectsc"
- :key="rect.id"
- :style="{
- position: 'absolute',
- width: '227px',
- 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',
- top: '0px',
- marginRight: rects.gap/5000*227+'px'
- }"
- >
- </div>
- </div>
- </div>
- <div v-show="cell5" style="width: 227px;height: 29px;position: absolute;top:170px;left: 495px;">
- <div
- v-for="(rect, index) in adjustedRectsd"
- :key="rect.id"
- :style="{
- position: 'absolute',
- width: '227px',
- 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',
- top: '0px',
- marginRight: rects.gap/5000*227+'px'
- }"
- >
- </div>
- </div>
- </div>
- <div v-show="cell6" style="width: 227px;height: 29px;position: absolute;top:241px;left: 495px;">
- <div
- v-for="(rect, index) in adjustedRectse"
- :key="rect.id"
- :style="{
- position: 'absolute',
- width: '227px',
- 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',
- top: '0px',
- marginRight: rects.gap/5000*227+'px'
- }"
- >
- </div>
- </div>
- </div>
- <div v-show="cell7" style="width: 227px;height: 29px;position: absolute;top:271px;left: 495px;">
- <div
- v-for="(rect, index) in adjustedRectsf"
- :key="rect.id"
- :style="{
- position: 'absolute',
- width: '227px',
- 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',
- top: '0px',
- marginRight: rects.gap/5000*227+'px'
- }"
- >
- </div>
- </div>
- </div>
- <div v-show="cell8" style="width: 227px;height: 29px;position: absolute;top:301px;left: 495px;">
- <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 v-show="cell9" style="width: 227px;height: 29px;position: absolute;top:332px;left: 495px;">
- <div
- v-for="(rect, index) in adjustedRectsh"
- :key="rect.id"
- :style="{
- position: 'absolute',
- width: '227px',
- 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',
- top: '0px',
- marginRight: rects.gap/5000*227+'px'
- }"
- >
- </div>
+ <div v-show="cell4" style="width: 170px;height: 53px;position: relative;top:89px;left: 445px;">
+ <div v-for="(rect, rectIndex) in adjustedRectsc" :key="rect.id" :style="rectStylec(rect, rectIndex)">
+ <div
+ v-for="(subRect, subIndex) in getSubRectsc(rectIndex)"
+ :key="subIndex"
+ :style="subRectStylec(rectIndex, subIndex)"
+ ></div>
</div>
</div>
</div>
</div>
+<el-card style="flex: 1;margin-left: 1074px;margin-top: -410px;">
+ <div style="width: 100%; height: calc(100% - 35px); overflow-y: auto;max-height: 420px;">
+ <el-table height="370px" ref="table" border
+ :data="tableDatass" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column fixed prop="engineerId" align="center" :label="$t('Mounting.project')" min-width="100" />
+ <el-table-column prop="countTemp" align="center" :label="$t('searchOrder.totalfurnaces')" min-width="68" />
+ <el-table-column prop="fullTemp" align="center" :label="$t('searchOrder.furnaces')" min-width="82" />
+ <el-table-column prop="countGlass" align="center" :label="$t('searchOrder.cagesnumber')" min-width="82" />
+ <el-table-column prop="area" align="center" :label="$t('large.are')" min-width="65" />
+ <el-table-column prop="countSlot" align="center" :label="$t('searchOrder.slotnumber')" min-width="95" />
+ <el-table-column prop="percent" align="center" :label="$t('searchOrder.progress')" min-width="75" />
+ </el-table>
+ </div>
+ </el-card>
+<div style="padding: 10px;display: flex;height:130px;margin-top:1px">
+ <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>{{ $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>{{ $t('searchOrder.free') }}</span><span>{{ item.count }}</span>
+ </el-col>
+ </div>
+ </div>
+ <div class="table-container">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 3px;">
+ <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 200px;">
+ <el-table height="200px" ref="table"
+ :row-class-name="tableRowClassName"
+ :data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="glassId" align="center" :label="$t('searchOrder.intoglassid')" min-width="140" />
+ <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
+ <el-table-column prop="targetSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" />
+ <el-table-column prop="taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="120">
+ <template #default="scope">
+ <el-tag type="success" >{{ scope.row.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="isSame" align="center" :label="$t('searchOrder.whethersame')" min-width="120">
+ <template #default="scope">
+ <el-tag :type="getcasOnea(scope.row.isSame)">
+ {{ getStatuscasOnea(scope.row.isSame) }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-card>
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 3px;">
+ <el-table height="200px" ref="table"
+ :data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="glassId" align="center" :label="$t('searchOrder.outputglassID')" min-width="140" />
+ <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
+ <el-table-column prop="targetSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" />
+ <el-table-column prop="taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="157">
+ <template #default="scope">
+ <el-tag type="success" >{{ scope.row.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-card>
</div>
+ </div>
+
<el-dialog v-model="add" top="10vh" width="70%" :title="$t('searchOrder.addcage')" >
<div style="margin-bottom: 20px">
<el-form>
@@ -1342,13 +1396,15 @@
<el-table-column prop="gap" align="center" :label="$t('searchOrder.glassgaps')" min-width="150"/>
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="150">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="finisha(scope.row)">{{ $t('searchOrder.sureadd') }}</el-button>
+ <el-button type="text" plain @click="finisha(scope.row)">{{ $t('searchOrder.sureadd') }}</el-button>
</template>
</el-table-column>
</el-table>
</div>
</el-dialog>
-<el-dialog v-model="dialogFormVisiblea" top="2vh" width="97%" :title="$t('searchOrder.cageinformation')">
+ <el-dialog v-model="dialogFormVisiblea" top="2vh" width="95%"
+ :title="$t('searchOrder.cageinformation')">
+ <div v-loading="isLoading" class="loading-container" :element-loading-text="$t('searchOrder.loadingText')" >
<div style="display: flex;">
<el-input v-model="flowCardId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.incardnumber')" />
<el-input v-model="filmsId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('film.infilms')"/>
@@ -1370,12 +1426,12 @@
<el-table
:data="props.row.bigStorageCageDetails"
border
- style="width: 100%;margin-left: 20px;"
+ style="width: 98%;margin-left: 20px;"
row-key="id"
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
>
<!-- <el-table-column prop="menuName" label="浜岀骇鑿滃崟鏍�" align="center" min-width="140" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"/> -->
- <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" min-width="130"/>
+ <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" min-width="120"/>
<el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="130" />
<el-table-column prop="filmsId" align="center" :label="$t('searchOrder.coatingtypes')" min-width="80" />
<!-- <el-table-column prop="glassType" align="center" :label="$t('searchOrder.typeglass')" min-width="80" /> -->
@@ -1399,10 +1455,10 @@
<el-table-column prop="gap" align="center" :label="$t('searchOrder.glassgaps')" min-width="80" />
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" min-width="220">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="broke(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
- <el-button size="mini" type="text" plain @click="brokec(scope.row)">{{ $t('searchOrder.takeout') }}</el-button>
- <el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('searchOrder.delete') }}</el-button>
- <el-button size="mini" type="text"
+ <el-button type="text" plain @click="broke(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
+ <el-button type="text" plain @click="brokec(scope.row)">{{ $t('searchOrder.takeout') }}</el-button>
+ <el-button type="text" plain @click="opena(scope.row)">{{ $t('searchOrder.delete') }}</el-button>
+ <el-button type="text"
:disabled="!((props.row.bigStorageCageDetails[0].state !== 102 && scope.$index == 0 ) || (props.row.bigStorageCageDetails[(scope.$index - 1)<0?0:scope.$index-1].state==102)&&(scope.row.state!=102))"
plain @click="outfil(scope.row)">
{{ $t('searchOrder.outfilm') }}
@@ -1413,8 +1469,8 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="id" :label="$t('searchOrder.cagetableID')" align="center" min-width="100"/>
- <el-table-column prop="deviceId" align="center" :label="$t('searchOrder.cagenumber')" min-width="150" />
+ <el-table-column prop="id" :label="$t('searchOrder.cagetableID')" align="center" min-width="90"/>
+ <el-table-column prop="deviceId" align="center" :label="$t('searchOrder.cagenumber')" min-width="100" />
<el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="150" />
<el-table-column
align="center"
@@ -1435,12 +1491,12 @@
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.add') }}</el-button>
+ <el-button type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.add') }}</el-button>
</template>
</el-table-column>
</el-table>
<div>
- <div style="margin-top: 20px;margin-left: 40%;">
+ <!-- <div style="margin-top: 20px;margin-left: 40%;">
<el-pagination
background
size="large"
@@ -1449,54 +1505,27 @@
:current-page.sync="currentPage2"
@current-change="handlePageChange2"
/>
- </div>
+ </div> -->
+ </div>
</div>
</el-dialog>
-<el-dialog v-model="dialogFormVisibleb" top="5vh" width="85%" :title="$t('searchOrder.productionqueue')">
- <el-table ref="table" style="margin-top: 20px;height: 700px;"
- :data="tableDatab" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="glassId" fixed align="center" :label="$t('searchOrder.glassID')" min-width="150"/>
- <el-table-column prop="flowCardId" fixed align="center" :label="$t('searchOrder.processcards')" min-width="120" />
- <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="$t('searchOrder.acceptshorizontal')"
- min-width="150"
- prop="ishorizontal"
- >
- <template #default="scope">
- <el-tag :type="getStatusTypea(scope.row.ishorizontal)">
- {{ getStatusTexta(scope.row.ishorizontal) }}
- </el-tag>
- </template>
- </el-table-column>
- <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="$t('searchOrder.state')"
- min-width="80"
- prop="state"
- >
- <template #default="scope">
- <el-tag :type="getStatusTypeb(scope.row.state)">
- {{ getStatusTextb(scope.row.state) }}
- </el-tag>
- </template>
- </el-table-column>
- </el-table>
-</el-dialog>
+<!-- 鍘嗗彶浠诲姟 -->
+<el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
+ <iframe
+ :src="iframeUrl"
+ marginwidth="2000px"
+ marginheight="2000px"
+ width="100%"
+ height="750px"
+ frameborder="0"
+ ></iframe>
+ </el-dialog>
+<!-- 閽㈠寲鏌ヨ -->
<el-dialog v-model="dialogFormVisiblec" top="5vh" width="85%" :title="$t('searchOrder.temperingqueries')">
<div style="margin-bottom: 20px">
<el-form>
<el-row style="margin-top: -15px;margin-bottom: -2px;">
- <el-col :span="4">
+ <el-col :span="2">
<div id="dt" style="font-size: 15px;">
<el-form-item :label="$t('searchOrder.temperingtotal')" style="width: 14vw">
{{ temperingtotal }}
@@ -1526,7 +1555,7 @@
</el-col>
<el-col :span="4">
<div id="dt" style="font-size: 15px;">
- <el-button size="mini" type="text" plain @click="broked()">{{ $t('searchOrder.undesignate') }}</el-button>
+ <el-button type="text" plain @click="broked()">{{ $t('searchOrder.undesignate') }}</el-button>
</div>
</el-col>
</el-row>
@@ -1544,11 +1573,11 @@
<el-table-column prop="damageCount" align="center" :label="$t('searchOrder.breakquantity')" min-width="150" />
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="500">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="brokee(scope.row,1)">{{ $t('searchOrder.specifytempering') }}</el-button>
- <el-button size="mini" type="text" plain @click="brokee(scope.row,0)">{{ $t('searchOrder.specifyout') }}</el-button>
- <el-button size="mini" type="text" plain @click="brokek(scope.row)">{{ $t('searchOrder.specifyengineerid') }}</el-button>
- <el-button size="mini" type="text" plain @click="handlelack(scope.row)">{{ $t('searchOrder.lacknumber') }}</el-button>
- <el-button size="mini" type="text" plain @click="handlecagedetails(scope.row)">{{ $t('searchOrder.cagedetails') }}</el-button>
+ <el-button type="text" plain @click="brokee(scope.row,1)">{{ $t('searchOrder.specifytempering') }}</el-button>
+ <el-button type="text" plain @click="brokee(scope.row,0)">{{ $t('searchOrder.specifyout') }}</el-button>
+ <el-button type="text" plain @click="brokek(scope.row)">{{ $t('searchOrder.specifyengineerid') }}</el-button>
+ <el-button type="text" plain @click="handlelack(scope.row)">{{ $t('searchOrder.lacknumber') }}</el-button>
+ <el-button type="text" plain @click="handlecagedetails(scope.row)">{{ $t('searchOrder.cagedetails') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -1677,31 +1706,7 @@
<el-table-column prop="ycoordinate" align="center" :label="$t('searchOrder.ycoordinates')" min-width="80" />
</el-table>
</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'}">
- <el-table-column prop="line" fixed align="center" :label="$t('searchOrder.line')"/>
- <el-table-column prop="workProcesses" fixed align="center" :label="$t('searchOrder.process')" />
- <el-table-column prop="teamsGroupsName" align="center" :label="$t('searchOrder.team')">
- <template #default="{ row }">
- <el-input v-model="row.teamsGroupsName" autocomplete="off" min-width="150"/>
- </template>
- </el-table-column>
- <el-table-column prop="deviceName" align="center" :label="$t('searchOrder.basic')">
- <template #default="{ row }">
- <el-input v-model="row.deviceName" autocomplete="off" min-width="150"/>
- </template>
- </el-table-column>
- </el-table>
- <template #footer>
- <div id="dialog-footer">
- <el-button type="primary" @click="handleConfirm">
- {{ $t('searchOrder.makesure') }}
- </el-button>
- <el-button @click="dialoglea = false">{{ $t('searchOrder.cancel') }}</el-button>
- </div>
- </template>
-</el-dialog>
+<!-- 闈為挗鍖� -->
<el-dialog v-model="dialogFormVisibles" top="5vh" width="85%" :title="$t('searchOrder.searchlayout')">
<el-table ref="table" style="margin-top: 20px;height: 500px;"
:data="tableDatas" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
@@ -1713,12 +1718,13 @@
<el-table-column prop="realCount" align="center" :label="$t('searchOrder.numbercages')" min-width="150" />
<el-table-column prop="lackCount" align="center" :label="$t('searchOrder.missingquantity')" min-width="150" />
<el-table-column prop="damageCount" align="center" :label="$t('searchOrder.breakquantity')" min-width="150" />
- <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="250">
+ <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="500">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="brokee(scope.row,1)">{{ $t('searchOrder.specifytempering') }}</el-button>
- <el-button size="mini" type="text" plain @click="brokee(scope.row,0)">{{ $t('searchOrder.specifyout') }}</el-button>
- <el-button size="mini" type="text" plain @click="brokek(scope.row)">{{ $t('searchOrder.specifyengineerid') }}</el-button>
- <el-button size="mini" type="text" plain @click="handlelack(scope.row)">{{ $t('hellow.missingnumber') }}</el-button>
+ <el-button type="text" plain @click="brokee(scope.row,1)">{{ $t('searchOrder.specifytempering') }}</el-button>
+ <el-button type="text" plain @click="brokee(scope.row,0)">{{ $t('searchOrder.specifyout') }}</el-button>
+ <el-button type="text" plain @click="brokek(scope.row)">{{ $t('searchOrder.specifyengineerid') }}</el-button>
+ <el-button type="text" plain @click="handlelack(scope.row)">{{ $t('hellow.missingnumber') }}</el-button>
+ <el-button type="text" plain @click="handlecagedetails(scope.row)">{{ $t('searchOrder.cagedetails') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -1729,40 +1735,14 @@
<el-table-column prop="count" align="center" :label="$t('searchOrder.numberglasses')" />
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" >
<template #default="scope">
- <el-button size="mini" type="text" plain @click="brokes(scope.row)">{{ $t('searchOrder.processcard') }}</el-button>
+ <el-button type="text" plain @click="brokes(scope.row)">{{ $t('searchOrder.processcard') }}</el-button>
</template>
</el-table-column>
</el-table> -->
</el-dialog>
-<el-dialog v-model="dialogFormVisibleaDownGlasss" top="2vh" width="97%" :title="$t('searchOrder.filminformation')">
- <div style="display:flex;justify-content: space-around;">
- <el-card
- style="display: flex; justify-content: center; align-items: center; width: 800px; height: 800px;position: relative;">
- <div
- :style="{ width: scanGlass.width + 'px', height: scanGlass.height + 'px', backgroundColor: '#e1f3d8', transform: 'scale(' + 800 / (scanGlass.width > scanGlass.height ? scanGlass.width : scanGlass.height) + ')' }">
-
- </div>
- <div style="font-size: 50px; text-align: center;position: absolute;top:0px;left:200px;">
- <div>{{ $t('searchOrder.currentglassinformation') }}</div>
- <div>
- <el-button type="primary" @click="open1(scanGlass)">{{ $t('searchOrder.printlabels') }}</el-button>
- </div>
- <div>{{ scanGlass.flowCardId }}</div>
- <div>{{ scanGlass.layer }}</div>
- <div>{{ scanGlass.glassId }}</div>
- <div>{{ scanGlass.width }}</div>
- <div>{{ scanGlass.height }}</div>
- </div>
- </el-card>
- </div>
- </el-dialog>
- <el-dialog id="sizePrintCalrd1" v-model="dialogTableVisible1" destroy-on-close>
- <print-label id="printFlowCard" :printFlowCardId="printFlowCardId" :printLayer="printLayer"
- :printGlassId="printGlassId" style=""/>
- </el-dialog>
</template>
-<style scoped>
-#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
+<style>
+#dt { display:block; float:left;line-height: 20px;margin-left: 150px;}
#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
#dialog-footer{
text-align: center;
@@ -1855,19 +1835,19 @@
.img-dlpl{
margin-left: 20px;
margin-top: 0px;
- background-image:url('../../assets/dlpl9.png');
+ background-image:url('/ganghuaqian.png');
background-repeat: no-repeat;
background-attachment: local;
- min-height: 400px;
- width: 1200px;
+ min-height: 380px;
+ width: 1050px;
max-width: 100%;
- background-size: 1200px 400px;
+ background-size: 1050px 380px;
overflow: hidden;
position:relative
}
.img-car1{
display: flex;
- background-image:url('../../assets/lp9.png');
+ background-image:url('/xiaoche.png');
position: absolute;
background-repeat: no-repeat;
background-attachment: local;
@@ -1880,7 +1860,7 @@
}
.img-car4{
display: flex;
- background-image:url('../../assets/lpa9.png');
+ background-image:url('/xiaoche.png');
position: absolute;
background-repeat: no-repeat;
background-attachment: local;
@@ -1907,4 +1887,56 @@
margin-top: 20px;
margin-bottom: 10px;
}
+.row-red-background {
+ background-color: #CDAF95 !important;
+}
+.global-alert-bar {
+ position: fixed;
+ top: 0;
+ left: 50%; /* 姘村钩灞呬腑鍏抽敭 */
+ transform: translateX(-50%); /* 姘村钩灞呬腑鍏抽敭 */
+ padding: 12px 20px;
+ background-color: #dbdbd7;
+ box-shadow: 0 2px 10px rgba(0,0,0,0.2);
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ z-index: 9999;
+ max-width: 80%; /* 闃叉灏忓睆骞曟孩鍑� */
+ min-width: 400px; /* 鏈�灏忓搴︿繚璇� */
+}
+/* 鎻愮ず鍐呭灞呬腑 */
+.alert-content {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-grow: 1; /* 鍗犳嵁鍙敤绌洪棿 */
+}
+/* 鎻愮ず鏂囧瓧鏍峰紡 */
+.alert-text {
+ margin-left: 8px;
+ text-align: center;
+ font-weight: bold;
+ color: #0d0d0d;
+}
+/* 鍏抽棴鎸夐挳鏍峰紡 */
+.close-btn {
+ background: none;
+ border: none;
+ font-size: 1.5rem;
+ cursor: pointer;
+ margin-left: 20px;
+}
+/* 椤甸潰瀹瑰櫒椤堕儴鍐呰竟璺� */
+#app-container {
+ padding-top: 60px; /* 鏍规嵁alert楂樺害璋冩暣 */
+}
+.loading-container {
+ position: relative;
+ height: 100%;
+}
+/* 纭繚閬僵灞傚湪鏈�椤跺眰 */
+.el-loading-mask {
+ z-index: 2000 !important;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0