welcome
/
screen
Watch 0
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 1 Activity
Browse Source

feats

张延森 6 years ago
parent
af89d13d5d
commit
9b1c15d6d1
5 changed files with 8 additions and 8 deletions
Split View Show Diff Stats
  1. 2
    2
      config/index.js
  2. 1
    1
      index.html
  3. 1
    1
      src/assets/css/reset.css
  4. 1
    1
      src/pages/font.css
  5. 3
    3
      src/pages/welcome.vue

+ 2
- 2
config/index.js View File 

@@ -19,14 +19,14 @@ module.exports = {
19 19 
         },
20 20 
       },
21 21 
       '/api': {
22 
-        target: 'http://192.168.0.67:8080',
22 
+        target: 'http://192.168.0.11:8080',
23 23 
         changeOrigin: true,
24 24 
         pathRewrite: {
25 25 
           '^/api': '/',
26 26 
         },
27 27 
       },
28 28 
       '/api/ws': {
29 
-        target: 'http://192.168.0.67:8080',
29 
+        target: 'http://192.168.0.11:8080',
30 30 
         changeOrigin: true,
31 31 
         ws: true,
32 32 
         pathRewrite: {

+ 1
- 1
index.html View File 

@@ -3,7 +3,7 @@
3 3 
   <head>
4 4 
     <meta charset="utf-8">
5 5 
     <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
6 
-    <link rel="stylesheet" href="//at.alicdn.com/t/font_948990_7dbjfb2d5yb.css">
6 
+    <!-- <link rel="stylesheet" href="//at.alicdn.com/t/font_948990_7dbjfb2d5yb.css"> -->
7 7 
     <!-- <script src="./static/vconsole.min.js?v=3.3.0"></script>
8 8 
     <script> var __vcl__111 = new VConsole();</script> -->
9 9 
     <title>迎宾系统</title>

+ 1
- 1
src/assets/css/reset.css View File 

@@ -35,7 +35,7 @@ body {
35 35 
 * {
36 36 
   margin: 0;
37 37 
   padding: 0;
38 
-  font-family: "微软雅黑";
38 
+  font-family: "康熙字典体";
39 39 
   -webkit-tap-highlight-color: rgba(255, 0, 0, 0);
40 40 
   -webkit-font-smoothing: antialiased;
41 41 
 }

+ 1
- 1
src/pages/font.css View File 

@@ -1,4 +1,4 @@
1 1 
 @font-face {
2 2 
   font-family: "康熙字典体";
3 
-  src:url('./kangxi.ttf')format('opentype');
3 
+  /* src:url('./kangxi.ttf')format('opentype'); */
4 4 
  }

+ 3
- 3
src/pages/welcome.vue View File 

@@ -127,7 +127,8 @@ export default {
127 127 
       delay: 10,
128 128 
       autoConnect: true
129 129 
     })
130 
-    this.ws.connect('ws://192.168.0.67:8080/ws/screen/113')
130 
+    // this.ws.connect(`${window.location.origin.replace('http', 'ws')}/api/ws/${this.$route.query.id}`)
131 
+    this.ws.connect(`${window.location.origin.replace('http', 'ws')}/api/ws/${this.$route.query.id}`)
131 132 
     this.init()
132 133 
     this.pageTimer = window.setInterval(() => {
133 134 
       let curMin = new Date().getMinutes() - 0
 
@@ -174,7 +175,7 @@ export default {
174 175 
         return x
175 176 
       })
176 177 
     },
177 
-    receviedMsg (e) {
178 
+    receviedMsg (e) {
178 179 
       const msg = e.data
179 180 
       if (!msg) {
180 181 
         return
 
@@ -220,7 +221,6 @@ export default {
220 221
221 222 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
222 223 
 <style lang="scss" scoped>
223 
-//  @import "./font.css";
224 224 
 .welcomePage {
225 225 
   $mainfontcolor: #000;
226 226 
   width: 100%;