From 33308e16bbb153d9aac76fd703ec0f38ea7e344a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 09 十月 2024 15:47:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/Identify/identify.vue | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index 013068a..e785987 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -35,12 +35,12 @@
</div>
</el-scrollbar>
<el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose">
- <el-button type="warning" plain :icon="Delete" @click="handleDamage(currentGlassId)" style="width: 140px;margin-left: 10px;">
+ <el-button :disabled="currentGlassRect?.glass_state === 8 || currentGlassRect?.glass_state === 9" type="warning" plain :icon="Delete" @click="handleDamage(currentGlassId)" style="width: 140px;margin-left: 10px;">
{{ $t('order.dilapidation') }}
</el-button>
- <el-button type="danger" plain @click="handleManualTake(currentGlassId)" style="width: 140px;margin-top: 10px;">
+ <el-button :disabled="currentGlassRect?.glass_state === 9 || currentGlassRect?.glass_state === 8" type="danger" plain @click="handleManualTake(currentGlassId)" style="width: 140px;margin-top: 10px;">
<el-icon class="el-icon--right"><Upload /></el-icon>
- {{ $t('order.Takeaway') }}</el-button>
+ {{ $t('order.takeaway') }}</el-button>
</el-dialog>
</el-card>
</template>
@@ -66,7 +66,7 @@
let webSocket: WebSocket | null = null;
const totalPages = ref(0);
const pageSize = ref(1);
-const currentPage = ref(1);
+const currentPage = ref('');
const disabled = false;
const size = 'small';
const rawData = ref([]);
@@ -74,6 +74,9 @@
// blind.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
// };
// 鏄剧ず瀵硅瘽妗嗗苟璁剧疆褰撳墠 glass_id
+const currentGlassRect = computed(() => {
+ return adjustedRects.value.find(rect => rect.glass_id === currentGlassId.value);
+});
function showDialog(glassId: number) {
currentGlassId.value = glassId;
blind.value = true;
@@ -90,21 +93,19 @@
// 鐮存崯
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', {
glassId: currentGlassId.value,
state: 8,
line: 1001,
- workingProcedure: '璇嗗埆',
+ workingProcedure: '鍒囧壊',
})
if (response.code == 200) {
ElMessage.success(response.message);
// window.location.reload()
blind.value = false;
updateRectStatus(currentGlassId.value, 8);
- } else {
+ findEngineering()
+ } else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.msg);
}
@@ -124,7 +125,7 @@
glassId: currentGlassId.value,
state: 9,
line: 1001,
- workingProcedure: '璇嗗埆',
+ workingProcedure: '鍒囧壊',
})
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
@@ -132,6 +133,7 @@
// window.location.reload()
blind.value = false;
updateRectStatus(currentGlassId.value, 9);
+ findEngineering()
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.msg);
@@ -142,7 +144,7 @@
console.error(error);
}
}
-const handleBlur = async () => {
+const handleBlur = async () => {
if (inputValue.value) {
var url="/cacheGlass/taskCache/cutTerritory?current="+inputValue.value;
const response = await request.post(url)
@@ -167,14 +169,26 @@
webSocket.close();
webSocket = null;
}
- currentPage.value = 1;
+ currentPage.value = 1;
}
} else{
connectWebSocket();
}
};
+const findEngineering = async () => {
+ if (inputValue.value) {
+ var url="/cacheGlass/taskCache/cutTerritory?current="+inputValue.value;
+ const response = await request.post(url)
+ if (response.code === 200) {
+ rawData.value = response.data;
+ }
+ } else{
+ }
+};
+
const handleCurrentChange = (val: number) => {
currentPage.value = val;
+ // window.localStorage.setItem('pagenumber', currentPage.value).
const page = currentPage.value - 1
const scaleFactor = 1621.78/6000;
const scaleFactory = 750/3300;
--
Gitblit v1.8.0