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

fix:signalR连接方式修改为分组;

zhangchong 1 жил өмнө
parent
commit
cc90f40ed3

+ 0 - 1
shim.d.ts

@@ -6,7 +6,6 @@ declare module '*.vue' {
 	const component: DefineComponent<{}, {}, any>;
 	export default component;
 }
-
 // 声明文件,定义全局变量。其它 app.config.globalProperties.xxx,使用 getCurrentInstance() 来获取
 interface Window {
 	nextLoading: boolean;

+ 6 - 11
src/components/LogicFlow/PropertySetting/summary.vue

@@ -181,18 +181,13 @@ const remoteMethod = (query: string) => {
 		loading.value = true;
 		queryUser({ name: query }).then((res: any) => {
 			loading.value = false;
-			usetList.value.push(...res.result);
-			usetList.value = removeDuplicate(usetList.value, 'id');
-			usetList.value = usetList.value.map((item: any) => {
-				if (!item.name.includes('-')) {
-					return {
-						...item,
-						name: item.name + '-' + item.organization.orgName,
-					};
-				} else {
-					return { ...item };
-				}
+			const newUsers = res.result.map((item: any) => {
+				return {
+					...item,
+					name: !item.name.includes('-') ? item.name + '-' + item.organization.orgName : item.name
+				};
 			});
+			usetList.value = removeDuplicate([...usetList.value, ...newUsers], 'id');
 		});
 	}
 };

+ 2 - 1
src/layout/navBars/breadcrumb/telControl.vue

@@ -1905,7 +1905,8 @@ onUnmounted(() => {
 		.active {
 			&:hover {
 				color: var(--hotline-color-white);
-				background-image: url('../../../assets/images/phoneControls/active.png');
+				// background-image: url('../../../assets/images/phoneControls/active.png');
+				background-image: url('/@/assets/images/phoneControls/active.png');
 				background-repeat: no-repeat;
 				background-size: 100% 100%;
 			}

+ 2 - 1
src/stores/themeConfig.ts

@@ -1,6 +1,7 @@
 import { defineStore } from 'pinia';
 import { ThemeConfigStates, ThemeConfigState } from './interface';
 import { Session } from '/@/utils/storage';
+import { getImageUrl } from '/@/utils/tools';
 /**
  * 布局配置
  * 修复:https://gitee.com/lyt-top/vue-next-admin/issues/I567R1,感谢@lanbao123
@@ -139,7 +140,7 @@ export const useThemeConfig = defineStore('themeConfig', {
 			// 默认全局组件大小,可选值"<large|'default'|small>",默认 'default'
 			globalComponentSize: 'default',
 			// 登录页面背景图
-			loginImage: ''
+			loginImage: `url(${getImageUrl('login/bg.png')})`
 		},
 	}),
 	actions: {

+ 8 - 8
src/views/login/component/Account.vue

@@ -114,9 +114,9 @@ const onSignIn = async (formEl: FormInstance | undefined) => {
 		if (valid) {
 			state.loading = true;
 			// 新建一个JSEncrypt对象
-			let encryptor = new JSEncrypt({default_key_size:'2048'});
+			const encryptor = new JSEncrypt({default_key_size:'2048'});
 			// 设置公钥
-			let publicKey =
+			const publicKey =
 				'-----BEGIN PUBLIC KEY-----MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgw+/x6IQPkH0A4eoF63jkLThsOXWyNBdcL9LATGy/G1yTHOr1RyKJB//iNug+V8DIoIHuFTlhgLHDbSqxvRWMONxIIF289riS6bDI4Ox/pFmOfmElFRk0lKGihaTE2Aefd6g/N+RfLLaHWztY+/voVeDTiOIw9y3tokIxjKwuJ/mQ66MkKh78AqQjjSD/3jcBP8ZhMyCJOK9XQcqvhD6WBFWkxlAqKOWggDU7YohfrbNkg3bd0oGE6zCE2EHhkcQbzGCh3lu1zf4TfKMXD+PPrr5JWDNYQTXFQklqgae+Puge7xxZGYRoi5YpIUnkQGm6zpPxhIOdxlz+Yb5geSJUQIDAQAB-----END PUBLIC KEY-----';
 			encryptor.setPublicKey(publicKey); // publicKey为公钥
 			// 加密数据
@@ -131,14 +131,14 @@ const onSignIn = async (formEl: FormInstance | undefined) => {
 					Session.set('token', res.result);
 					if (!themeConfig.value.isRequestRoutes) {
 						// 前端控制路由,2、请注意执行顺序
-						const isNopower = await initFrontEndControlRoutes();
-						signInSuccess(isNopower);
+						const isNoPower = await initFrontEndControlRoutes();
+						signInSuccess(isNoPower);
 					} else {
 						// 模拟后端控制路由,isRequestRoutes 为 true,则开启后端控制路由
 						// 添加完动态路由,再进行 router 跳转,否则可能报错 No match found for location with path "/"
-						const isNopower = await initBackEndControlRoutes();
+						const isNoPower = await initBackEndControlRoutes();
 						// 执行完 initBackEndControlRoutes,再执行 signInSuccess
-						signInSuccess(isNopower);
+						signInSuccess(isNoPower);
 					}
 				})
 				.catch(() => {
@@ -150,8 +150,8 @@ const onSignIn = async (formEl: FormInstance | undefined) => {
 	});
 };
 // 登录成功后的跳转
-const signInSuccess = (isNopower: boolean | undefined) => {
-	if (isNopower) {
+const signInSuccess = (isNoPower: boolean | undefined) => {
+	if (isNoPower) {
 		state.loading = false;
 		ElNotification({
 			title: '提示',

+ 1 - 0
src/views/login/index.vue

@@ -67,6 +67,7 @@ onMounted(async () => {
 .login-container {
 	position: relative;
 	background-image: v-bind(bgImg);
+	// background-image: url("/@/assets/images/login/bg.png");
 	background-repeat: no-repeat;
 	background-size: calc(100vw + 1px) calc(100vh + 1px);
 

+ 0 - 12
src/views/tels/blacklist/component/Blacklist-add.vue

@@ -75,18 +75,6 @@ import { ref, reactive } from 'vue';
 import { ElMessage } from 'element-plus';
 import { addBlacklist } from '/@/api/tels/blacklist';
 
-// 定义接口来定义对象的类型
-interface StateBlacklist {
-	ruleForm: {
-		phoneNo: string; //电话号码
-		level: string; //级别
-		time: Array<any>; // 时间
-		remark: string; //清空说明
-	};
-	isShowDialog: boolean;
-	levelList: Array<any>; // 级别列表
-}
-
 // 定义子组件向父组件传值/事件
 const emit = defineEmits(['updateList', 'openDialog', 'closeDialog']);
 

+ 1 - 1
src/views/tels/callRecord/component/Play-record.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="tels-callRecord-playRecord-container">
 		<el-dialog v-model="state.isShowDialog" width="500px" draggable title="播放录音">
-			<AudioPlayer url="http://music.163.com/song/media/outer/url?id=447925558.mp3" v-if="state.isShowDialog" />
+			<audio-player url="http://music.163.com/song/media/outer/url?id=447925558.mp3" v-if="state.isShowDialog" />
 			<template #footer>
 				<span class="dialog-footer">
 					<el-button @click="closeDialog" class="default-button">关 闭</el-button>