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 | 609 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 357 insertions(+), 252 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 3e14d28..aa87387 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -18,6 +18,7 @@
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');
@@ -54,6 +55,13 @@
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({});
@@ -81,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鏁版嵁
@@ -149,7 +115,6 @@
}
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
- console.log(currentPage2.value);
window.localStorage.setItem('pagenumber', currentPage2.value)
fetchxiang(currentPage2.value);
};
@@ -174,7 +139,6 @@
ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
};
// 鏄惁绂佺敤
@@ -202,7 +166,6 @@
row.isDamage = newState;
}
catch (error) {
- console.error(error);
}
}
// 鍒犻櫎
@@ -227,7 +190,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
// 鐮存崯
@@ -251,8 +213,7 @@
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 鍘嗗彶浠诲姟
@@ -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();
};
@@ -383,8 +340,7 @@
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 鍙栨秷鎸囧畾
@@ -400,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) {
}
};
// 鎸囧畾娴佺▼鍗�
@@ -436,8 +389,7 @@
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 鍑虹墖闃熷垪鎷胯蛋
@@ -460,8 +412,7 @@
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 鍑虹墖闃熷垪鍒犻櫎
@@ -488,8 +439,7 @@
ElMessage.error(response.message);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 瀹屾垚浠诲姟
@@ -513,7 +463,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
// 纭娣诲姞
@@ -549,7 +498,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
const handleganghua = () => {
@@ -557,8 +505,9 @@
fetchFlow();
};
const handlexiang = () => {
+ isLoading.value = true; // 寮�鍚姞杞界姸鎬�
dialogFormVisiblea.value = true;
- fetchxiang(1);
+ fetchxiang();
currentPage2.value = 1;
window.localStorage.setItem('pagenumber', currentPage2.value)
filmsId.value = ''
@@ -576,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 {
@@ -591,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')
@@ -656,7 +624,6 @@
}
catch (error) {
// 澶勭悊閿欒
- console.error(error);
}
}
// 绗煎唴璇︽儏
@@ -667,8 +634,6 @@
temperingLayoutId: temperingLayoutId,
})
if (response.code == 200) {
- console.log(response.data);
-
ElMessage.success(response.message);
tableDatacagedetails.value = response.data
} else {
@@ -676,8 +641,6 @@
}
}
catch (error) {
- // 澶勭悊閿欒
- console.error(error);
}
}
const fetchFlow = async () => {
@@ -704,8 +667,6 @@
}
}
catch (error) {
- // 澶勭悊閿欒
- console.error(error);
}
}
function handleRowClick(row) {
@@ -728,7 +689,6 @@
}
}
catch (error) {
- console.error(error);
}
}
// 璋冨害寮�鍏�
@@ -747,36 +707,84 @@
}
}
catch (error) {
- console.error(error);
}
}
// 浠诲姟閲嶇疆
-const handleptask = async() => {
+// 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('searchOrder.partasks'),
- t('workOrder.prompt'),
- {
- confirmButtonText: t('workOrder.yes'),
- cancelButtonText: t('workOrder.cancel'),
- type: 'warning',
- }
+ 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('/cacheVerticalGlass/bigStorageCage/resetCage')
- if (response.code === 200) {
- ElMessage.success(response.message);
+ 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);
- }
-};
+ 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{
@@ -810,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]
@@ -1026,8 +1034,6 @@
const backendTime = new Date(globalDate);
const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
oneWeekAgo.setHours(0, 0, 0, 0);
- console.log(formatTimestamp(oneWeekAgo));
- console.log(oneWeekAgo);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
}
@@ -1108,7 +1114,7 @@
}
function tableRowClassName({ row }) {
if (row.isSame === 1) {
- return 'row-red-background'; // 璁剧疆绾㈣壊鑳屾櫙
+ return 'row-red-background';
}
return '';
}
@@ -1123,17 +1129,69 @@
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="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="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-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" />
<div id="dotClass">
@@ -1148,11 +1206,105 @@
<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="img-dlpl" >
+ <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"
+ :style="{
+ width: '30px',
+ height: '5px',
+ backgroundColor: '#409EFF',
+ marginLeft: 5+ `px`,
+ top: '10px',
+ }"
+ >
+ </div>
+ </div>
+ <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"
+ :style="{
+ width: '30px',
+ height: '5px',
+ backgroundColor: '#409EFF',
+ marginLeft: 5+ `px`,
+ top: '10px',
+ }"
+ >
+ </div>
+ </div>
+ <div style="position: relative;">
+ <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: 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: 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: 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: 10px;" v-loading="loading">
- <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 300px;">
- <el-table height="300px" ref="table"
- @selection-change="handleSelectionChange"
+ <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" />
@@ -1173,8 +1325,8 @@
</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"
+ <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" />
@@ -1187,103 +1339,8 @@
</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:290px;top:' + 350*carPosition[0] + 'px;position:absolute;'">
- <div
- v-for="(rect, index) in adjusta"
- :key="rect.id"
- :style="{
- width: '30px',
- height: '5px',
- backgroundColor: '#409EFF',
- marginLeft: 5+ `px`,
- top: '10px',
- }"
- >
- </div>
- </div>
- <div class="img-car4" :style="'z-index:999;left:735px;top:' + 350*carPosition[1] + 'px;position:absolute;'">
- <div
- v-for="(rect, index) in adjust"
- :key="rect.id"
- :style="{
- width: '30px',
- height: '5px',
- backgroundColor: '#409EFF',
- marginLeft: 5+ `px`,
- top: '10px',
- }"
- >
- </div>
- </div>
- <div style="position: relative;">
- <div v-show="cell1" style="width: 170px;height: 53px;position: relative;top:63px;left: 525px;">
- <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: 170px;height: 53px;position: relative;top:67px;left: 525px;">
- <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: 170px;height: 53px;position: relative;top:72px;left: 525px;">
- <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: 170px;height: 53px;position: relative;top:77px;left: 525px;">
- <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: 1220px;margin-top: -510px;" v-loading="loading">
- <div style="width: 100%; height: calc(100% - 35px); overflow-y: auto;max-height: 420px;">
- <el-table height="420px" ref="table" border
- :data="tableDatass" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column fixed prop="engineerId" align="center" :label="$t('Mounting.project')" min-width="100" />
- <el-table-column prop="countTemp" align="center" :label="$t('searchOrder.totalfurnaces')" min-width="68" />
- <el-table-column prop="fullTemp" align="center" :label="$t('searchOrder.furnfullTemp')" min-width="82" />
- <el-table-column prop="countGlass" align="center" :label="$t('searchOrder.cagesnumber')" min-width="82" />
- <el-table-column prop="area" align="center" :label="$t('large.are')" min-width="70" />
- <el-table-column prop="countSlot" align="center" :label="$t('searchOrder.slotnumber')" min-width="96" />
- <el-table-column prop="percent" align="center" :label="$t('searchOrder.progress')" min-width="80" />
- </el-table>
- </div>
- </el-card>
-
</div>
+
<el-dialog v-model="add" top="10vh" width="70%" :title="$t('searchOrder.addcage')" >
<div style="margin-bottom: 20px">
<el-form>
@@ -1339,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')"/>
@@ -1367,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" /> -->
@@ -1396,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') }}
@@ -1410,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"
@@ -1432,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"
@@ -1446,11 +1505,12 @@
:current-page.sync="currentPage2"
@current-change="handlePageChange2"
/>
- </div>
+ </div> -->
+ </div>
</div>
</el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
-<el-dialog v-model="blindb" top="10vh" width="71%">
+<el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
<iframe
:src="iframeUrl"
marginwidth="2000px"
@@ -1465,7 +1525,7 @@
<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 }}
@@ -1495,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>
@@ -1513,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>
@@ -1660,11 +1720,11 @@
<el-table-column prop="damageCount" align="center" :label="$t('searchOrder.breakquantity')" min-width="150" />
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="500">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="brokee(scope.row,1)">{{ $t('searchOrder.specifytempering') }}</el-button>
- <el-button size="mini" type="text" plain @click="brokee(scope.row,0)">{{ $t('searchOrder.specifyout') }}</el-button>
- <el-button size="mini" type="text" plain @click="brokek(scope.row)">{{ $t('searchOrder.specifyengineerid') }}</el-button>
- <el-button size="mini" type="text" plain @click="handlelack(scope.row)">{{ $t('hellow.missingnumber') }}</el-button>
- <el-button size="mini" type="text" plain @click="handlecagedetails(scope.row)">{{ $t('searchOrder.cagedetails') }}</el-button>
+ <el-button type="text" plain @click="brokee(scope.row,1)">{{ $t('searchOrder.specifytempering') }}</el-button>
+ <el-button type="text" plain @click="brokee(scope.row,0)">{{ $t('searchOrder.specifyout') }}</el-button>
+ <el-button type="text" plain @click="brokek(scope.row)">{{ $t('searchOrder.specifyengineerid') }}</el-button>
+ <el-button type="text" plain @click="handlelack(scope.row)">{{ $t('hellow.missingnumber') }}</el-button>
+ <el-button type="text" plain @click="handlecagedetails(scope.row)">{{ $t('searchOrder.cagedetails') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -1675,18 +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 id="sizePrintCalrd1" v-model="dialogTableVisible1" destroy-on-close>
- <print-label id="printFlowCard" :printFlowCardId="printFlowCardId" :printLayer="printLayer"
- :printGlassId="printGlassId" style=""/>
- </el-dialog>
</template>
<style>
-#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
+#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;
@@ -1779,19 +1835,19 @@
.img-dlpl{
margin-left: 20px;
margin-top: 0px;
- background-image:url('../../assets/ganghuaqian.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/xiaoche.png');
+ background-image:url('/xiaoche.png');
position: absolute;
background-repeat: no-repeat;
background-attachment: local;
@@ -1804,7 +1860,7 @@
}
.img-car4{
display: flex;
- background-image:url('../../assets/xiaoche.png');
+ background-image:url('/xiaoche.png');
position: absolute;
background-repeat: no-repeat;
background-attachment: local;
@@ -1834,4 +1890,53 @@
.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