Эх сурвалжийг харах

reactor:三方会议调整;

zhangchong 6 сар өмнө
parent
commit
17ed9e6073

+ 33 - 41
src/layout/navBars/breadcrumb/ybTel.vue

@@ -196,44 +196,37 @@
 				</div>
 			</template>
 
-			<!--						&lt;!&ndash; 三方会议 可用(当前处于通话中)&ndash;&gt;
-      <template v-if="telStatusInfo.isDutyOn && activeArr.includes('conference') && onCallArr.length !== 1">
-        <div
-          class="item active"
-          title="三方会议"
-          @click="onControlClick('conference')"
-        >
-          <SvgIcon name="iconfont icon-conference" class="icon mr3" size="16px" />
-          <span>三方会议</span>
-        </div>
-      </template>
-      &lt;!&ndash; 三方会议并且处于三方会议中  &ndash;&gt;
-      <template v-else-if="telStatusInfo.isDutyOn && activeArr.includes('conference') && onCallArr.length === 1">
-        <el-popover :width="130 * onCallArr.length" :offset="0" v-model:visible="threeWayVisible" trigger="hover" popper-class="hangup-popover">
-          <template #reference>
-            <div
-              class="item active"
-              title="三方会议"
-            >
-                <SvgIcon name="iconfont icon-conference" class="icon mr3" size="16px" />
-              <span>三方会议({{ onCallArr.length }})</span>
-            </div>
-          </template>
-          <div class="hangup-container">
-            <div class="hangup-item" v-for="(item, index) in onCallArr" :key="index">
-              <p class="hangup-item-phoneNumber">{{ item.telNo }}</p>
-              <el-button size="small" @click="kickOut(item)" class="default-button">踢出</el-button>
-            </div>
-          </div>
-        </el-popover>
-      </template>
-      &lt;!&ndash; 三方会议 不可用 &ndash;&gt;
-      <template v-else>
-        <div class="item disabled" title="三方会议">
-          <SvgIcon name="iconfont icon-conference" class="icon mr3" size="16px" />
-          <span>三方会议</span>
-        </div>
-      </template>-->
+			<!-- 三方会议 可用(当前处于通话中)-->
+			<template v-if="telStatusInfo.isDutyOn && activeArr.includes('conference') && onCallArr.length !== 1">
+				<div class="item active" title="三方会议" @click="onControlClick('conference')">
+					<SvgIcon name="iconfont icon-conference" class="icon mr3" size="16px" />
+					<span>三方会议</span>
+				</div>
+			</template>
+			<!-- 三方会议并且处于三方会议中  -->
+			<template v-else-if="telStatusInfo.isDutyOn && activeArr.includes('conference') && onCallArr.length === 1">
+				<el-popover :width="130 * onCallArr.length" :offset="0" v-model:visible="threeWayVisible" trigger="hover" popper-class="hangup-popover">
+					<template #reference>
+						<div class="item active" title="三方会议">
+							<SvgIcon name="iconfont icon-conference" class="icon mr3" size="16px" />
+							<span>三方会议({{ onCallArr.length }})</span>
+						</div>
+					</template>
+					<div class="hangup-container">
+						<div class="hangup-item" v-for="(item, index) in onCallArr" :key="index">
+							<p class="hangup-item-phoneNumber">{{ item.telNo }}</p>
+							<el-button size="small" @click="kickOut(item)" class="default-button">踢出</el-button>
+						</div>
+					</div>
+				</el-popover>
+			</template>
+			<!-- 三方会议 不可用 -->
+			<template v-else>
+				<div class="item disabled" title="三方会议">
+					<SvgIcon name="iconfont icon-conference" class="icon mr3" size="16px" />
+					<span>三方会议</span>
+				</div>
+			</template>
 
 			<!-- 呼叫 可用-->
 			<template v-if="telStatusInfo.isDutyOn && activeArr.includes('outbound')">
@@ -549,7 +542,6 @@ import { extensionList } from '@/api/tels/extension';
 const CommonAdvice = defineAsyncComponent(() => import('@/components/CommonAdvice/index.vue')); // 常用意见
 const AnnexList = defineAsyncComponent(() => import('@/components/AnnexList/index.vue'));
 
-
 const globalState = useGlobalState(); // 全局变量
 const state = reactive<any>({
 	active: <EmptyArrayType>[], // 当前选中
@@ -778,7 +770,7 @@ const RestApplyPassFn = (data: any) => {
 // 查询所有分机
 const getTelsLists = async () => {
 	try {
-		const { result } = await extensionList({hasListen:false});
+		const { result } = await extensionList({ hasListen: false });
 		state.telsList = result ?? [];
 		return state.telsList;
 	} catch (err) {
@@ -1250,7 +1242,7 @@ const onMessage = async (event: any) => {
 			// 结束计时
 			stopTalkTimer();
 			onCallArr.value = [];
-	/*		if (currentTel.value.telModel === 2) {
+			/*		if (currentTel.value.telModel === 2) {
 				// 设置外呼模式
 				useTelStatusStore.setCallOut(true);
 				// 设置话机状态 修改为外呼状态