diff --git a/src/components/screen/largeScreen.vue b/src/components/screen/largeScreen.vue index 054c552..00e59d2 100644 --- a/src/components/screen/largeScreen.vue +++ b/src/components/screen/largeScreen.vue @@ -57,22 +57,23 @@
- + + + + + {{item.aliasName}} - +
{{item.signUps}} | {{item.arrived}} | {{item.passed}}
@@ -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()); @@ -425,17 +426,23 @@ export default { // 180000 // debugger - // && (timeStamp == 0 || new Date().getTime() - timeStamp >= 40000 ) - if(e.data != '"pong"'){ + // && (timeStamp == 0 || new Date().getTime() - timeStamp >= 40000 ) + 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] + that.array = []; + 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; */ - 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 { @@ -843,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; } @@ -859,8 +876,8 @@ div{ } .ttd{ text-align: center; - font-size: 22px; - line-height: 1.6; + font-size: 21px; + /* line-height: 2.2; */ } .lNum{ font-size: 22px; @@ -873,7 +890,7 @@ div{ min-width: 50px; } .tc2{ - width:14% + width:18% } .tc5 { width: 10%; @@ -910,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 new file mode 100644 index 0000000..cfa43d3 --- /dev/null +++ b/src/components/screen/largeScreen1.vue @@ -0,0 +1,932 @@ + + + + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 5e76ad7..3672af9 100644 --- a/src/router/index.js +++ b/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",