Browse Source

reactor:事件分类选择问题修复;

zhangchong 10 months ago
parent
commit
bd906e4427

+ 2 - 0
src/components/Hotspot/event.vue

@@ -135,6 +135,7 @@ const loading = ref(false);
 // 懒加载
 const treeRef = ref<RefType>();
 const loadNode = async (node: any, resolve: any) => {
+  await nextTick();
   if (node.isLeaf) return resolve([]);
   const { showCheckbox, modelValue } = props;
   try {
@@ -142,6 +143,7 @@ const loadNode = async (node: any, resolve: any) => {
     const { result } = await treeEventClass({ id: node.data.id ? node.data.id : null });
     resolve(result);
     state.id = modelValue;
+    console.log('子组件',modelValue)
     if (showCheckbox) {
       treeRef.value.setCheckedKeys(modelValue);
       const nodes = treeRef.value.getCheckedNodes();

+ 1 - 0
src/components/Hotspot/index.vue

@@ -136,6 +136,7 @@ const loading = ref(false);
 // 懒加载
 const treeRef = ref<RefType>();
 const loadNode = async (node: any, resolve: any) => {
+  await nextTick();
 	if (node.isLeaf) return resolve([]);
 	const { showCheckbox, modelValue } = props;
 	try {

+ 7 - 11
src/layout/navBars/breadcrumb/telControl.vue

@@ -914,8 +914,6 @@ const onMessage = async (event: any) => {
 			sendMsg('login');
 		} else if (data.state == 'logout') {
 			// 签出
-			// 重置所有状态
-			useTelStatusStore.resetState();
 			console.log('呼叫中心:已签出');
 			ElMessage.success('签出成功');
 			seatAssistOff(); // 坐席助手关闭
@@ -1243,13 +1241,12 @@ const submitLogFn = async (event: any) => {
 // 呼叫中心链接关闭
 const isReconnect = ref<boolean>(true); // 是否需要重连
 const onClose = async (event: any) => {
+	resetState();
 	const { result } = await getTelStatus();
 	console.log('呼叫中心断开链接', result && isReconnect.value ? '需要重连' : '不需要重连');
 	if (result && isReconnect.value) {
 		// 签入状态需要重连
 		await reConnect(); // 重新链接呼叫中心
-	} else {
-		resetState();
 	}
 	await submitLogFn(event);
 };
@@ -1283,8 +1280,10 @@ const reConnect = async () => {
 // 链接成功 停止重连
 const stopReconnect = () => {
 	clearTimeout(reconnectTimeout.value);
-	isReconnect.value = false;
 	console.log('停止重连');
+	setTimeout(() => {
+		isReconnect.value = true;
+	}, 3000);
 };
 const dutyFormRef = ref<RefType>();
 const currentTel = ref<any>({}); // 当前分机
@@ -1415,12 +1414,12 @@ const offDutyFn = () => {
 					console.log('业务系统:签出成功');
 					sendMsg('logout');
 					ola.logout(currentTel.value.telNo); //签出
+					state.dutyOnSrc = getImageUrl('phoneControls/dutyOn_blue.png'); //签入图片
+					isReconnect.value = false;
 					setTimeout(() => {
 						ola.close();
 					}, 500);
-					state.dutyOnSrc = getImageUrl('phoneControls/dutyOn_blue.png'); //签入图片
-					isReconnect.value = false;
-					resetState(); // 重置所有状态
+					resetState();
 					state.loading = false;
 				})
 				.catch(() => {})
@@ -1928,7 +1927,6 @@ const resetState = () => {
 	clearInterval(pingTimer.value); // 清除心跳定时器
 	clearInterval(onDutyTimer.value); // 清除签入时长定时器
 	clearInterval(talkTimer.value); // 清除通话时长定时器
-	isReconnect.value = true;
 	state.loading = false;
 };
 // 获取当前分机状态
@@ -1974,8 +1972,6 @@ const callCenterConnect = async () => {
 			isTelMute.value = result.isTelMute; // 是否静音中
 			state.loading = false;
 		} else {
-			// 没有查询到当前用户上班状态  直接重置
-			resetState();
 			state.loading = false;
 		}
 	} catch (e) {

+ 9 - 0
src/views/dataShare/callLog.vue

@@ -83,6 +83,15 @@ const columns = ref<any[]>([
     render: (scope) => {
       return <span>{formatDate(scope.row.overTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
     },
+  },
+  {
+    prop: 'creationTime',
+    label: '入库时间',
+    align: 'center',
+    width: 170,
+    render: (scope) => {
+      return <span>{formatDate(scope.row.creationTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
+    },
   },
 	{ prop: 'cpn', label: '主叫号码', width: 120, align: 'center' },
 	{ prop: 'cdpn', label: '被叫号码', width: 120, align: 'center' },

+ 0 - 9
src/views/dataShare/orderNoCallLog.vue

@@ -85,15 +85,6 @@ const columns = ref<any[]>([
 			return <span>{formatDate(scope.row.startTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
 		},
 	},
-  {
-    prop: 'creationTime',
-    label: '入库时间',
-    align: 'center',
-    width: 170,
-    render: (scope) => {
-      return <span>{formatDate(scope.row.creationTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
-    },
-  },
 	{
 		prop: 'firstSendProvinceTime',
 		label: '第一次上传省上的时间',

+ 1 - 0
src/views/todo/seats/accept/index.vue

@@ -1220,6 +1220,7 @@ const loadForm = async () => {
 			dicDataValue: state.ruleForm.transpondCityValue,
 			dicDataName: state.ruleForm.transpondCityName,
 		};
+    console.log('父组件',state.ruleForm.eventCategoryId)
 	}
 };
 // 加载省市区