Browse Source

电话控件调整

zhangchong 1 year ago
parent
commit
08b5d72b2f

+ 0 - 3
src/components/LogicFlow/PropertySetting/summary.vue

@@ -158,12 +158,9 @@ const changeOptions = (e: any) => {
 };
 // 获取可用组织
 const getOrgListFn = () => {
-	if (!auth('100504')) ElMessage.warning('抱歉,您没有获取可用组织架构树形的权限!');
-	else {
 		getCanUseOrg().then((res: any) => {
 			orgData.value = res?.result ?? [];
 		});
-	}
 };
 const treeSelectRef = ref<RefType>();
 // 选择部门

+ 0 - 3
src/components/LogicFlow/PropertySetting/task.vue

@@ -173,12 +173,9 @@ const remoteMethod = (query: string) => {
 };
 // 获取可用组织
 const getOrgListFn = () => {
-	if (!auth('100504')) ElMessage.warning('抱歉,您没有获取可用组织架构树形的权限!');
-	else {
 		getCanUseOrg().then((res: any) => {
 			orgData.value = res?.result ?? [];
 		});
-	}
 };
 const treeSelectRef = ref<RefType>();
 // 选择部门

+ 10 - 12
src/layout/navBars/breadcrumb/telControl.vue

@@ -776,7 +776,7 @@ const canMeeting = computed((): boolean => {
 	return telStatusInfo.value.onHoldArr.length === 2 && telStatusInfo.value.onHoldArr[0].isHold != telStatusInfo.value.onHoldArr[1].isHold;
 });
 // 接听事件处理
-const answerFn = (data: any) => {
+const answerFn = () => {
 	// 设置电话状态
 	useTelStatusStore.setPhoneControlState(TelStates.onCall);
 
@@ -796,7 +796,7 @@ const answerFn = (data: any) => {
 	}
 };
 // 小休审批通过消息
-const RestApplyPassFn = (data: any) => {
+const RestApplyPassFn = () => {
 	ElNotification({
 		title: '成功',
 		message: '小休审批通过,开始小休',
@@ -841,7 +841,7 @@ const idleFn = ()=>{
 }
 // 排队事件
 const callQueueFv = (data:any)=>{
-
+  console.log(data,'排队事件')
 }
 // 如果当前是已经签入状态 监听消息事件
 if (telStatusInfo.value.isDutyOn) {
@@ -867,7 +867,7 @@ if (telStatusInfo.value.isDutyOn) {
 	signalR.SR.on('Answered', (data: any) => {
 		//接收接听消息
 		console.log(data, '接听消息');
-		answerFn(data);
+		answerFn();
 	});
 
 	signalR.SR.on('Bye', (data: any) => {
@@ -878,7 +878,7 @@ if (telStatusInfo.value.isDutyOn) {
 	signalR.SR.on('RestApplyPass', (data: any) => {
 		// 小休审批通过消息
 		console.log(data, '小休审批通过消息');
-		RestApplyPassFn(data);
+		RestApplyPassFn();
 	});
   signalR.SR.on('Idle', (data: any) => {
     // 小休审批通过消息
@@ -886,8 +886,7 @@ if (telStatusInfo.value.isDutyOn) {
     idleFn();
   });
   signalR.SR.on('CallQueue', (data: any) => {
-    // 小休审批通过消息
-    console.log(data, '排队事件消息');
+    // 排队事件
     callQueueFv(data);
   });
 }
@@ -1041,12 +1040,12 @@ const clickOnDuty = () => {
 					signalR.SR.on('Answered', (data: any) => {
 						//接收接听消息
 						console.log(data, '接听消息');
-						answerFn(data);
+						answerFn();
 					});
 					signalR.SR.on('RestApplyPass', (data: any) => {
 						// 小休审批通过消息
 						console.log(data, '小休审批通过消息');
-						RestApplyPassFn(data);
+						RestApplyPassFn();
 					});
           signalR.SR.on('Idle', (data: any) => {
             // 小休审批通过消息
@@ -1054,8 +1053,7 @@ const clickOnDuty = () => {
             idleFn();
           });
           signalR.SR.on('CallQueue', (data: any) => {
-            // 小休审批通过消息
-            console.log(data, '排队事件消息');
+            // 排队事件
             callQueueFv(data);
           });
 					ElNotification({
@@ -1691,7 +1689,7 @@ const onConferenceEnd = () => {
 			for (let item of telStatusInfo.value.onCallArr) {
 				hangupApi(item)
 					.then(() => {})
-					.catch((err: any) => {});
+					.catch(() => {});
 			}
 		})
 		.catch(() => {});