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 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; diff --git a/src/components/liveCall/LiveCallItemHome.vue b/src/components/liveCall/LiveCallItemHome.vue index 58bc90c..b6ee640 100644 --- a/src/components/liveCall/LiveCallItemHome.vue +++ b/src/components/liveCall/LiveCallItemHome.vue @@ -6,32 +6,36 @@ 电话号码:{{ recordObj.phone ||'--'}}
工单名称:{{ recordObj.orderName||'--' }}
-
{{ recordObj.type=='1'?'线路一':recordObj.type=='2'?'线路二':'' }}
+ +
{{ lineName }}
-
{{ 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 }}
+
-
@@ -51,6 +55,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..c1c64db 100644 --- a/src/components/liveCall/index.vue +++ b/src/components/liveCall/index.vue @@ -1,8 +1,8 @@ @@ -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(() => {