From c0505074f5149b7f0c7fe26822e793eac18319f3 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 13 五月 2024 11:00:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Identify/identify.vue | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index 30fe865..5e2bc03 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -1,5 +1,6 @@
<template>
-<!-- <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading"> -->
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading">
+ <el-scrollbar height="700px">
<div id="app" style="margin-top: 20px;">
<div
:style="{ width: `${olWidth}px`, height: `${olHeight}px`,position: 'relative' }"
@@ -8,29 +9,51 @@
v-for="(rect, index) in adjustedRects"
:key="index"
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` }"
>
<!-- 绠ご -->
- <div id="arrow"></div>
- <div id="line"></div>
+ <!-- <div id="arrow"></div>
+ <div id="line"></div> -->
<!-- <div class="centered-text" >NG24030401B01</div> -->
<div class="centered-text">
<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;">
+ 鐮存崯
+ </el-button>
+ <el-button type="danger" plain @click="blind = false" style="width: 120px;margin-top: 10px;">
+ <el-icon class="el-icon--right"><Upload /></el-icon>
+ 浜哄伐鎷胯蛋</el-button>
+ <!-- </div> -->
+ <!-- </template> -->
+ </el-dialog>
</div>
</div>
+ </el-scrollbar>
+ </el-card>
</template>
-<script setup>
+<script setup lang="ts">
+import { Delete, Upload } from '@element-plus/icons-vue'
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 rects = ref([]); // 鐢ㄤ簬瀛樺偍鐭╁舰鏁版嵁鐨勫搷搴斿紡寮曠敤
const adjustedRects = ref([]);
+const handleBind = (row) => {
+
+ blind.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+};
onMounted(async () => {
try {
const response = await request.post('/cacheGlass/taskCache/currentCutTerritory'); // 鏇挎崲涓轰綘鐨凙PI绔偣
@@ -103,4 +126,5 @@
width: 240px; /* 鐩寸嚎鐨勯暱搴︼紝鏍规嵁闇�瑕佽皟鏁� */
background-color: #911005; /* 鐩寸嚎鐨勯鑹� */
}
+
</style>
\ No newline at end of file
--
Gitblit v1.8.0