From a748c8cd789059b3f870c9240e68523db4eb19a7 Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Tue, 18 Jan 2022 19:02:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=E6=95=B4?=
 =?UTF-8?q?=E4=BD=93=E7=BC=A9=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/counter/list/index.vue      | 113 +++++++++++++-------------
 src/pages/lobbyManager/list/index.vue |   7 +-
 2 files changed, 62 insertions(+), 58 deletions(-)

diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index ef735e9..c838fb6 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -71,20 +71,13 @@
             <img class="sth cipher-machine cp" v-lazy="lazyImg[20]" @click="showData('密码器',8)" alt="" />
         </el-tooltip>
 
-        <!-- <el-tooltip placement="top" popper-class="sth-popper" offset="50">
+        <el-tooltip placement="top" popper-class="sth-popper" offset="50">
             <div slot="content">
                 <img v-lazy="this.lazyImg[29]" alt=""  />
             </div>
             <img class="sth employee" v-lazy="lazyImg[21]" @click="setShowBusiness(true)" alt="" />
-<<<<<<< HEAD
-        </el-tooltip> -->
-
-        <img class="sth employee" v-lazy="lazyImg[21]" alt="" />
-
-=======
         </el-tooltip>
 <!--        点击打开资料-->
->>>>>>> 8498f8e3a48d5889580b43697701a1ef33281d85
         <el-tooltip placement="top" popper-class="sth-popper" offset="-50">
             <div slot="content">
                 <img v-lazy="lazyImg[22]" alt="" />
@@ -120,7 +113,7 @@
         </div>
 
         <!-- 硬件交互--弹框 -->
-        <div v-show="showPop" width="1120px" class="data-dia">
+        <div v-show="showPop" width="900px" class="data-dia">
             <div class="dia-header">
                 <div class="data-title">{{ popText }}</div>
                 <img class="close" v-lazy="lazyImg[28]" alt="" @click="closePop" />
