From 5d591a9bfb93d0dae22c322016a2ec98b228bbb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=B0=91=E5=BA=B7?=
 <zhangshaokang@zhangshaokangdeMacBook-Pro.local>
Date: Thu, 9 Nov 2023 19:20:06 +0800
Subject: [PATCH] ...

---
 src/components/screen/largeScreen.vue  | 65 +++++++++++++++++++++-------------
 src/components/screen/largeScreen1.vue | 51 ++++++++++----------------
 2 files changed, 59 insertions(+), 57 deletions(-)

diff --git a/src/components/screen/largeScreen.vue b/src/components/screen/largeScreen.vue
index cfa43d3..00e59d2 100644
--- a/src/components/screen/largeScreen.vue
+++ b/src/components/screen/largeScreen.vue
@@ -57,22 +57,23 @@
                                         </div>
                                         <div class="ttd tc2 name" :class="showaliasName_curr == item.aliasName ?'numeAni' : ''" style="">
                                          
-                                         <!-- <span style="display:inline-block;height:100%;line-height:40px;">
-                                          <img v-if="item.imgSrc" :src="item.imgSrc" alt="" style="vertical-align:middle">
-                                           <i v-else class="iconfont icon-morentouxiang f40" style="color:transparent"></i>
-                                         </span> -->
+                                         <span style="display:inline-block;height:100%;line-height:40px;">
+                                          <img v-if="item.avatar" :src="item.avatar" alt="" class="leftAvater" style="">
+										  <img v-else  class="leftAvater" src="https://matripeweb.oss-cn-hangzhou.aliyuncs.com/antd/touxiang1107.svg" style="" alt=""/>
+                                           <!-- <i v-else class="iconfont icon-morentouxiang f40" style="position:relative;top:9px;"></i> -->
+                                         </span>
                                             {{item.aliasName}}
-                                            <!-- <span class="dn">
-                                              <svg class="svg_icon" style="display:inline-block;line-height:60px;vertical-align:middle" v-if="index == 1" aria-hidden="true">
+                                            <span class="">
+                                              <svg class="svg_icon weekIcon" style="" v-if="item.weekIdx == 1" aria-hidden="true">
                                                 <use xlink:href="#icon-zhou1"></use>
                                               </svg>
-                                              <svg class="svg_icon" style="display:inline-block;line-height:60px;vertical-align:middle" v-if="index == 4" aria-hidden="true">
+                                              <svg class="svg_icon weekIcon" style="" v-if="item.weekIdx == 2" aria-hidden="true">
                                                 <use xlink:href="#icon-zhou2"></use>
                                               </svg>
-                                                <svg class="svg_icon" style="display:inline-block;line-height:60px;vertical-align:middle" v-if="index == 2" aria-hidden="true">
+                                                <svg class="svg_icon weekIcon" style="" v-if="item.weekIdx == 3" aria-hidden="true">
                                                 <use xlink:href="#icon-zhou3"></use>
                                               </svg>
-                                            </span> -->
+                                            </span>
                                         </div>
                                         <!-- <div class="ttd tc7"></div> -->
                                         <div class="ttd tc4" style="">{{item.signUps}} | <span :class="daomianStyle == item.aliasName ?'bulingbuling' : ''">{{item.arrived}}</span> | <span :class="tongguoStyle == item.aliasName ?'bulingbuling' : ''">{{item.passed}}</span></span></div>
@@ -436,10 +437,12 @@ export default {
 			var getWebsocketData = JSON.parse(getWebsocketDataMap.value);	
 				
 				// console.log(getWebsocketData);
-				// console.log(getWebsocketData.list);
+			 console.log(getWebsocketData.list);
 				// that.array = [...getWebsocketData.list]
-				that.array = [];
-				var arr = [...getWebsocketData.list]
+				that.array = [];
+				if(getWebsocketData.list){
+					
+				var arr = getWebsocketData.list
 				
 				var arrLength = arr.length;
 				// that.array = [];
@@ -464,7 +467,7 @@ export default {
 					}
 					
 				})
-				
+				}
 				// console.log(this.nameArray);
 				// if (this.nameArray.length >= 1) {
 				// 	this.func();
@@ -822,24 +825,25 @@ div{
 }
 
 .tc2 {
-    width: 16%;
+    width: 19%;
     padding-left: 0px;
     text-align: center;
 }
