Merge branch 'master' of ssh://git.czcyedu.com:222/huoran/FE_bankTeaching into master

src/pages/counter/list/index.vue

@@ -108,16 +108,9 @@
             </div>
             
         </el-tooltip>
-
+        <div class="employee-wrap sth">
             <el-tooltip placement="top" popper-class="sth-popper" offset="50">
-            <div slot="content"   style="margin-left: -250px">
+                <img v-lazy="lazyImg[21]" alt="" @click="setShowBusiness(true)" />
-               <!-- <img v-lazy="this.lazyImg[29]" alt="" /> -->
-            </div>
-            <div class="sth employee" @click="setShowBusiness(true)">
-                <img v-lazy="lazyImg[21]" alt="" />
-                
-            </div>
-            
             </el-tooltip>
 
             <el-tooltip placement="top" popper-class="sth-popper" offset="-50">
@@ -126,6 +119,7 @@
                 </div>
                 <p class="employeeText" @click="showData('资料',9)">资料</p>
             </el-tooltip>
+        </div>
 <!--        点击打开刷卡器-->
         <el-tooltip placement="top" popper-class="sth-popper" offset="00">
             <div slot="content">
@@ -2286,7 +2280,7 @@ export default {
         width: 36.5%;
         cursor: pointer;
     }
-    .employee {
+    .employee-wrap {
         // 柜员
         top: 29%;
         left: 43%;
@@ -2297,8 +2291,10 @@ export default {
     .employeeText {
         // 资料文字
         position: absolute;
-        top: 47%;
+        top: 29%;
-        left: 58%;
+        left: 74%;
+        width: 100px;
+        height: 100px;
         color: #000;
         transform: rotateZ(38deg) scale3d(1, 1, 1) skew(-19deg, -9deg);
         font-size: 18px;
@@ -2372,11 +2368,6 @@ export default {
         width: 4.5%;
     }
 
-    @media screen and (max-width: 1850px) {
-        .employeeText {
-            top: 48%;
-        }
-    }
     @media screen and (max-width: 1680px) {
         .money-box {
           top: 33%;
@@ -2419,10 +2410,6 @@ export default {
           top: 31%;
           left: 58%;
         }
-        .employeeText {
-            top: 36.5%;
-            left: 55%;
-        }
         .seal-box {
           top: 33%;
         }

src/pages/manage/index/index.vue

@@ -114,10 +114,6 @@ export default {
     .box{
         display: flex;
         min-width: 1300px;
-        margin-top: 70px;
-        
-        // overflow: auto;
-        
         .nav{
             width: 270px;
             min-height: 80vh;