From 287539dca2d9b3a5b163807a35d7f5b2e9c15217 Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期五, 17 五月 2024 19:30:53 +0800
Subject: [PATCH] 上片机新增判断条件， 掰片/识别：新增两个接口，判断返回玻璃颜色，磨边前卧式缓存：调整报缺接口传值
---
UI-Project/src/views/Caching/cachingun.vue | 95 +------------
UI-Project/src/views/Returns/returns.vue | 84 +++++++++--
UI-Project/src/views/Identify/identify.vue | 109 +++++++++++++--
UI-Project/src/views/Caching/cachingbefore.vue | 87 -----------
4 files changed, 174 insertions(+), 201 deletions(-)
diff --git a/UI-Project/src/views/Caching/cachingbefore.vue b/UI-Project/src/views/Caching/cachingbefore.vue
index 284a33c..5b9d2a2 100644
--- a/UI-Project/src/views/Caching/cachingbefore.vue
+++ b/UI-Project/src/views/Caching/cachingbefore.vue
@@ -27,31 +27,6 @@
}
});
-// const getTableRow = (row,type) =>{
-// switch (type) {
-// case 'delete':{
-// let flowData = ref({
-// id:0,
-// slot:row.slot
-// })
-// request.post("/cacheGlass/edgStorageCage/edgStorageCageGlass",flowData.value).then((res) => {
-// if(res.code==200){
-// ElMessage.success(t('searchOrder.msgDeleteSuccess'))
-// router.push({path:'/main/delivery/selectDelivery',query:{random:Math.random()}})
-// }else{
-// ElMessage.warning(res.msg)
-// router.push("/login")
-// }
-// })
-
-// return
-// }
-// }
-// }
-// let slots = ref({
-// id:0,
-// slot: slot.value
-// })
const open = async(row) => {
try {
const confirmResult = await ElMessageBox.confirm(
@@ -67,19 +42,15 @@
// 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
var url="/cacheGlass/edgStorageCage/edgStorageCageGlass?edgStorageCageId="+row.id;
console.log(url);
- const deleteResponse = await request.post(url, {
+ const response = await request.post(url, {
esdId: row.esdId
})
- if (response.code == 200) {
- // 鍒犻櫎鎴愬姛锛屾偍鍙互鏍规嵁闇�瑕佸鐞嗘垚鍔熺殑鎯呭喌
- // ElMessage({
- // type: 'success',
- // message: '鍒犻櫎鎴愬姛锛�',
- // })
+ if (response.code === 200) {
ElMessage.success(response.message);
} else {
// 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
- alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
+ ElMessage.error(response.msg);
+ // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
} catch (error) {
@@ -87,56 +58,6 @@
console.error('鍙戠敓閿欒:', error);
}
};
-// const open = () => {
-// ElMessageBox.confirm(
-// '鏄惁鍒犻櫎璇ユ潯淇℃伅?',
-// '鎻愮ず',
-// {
-// confirmButtonText: '鏄�',
-// cancelButtonText: '鍙栨秷',
-// type: 'warning',
-// }
-// )
-// .then(() => {
-// ElMessage({
-// type: 'success',
-// message: '鍒犻櫎鎴愬姛锛�',
-// })
-// })
-// .catch(() => {
-// ElMessage({
-// type: 'info',
-// message: '鍒犻櫎澶辫触',
-// })
-// })
-// }
-// 鍒犻櫎
-// const handleBindRacka = (row) => {
-// adda.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
-// };
-// // 鍒犻櫎
-// const handleConfirma = async () => {
-// try {
-// window.localStorage.setItem('slot', res.data.slot)
-// let slot = window.localStorage.getItem('slot')
-// const response = await request.post('/cacheGlass/edgStorageCage/edgStorageCageGlass', {
-// slot: slot.value,
-// id: 0
-// });
-
-// if (response.code == 200) {
-// // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
-// ElMessage.success(response.message);
-// adda.value = false;
-// } else {
-// // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
-// ElMessage.error(response.msg);
-// }
-// } catch (error) {
-// // 澶勭悊閿欒
-// console.error(error);
-// }
-// };
const gridOptions = reactive({
border: "full",//琛ㄦ牸鍔犺竟妗�
diff --git a/UI-Project/src/views/Caching/cachingun.vue b/UI-Project/src/views/Caching/cachingun.vue
index 5a82915..ba1686f 100644
--- a/UI-Project/src/views/Caching/cachingun.vue
+++ b/UI-Project/src/views/Caching/cachingun.vue
@@ -27,35 +27,10 @@
}
});
-// const getTableRow = (row,type) =>{
-// switch (type) {
-// case 'delete':{
-// let flowData = ref({
-// id:0,
-// slot:row.slot
-// })
-// request.post("/cacheGlass/edgStorageCage/edgStorageCageGlass",flowData.value).then((res) => {
-// if(res.code==200){
-// ElMessage.success(t('searchOrder.msgDeleteSuccess'))
-// router.push({path:'/main/delivery/selectDelivery',query:{random:Math.random()}})
-// }else{
-// ElMessage.warning(res.msg)
-// router.push("/login")
-// }
-// })
-
-// return
-// }
-// }
-// }
-// let slots = ref({
-// id:0,
-// slot: slot.value
-// })
const open = async(row) => {
try {
const confirmResult = await ElMessageBox.confirm(
- '鏄惁鍒犻櫎璇ユ潯淇℃伅?',
+ '鏄惁鎶ョ己璇ユ潯淇℃伅?',
'鎻愮ず',
{
confirmButtonText: '鏄�',
@@ -65,74 +40,24 @@
);
if (confirmResult === 'confirm') {
// 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
- const deleteResponse = await request.post("/cacheGlass/edgStorageCage/edgStorageCageGlass", {
- id:0,
- slot: row.slot
+ var url="/cacheGlass/edgStorageCage/edgStorageCageGlass?edgStorageCageId="+row.id;
+ console.log(url);
+ const response = await request.post(url, {
+ esdId: row.esdId
})
- if (response.code == 200) {
- // 鍒犻櫎鎴愬姛锛屾偍鍙互鏍规嵁闇�瑕佸鐞嗘垚鍔熺殑鎯呭喌
- alert('鍒犻櫎鎴愬姛锛�');
+ if (response.code === 200) {
+ ElMessage.success(response.message);
} else {
// 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
- alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
+ ElMessage.error(response.msg);
+ // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
} catch (error) {
// 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
console.error('鍙戠敓閿欒:', error);
}
-};
-// const open = () => {
-// ElMessageBox.confirm(
-// '鏄惁鍒犻櫎璇ユ潯淇℃伅?',
-// '鎻愮ず',
-// {
-// confirmButtonText: '鏄�',
-// cancelButtonText: '鍙栨秷',
-// type: 'warning',
-// }
-// )
-// .then(() => {
-// ElMessage({
-// type: 'success',
-// message: '鍒犻櫎鎴愬姛锛�',
-// })
-// })
-// .catch(() => {
-// ElMessage({
-// type: 'info',
-// message: '鍒犻櫎澶辫触',
-// })
-// })
-// }
-// 鍒犻櫎
-// const handleBindRacka = (row) => {
-// adda.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
-// };
-// // 鍒犻櫎
-// const handleConfirma = async () => {
-// try {
-// window.localStorage.setItem('slot', res.data.slot)
-// let slot = window.localStorage.getItem('slot')
-// const response = await request.post('/cacheGlass/edgStorageCage/edgStorageCageGlass', {
-// slot: slot.value,
-// id: 0
-// });
-
-// if (response.code == 200) {
-// // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
-// ElMessage.success(response.message);
-// adda.value = false;
-// } else {
-// // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
-// ElMessage.error(response.msg);
-// }
-// } catch (error) {
-// // 澶勭悊閿欒
-// console.error(error);
-// }
-// };
-
+};
const gridOptions = reactive({
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index 5e2bc03..c8c0ce0 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -7,28 +7,31 @@
>
<div
v-for="(rect, index) in adjustedRects"
- :key="index"
+ :key="rect.glass_id"
class="rect"
- @click="handleBind"
- :style="{ position: 'absolute', top: `${rect.y_axis}px`, left: `${rect.x_axis}px`, width: `${rect.width}px`, height: `${rect.height}px` }"
+ @click="showDialog(rect.glass_id)"
+ :style="{ position: 'absolute',
+ top: `${rect.y_axis}px`, left: `${rect.x_axis}px`, width: `${rect.width}px`, height: `${rect.height}px`,
+ backgroundColor: getRectColor(rect.glass_state)
+ }"
>
<!-- 绠ご -->
<!-- <div id="arrow"></div>
<div id="line"></div> -->
<!-- <div class="centered-text" >NG24030401B01</div> -->
<div class="centered-text">
- <div>{{ rect.process_id }}</div>
+ <div>{{ rect.process_id }}</div>
<div style="margin-top: 50px;margin-left: -85px;">{{ rect.width }}*{{ rect.height }}</div>
</div>
</div>
<!-- 鐐瑰嚮寮瑰嚭 -->
<el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;">
<!-- <template #footer> -->
- <!-- <div id="dialog-footer"> -->
- <el-button type="warning" plain :icon="Delete" @click="handle" style="width: 120px;margin-left: 10px;">
+ <!-- <div id="dialog-footer"> -->
+ <el-button type="warning" plain :icon="Delete" @click="handleDamage(currentGlassId)" style="width: 120px;margin-left: 10px;">
鐮存崯
</el-button>
- <el-button type="danger" plain @click="blind = false" style="width: 120px;margin-top: 10px;">
+ <el-button type="danger" plain @click="handleManualTake(currentGlassId)" style="width: 120px;margin-top: 10px;">
<el-icon class="el-icon--right"><Upload /></el-icon>
浜哄伐鎷胯蛋</el-button>
<!-- </div> -->
@@ -42,18 +45,25 @@
<script setup lang="ts">
import { Delete, Upload } from '@element-plus/icons-vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
import { ref, onMounted } from 'vue';
import request from "@/utils/request"
const blind = ref(false)
const olWidth = ref();
const olHeight = ref();
const process_id = ref(); // 鐢ㄤ簬瀛樺偍process_id鐨勫搷搴斿紡寮曠敤
+const glass_id = ref();
// const rects = ref([]); // 鐢ㄤ簬瀛樺偍鐭╁舰鏁版嵁鐨勫搷搴斿紡寮曠敤
+const currentGlassId = ref(null); // 瀛樺偍褰撳墠鐐瑰嚮鐭╁舰鐨� glass_id
const adjustedRects = ref([]);
-const handleBind = (row) => {
-
- blind.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
-};
+// const handleBind = (row) => {
+// blind.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+// };
+// 鏄剧ず瀵硅瘽妗嗗苟璁剧疆褰撳墠 glass_id
+function showDialog(glassId: number) {
+ currentGlassId.value = glassId;
+ blind.value = true;
+}
onMounted(async () => {
try {
const response = await request.post('/cacheGlass/taskCache/currentCutTerritory'); // 鏇挎崲涓轰綘鐨凙PI绔偣
@@ -61,10 +71,11 @@
// const process_id = response.data[0].process_id
const rawRects = response.data; // 璁剧疆鐭╁舰鏁版嵁
console.log(response.data);
- const { olWidth: newolWidth, olHeight: newolHeight, process_id: newprocess_id } = response.data; // 鑾峰彇灏哄
+ const { olWidth: newolWidth, olHeight: newolHeight, process_id: newprocess_id ,glass_id:newglass_id } = response.data; // 鑾峰彇灏哄
olWidth.value = newolWidth; // 璁剧疆瀹瑰櫒瀹藉害
olHeight.value = newolHeight; // 璁剧疆瀹瑰櫒楂樺害
process_id.value = newprocess_id;
+ glass_id.value = newglass_id;
adjustedRects.value = rawRects.map(rect => ({
...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
@@ -72,7 +83,9 @@
y_axis: (rect.y_axis*100) * 0.005,
width: (rect.width*100) * 0.004 ,
height:( rect.height*100) * 0.004 ,
+ glass_state: rect.glass_state
}));
+
console.log(rect);
// console.log( (rect.width*100) / 300 );
@@ -84,13 +97,81 @@
// console.error('Error fetching rectangles :', error);
console.error('Error fetching rects :', error);
}
-});
+});
+// 鐮存崯
+const handleDamage = async () => {
+ try {
+ var url="/cacheGlass/taskCache/identControls?identId="+currentGlassId.value+'&controlsId='+201;
+ console.log(url);
+ const response = await request.post(url)
+ // const response = await request.post('/cacheGlass/taskCache/identControls', {
+ // identId: currentGlassId.value,
+ // controlsId: 201,
+ // })
+ if (response.code == 200) {
+ // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
+ ElMessage.success(response.message);
+ // window.location.reload()
+ blind.value = false;
+ } else {
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.msg);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
+// // 浜哄伐鎷胯蛋
+const handleManualTake = async () => {
+ try {
+ var url="/cacheGlass/taskCache/identControls?identId="+currentGlassId.value+'&controlsId='+200;
+ console.log(url);
+ const response = await request.post(url)
+ // const response = await request.post('/cacheGlass/taskCache/identControls', {
+ // identId: currentGlassId.value,
+ // controlsId: 200,
+ // })
+ if (response.code == 200) {
+ // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
+ ElMessage.success(response.message);
+ // window.location.reload()
+ blind.value = false;
+ } else {
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.msg);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
+function getRectColor(state: number): string {
+ switch (state) {
+ case 0:
+ return '#e1f3d8';
+ case 100:
+ return '#c8c9cc';
+ case 110:
+ return '#b3e19d';
+ case 120:
+ return '#f89898';
+ case 200:
+ return 'lightblue';
+ case 201:
+ return '#f3d19e';
+ default:
+ return '#911005'; // 榛樿棰滆壊
+ }
+}
</script>
<style scoped>
.rect {
border: 1px solid black; /* 璁剧疆鐭╁舰鐨勮竟妗� */
- background-color: lightblue; /* 璁剧疆鐭╁舰鐨勮儗鏅壊 */
+ /* background-color: lightblue; 璁剧疆鐭╁舰鐨勮儗鏅壊 */
}
.centered-text {
/* 璁剧疆鏂囧瓧灞呬腑鏍峰紡 */
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index 6164565..c917ca0 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -5,7 +5,6 @@
const router = useRouter()
import type { TableColumnCtx } from 'element-plus'
-// import { ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
const dialogFormVisible = ref(false)
const blind = ref(false)
@@ -17,7 +16,7 @@
const flakea = ref(false)
// const value = ref('')
import request from "@/utils/request"
-
+const ida = ref(null);
import { ref, onMounted } from "vue";
// import http from "@/http/index";
@@ -33,7 +32,7 @@
})
const tableDataa = ref([])
-
+
const tableData = reactive([]);
// let filterData = ref({
// damageDetails: {
@@ -70,7 +69,7 @@
if (tableDataa.value[0].patternWidth > 0) {
flake.value = true;
}
-
+
if (tableDataa.value[1].patternWidth > 0) {
flakea.value = true;
}
@@ -148,7 +147,7 @@
if (response.code == 200) {
titleSelectJson.value.processType = response.data;
console.log(response.data);
-
+
} else {
ElMessage.warning(response.data);
}
@@ -164,7 +163,7 @@
if (response.code == 200) {
titleSelectJsona.value.processTypea = response.data;
console.log(response.data);
-
+
} else {
ElMessage.warning(response.data);
}
@@ -214,14 +213,25 @@
// })
const projectNo = ref('');
const workstationId = ref('');
+const id = ref('');
const patternHeight = ref('');
const patternWidth = ref('');
const filmsId = ref('');
const patternThickness = ref('');
const number = ref('');
// 娣诲姞
+const handleBindRack = (row) => {
+ workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
+ ida.value = row.id;
+ console.log(ida.value);
+ add.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+};
+// 娣诲姞
const handleConfirm = async () => {
- try {
+ console.log(ida.value);
+ // console.log('id.value:', id.value);
+ if ((ida.value === 2 || ida.value === 4) && (parseInt(patternHeight.value, 10) >= 2700 )) {
+ try {
const response = await request.post('/loadGlass/LoadGlass/updateGlassMessage', {
id: workstationId.value,
workstationId: workstationId.value,
@@ -231,7 +241,6 @@
patternThickness: patternThickness.value,
number: number.value
});
-
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
@@ -248,11 +257,53 @@
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.msg);
}
- } catch (error) {
- // 澶勭悊閿欒
- console.error(error);
- }
-};
+ } catch (error) {
+ // 澶勭悊璇锋眰閿欒
+ console.error(error);
+ alert('璇锋眰澶辫触锛岃绋嶅悗鍐嶈瘯锛�');
+ }
+ }
+ else if( ida.value === 1 || ida.value === 3){
+ try {
+ const response = await request.post('/loadGlass/LoadGlass/updateGlassMessage', {
+ id: workstationId.value,
+ workstationId: workstationId.value,
+ patternHeight: patternHeight.value,
+ patternWidth: patternWidth.value,
+ filmsId: filmsId.value,
+ patternThickness: patternThickness.value,
+ number: number.value
+ });
+ if (response.code == 200) {
+ // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
+ ElMessage.success(response.message);
+ window.location.reload()
+ add.value = false;
+ window.localStorage.setItem('workstationId', response.data.workstationId)
+ let workstationId = window.localStorage.getItem('workstationId')
+ if (workstationId == '1') {
+ flake.value = true
+ } else if (workstationId == '2'){
+ flakea.value = true
+ }
+ } else {
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.msg);
+ }
+ } catch (error) {
+ // 澶勭悊璇锋眰閿欒
+ console.error(error);
+ alert('璇锋眰澶辫触锛岃绋嶅悗鍐嶈瘯锛�');
+ }
+ }
+ else {
+ ElMessage({
+ type: 'info',
+ message: '绗簩琛屽拰绗洓琛岀殑楂樺繀椤诲ぇ浜�2700鎵嶈兘淇濆瓨锛�',
+ })
+ }
+
+};
// 鍒犻櫎
const handleConfirma = async () => {
try {
@@ -482,12 +533,7 @@
blindb.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
};
-// 娣诲姞
-const handleBindRack = (row) => {
- workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
-
- add.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
-};
+
// 鍒犻櫎
const handleBindRacka = (row) => {
workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
--
Gitblit v1.8.0