From 24dd9b829d5e625345e06c0ee0c3509cf4c4101a Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Mon, 11 Apr 2022 15:31:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=9F=A5=E7=9C=8B=E5=99=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/checkPhoto/index.vue |  2 ++
 src/layouts/header/index.vue        |  3 ++-
 src/pages/counter/list/index.vue    | 34 +++++++++++++++++++----------
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/components/checkPhoto/index.vue b/src/components/checkPhoto/index.vue
index 4affa71..a5b028c 100644
--- a/src/components/checkPhoto/index.vue
+++ b/src/components/checkPhoto/index.vue
@@ -1,6 +1,8 @@
 <template>
     <div class="relative -translate-y-2/4" style="margin-top: 10px;color: black;">
         <!-- <div class="bg-gray-400" @click="closeIt">关闭</div> -->
+        <img class="absolute cursor-pointer hover:bg-red-700" src="@/assets/svg/close.svg" alt="" @click="closeIt"  style="right: 50px; top: 30px;" />
+
         <template v-if="imgSrcId==14">
             <h3 class="subpixel-antialiased  text-2xl text-center absolute" style="left: 95px;top: 110px;">{{ dataFlow.userName }}</h3>
             <h3 class="subpixel-antialiased  text-2xl text-center absolute" v-if="dataFlow.sex==1" style="left: 446px;top: 110px;">√</h3>
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 58b41b8..9b111e2 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -59,7 +59,8 @@ export default {
         align-items: center;
         position: relative;
         height: 68px;
-        background-color: #fff;
+        // background-color: #fff;
+        background-color: rgb(250,250,250);
         z-index: 1001;
         .logo{
             width: 500px;
diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index f21371a..2b3134d 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -402,9 +402,9 @@
             <router-view></router-view>
         </div>
 
-        <!-- <div  v-show="showImg" v-drag style="background-color: blur;width: 100vw; height: 100vh;">
-            <div  class="dia-header">
-                <check-photo  :imgSrc="imgSrc" :imgSrcId='imgSrcId' :imgSrcName="imgSrcName" :showImg.sync="showImg" style="width: 850px;z-index: 9999;" ref="photoCheck">
+        <div  v-show="showImg" style="background-color: blur;">
+            <div v-drag class="relative w-screen h-screen" ref="imgCheckDrag">
+            <check-photo  :imgSrc="imgSrc" :imgSrcId='imgSrcId' :imgSrcName="imgSrcName" :showImg.sync="showImg" class="dia-header"  style="width: 850px;z-index: 9999;" ref="photoCheck">
                 <div class="absolute flex justify-end w-full flex-wrap" style="bottom:7vh; right: 4vw">
                     <seal-name v-for="item in isSeal(imgSrcId)" :key="item.id" :item="item">
                     </seal-name>
@@ -412,23 +412,23 @@
             </check-photo>
             </div>
             
-        </div> -->
+        </div>
         
 
         <!-- 图片查看器 -->
-        <el-dialog
+        <!-- <el-dialog
             custom-class="data-dia "
             class="imgIndex"
             :visible.sync="showImg"
             width="850px"
             >
-            <check-photo  :imgSrc="imgSrc" :imgSrcId='imgSrcId' :imgSrcName="imgSrcName">
-                <div class="absolute flex justify-end w-full flex-wrap" style="bottom:7vh; right: 4vw">
-                    <seal-name v-for="item in isSeal(imgSrcId)" :key="item.id" :item="item">
-                    </seal-name>
-                </div>
-            </check-photo>
-        </el-dialog>
+                <check-photo  :imgSrc="imgSrc" :imgSrcId='imgSrcId' :imgSrcName="imgSrcName" class="dia-header">
+                    <div class="absolute flex justify-end w-full flex-wrap" style="bottom:7vh; right: 4vw">
+                        <seal-name v-for="item in isSeal(imgSrcId)" :key="item.id" :item="item">
+                        </seal-name>
+                    </div>
+                </check-photo>
+        </el-dialog> -->
 
         <!-- <tip-dialog /> -->
 
@@ -1094,6 +1094,16 @@ export default {
     mounted(){
 
         let that = this
+
+        // 图片查看器允许拖拽
+        new Sortable(this.$refs.imgCheckDrag, {
+            animation: 150,
+            group: {
+                name:'shared',
+                pull:'clone',// 是否可以被移出或克隆
+                put:false// 禁止拖入
+            },
+        })
         // 拖拽-物品栏
         new Sortable(this.$refs.goods, {
             animation: 150,