添加socket及修改归口中的其他value

src/store/modules/user.js

@@ -1,10 +1,11 @@
-import { login, logout, getInfo } from '@/api/login'
+import { login, logout, getInfo } from '@/api/login';
-import { getToken, setToken, removeToken } from '@/utils/auth'
+import { getToken, setToken, removeToken } from '@/utils/auth';
 
 const user = {
   state: {
     token: getToken(),
     name: '',
+    userId: '',
     avatar: '',
     roles: [],
     permissions: []
@@ -12,84 +13,98 @@ const user = {
 
   mutations: {
     SET_TOKEN: (state, token) => {
-      state.token = token
+      state.token = token;
     },
     SET_NAME: (state, name) => {
-      state.name = name
+      state.name = name;
+    },
+    SET_USER_ID: (state, userId) => {
+      state.userId = userId;
+      localStorage.setItem('userId', userId);
     },
     SET_AVATAR: (state, avatar) => {
-      state.avatar = avatar
+      state.avatar = avatar;
     },
     SET_ROLES: (state, roles) => {
-      state.roles = roles
+      state.roles = roles;
     },
     SET_PERMISSIONS: (state, permissions) => {
-      state.permissions = permissions
+      state.permissions = permissions;
     }
   },
 
   actions: {
     // 登录
     Login({ commit }, userInfo) {
-      const username = userInfo.username.trim()
+      const username = userInfo.username.trim();
-      const password = userInfo.password
+      const password = userInfo.password;
-      const code = userInfo.code
+      const code = userInfo.code;
       return new Promise((resolve, reject) => {
-        login(username, password, code).then(res => {
+        login(username, password, code)
-          setToken(res.data.token)
+          .then(res => {
-          commit('SET_TOKEN', res.data.token)
+            setToken(res.data.token);
-          resolve()
+            commit('SET_TOKEN', res.data.token);
-        }).catch(error => {
+            resolve();
-          reject(error)
-        })
           })
+          .catch(error => {
+            reject(error);
+          });
+      });
     },
 
     // 获取用户信息
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
-        getInfo(state.token).then(res => {
+        getInfo(state.token)
-          const user = res.data
+          .then(res => {
-          const avatar = !res.data.icon ? require("@/assets/image/profile.jpg") : process.env.VUE_APP_BASE_API + user.icon;
+            const user = res.data;
-          if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
+            const avatar = !res.data.icon
-            commit('SET_ROLES', res.roles)
+              ? require('@/assets/image/profile.jpg')
+              : process.env.VUE_APP_BASE_API + user.icon;
+            if (res.roles && res.roles.length > 0) {
+              // 验证返回的roles是否是一个非空数组
+              commit('SET_ROLES', res.roles);
               // commit('SET_PERMISSIONS', res.permissions)
             } else {
-            commit('SET_ROLES', ['ROLE_DEFAULT'])
+              commit('SET_ROLES', ['ROLE_DEFAULT']);
             }
-          commit('SET_NAME', user.userName)
+            commit('SET_NAME', user.userName);
-          commit('SET_AVATAR', avatar)
+            commit('SET_USER_ID', user.userId);
-          resolve(res)
+            commit('SET_AVATAR', avatar);
-        }).catch(error => {
+            resolve(res);
-          reject(error)
-        })
           })
+          .catch(error => {
+            reject(error);
+          });
+      });
     },
 
     // 退出系统
     LogOut({ commit, state }) {
       return new Promise((resolve, reject) => {
-        logout(state.token).then(() => {
+        logout(state.token)
-          commit('SET_TOKEN', '')
+          .then(() => {
-          commit('SET_ROLES', [])
+            commit('SET_TOKEN', '');
-          commit('SET_PERMISSIONS', [])
+            commit('SET_ROLES', []);
-          removeToken()
+            commit('SET_PERMISSIONS', []);
-          resolve()
+            removeToken();
-        }).catch(error => {
+            resolve();
-          reject(error)
-        })
           })
+          .catch(error => {
+            reject(error);
+          });
+      });
     },
 
     // 前端 登出
     FedLogOut({ commit }) {
       return new Promise(resolve => {
-        commit('SET_TOKEN', '')
+        commit('SET_TOKEN', '');
-        removeToken()
+        removeToken();
-        resolve()
+        resolve();
-      })
+      });
     }
   }
-}
+};
 
-export default user
+export default user;

src/views/front/unscramble/add.vue

@@ -80,7 +80,7 @@ export default {
           label: '发改'
         },
         {
-          value: 'qita',
+          value: 'OTHER',
           label: '其他'
         }
       ],

src/views/front/unscramble/index.vue

@@ -108,7 +108,7 @@ export default {
           label: '发改'
         },
         {
-          value: 'qita',
+          value: 'OTHER',
           label: '其他'
         }
       ]

src/views/policy/library/add.vue

@@ -110,7 +110,7 @@ export default {
           label: '发改'
         },
         {
-          value: 'qita',
+          value: 'OTHER',
           label: '其他'
         }
       ],

src/views/policy/library/index.vue

@@ -270,7 +270,7 @@ export default {
           label: '发改'
         },
         {
-          value: 'qita',
+          value: 'OTHER',
           label: '其他'
         }
       ],

src/views/service/index.vue

@@ -1,5 +1,58 @@
 <template>
   <div>
-    Service
+    <button @click="send">发消息</button>
   </div>
 </template>
+
+<script>
+export default {
+  data() {
+    return {
+      path: 'ws://192.168.0.125:1919/webStock/' + this.$store.state.user.userId,
+      socket: ''
+    };
+  },
+  mounted() {
+    // 初始化
+    this.init();
+  },
+  methods: {
+    init: function() {
+      if (typeof WebSocket === 'undefined') {
+        alert('您的浏览器不支持socket');
+      } else {
+        // 实例化socket
+        this.socket = new WebSocket(this.path);
+        console.log(this.socket);
+        // 监听socket连接
+        this.socket.onopen = this.open;
+        // 监听socket错误信息
+        this.socket.onerror = this.error;
+        // 监听socket消息
+        this.socket.onmessage = this.getMessage;
+      }
+    },
+    open: function() {
+      console.log('socket连接成功');
+    },
+    error: function() {
+      console.log('连接错误');
+    },
+    getMessage: function(msg) {
+      console.log(msg.data);
+    },
+    send: function(params) {
+      this.socket.send(params);
+    },
+    close: function() {
+      console.log('socket已经关闭');
+    }
+  },
+  destroyed() {
+    // 销毁监听
+    this.socket.onclose = this.close;
+  }
+};
+</script>
+
+<style></style>

src/views/technology/achievement/index.vue

@@ -114,7 +114,7 @@ export default {
           label: '发改'
         },
         {
-          value: 'qita',
+          value: 'OTHER',
           label: '其他'
         }
       ]