ljydlv
/
video_ca
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复群消息为到底部，添加删除群及修改群信息

This commit is contained in:
junleea 2024-10-02 19:09:32 +08:00
parent 260bd5a5d9
commit a3f524e345
4 changed files with 478 additions and 420 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/api/group.js
View File

@ -10,7 +10,7 @@ export const updateDeviceService = (data) => {
return request.post('/device/update_device', params, { "headers": { 'token': data.token } });
}
export const deleteDeviceService = (data) => {
export const deleteGroupService = (data) => {
const params = new URLSearchParams();
for (let key in data) {
params.append(key, data[key])
@ -40,3 +40,18 @@ export const getGroupListService = (data) => {
}
);
}
export const getGroupReqService = (data) => {
const params = new URLSearchParams();
for (let d in data) {
params.append(d, data[d]);
}
// request.headers["Content-Type"] = "application/json";
request.defaults.headers["token"] = data.token.value;
return request.post('/im/get_group', params, {
headers: {
'token': data.token, // 将 token 替换为您的令牌值
}
}
);
}

1
src/api/user.js
View File

@ -75,6 +75,7 @@ export const GetUserInfoService = (Data) => {
})
}
//删除好友或者群组
export const DelFGService =(Data) =>{
const params = new URLSearchParams();
for (let key in Data) {

210
src/views/Chat.vue
View File

@ -1,5 +1,8 @@
<template>
<el-container class="layout-container-demo" style="height: 700px;width: 1000px;">
<el-container
class="layout-container-demo"
style="height: 700px; width: 1000px"
>
<el-aside width="200px">
<el-input
placeholder="请输入用户姓名"
@ -11,12 +14,16 @@
<el-sub-menu index="1">
<template #title>
<el-icon>
<message />
</el-icon>联系人
<message /> </el-icon
>联系人
</template>
<el-scrollbar height="300px">
<el-menu-item-group v-for="user in filteredUsers" :key="user.id">
<el-menu-item :index="String(user.id)" @click="handleGetMessage(user.id)" style="height: 40px;">
<el-menu-item
:index="String(user.id)"
@click="handleGetMessage(user.id)"
style="height: 40px"
>
{{ user.name }}
<span v-if="hasUnreadMsg[user.id]" class="unread-dot"></span>
</el-menu-item>
@ -31,13 +38,18 @@
<el-scrollbar height="200px">
<el-menu-item-group v-for="item in groupList" :key="item.ID">
<!-- <template #title>Group 1</template> -->
<el-menu-item :index="String(item.GroupName)" @click="handleGetGroupMessage(item.ID)">{{ item.GroupName
}}</el-menu-item>
<span v-if="hasUnreadMsg[`g_${item.ID}`]" class="unread-dot"></span>
<el-menu-item
:index="String(item.GroupName)"
@click="handleGetGroupMessage(item.ID)"
>{{ item.GroupName }}</el-menu-item
>
<span
v-if="hasUnreadMsg[`g_${item.ID}`]"
class="unread-dot"
></span>
<!-- <el-menu-item index="2-2">Option 2</el-menu-item> -->
</el-menu-item-group>
</el-scrollbar>
</el-sub-menu>
</el-menu>
</el-scrollbar>
@ -46,10 +58,7 @@
<el-container width="800px">
<el-header style="text-align: right; font-size: 12px">
<div class="toolbar">
<el-button
type="primary"
size="mini"
@click.prevent="getHistory()"
<el-button type="primary" size="mini" @click.prevent="getHistory()"
>历史消息</el-button
>
<el-button
@ -58,24 +67,49 @@
@click.prevent="handleMenuSelect('/videoList')"
>返回</el-button
>
<el-text class="mx-1" type="primary" >目前:{{ cur_user_name }}</el-text>
<el-text class="mx-1" type="primary"
>目前:{{ cur_user_name }}</el-text
>
<div>
<span style=" margin-right: 10px;margin-left: 10px;">{{ username }}</span>
<span style="margin-right: 10px; margin-left: 10px">{{
username
}}</span>
<el-avatar size="default" fit="fit"> {{ username }} </el-avatar>
</div>
</div>
</el-header>
<el-main style="margin-top: 1px;">
<el-scrollbar class="chat-room" id="chat-room" ref="chatRoom" height="600px" style="margin-top: 1px" always>
<div v-for="item in MsgList" :key="item.ID"
style="margin-top: 10px;margin-bottom: 20px;">
<el-main style="margin-top: 1px">
<el-scrollbar
class="chat-room"
id="chat-room"
ref="chatRoom"
height="600px"
style="margin-top: 1px"
always
>
<div
v-for="item in MsgList"
:key="item.ID"
style="margin-top: 10px; margin-bottom: 20px"
>
<!-- 左边 -->
<div v-if="uid == item.ToUserID && item.FromUserID == cur_user_id && cur_group_id==0" style="margin-left: 10px;margin-bottom: 8px;">
<div
v-if="
uid == item.ToUserID &&
item.FromUserID == cur_user_id &&
cur_group_id == 0
"
style="margin-left: 10px; margin-bottom: 8px"
>
<el-row class="row-bg" type="flex" align="middle">
<el-avatar size="default" fit="fit">{{ cur_user_name }}</el-avatar>
<span style="margin-left: 10px">{{ formatTime(item.CreatedAt) }}</span>
<el-avatar size="default" fit="fit">{{
cur_user_name
}}</el-avatar>
<span style="margin-left: 10px"
>{{ cur_user_name }} : {{ formatTime(item.CreatedAt) }}</span
>
</el-row>
<el-row>
@ -84,10 +118,15 @@
</el-col>
</el-row>
</div>
<div v-if="cur_group_id !=0 && uid != item.FromUserID" style="margin-left: 10px;margin-bottom: 8px;">
<div
v-if="cur_group_id != 0 && uid != item.FromUserID"
style="margin-left: 10px; margin-bottom: 8px"
>
<el-row class="row-bg" type="flex" align="middle">
<el-avatar size="default" fit="fit">{{ item.name }}</el-avatar>
<span style="margin-left: 10px">{{ formatTime(item.CreatedAt) }}</span>
<span style="margin-left: 10px"
>{{ item.name }} : {{ formatTime(item.CreatedAt) }}</span
>
</el-row>
<el-row>
@ -97,14 +136,22 @@
</el-row>
</div>
<!-- 右边 -->
<div v-if="uid == item.FromUserID && item.ToUserID == cur_user_id" style="margin-right: 10px;margin-bottom: 8px;">
<div
v-if="uid == item.FromUserID && item.ToUserID == cur_user_id"
style="margin-right: 10px; margin-bottom: 8px"
>
<el-row class="row-bg" type="flex" justify="end" align="middle">
<span style="margin-right: 10px">{{ formatTime(item.CreatedAt)}}</span>
<el-avatar size="default" fit="fit"> {{ tokenData.username }} </el-avatar>
<span style="margin-right: 10px">
{{ tokenData.username }} :
{{ formatTime(item.CreatedAt) }}</span
>
<el-avatar size="default" fit="fit">
{{ tokenData.username }}
</el-avatar>
</el-row>
<el-row justify="end">
<el-col :span="1000" class="msg2" style="margin-right: 20px;">
<el-col :span="1000" class="msg2" style="margin-right: 20px">
{{ item.Msg }}
</el-col>
</el-row>
@ -114,11 +161,22 @@
</el-main>
<el-row class="row-bg" type="flex" justify="space-around" align="middle">
<el-col :span="20">
<el-input type="text" style="width: 100%" autofocus @keyup.enter="handleSendBtnClick"
placeholder="请输入消息按Enter发送" v-model="currentMsg"></el-input>
<el-input
type="text"
style="width: 100%"
autofocus
@keyup.enter="handleSendBtnClick"
placeholder="请输入消息按Enter发送"
v-model="currentMsg"
></el-input>
</el-col>
<el-col :span="2">
<el-button class="sendBtn" @click="handleSendBtnClick" type="primary" size="default">
<el-button
class="sendBtn"
@click="handleSendBtnClick"
type="primary"
size="default"
>
发送
</el-button>
</el-col>
@ -133,8 +191,21 @@ import { inject } from "vue";
import { getFriendListService } from "@/api/chat.js";
import { getMessageService } from "@/api/chat.js";
import { sendMessageService } from "@/api/chat.js";
import { ElAvatar, ElDropdown, ElDropdownItem, ElDropdownMenu, ElIcon, ElMenu, ElMenuItem, ElMenuItemGroup, ElScrollbar, ElRow, ElCol, ElButton } from 'element-plus'
import { Menu as IconMenu, Message, Setting } from '@element-plus/icons-vue'
import {
ElAvatar,
ElDropdown,
ElDropdownItem,
ElDropdownMenu,
ElIcon,
ElMenu,
ElMenuItem,
ElMenuItemGroup,
ElScrollbar,
ElRow,
ElCol,
ElButton,
} from "element-plus";
import { Menu as IconMenu, Message, Setting } from "@element-plus/icons-vue";
import router from "@/router/index.js";
import { ElMessage } from "element-plus";
@ -156,7 +227,7 @@ export default {
cur_user_id: 0,
cur_group_id: 0,
msg_type: 1,
searchName: '', // 搜索框内容
searchName: "", // 搜索框内容
history_cnt: 1,
cur_user_name: "",
@ -187,12 +258,12 @@ export default {
this.groupList = data.groups;
},
filterUsers() {
this.filteredUsers = this.userList.filter(user => {
this.filteredUsers = this.userList.filter((user) => {
return user.name.toLowerCase().includes(this.searchName.toLowerCase());
});
},
getHistory() {
this.history_cnt++
this.history_cnt++;
this.handleGetMessage(this.cur_user_id);
},
async handleGetGroupMessage(id) {
@ -201,7 +272,7 @@ export default {
this.to_user_id = 0;
this.msg_type = 2;
this.hasUnreadMsg["g_" + id] = false;
let result={}
let result = {};
try {
let req = {
token: localStorage.getItem("token"),
@ -211,7 +282,7 @@ export default {
group_id: id,
index: this.history_cnt,
type: 2,
}
};
result = await getMessageService(req);
} catch (e) {
console.log(e);
@ -221,8 +292,8 @@ export default {
ElMessage({
message: "无消息！",
type: "error",
})
this.MsgList=[]
});
this.MsgList = [];
return;
}
data.sort((a, b) => {
@ -246,7 +317,7 @@ export default {
this.cur_user_id = id;
this.cur_group_id = 0;
this.msg_type = 1;
console.log("uid:",this.uid,"\tcur_user_id:",this.cur_user_id)
console.log("uid:", this.uid, "\tcur_user_id:", this.cur_user_id);
for (let i = 0; i < this.userList.length; i++) {
if (this.userList[i].id === id) {
this.cur_user_name = this.userList[i].name;
@ -264,7 +335,7 @@ export default {
to_user_id: localStorage.getItem("userId"),
index: this.history_cnt,
type: this.msg_type,
}
};
result = await getMessageService(req);
} catch (e) {
console.log(e);
@ -274,7 +345,7 @@ export default {
ElMessage({
message: "消息获取失败！",
type: "error",
})
});
return;
}
//data sort by created time
@ -303,11 +374,11 @@ export default {
let date = new Date(time);
// 提取年、月、日、时、分、秒
const year = date.getFullYear();
const month = ('0' + (date.getMonth() + 1)).slice(-2); // 月份是从0开始的，所以要加1
const day = ('0' + date.getDate()).slice(-2);
const hour = ('0' + date.getHours()).slice(-2);
const minute = ('0' + date.getMinutes()).slice(-2);
const second = ('0' + date.getSeconds()).slice(-2);
const month = ("0" + (date.getMonth() + 1)).slice(-2); // 月份是从0开始的，所以要加1
const day = ("0" + date.getDate()).slice(-2);
const hour = ("0" + date.getHours()).slice(-2);
const minute = ("0" + date.getMinutes()).slice(-2);
const second = ("0" + date.getSeconds()).slice(-2);
// 重新组合并返回格式化的日期时间字符串
return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
@ -335,12 +406,12 @@ export default {
this.socket = new WebSocket(socketUrl);
//打开事件
this.socket.onopen = function () {
this.loading=false
this.loading = false;
//alert("连接成功");
ElMessage({
message: "连接成功",
type: "success",
})
});
};
this.socket.onerror = (error) => {
console.error("WebSocket Error:", error);
@ -351,7 +422,7 @@ export default {
ElMessage({
message: "连接已关闭",
type: "error",
})
});
};
// 浏览器端收消息，获得从服务端发送过来的文本消息
this.socket.onmessage = async function (msg) {
@ -360,12 +431,16 @@ export default {
// console.log("收到数据====" + data);
// 如果服务器端发送过来的json数据
console.log("data.type:", data.type);
if (data.type == "msg") { // 如果是消息类型，解密消息内容
if (data.type == "msg") {
// 如果是消息类型，解密消息内容
// console.log("收到数据====" + JSON.stringify(msg.data));
console.log("msg_:", data.data);
let msg_data=JSON.parse(data.data)
let msg_data = JSON.parse(data.data);
_this.MsgList.push(msg_data);
if(_this.cur_user_id != msg_data.FromUserID || _this.cur_group_id != msg_data.GroupID){
if (
_this.cur_user_id != msg_data.FromUserID &&
_this.cur_group_id != msg_data.GroupID
) {
if (msg_data.GroupID === 0) {
_this.hasUnreadMsg[msg_data.FromUserID] = true;
} else {
@ -379,15 +454,17 @@ export default {
// 构建消息内容
} else if (data.type == "check") {
//alert("对方已下线");
console.log(data.type)
console.log(data.type);
}
};
}
},
async connectSSE() {
if (!!window.EventSource) {
this.eventSource = new EventSource("https://gep.ljsea.xyz/im/sse_msg?token="+this.tokenData.token);
let this_=this
this.eventSource = new EventSource(
"https://gep.ljsea.xyz/im/sse_msg?token=" + this.tokenData.token
);
let this_ = this;
this.eventSource.onopen = function (event) {
console.log("连接已建立！");
};
@ -407,8 +484,7 @@ export default {
ElMessage({
message: "连接已关闭！:" + error,
type: "error",
})
});
// Optionally, try to reconnect
} else {
@ -416,7 +492,7 @@ export default {
ElMessage({
message: "连接失败！服务器无法实时推送消息！",
type: "error",
})
});
// Handle error
}
};
@ -424,12 +500,14 @@ export default {
ElMessage({
message: "您的浏览器不支持SSE！",
type: "error",
})
});
}
},
scrollToBottom() {
this.$nextTick(() => {
const scrollbar = this.$refs.chatRoom.$el.querySelector('.el-scrollbar__wrap');
const scrollbar = this.$refs.chatRoom.$el.querySelector(
".el-scrollbar__wrap"
);
if (scrollbar) {
scrollbar.scrollTop = scrollbar.scrollHeight;
}
@ -438,7 +516,7 @@ export default {
async handleSendBtnClick() {
if (this.currentMsg == "" || this.currentMsg === null) {
ElMessage.error("消息不能为空！");
return
return;
}
let result = {};
try {
@ -452,13 +530,13 @@ export default {
group_id: this.cur_group_id,
msg: this.currentMsg,
type: this.msg_type,
}
};
result = await sendMessageService(req);
if (result.code !== 0) {
ElMessage({
message: "消息发送失败！",
type: "error",
})
});
}
let msg = {
ID: result.Data,
@ -467,7 +545,7 @@ export default {
GroupID: this.cur_group_id,
Msg: this.currentMsg,
CreatedAt: new Date(),
}
};
this.MsgList.push(msg);
this.scrollToBottom();
} catch (e) {
@ -568,7 +646,7 @@ export default {
}
.msg2 {
background-color: #12B7F5;
background-color: #12b7f5;
/* box-shadow: rgba(18, 23, 45, 0.6) 0px 8px 24px; */
border-radius: 4px;
padding: 10px;

94
src/views/Group.vue
View File

@ -7,7 +7,7 @@ import { addDeviceService } from "@/api/device.js";
import { deleteDeviceService } from "@/api/device.js";
import { getFriendListService } from "@/api/chat.js";
import { addGroupService} from "@/api/chat.js";
import {sendMessageService} from "@/api/chat.js";
import {DelFGService} from "@/api/user.js";
import { updateDeviceService } from "@/api/device.js";
import router from "@/router/index.js";
import { ElMessage } from 'element-plus';
@ -43,12 +43,10 @@ export default {
},
updateForm: {
id:0,
device_name: "",
device_ip: "",
device_status: "",
device_info: "",
device_location: "",
device_type: "",
group_name: "",
group_info: "",
group_type: "",
group_icon:"",
auth_id: -1,
token: localStorage.getItem("token"),
},
@ -103,7 +101,7 @@ export default {
}
},
//设置设备重启
//邀请好友加入群组
async inviteUser(index) {
var id = this.tableData[index].ID;
var restart_data = {
@ -116,7 +114,6 @@ export default {
try {
var d_re = await restartDeviceService(restart_data);
if (d_re.code == 0) {
//alert("重启成功");
ElMessage.success('重启成功');
} else {
alert("操作失败");
@ -126,20 +123,17 @@ export default {
console.log(e);
}
},
playRealVp(index) {
var id = this.tableData[index].ID;
localStorage.setItem("realvp_device_id", id);
router.push("/deviceRealVP");
},
async deleteDevice(index) {
async deleteGroup(index) {
var id = this.tableData[index].ID;
var delete_data = {
id: id,
group_id: id,
type:3,//删除群组
userId: this.tokenData.userId,
token: this.tokenData.token,
};
try {
var d_re = await deleteGroupService(delete_data);
var d_re = await DelFGService(delete_data);
if (d_re.code == 0) {
//alert("删除成功");
ElMessage.success('删除成功');
@ -153,15 +147,13 @@ export default {
console.log(e);
}
},
async updateButtonDevice(index) {
async updateButtonGroup(index) {
var id = this.tableData[index].ID;
this.group_id = id;
this.updateForm.device_name = this.tableData[index].DeviceName;
this.updateForm.device_ip = this.tableData[index].DeviceIP;
this.updateForm.device_status = this.tableData[index].DeviceStatus;
this.updateForm.device_info = this.tableData[index].DeviceInfo;
this.updateForm.device_location = this.tableData[index].DeviceLocation;
this.updateForm.device_type = this.tableData[index].DeviceType;
this.updateForm.group_name = this.tableData[index].GroupName;
this.updateForm.group_info = this.tableData[index].GroupInfo;
this.updateForm.group_type = this.tableData[index].GroupType;
this.updateForm.group_icon = this.tableData[index].GroupIcon;
this.updateForm.auth_id = this.tableData[index].AuthID;
this.updateForm.id = id;
this.updateDialogVisible= true;
@ -197,26 +189,7 @@ export default {
console.log(e);
}
},
async restartAllDevice() {
var restart_data = {
id: id,
ip: this.ip,
option: "all",
userId: this.tokenData.userId,
token: this.tokenData.token,
};
try {
var d_re = await restartDeviceService(restart_data);
if (d_re.code == 0) {
//alert("重启成功");
ElMessage.success("重启成功");
} else {
alert("操作失败");
}
} catch (e) {
console.log(e);
}
},
async inviteFriendAddGroup(index){
var id = this.FriendsGList[index].id;
let req={
@ -416,7 +389,7 @@ export default {
<el-form-item>
<el-dialog
v-model="updateDialogVisible"
title="修改设备"
title="修改群信息"
width="50%"
:before-close="handleClose"
>
@ -427,29 +400,20 @@ export default {
:rules="updateFormRules"
label-width="70px"
>
<el-form-item label="设备名称" prop="device_name">
<el-form-item label="名称" prop="group_name">
<el-input
v-model="updateForm.device_name"
v-model="updateForm.group_name"
autocomplete="on"
></el-input>
</el-form-item>
<el-form-item label="设备IP" prop="device_ip">
<el-input v-model="updateForm.device_ip"></el-input>
<el-form-item label="群信息" prop="group_info">
<el-input v-model="updateForm.group_info"></el-input>
</el-form-item>
<el-form-item label="设备状态" prop="device_status">
<el-select v-model="updateForm.device_status">
<el-option label="在线" value="在线"></el-option>
<el-option label="离线" value="离线"></el-option>
</el-select>
<el-form-item label="群类型" prop="group_type">
<el-input v-model="updateForm.group_type"></el-input>
</el-form-item>
<el-form-item label="设备类型" prop="device_type">
<el-input v-model="updateForm.device_type"></el-input>
</el-form-item>
<el-form-item label="设备位置" prop="device_location">
<el-input v-model="updateForm.device_location"></el-input>
</el-form-item>
<el-form-item label="设备信息" prop="device_info">
<el-input v-model="updateForm.device_info"></el-input>
<el-form-item label="群Icon" prop="group_icon">
<el-input v-model="updateForm.group_icon"></el-input>
</el-form-item>
</el-form>
<!-- 底部区域 -->
@ -458,7 +422,7 @@ export default {
<el-button @click="updateDialogVisible = false"
>取消</el-button
>
<el-button type="primary" @click="updateDevice()"
<el-button type="primary" @click="updateGroup()"
>确定</el-button
>
</span>
@ -579,13 +543,13 @@ export default {
<el-button
type="primary"
size="mini"
@click.prevent="updateButtonDevice(scope.$index)"
@click.prevent="updateButtonGroup(scope.$index)"
>修改</el-button
>
<el-button
type="primary"
size="mini"
@click.prevent="deleteDevice(scope.$index)"
@click.prevent="deleteGroup(scope.$index)"
>删除</el-button
>
<!-- <el-button type="danger" size="mini">删除</el-button> -->