From c377d90fe2a01c2118f6c69c3c177f75be7c318b Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 29 十一月 2024 15:20:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Identify/identify.vue | 69 +++++++++++++++++++---------------
1 files changed, 38 insertions(+), 31 deletions(-)
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index e785987..dc32adf 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -1,20 +1,22 @@
<template>
- <div style="display: flex;">
-<el-input v-model="inputValue" style="margin-left: 15px;margin-top: 10px;width: 240px" placeholder="璇疯緭鍏ュ伐绋嬪彿" @blur="handleBlur"/>
-<el-pagination
- v-model:current-page="currentPage"
- :page-size="pageSize"
- :size="size"
- :disabled="disabled"
- layout="prev, pager, next, jumper"
- :total="totalPages"
- @current-change="handleCurrentChange"
- />
+ <div style="height: 500px;">
+ <div style="display: flex;">
+ <el-input v-model="inputValue" style="margin-left: 15px;margin-top: 10px;width: 240px" placeholder="璇疯緭鍏ュ伐绋嬪彿"
+ @blur="handleBlur"/>
+ <el-pagination
+ v-model:current-page="currentPage"
+ :page-size="pageSize"
+ :size="size"
+ :disabled="disabled"
+ layout="prev, pager, next, jumper"
+ :total="totalPages"
+ @current-change="handleCurrentChange"
+ />
</div>
<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;" v-loading="loading">
<el-scrollbar height="750px" width="1400px" style="background-color: #e9e9eb;">
<div style="position: relative;">
- <div
+ <div
v-for="(rect, index) in adjustedRects"
:key="rect.glass_id"
class="rect"
@@ -33,29 +35,34 @@
</div>
</div>
</div>
- </el-scrollbar>
- <el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose">
- <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;">
+ </el-scrollbar>
+ <el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose">
+ <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 :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>
- </el-dialog>
- </el-card>
-</template>
-<script setup lang="ts">
-import { Delete, Upload } from '@element-plus/icons-vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { ref, onMounted, onBeforeUnmount,onUnmounted, computed } from 'vue';
+ <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>
+ </el-dialog>
+ </el-card>
+ </div>
+</template>
+<script setup lang="ts">
+import {ElMessage} from 'element-plus'
+import {computed, onMounted, onUnmounted, ref} from 'vue';
import request from "@/utils/request"
-import { WebSocketHost ,host} from '@/utils/constants'
-import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
- import { useI18n } from 'vue-i18n'
- const { t } = useI18n()
- let language = ref(localStorage.getItem('lang') || 'zh')
+import {host, WebSocketHost} from '@/utils/constants'
+import {useI18n} from 'vue-i18n'
+
+const {t} = useI18n()
+let language = ref(localStorage.getItem('lang') || 'zh')
const blind = ref(false)
-const olWidth = ref();
+const olWidth = ref();
const olHeight = ref();
const glass_id = ref();
const inputValue = ref('');
--
Gitblit v1.8.0