From afac2b82829d6c953d7b82c84f457457f32a3d06 Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Thu, 20 Jan 2022 18:33:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=AE=9E=E8=AE=AD?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=97=A0=E5=86=85=E5=AE=B9=E7=9A=84=E8=AF=9D?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8C=89=E9=92=AE=E4=B8=8D=E5=8F=AF=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/counter/list/index.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index 6334d67..b68675f 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -73,13 +73,11 @@
 
         <el-tooltip placement="top" popper-class="sth-popper" offset="50">
             <div slot="content">
-                <img v-lazy="this.lazyImg[29]" alt=""  />
+<!--                <img v-lazy="this.lazyImg[29]" alt=""  />-->
             </div>
             <img class="sth employee" v-lazy="lazyImg[21]" @click="setShowBusiness(true)" alt="" />
         </el-tooltip>
 
-        <img class="sth employee" v-lazy="lazyImg[21]" alt="" />
-
         <el-tooltip placement="top" popper-class="sth-popper" offset="-50">
             <div slot="content">
                 <img v-lazy="lazyImg[22]" alt="" />

From cb8fa9a5cb9c2943b34f938daee3df59f48bd024 Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Fri, 21 Jan 2022 16:00:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=85=A5?=
 =?UTF-8?q?=E6=B0=94=E6=B3=A1=E4=BD=8D=E7=BD=AE,=E8=BE=93=E4=BA=86?=
 =?UTF-8?q?=E5=BC=80=E6=88=B7=E4=B8=9A=E5=8A=A1=E5=85=B6=E4=BB=96=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=AF=86=E7=A0=81=E6=A1=86=E5=8F=AA=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E4=BF=9D=E7=95=99=E4=B8=80=E4=B8=AA=E8=BE=93=E5=85=A5=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E5=8D=B3=E5=8F=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/counter/list/index.vue | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index b68675f..84155c0 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -9,8 +9,8 @@
 
         <!-- 系统录入 height: 178px;position:relative;top:-450px;right:20px-->
         <el-tooltip placement="top" popper-class="sth-popper">
-            <div slot="content">
-                <img style="height: 150px;position:relative;top:10vh;right:20px" v-lazy="lazyImg[3]" alt="" />
+            <div slot="content" class="computerContent" style="">
+                <img style="height: 150px;" v-lazy="lazyImg[3]" alt="" />
             </div>
             <img @click="showManage" class="sth computer cp" v-lazy="lazyImg[4]" alt="" />
         </el-tooltip>
@@ -126,7 +126,7 @@
                     <el-form-item label="密码" prop="password">
                         <el-input v-focus show-password v-model="passwordForm.password" maxlength="6" onkeyup="{this.value=this.value.replace(/\D/g,'')}" autocomplete="off"></el-input>
                     </el-form-item>
-                    <el-form-item label="确认密码" prop="passwordAgain">
+                    <el-form-item label="确认密码" prop="passwordAgain" v-if="systemId == '62,1' || systemId == '62,2' || systemId == '62,3'">
                         <el-input show-password v-model="passwordForm.passwordAgain"  maxlength="6" onkeyup="this.value=this.value.replace(/\D/g,'')" autocomplete="off"></el-input>
                     </el-form-item>
                 </el-form>
@@ -477,6 +477,7 @@ export default {
                 password:'',
                 passwordAgain: ''
             },
+            systemId:'',
             passwordRules:{
                 password:[
                     {  validator: validatePass, trigger: 'blur' },
@@ -727,6 +728,7 @@ export default {
             }
             else if(this.$store.state.system.popText == '密码器'){
                 if(this.$store.state.system.id == '62,1'){
+                    this.systemId = this.$store.state.system.id
                     let accountPassword = sessionStorage.getItem('accountPassword');
                     if(accountPassword){
                         this.passwordForm.password = accountPassword
@@ -1801,6 +1803,16 @@ export default {
     line-height: 100px;
     font-size: 23px;
 }
+@media screen and (min-width: 1200px) and (max-width: 1919px) {
+    .computerContent{
+        position: absolute;top: -50px;width:200px;left: -100px
+    }
+}
+@media screen and (min-width: 1920px) {
+    .computerContent{
+        position: absolute;top: -10px;width:200px;left: -100px
+    }
+}
 
 .wrap {
     .bg {