Merge branch 'test'

Author: Cupcc

.eslintrc.js

@@ -4,7 +4,10 @@ module.exports = {
     es6: true,
     node: true
   },
-  extends: ['plugin:vue/essential', '@vue/standard'],
+  extends: [
+    'plugin:vue/essential'
+    //'@vue/standard'
+  ],
   parserOptions: {
     parser: 'babel-eslint'
   },
@@ -14,6 +17,7 @@ module.exports = {
     'vue/comment-directive': 0,
     quotes: [1, 'single'],
     semi: [0, 'never'],
-    'space-before-function-paren': ['error', 'never']
+    'space-before-function-paren': ['error', 'never'],
+    'no-multiple-empty-lines': 0
   }
 };

src/router/index.js

@@ -10,13 +10,13 @@ const routes = [
     redicrect: '/screen'
   },
   {
-    path: 'screen',
+    path: '/screen',
     component: ScreenPage
   }
 ];
 
 const router = new VueRouter({
-  mode: 'history',
+  mode: 'hash',
   base: process.env.BASE_URL,
   routes
 });

src/utils/socket_service.js

@@ -55,6 +55,7 @@ export default class SocketService {
       console.log('从服务端获取到了数据');
       // 真正服务端发送过来的原始数据时在msg中的data字段
       // console.log(msg.data)
+      console.log('msg.data:::', msg.data);
       const recvData = JSON.parse(msg.data);
       const socketType = recvData.socketType;
       // 判断回调函数是否存在

src/views/HotPage.vue

@@ -1,24 +1,25 @@
 <!--
-针对于 /hotpage 这条路径而显示出来的
-在这个组件中, 通过子组件注册的方式, 要显示出Hot.vue这个组件
+针对于 /mappage 这条路径而显示出来的
+在这个组件中, 通过子组件注册的方式, 要显示出Map.vue这个组件
 -->
 <template>
   <div class="com-page">
-    <hot></hot>
+    <single-map></single-map>
   </div>
 </template>
 
 <script>
-import Hot from '@/components/Hot';
+import Map from '@/components/Map'
 export default {
-  data() {
-    return {};
-  },
-  methods: {},
-  components: {
-    hot: Hot
-  }
-};
+    data() {
+        return {}
+    },
+    methods: {},
+    components: {
+        'single-map': Map
+    }
+}
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+</style>

vue.config.js

@@ -1,6 +1,15 @@
 module.exports = {
   devServer: {
     port: 8999,
-    open: true
+    open: true,
+    proxy: {
+      '/api': {
+        target: 'http://localhost:8999',
+        changeOrigin: true,
+        pathRewrite: {
+          '/api': ''
+        }
+      }
+    }
   }
 };