@@ -51,6 +52,10 @@ const props = defineProps({
type: Object,
default: {}
},
+ lineName: {
+ type: String,
+ default: ''
+ },
})
const getScrollbarRef=()=>{
diff --git a/src/components/liveCall/index.vue b/src/components/liveCall/index.vue
index 1289503..6b06420 100644
--- a/src/components/liveCall/index.vue
+++ b/src/components/liveCall/index.vue
@@ -1,8 +1,8 @@
-
-
+
+
From 6b7376b45dc3992ef6ff917c22e9fb5f7418d330 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Tue, 8 Oct 2024 13:28:45 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix=20:=20=E5=8C=BA=E5=88=86=E5=B7=A5?=
=?UTF-8?q?=E4=BD=9C=E5=8F=B0=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE=E6=96=B0?=
=?UTF-8?q?=E6=97=A7=E5=AF=B9=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/liveCall/LiveCallItemHome.vue | 35 +++++++++++---------
src/components/liveCall/index.vue | 33 ++++++++++++++++++
2 files changed, 52 insertions(+), 16 deletions(-)
diff --git a/src/components/liveCall/LiveCallItemHome.vue b/src/components/liveCall/LiveCallItemHome.vue
index 7c2a86f..b6ee640 100644
--- a/src/components/liveCall/LiveCallItemHome.vue
+++ b/src/components/liveCall/LiveCallItemHome.vue
@@ -12,27 +12,30 @@
-
{{ item.conversationTimestamp || '6月5日 12:05' }}
-
-
-
-
-
{{ item.speaker==0?item.callIdNumber:'AI助手' }}
-
{{ item.message }}
+
{{item.lineMsg}}
+
+
{{ item.conversationTimestamp || '6月5日 12:05' }}
+
+
+
+
+
{{ item.speaker==0?item.callIdNumber:'AI助手' }}
+
{{ item.message }}
+
+
-
-
-
-
-
-
-
{{ item.speaker==0?item.callIdNumber:'AI助手' }}
-
{{ item.message }}
+
+
+
+
+
+
{{ item.speaker==0?item.callIdNumber:'AI助手' }}
+
{{ item.message }}
+
-
diff --git a/src/components/liveCall/index.vue b/src/components/liveCall/index.vue
index 6b06420..c1c64db 100644
--- a/src/components/liveCall/index.vue
+++ b/src/components/liveCall/index.vue
@@ -55,6 +55,13 @@ const handleLogout = () => {
permisstionStore.removeMenu()
router.push('/login')
}
+const handleShowDeadLine=(recordObj,data)=>{
+ let flag=false
+ if(recordObj.content&&recordObj.content.length>0){
+ flag=recordObj.content[recordObj.content.length-1]?.callIdNumber!=data.callIdNumber
+ }
+ return flag;
+}
const initWebSocket = () => {
try {
// const wsUrl=setWsUrl(`/ws/text/${token}`)
@@ -93,6 +100,19 @@ const initWebSocket = () => {
recordLeftObj.value.phone=data.phone
recordLeftObj.value.type=data.type
recordLeftObj.value.orderName=data.orderName
+ let flag=handleShowDeadLine(recordLeftObj.value,data)
+ console.info("🚀 ~method:flag -----", flag)
+ if(flag){
+ recordLeftObj.value.content.push({
+ // callIdNumber: "17282197782048",
+ // conversationId:0,
+ // conversationTimestamp: "",
+ // createTime: "2024-10-08",
+ isLine:true,
+ lineMsg: "一轮通话结束~~",
+ speaker: data.content.speaker
+ })
+ }
recordLeftObj.value.content.push(data.content)
// console.info("🚀 ~method:onmessage -----", recordLeftObj.value)
nextTick(() => {
@@ -103,6 +123,19 @@ const initWebSocket = () => {
recordRightObj.value.phone=data.phone
recordRightObj.value.type=data.type
recordRightObj.value.orderName=data.orderName
+ let flag=handleShowDeadLine(recordRightObj.value,data)
+ console.info("🚀 ~method:flag -----", flag)
+ if(flag){
+ recordRightObj.value.content.push({
+ // callIdNumber: "17282197782048",
+ // conversationId:0,
+ // conversationTimestamp: "",
+ // createTime: "2024-10-08",
+ isLine:true,
+ lineMsg: "一轮通话结束~~",
+ speaker: data.content.speaker
+ })
+ }
recordRightObj.value.content.push(data.content)
// console.info("🚀 ~method:onmessage -----", recordRightObj.value)
nextTick(() => {
From e5be1bebe9323020a4c3cfb94445904f0be18952 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Tue, 8 Oct 2024 14:23:37 +0000
Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20nginx.conf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
nginx.conf | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/nginx.conf b/nginx.conf
index a9e94c9..7b3267f 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -29,6 +29,20 @@ http {
listen 80;
listen [::]:80;
+
+ location /api {
+ proxy_pass http://smartopsserver:8080;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_set_header X-Forwarded-Port $server_port;
+ proxy_set_header Host $host;
+ rewrite "^/api/(.*)$" /$1 break;
+ proxy_http_version 1.1;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection 'upgrade';
+ client_max_body_size 30m;
+ }
+
location / {
root /home/clay;
index index.html index.htm;
From 52af20bec88a4f2cc639e113091281c25978cbfb Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Tue, 8 Oct 2024 14:24:30 +0000
Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20docker.sh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
docker.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docker.sh b/docker.sh
index 8a5db81..1b0153e 100644
--- a/docker.sh
+++ b/docker.sh
@@ -12,5 +12,5 @@ docker rmi smartopsweb:latest
echo '----build image start----'
docker build -t smartopsweb:latest .
echo '----build image success----'
-docker run --name smartopsweb --restart=always -d -p 28081:80 smartopsweb:latest
+docker run --name smartopsweb --link smartopsserver --restart=always -d -p 28081:80 smartopsweb:latest