Merge pull request 'dd' (#135) from dd into master

Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/135

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=()=>{

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="recordLeftRef" :recordObj="recordLeftObj" :headData="leftHeadData" lineName="线路一"/>
-    <live-call-item-home ref="recordRightRef" :recordObj="recordRightObj" :headData="rightHeadData"/>
+    <live-call-item-home ref="recordRightRef" :recordObj="recordRightObj" :headData="rightHeadData" lineName="线路二"/>
   </div>
 </template>
 

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",