|
@@ -17,15 +17,22 @@
|
17
|
17
|
<span>{{user.words}}</span>
|
18
|
18
|
</li>
|
19
|
19
|
</ul>
|
20
|
|
- <div v-if="audios.length > 0" :hidden="true">
|
|
20
|
+ </div>
|
|
21
|
+ <!-- <div v-if="audios.length > 0" :hidden="true">
|
21
|
22
|
<div v-for="(audio, k) in audios" :key="k+'audio'">
|
22
|
23
|
<audio v-if="audio.isShow" @ended="audioEnd(k)" autoplay>
|
23
|
24
|
<source :src="audio.url">
|
24
|
25
|
</audio>
|
25
|
26
|
</div>
|
|
27
|
+ </div> -->
|
|
28
|
+ <div >
|
|
29
|
+ <div v-for="(audio, k) in audios" :key="k+'audio'">
|
|
30
|
+ <audio @ended="audioEnd(k)" autoplay>
|
|
31
|
+ <source :src="audio.url">
|
|
32
|
+ </audio>
|
|
33
|
+ </div>
|
26
|
34
|
</div>
|
27
|
35
|
</div>
|
28
|
|
- </div>
|
29
|
36
|
</div>
|
30
|
37
|
</div>
|
31
|
38
|
<x-maquee class="marquee" v-if="pageDetail !== null && (pageDetail.detail.noticeShow || pageDetail.detail.weatherShow)">
|
|
@@ -141,8 +148,8 @@ export default {
|
141
|
148
|
|
142
|
149
|
// window.console.log(this.$route.query.id, this.$route.query)
|
143
|
150
|
|
144
|
|
- const wsURI = `${window.location.origin.replace('http', 'ws')}/api/ws/${this.$route.query.id}`
|
145
|
|
- this.ws.connect(wsURI)
|
|
151
|
+ // const wsURI = `${window.location.origin.replace('http', 'ws')}/api/ws/${this.$route.query.id}`
|
|
152
|
+ this.ws.connect('ws://192.168.0.67:8080/ws/screen/113')
|
146
|
153
|
this.init()
|
147
|
154
|
this.pageTimer = window.setInterval(() => {
|
148
|
155
|
let curMin = new Date().getMinutes() - 0
|
|
@@ -158,7 +165,6 @@ export default {
|
158
|
165
|
}, 1000)
|
159
|
166
|
},
|
160
|
167
|
mounted () {
|
161
|
|
- console.log(this.users, 'this.users')
|
162
|
168
|
},
|
163
|
169
|
updated () {
|
164
|
170
|
this.$nextTick(() => {
|
|
@@ -201,7 +207,6 @@ export default {
|
201
|
207
|
if (!msg) {
|
202
|
208
|
return
|
203
|
209
|
}
|
204
|
|
-
|
205
|
210
|
const res = JSON.parse(e.data)
|
206
|
211
|
if (res.type && res.type === 'cmd') {
|
207
|
212
|
// 如果这种类型的消息, 说明是行为控制
|
|
@@ -215,7 +220,7 @@ export default {
|
215
|
220
|
}
|
216
|
221
|
} else {
|
217
|
222
|
this.newData({
|
218
|
|
- name: !res.person.name ? '' : res.person.name,
|
|
223
|
+ name: !res.person.words ? '' : res.person.words,
|
219
|
224
|
classId: res.person.typeId,
|
220
|
225
|
words: res.taVisitingWords.words,
|
221
|
226
|
url: res.audio
|
|
@@ -242,6 +247,7 @@ export default {
|
242
|
247
|
|
243
|
248
|
<!-- Add "scoped" attribute to limit CSS to this component only -->
|
244
|
249
|
<style lang="scss" scoped>
|
|
250
|
+ @import "./font.css";
|
245
|
251
|
.welcomePage {
|
246
|
252
|
$mainfontcolor: #000;
|
247
|
253
|
width: 100%;
|
|
@@ -251,7 +257,7 @@ export default {
|
251
|
257
|
background: url('../assets/images/welcome/bg.jpg') no-repeat center ;
|
252
|
258
|
background-size: 100% 100%;
|
253
|
259
|
.fade-item {
|
254
|
|
- transition: all 1s;
|
|
260
|
+ transition: all 0.5s;
|
255
|
261
|
display: inline-block;
|
256
|
262
|
}
|
257
|
263
|
.fade-enter,
|
|
@@ -279,14 +285,17 @@ export default {
|
279
|
285
|
width: 100%;
|
280
|
286
|
height: 100%;
|
281
|
287
|
position: absolute;
|
282
|
|
- top:88vh;
|
|
288
|
+ top:86vh;
|
283
|
289
|
margin-left: 5vw;
|
284
|
290
|
li{
|
|
291
|
+ font-family: "康熙字典体";
|
285
|
292
|
span{
|
286
|
|
- width: 60%;
|
|
293
|
+ width: 100%;
|
287
|
294
|
font-size: 6vw;
|
|
295
|
+ font-family: "康熙字典体";
|
288
|
296
|
display: block;
|
289
|
297
|
text-align: center;
|
|
298
|
+ line-height: 1.4;
|
290
|
299
|
}
|
291
|
300
|
}
|
292
|
301
|
}
|