Merge branch 'master' of http://101.37.147.115:3000/bocaigroup/daotian_pc

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;">
+                                         <span style="display:inline-block;height:100%;line-height:40px;">
-                                          <img v-if="item.imgSrc" :src="item.imgSrc" alt="" style="vertical-align:middle">
+                                          <img v-if="item.avatar" :src="item.avatar" alt="" class="leftAvater" style="">
-                                           <i v-else class="iconfont icon-morentouxiang f40" style="color:transparent"></i>
+										  <img v-else  class="leftAvater" src="https://matripeweb.oss-cn-hangzhou.aliyuncs.com/antd/touxiang1107.svg" style="" alt=""/>
-                                         </span> -->
+                                           <!-- <i v-else class="iconfont icon-morentouxiang f40" style="position:relative;top:9px;"></i> -->
+                                         </span>
                                             {{item.aliasName}}
-                                            <!-- <span class="dn">
+                                            <span class="">
-                                              <svg class="svg_icon" style="display:inline-block;line-height:60px;vertical-align:middle" v-if="index == 1" aria-hidden="true">
+                                              <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>
@@ -415,7 +416,7 @@ export default {
       websocketonmessage(e) { //数据接收
             // const redata = JSON.parse(e.data);
             var that = this;
-             console.log("接收消息", e.data)
+             // console.log("接收消息", e.data)
             // console.log(JSON.parse(e.data))
             // console.log(JSON.parse(e.data).list)
             // console.log(new Date());
@@ -426,16 +427,22 @@ export default {
             // 180000
 			// debugger
 			 // && (timeStamp == 0 || new Date().getTime() - timeStamp >= 40000 )
-			if(e.data != '"pong"'){
+			 var getWebsocketDataMap = JSON.parse(e.data);
+			 
+			 console.log(getWebsocketDataMap);
+			 
+			if(getWebsocketDataMap.name == 'data'){
 				
 				 timeStamp = new Date().getTime();
+			var getWebsocketData = JSON.parse(getWebsocketDataMap.value);	
 				
-				var getWebsocketData = JSON.parse(e.data);
 				// console.log(getWebsocketData);
-				// console.log(getWebsocketData.list);
+			 console.log(getWebsocketData.list);
 				// that.array = [...getWebsocketData.list]
 				that.array = [];
-				var arr = [...getWebsocketData.list]
+				if(getWebsocketData.list){
+					
+				var arr = getWebsocketData.list
 				
 				var arrLength = arr.length;
 				// that.array = [];
@@ -460,7 +467,7 @@ export default {
 					}
 					
 				})
-				
+				}
 				// console.log(this.nameArray);
 				// if (this.nameArray.length >= 1) {
 				// 	this.func();
@@ -818,24 +825,25 @@ div{
 }
 
 .tc2 {
-    width: 16%;
+    width: 19%;
     padding-left: 0px;
     text-align: center;
 }
 .tc2.name {
-  /* text-align: left !important; */
+	text-align: left !important;
-  min-width: 200px;
+  min-width: 190px;
+  padding-left: 3%;
 }
 .tc2.nameTitle {
-  /* text-align: left !important; */
+	text-align: center !important;
-  min-width: 200px;
+  min-width: 190px;
 }
 .tc3 {
     width: 15%;
 }
 
 .tc4 {
-    width: 28%;
+    width: 25%;
 }
 
 .tc5 {
@@ -844,7 +852,16 @@ 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;
 	}
@@ -859,8 +876,8 @@ div{
 	}
 	.ttd{
 		text-align: center;
-		font-size: 22px;
+		font-size: 21px;
-		line-height: 1.6;
+		/* line-height: 2.2; */
 	}
 	.lNum{
 		font-size: 22px;
@@ -873,7 +890,7 @@ div{
         min-width: 50px;
     }
 	.tc2{
-		width:14%
+		width:18%
 	}
 	.tc5 {
 	    width: 10%;
@@ -911,6 +928,8 @@ h4.f24 {
 	content: '';
 	width: 24px;
 }
+
+
 /* .swiperPage{
   display: flex;
   flex-direction: column;

src/router/index.js

@@ -233,6 +233,11 @@ const routes = [
     name: "largeScreen",
     component: () => import("../components/screen/largeScreen.vue"),
     // component: resolve => require(['../components/FirstJob/joblist.vue'],resolve)
+  },{
+    path: "/largeScreen1",
+    name: "largeScreen1",
+    component: () => import("../components/screen/largeScreen1.vue"),
+    // component: resolve => require(['../components/FirstJob/joblist.vue'],resolve)
   },
   {
     path: "/userinfo",