feat:更新代码
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -9,6 +9,7 @@ lerna-debug.log*
|
|||||||
|
|
||||||
node_modules
|
node_modules
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
dist
|
||||||
dist-ssr
|
dist-ssr
|
||||||
coverage
|
coverage
|
||||||
*.local
|
*.local
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ defineExpose({
|
|||||||
// onMounted(async () => {
|
// onMounted(async () => {
|
||||||
// await mqttClient.connect(`room${Math.random().toString(16).substr(2, 8)}`);
|
// await mqttClient.connect(`room${Math.random().toString(16).substr(2, 8)}`);
|
||||||
// const res = await userStore.getInfo()
|
// const res = await userStore.getInfo()
|
||||||
// const topic = `xSynergy/ROOM/+/rooms/${res.uid}`;
|
// const topic = `xsynergy/room/+/rooms/${res.uid}`;
|
||||||
// mqttClient.subscribe(topic, async (shapeData) => {
|
// mqttClient.subscribe(topic, async (shapeData) => {
|
||||||
// // console.log(shapeData.toString(),'shapeData发送邀请')
|
// // console.log(shapeData.toString(),'shapeData发送邀请')
|
||||||
// processingSocket(shapeData.toString())
|
// processingSocket(shapeData.toString())
|
||||||
|
|||||||
@@ -144,7 +144,7 @@ function handleClickOutside() {
|
|||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
await mqttClient.connect(`room${Math.random().toString(16).substr(2, 8)}`);
|
await mqttClient.connect(`room${Math.random().toString(16).substr(2, 8)}`);
|
||||||
const res = await userStore.getInfo()
|
const res = await userStore.getInfo()
|
||||||
const topic = `xSynergy/ROOM/+/rooms/${res.uid}`;
|
const topic = `xsynergy/room/+/rooms/${res.uid}`;
|
||||||
mqttClient.subscribe(topic, async (shapeData) => {
|
mqttClient.subscribe(topic, async (shapeData) => {
|
||||||
if(inviteJoinRef.value){
|
if(inviteJoinRef.value){
|
||||||
inviteJoinRef.value.processingSocket(shapeData.toString())
|
inviteJoinRef.value.processingSocket(shapeData.toString())
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ export const WhiteboardSync = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 订阅当前房间
|
// 订阅当前房间
|
||||||
const topic = `xSynergy/ROOM/${roomUid}/whiteboard/#`;
|
const topic = `xsynergy/room/${roomUid}/whiteboard/#`;
|
||||||
mqttClient.subscribe(topic, async (shapeData) => {
|
mqttClient.subscribe(topic, async (shapeData) => {
|
||||||
const shapeDataNew = JSON.parse(shapeData.toString())
|
const shapeDataNew = JSON.parse(shapeData.toString())
|
||||||
// const shapeDataNew = decode(message);
|
// const shapeDataNew = decode(message);
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ export const WhiteboardSync = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 订阅当前房间
|
// 订阅当前房间
|
||||||
const topic = `xSynergy/ROOM/${roomUid}/whiteboard/#`;
|
const topic = `xsynergy/room/${roomUid}/whiteboard/#`;
|
||||||
mqttClient.subscribe(topic, async (shapeData) => {
|
mqttClient.subscribe(topic, async (shapeData) => {
|
||||||
const shapeDataNew = JSON.parse(shapeData.toString())
|
const shapeDataNew = JSON.parse(shapeData.toString())
|
||||||
// const shapeDataNew = decode(message);
|
// const shapeDataNew = decode(message);
|
||||||
|
|||||||
@@ -500,7 +500,7 @@ const { detail, weekName, tabValue, isShow, load, loadText, isLinkKnow, socketIn
|
|||||||
// onMounted(async () => {
|
// onMounted(async () => {
|
||||||
// await mqttClient.connect(`room${Math.random().toString(16).substr(2, 8)}`);
|
// await mqttClient.connect(`room${Math.random().toString(16).substr(2, 8)}`);
|
||||||
// const res = await userStore.getInfo()
|
// const res = await userStore.getInfo()
|
||||||
// const topic = `xSynergy/ROOM/+/rooms/${res.uid}`;
|
// const topic = `xsynergy/room/+/rooms/${res.uid}`;
|
||||||
// mqttClient.subscribe(topic, async (shapeData) => {
|
// mqttClient.subscribe(topic, async (shapeData) => {
|
||||||
// // console.log(shapeData.toString(),'shapeData发送邀请')
|
// // console.log(shapeData.toString(),'shapeData发送邀请')
|
||||||
// processingSocket(shapeData.toString())
|
// processingSocket(shapeData.toString())
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button :loading="loading" size="large" class="button-login" type="primary"
|
<el-button :loading="loading" size="large" class="button-login" type="primary"
|
||||||
@click.prevent="handleLogin">
|
@click.prevent="handleLogin">
|
||||||
<span v-if="!loading">登 录++</span>
|
<span v-if="!loading">登 录</span>
|
||||||
<span v-else>登录中...</span>
|
<span v-else>登录中...</span>
|
||||||
</el-button>
|
</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|||||||
Reference in New Issue
Block a user