-.tc2.name {
-  /* text-align: left !important; */
-  min-width: 200px;
+.tc2.name {
+	text-align: left !important;
+  min-width: 190px;
+  padding-left: 3%;
 }
-.tc2.nameTitle {
-  /* text-align: left !important; */
-  min-width: 200px;
+.tc2.nameTitle {
+	text-align: center !important;
+  min-width: 190px;
 }
 .tc3 {
     width: 15%;
 }
 
 .tc4 {
-    width: 28%;
+    width: 25%;
 }
 
 .tc5 {
@@ -847,8 +851,17 @@ div{
 }
 .tac img{
 	width:44px;
+}
+.leftAvater{
+	vertical-align:middle;width:48px;height:48px;border-radius: 50%;position:relative;top:10px;
+}
+.weekIcon{
+	display:inline-block;line-height:60px;vertical-align:middle;position:relative;top:-1px;
 }
 @media screen and (max-width: 1520px) {
+	.leftAvater{
+		width:38px;height:38px;
+	}
 	.tth[data-v-3b9d2e74] {
 	    height: auto;
 	}
@@ -863,8 +876,8 @@ div{
 	}
 	.ttd{
 		text-align: center;
-		font-size: 22px;
-		line-height: 2.2;
+		font-size: 21px;
+		/* line-height: 2.2; */
 	}
 	.lNum{
 		font-size: 22px;
@@ -877,7 +890,7 @@ div{
         min-width: 50px;
     }
 	.tc2{
-		width:14%
+		width:18%
 	}
 	.tc5 {
 	    width: 10%;
@@ -914,7 +927,9 @@ h4.f24 {
 .dotClass button.slick-active:before {
 	content: '';
 	width: 24px;
-}
+}
+
+
 /* .swiperPage{
   display: flex;
   flex-direction: column;
diff --git a/src/components/screen/largeScreen1.vue b/src/components/screen/largeScreen1.vue
index e81dbed..cfa43d3 100644
--- a/src/components/screen/largeScreen1.vue
+++ b/src/components/screen/largeScreen1.vue
@@ -57,23 +57,22 @@
                                         </div>
                                         <div class="ttd tc2 name" :class="showaliasName_curr == item.aliasName ?'numeAni' : ''" style="">
                                          
-                                         <span style="display:inline-block;height:100%;line-height:40px;">
-                                          <img v-if="item.avatar" :src="item.avatar" alt="" class="leftAvater" style="">
-										  <img v-else  class="leftAvater" src="https://matripeweb.oss-cn-hangzhou.aliyuncs.com/antd/touxiang1107.svg" style="" alt=""/>
-                                           <!-- <i v-else class="iconfont icon-morentouxiang f40" style="position:relative;top:9px;"></i> -->
-                                         </span>
+                                         <!-- <span style="display:inline-block;height:100%;line-height:40px;">
+                                          <img v-if="item.imgSrc" :src="item.imgSrc" alt="" style="vertical-align:middle">
+                                           <i v-else class="iconfont icon-morentouxiang f40" style="color:transparent"></i>
+                                         </span> -->
                                             {{item.aliasName}}
-                                            <span class="">
-                                              <svg class="svg_icon weekIcon" style="" v-if="item.weekIdx == 1" aria-hidden="true">
+                                            <!-- <span class="dn">
+                                              <svg class="svg_icon" style="display:inline-block;line-height:60px;vertical-align:middle" v-if="index == 1" aria-hidden="true">
                                                 <use xlink:href="#icon-zhou1"></use>
                                               </svg>
-                                              <svg class="svg_icon weekIcon" style="" v-if="item.weekIdx == 2" aria-hidden="true">
+                                              <svg class="svg_icon" style="display:inline-block;line-height:60px;vertical-align:middle" v-if="index == 4" aria-hidden="true">
                                                 <use xlink:href="#icon-zhou2"></use>
                                               </svg>
-                                                <svg class="svg_icon weekIcon" style="" v-if="item.weekIdx == 3" aria-hidden="true">
+                                                <svg class="svg_icon" style="display:inline-block;line-height:60px;vertical-align:middle" v-if="index == 2" aria-hidden="true">
                                                 <use xlink:href="#icon-zhou3"></use>
                                               </svg>
-                                            </span>
+                                            </span> -->
                                         </div>
                                         <!-- <div class="ttd tc7"></div> -->
                                         <div class="ttd tc4" style="">{{item.signUps}} | <span :class="daomianStyle == item.aliasName ?'bulingbuling' : ''">{{item.arrived}}</span> | <span :class="tongguoStyle == item.aliasName ?'bulingbuling' : ''">{{item.passed}}</span></span></div>
@@ -187,7 +186,7 @@ export default {
             ruzhiStyle: '',
             array: [],
             isAuto: true,
-            autoSpeed: 10000000,
+            autoSpeed: 10000,
             pageSize: 10,
             // pageSize: 5,
 
@@ -827,21 +826,20 @@ div{
     padding-left: 0px;
     text-align: center;
 }
-.tc2.name {
-	text-align: left !important;
-  min-width: 160px;
-  padding-left: 3%;
+.tc2.name {
+  /* text-align: left !important; */
+  min-width: 200px;
 }
-.tc2.nameTitle {
-	text-align: center !important;
-  min-width: 160px;
+.tc2.nameTitle {
+  /* text-align: left !important; */
+  min-width: 200px;
 }
 .tc3 {
     width: 15%;
 }
 
 .tc4 {
-    width: 25%;
+    width: 28%;
 }
 
 .tc5 {
@@ -849,17 +847,8 @@ div{
 }
 .tac img{
 	width:44px;
-}
-.leftAvater{
-	vertical-align:middle;width:48px;height:48px;border-radius: 50%;position:relative;top:10px;
-}
-.weekIcon{
-	display:inline-block;line-height:60px;vertical-align:middle;position:relative;top:-1px;
 }
 @media screen and (max-width: 1520px) {
-	.leftAvater{
-		width:38px;height:38px;
-	}
 	.tth[data-v-3b9d2e74] {
 	    height: auto;
 	}
@@ -875,7 +864,7 @@ div{
 	.ttd{
 		text-align: center;
 		font-size: 22px;
-		/* line-height: 2.2; */
+		line-height: 2.2;
 	}
 	.lNum{
 		font-size: 22px;
@@ -925,9 +914,7 @@ h4.f24 {
 .dotClass button.slick-active:before {
 	content: '';
 	width: 24px;
-}
-
-
+}
 /* .swiperPage{
   display: flex;
   flex-direction: column;