From 2046b486eec014aa4f51b28a20892bea0fce23fc Mon Sep 17 00:00:00 2001
From: zhangkaihuai <zhangkaihuai@qq.com>
Date: Fri, 4 Oct 2024 10:51:32 +0000
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20vite.config.js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite.config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vite.config.js b/vite.config.js
index a3ab326..13ff68e 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -77,9 +77,9 @@ export default defineConfig({
       // },
       "/api": {
         // target: "http://frp.feashow.cn:31800/",
-        target: "http://112.19.165.99:20002/",
+        target: "http://10.8.105.91:28080/",
         changeOrigin: true,
-        // rewrite: (path) => path.replace(/^\/api/, ""),
+        rewrite: (path) => path.replace(/^\/api/, ""),
       },
       // "/socket": {
       //   target: "ws://frp.feashow.cn:8081/ws",

From bd2e5366aa4c4e8aecb7049d3cb5d07391b49875 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 6 Oct 2024 19:40:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=8F=B0=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE=E7=BA=BF?=
 =?UTF-8?q?=E8=B7=AF=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/liveCall/LiveCallItemHome.vue | 7 ++++++-
 src/components/liveCall/index.vue            | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/liveCall/LiveCallItemHome.vue b/src/components/liveCall/LiveCallItemHome.vue
index 58bc90c..7c2a86f 100644
--- a/src/components/liveCall/LiveCallItemHome.vue
+++ b/src/components/liveCall/LiveCallItemHome.vue
@@ -6,7 +6,8 @@
         <span>电话号码：{{ recordObj.phone ||'--'}}</span>
       </div>
       <div><span>工单名称：{{ recordObj.orderName||'--' }}</span></div>
-      <div><span>{{ recordObj.type=='1'?'线路一':recordObj.type=='2'?'线路二':'' }}</span></div>
+<!--      <div><span>{{ recordObj.type=='1'?'线路一':recordObj.type=='2'?'线路二':'' }}</span></div>-->
+      <div><span>{{ lineName  }}</span></div>
     </div>
     <el-scrollbar ref="scrollbarRef" class="scrollbar">
       <div class="chat-content" ref="innerRef">
@@ -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 @@
 <template>
   <!--测试 张三 : 17260625724565   李四: 17260625724123-->
   <div class="live-call-block">
-    <live-call-item-home ref="recordLeftRef" :recordObj="recordLeftObj" :headData="leftHeadData"/>
-    <live-call-item-home ref="recordRightRef" :recordObj="recordRightObj" :headData="rightHeadData"/>
+    <live-call-item-home ref="recordLeftRef" :recordObj="recordLeftObj" :headData="leftHeadData" lineName="线路一"/>
+    <live-call-item-home ref="recordRightRef" :recordObj="recordRightObj" :headData="rightHeadData" lineName="线路二"/>
   </div>
 </template>