@@ -2543,29 +2536,30 @@ export default {
             background:url("../../../assets/img/integrated-counter-bg.png");
         }
         .counter {
+            width: 65vw;
             top: 30%;
-            left: 8%;
-            height: 63vh;
+            left: 18%;
+            height: 67vh;
         }
         .glass {
             // 玻璃窗
-            top: 15vh;
-            left: 35vw;
-            width: 35vw;
+            top: 13vh;
+            left: 46vw;
+            width: 33vw;
         }
 
         .employee {
             // 柜员
-            top: 430px;
-            left: 490px;
+            top: 373px;
+            left: 675px;
             width: 283px;
             position: relative;
         }
         .employeeText {
             // 资料文字
             position: absolute;
-            top: 580px;
-            left: 710px;
+            top: 517px;
+            left: 893px;
             color: #000;
             transform: rotateZ(38deg) scale3d(1, 1, 1) skew(-19deg, -9deg);
             font-size: 18px;
@@ -2579,66 +2573,66 @@ export default {
         .man {
             // 人
             top: 191px;
-            left: 846px;
+            left: 1090px;
             width: 199px;
         }
         .money-box {
             // 钱箱
-            top: 540px;
-            left: 190px;
+            top: 480px;
+            left: 353px;
             width: 129px;
         }
         .important {
             // 重空箱
-            top: 48vh;
-            left: 18vw;
+            top: 51vh;
+            left: 26vw;
             width: 118px;
         }
         .voucher-box {
             // 普通箱
-            top: 35vh;
-            left: 24vw;
+            top: 40vh;
+            left: 31vw;
             width: 112px;
         }
         .summons {
             // 传票栏
-            top: 35vh;
-            left: 30vw;
+            top: 42vh;
+            left: 35vw;
             width: 112px;
         }
         .computer {
-            top: 30vh;
-            left: 35vw;
+            top: 29vh;
+            left: 42vw;
             width: 148px;
         }
         .card-machine {
-            top: 50vh;
-            left: 43vw;
-            width: 66px;
+            top: 48vh;
+            left: 50vw;
+            width: 60px;
         }
         .idCard-scanner {
-            top: 53vh;
-            left: 46vw;
+            top: 52vh;
+            left: 53vw;
             width: 46px;
         }
         .seal-box {
             top: 55vh;
-            left: 49vw;
+            left: 57vw;
             width: 50px;
         }
         .currency-detector {
-            top: 55vh;
-            left: 51vw;
+            top: 56vh;
+            left: 62vw;
             width: 117px;
         }
         .printer {
             top: 60vh;
-            left: 56vw;
+            left: 67vw;
             width: 149px;
         }
         .cipher-machine {
-            top: 391px;
-            left: 711px;
+            top: 394px;
+            left: 932px;
             width: 79px;
         }
     }
@@ -2785,14 +2779,14 @@ export default {
     background: #fff;
     position: fixed;
     // top: 7%;
-    top: 7vh!important;
+    margin-top: 7vh!important;
     left: 50%;
     transform: translate(-50%, 0);
     padding: 0 15px 15px;
     z-index: 997;
     border: 1px solid #e6e6e6;
     max-height: 600px;
-    overflow: auto;
+    //overflow: auto;
     .dia-header {
         position: relative;
         .data-title {
@@ -2897,16 +2891,15 @@ export default {
     }
     .list {
         width: 940px;
-        min-height: 204px;
-        max-height: 360px;
+        max-height: 30vh;
+        min-height: 30vh;
         overflow: auto;
-        margin: 0 auto;
         display: flex;
-        align-items: center;
+        flex-wrap: wrap;
         .img-wrap{
             background: url(../../../assets/img/data-frame.png) 0 0 / cover no-repeat;
-            width: 180px;
-            height: 180px;
+            width: 140px;
+            height: 140px;
             display: flex;
             justify-content: center;
             margin: 5px 10px;
@@ -2914,8 +2907,8 @@ export default {
             cursor: pointer;
             .file {
                 position: relative;
-                max-width: 180px;
-                max-height: 130px;
+                max-width: 135px;
+                max-height: 90px;
                 text-align: center;
                 margin: 10px 10px ;
                 img {
@@ -2925,7 +2918,7 @@ export default {
                     position: absolute;
                     bottom: 0;
                     width: 100%;
-                    line-height: 54px;
+                    line-height: 40px;
                     text-align: center;
                     font-size: 18px;
                     color: #000;
@@ -2935,7 +2928,7 @@ export default {
                 font-size: 18px;
                 white-space:nowrap;
                 position: absolute;
-                bottom: 15px;
+                bottom: 7px;
                 left: 50%;
                 transform: translate(-50%,0);
             }
@@ -2950,9 +2943,13 @@ export default {
     }
     .seal{
         width: 1100px;
-        padding: 0 5%;
+        margin-top: -5vh;
+        max-height: 30vh;
+        min-height: 30vh;
+        overflow: auto;
         display: flex;
-        justify-content: space-between;
+        justify-content: space-around;
+        flex-wrap: wrap;
         .box{
             border: 2px solid #e6e6e6;
             width: 45%;
@@ -3034,7 +3031,7 @@ export default {
         }
     }
     .dia-footer {
-        margin-top: 100px;
+        margin-top: 65px;
         text-align: center;
         button {
             width: 300px;
@@ -3071,6 +3068,12 @@ export default {
             min-height: 65vh;
             .seal{
                 margin-top: -5vh;
+                max-height: 30vh;
+                min-height: 30vh;
+                overflow: auto;
+                display: flex;
+                justify-content: space-around;
+                flex-wrap: wrap;
                 .left{
                     .file {
                         //height: 10vh;
diff --git a/src/pages/lobbyManager/list/index.vue b/src/pages/lobbyManager/list/index.vue
index ce206bc..2ca8d68 100644
--- a/src/pages/lobbyManager/list/index.vue
+++ b/src/pages/lobbyManager/list/index.vue
@@ -48,7 +48,7 @@
                 <img class="close" src="@/assets/svg/close.svg" alt="" @click="takeResultVisible = false">
             </div>
             <div class="result">
-                <div style='width: 50px;height: 50px;margin: auto'>
+                <div style='width: 60px;height: 60px;margin: auto'>
                     <img src="@/assets/img/finish.png" alt="">
                 </div>
                 <h6>取号成功</h6>
@@ -391,14 +391,15 @@ export default {
                     //margin-left: 30px;
                 }
                 img{
-                    width: 100%;
+                    margin-left: 10px;
+                    width: 30%;
                 }
                 p{
                     font-size: 18px;
                     color: #000;
                     text-align: center;
                     font-weight: bold;
-                    padding: 0 18px;
+                    padding: 0 15px;
                 }
                 &.checked{
                     background: rgba(97,145,255,0.10) url(../../../assets/svg/checked.svg) 96% 7%/auto no-repeat;