From ba2cfa9907623c094e6e2d52d12dc3055ddd587a Mon Sep 17 00:00:00 2001
From: he wei <858544502@qq.com>
Date: 星期日, 19 一月 2025 17:23:34 +0800
Subject: [PATCH] U 整理提交
---
src/views/home/viewer.vue | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/src/views/home/viewer.vue b/src/views/home/viewer.vue
index 34b647b..a2eb64e 100644
--- a/src/views/home/viewer.vue
+++ b/src/views/home/viewer.vue
@@ -157,10 +157,15 @@
canvas2d.value.strokeStyle = color;
canvas2d.value.stroke();
}
-const emit = defineEmits(["on-success"]);
+const emit = defineEmits(["on-success", "on-close"]);
function getData(data) {
emit("on-success", data);
+ closeCamera();
+}
+
+function close() {
+ emit("on-close");
closeCamera();
}
@@ -183,17 +188,16 @@
<template>
<div>
<div class="canvasBox">
+ <div class="close" @click="close">
+ <el-icon><CircleClose /></el-icon>
+ </div>
<div class="box">
<div class="line"></div>
<div class="angle"></div>
</div>
<div v-if="isUseTorch" class="box2">
<div class="track" @click="openTrack">
- <div class="flash-light" v-if="trackStatus">
- 00
- </div>
- <div class="flash-light" v-else>
- 11
+ <div :class="['flash-light', {open : trackStatus}]">
</div>
{{ trackStatus ? "鍏抽棴闂厜鐏�" : "鎵撳紑闂厜鐏�" }}
</div>
@@ -245,7 +249,7 @@
bottom: 0;
left: 0;
right: 0;
- background-image: linear-gradient(
+ /* background-image: linear-gradient(
0deg,
transparent 24%,
rgba(32, 255, 77, 0.1) 25%,
@@ -270,11 +274,18 @@
transparent
);
background-size: 3rem 3rem;
- background-position: -1rem -1rem;
+ background-position: -1rem -1rem; */
z-index: 10;
background-color: #1110;
}
-
+.flash-light {
+ width: 4em;
+ height: 4em;
+ background: url("data:image/svg+xml,%3csvg viewBox='0 0 1024 1024' version='1.1' xmlns='http://www.w3.org/2000/svg' fill='%23cdcdcd'%3e%3cpath d='M675.7 266.3H348.4c-46.1 0-83.6 37.5-83.6 83.6v96.4c0 70.9 33.3 137.2 89.6 179.7v275.2c0 46.1 37.5 83.7 83.7 83.7h148c46.1 0 83.7-37.5 83.7-83.7V626c56.3-42.5 89.6-108.8 89.6-179.7v-96.2c0.1-22.3-8.5-43.3-24.3-59.2-16-15.8-37-24.6-59.4-24.6z m-327.3 43.8h327.3c10.6 0 20.6 4.2 28.1 11.7 7.5 7.5 11.6 17.5 11.6 28.2v39.4H308.6V350c0-22 17.8-39.9 39.8-39.9z m287.1 286.5c-6 4.1-9.6 10.9-9.6 18.1v286.5c0 22-17.9 39.9-39.9 39.9H438c-22 0-39.9-17.9-39.9-39.9V614.8c0-7.3-3.6-14.1-9.6-18.1-49.5-33.4-79.1-88.7-79.8-148.2h406.6c-0.7 59.4-30.3 114.7-79.8 148.1z'%3e%3c/path%3e%3cpath d='M524 625.6h-23.8c-9.7 0-17.6 7.9-17.6 17.6v122.2c0 9.7 7.9 17.6 17.6 17.6H524c9.7 0 17.6-7.9 17.6-17.6V643.2c0-9.7-7.9-17.6-17.6-17.6z'%3e%3c/path%3e%3c/svg%3e") center center / contain no-repeat;
+}
+.flash-light.open {
+ background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 1024 1024' version='1.1' xmlns='http://www.w3.org/2000/svg' fill='%23cde919'%3e%3cpath d='M675.7 266.3H348.4c-46.1 0-83.6 37.5-83.6 83.6v96.4c0 70.9 33.3 137.2 89.6 179.7v275.2c0 46.1 37.5 83.7 83.7 83.7h148c46.1 0 83.7-37.5 83.7-83.7V626c56.3-42.5 89.6-108.8 89.6-179.7v-96.2c0.1-22.3-8.5-43.3-24.3-59.2-16-15.8-37-24.6-59.4-24.6z m-327.3 43.8h327.3c10.6 0 20.6 4.2 28.1 11.7 7.5 7.5 11.6 17.5 11.6 28.2v39.4H308.6V350c0-22 17.8-39.9 39.8-39.9z m287.1 286.5c-6 4.1-9.6 10.9-9.6 18.1v286.5c0 22-17.9 39.9-39.9 39.9H438c-22 0-39.9-17.9-39.9-39.9V614.8c0-7.3-3.6-14.1-9.6-18.1-49.5-33.4-79.1-88.7-79.8-148.2h406.6c-0.7 59.4-30.3 114.7-79.8 148.1z'%3e%3c/path%3e%3cpath d='M524 625.6h-23.8c-9.7 0-17.6 7.9-17.6 17.6v122.2c0 9.7 7.9 17.6 17.6 17.6H524c9.7 0 17.6-7.9 17.6-17.6V643.2c0-9.7-7.9-17.6-17.6-17.6zM306.7 239.3c11.5 11.5 30.3 11.5 41.8 0 11.5-11.5 11.5-30.3 0-41.8l-37.4-37.4c-11.5-11.5-30.3-11.5-41.8 0-11.5 11.5-11.5 30.3 0 41.8l37.4 37.4zM675.5 239.3c11.5 11.5 30.3 11.5 41.8 0l37.4-37.4c11.5-11.5 11.5-30.3 0-41.8-11.5-11.5-30.3-11.5-41.8 0l-37.4 37.4c-11.4 11.5-11.4 30.3 0 41.8zM512.1 164c16.2 0 29.5-13.3 29.5-29.5V81.6c0-16.2-13.3-29.5-29.5-29.5s-29.5 13.3-29.5 29.5v52.8c0 16.3 13.2 29.6 29.5 29.6z'%3e%3c/path%3e%3c/svg%3e");
+}
.box {
width: 11.9375rem;
height: 11.9375rem;
@@ -285,6 +296,14 @@
overflow: hidden;
border: 0.1rem solid rgba(0, 255, 51, 0.2);
z-index: 11;
+}
+.close {
+ position: absolute;
+ top: 2rem;
+ right: 1rem;
+ font-size: 2.25rem;
+ color: #fff;
+ z-index: 32;
}
.line {
@@ -357,7 +376,7 @@
.track {
position: absolute;
- bottom: -6.25rem;
+ bottom: -8.25rem;
left: 50%;
transform: translateX(-50%);
z-index: 20;
--
Gitblit v1.9.1