diff --git a/.env b/.env index 9472ed5..a3f408e 100644 --- a/.env +++ b/.env @@ -1 +1,2 @@ -VITE_BASE_URL=http://192.168.1.111:8899 \ No newline at end of file +VITE_BASE_URL=http://192.168.1.111:8899 +VITE_WEBSOCKET_URL=ws://127.0.0.1:8899/websocket/nuclear \ No newline at end of file diff --git a/src/components/Task.vue b/src/components/Task.vue index cb8b64a..a672e40 100644 --- a/src/components/Task.vue +++ b/src/components/Task.vue @@ -17,7 +17,7 @@ row-key="id" :data="data" :columns="columns" - table-layout="auto" + table-layout="fixed" :height="500" :scroll="{ type: 'virtual', rowHeight: 69, bufferSize: 10 }" resizable @@ -291,6 +291,7 @@ export default { { title: '操作', fixed: 'right', + colKey: 'oper', cell: (h, { row }) => { if (this.role == 'ROLE_ADMIN') { return ( diff --git a/src/pages/index.vue b/src/pages/index.vue index a224ec6..424bb18 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -337,6 +337,7 @@ diff --git a/src/utils/websocket.js b/src/utils/websocket.js new file mode 100644 index 0000000..e72eab8 --- /dev/null +++ b/src/utils/websocket.js @@ -0,0 +1,27 @@ +class socket { + constructor() { + this.ws = null + } + WebSocketSet(callBack) { + if ('WebSocket' in window) { + this.ws = new WebSocket(`${import.meta.env.VITE_WEBSOCKET_URL}`) + this.ws.onopen = res => { + console.log('socket连接成功') + } + this.ws.onmessage = res => { + console.log('数据已接收...', res.data) + callBack(res.data) + } + } else { + alert('当前浏览器不支持websocket') + } + } + close() { + this.ws.close() + this.ws.onclose = res => { + console.log(console.log('socket已经关闭')) + } + } +} + +export default socket