feat: 优化

src/store/contacts/index.ts

 import { defineStore } from 'pinia'
-import { ContactsState, UserItemDto } from './types'
+import { ContactsState, ContactsItemDto } from './types'
 import { userStates } from 'AnyR/states/wsStates'
 const useContactsStore = defineStore('contacts', {
     state: (): ContactsState => {
         return {
-            showWait: false, //是否等待接通
-            chooseUser: undefined, //当前选中的联系人
-            userList: [] //所有联系人
+            showContactsWait: false, //是否等待接通
+            chooseContactsItem: undefined, //当前选中的联系人
+            allContactsList: [] //所有联系人
         }
     },
 
     getters: {
         //获取合并ws后的所有用户列表
         getAllOnlineContacts(state) {
-            const userList = [] as UserItemDto[]
-            state.userList.forEach((item1) => {
+            const allContactsList = [] as ContactsItemDto[]
+            state.allContactsList.forEach((item1) => {
                 userStates.value.onlineContacts.forEach((item2: any) => {
                     if (item1.id == item2.fromID) {
                         Object.assign(item1, item2)
                     }
                 })
-                userList.push(item1)
+                allContactsList.push(item1)
             })
-            return userList
+            return allContactsList
         },
         //获取ws的用户列表
         getOnlineContacts(state) {
-            const userList = [] as UserItemDto[]
+            const allContactsList = [] as ContactsItemDto[]
             userStates.value.onlineContacts.forEach((item1: any) => {
-                state.userList.forEach((item2) => {
+                state.allContactsList.forEach((item2) => {
                     if (item1.fromID == item2.id) {
                         Object.assign(item1, item2)
                     }
                 })
-                userList.push(item1)
+                allContactsList.push(item1)
             })
-            return userList
+            return allContactsList
         }
     },
 
     actions: {
         //设置当前选中联系人
-        setChooseUser(info: UserItemDto | undefined) {
-            this.chooseUser = info
+        setChooseUser(info: ContactsItemDto | undefined) {
+            this.chooseContactsItem = info
         },
         //修改通话状态
         changeWait(val: boolean) {
-            this.showWait = val
+            this.showContactsWait = val
         },
         //获取全部联系人
-        setUserList(info: UserItemDto[]) {
-            this.userList = info
+        setUserList(info: ContactsItemDto[]) {
+            this.allContactsList = info
         }
     },
 

src/store/contacts/types.ts

-export interface UserItemDto {
+export interface ContactsItemDto {
     id: string
     nickname: string
     remark: string
@@ -7,7 +7,7 @@ export interface UserItemDto {
     [propName: string]: any
 }
 export interface ContactsState {
-    showWait: boolean
-    chooseUser?: UserItemDto
-    userList: UserItemDto[]
+    showContactsWait: boolean
+    chooseContactsItem?: ContactsItemDto
+    allContactsList: ContactsItemDto[]
 }

src/views/layout/index.vue

@@ -6,7 +6,7 @@
             <!-- 内容区域 -->
             <a-layout class="h-[calc(100%-60px)]">
                 <!-- 视频等待遮罩 -->
-                <contacts-wait v-if="showWait"></contacts-wait>
+                <contacts-wait v-if="showContactsWait"></contacts-wait>
                 <!-- 侧边栏 -->
                 <g-aside v-if="getShowMenu"></g-aside>
                 <!-- 路由内容 -->
@@ -29,7 +29,7 @@ import { activedTheme } from '../../../project.ui.config'
 
 //显示通话等待
 const contactsStore = useContactsStore()
-const { showWait } = storeToRefs(contactsStore)
+const { showContactsWait } = storeToRefs(contactsStore)
 //是否展示菜单
 const route = useRoute()
 const getShowMenu = computed(() => {

src/views/remote/contacts/contactsInfo.vue

@@ -33,7 +33,7 @@
 import contactsList from './contactsList.vue'
 import multiCallModel from './multiCallModel.vue'
 import { alova } from '@/api/alova-instance'
-import type { UserItemDto } from '@/store/contacts/types'
+import type { ContactsItemDto } from '@/store/contacts/types'
 import useContactsStore from '@/store/contacts/index'
 import { useRequest } from 'alova'
 import { videoGroup } from '@/constants/common/user'
@@ -58,7 +58,7 @@ const { loading, data, onSuccess } = useRequest(
                 pageSize: 99999
             },
             {
-                transformData: (res: any) => res.data as UserItemDto[]
+                transformData: (res: any) => res.data as ContactsItemDto[]
             }
         ),
     {

src/views/remote/contacts/contactsList.vue

 <template>
     <template v-for="(item, index) in data" :key="item.id">
-        <div class="item flex items-center px-4 py-3 rounded cursor-pointer" :class="{ active: chooseUser?.id == item.id }" @click="handleClick(item)">
+        <div class="item flex items-center px-4 py-3 rounded cursor-pointer" :class="{ active: chooseContactsItem?.id == item.id }" @click="handleClick(item)">
             <global-avatar></global-avatar>
             <div class="ml-[9px] inline-block">{{ item.nickname }}</div>
             <div class="flex items-center ml-6">
-                <global-icon icon="camera" :size="14" class="mr-2"></global-icon>
-                <global-icon icon="mic" :size="14"></global-icon>
+                <global-icon icon="camera" :size="14" class="mr-2" v-if="item.hasCamera == 1"></global-icon>
+                <global-icon icon="mic" :size="14" v-if="item.hasMike == 1"></global-icon>
             </div>
             <div class="flex-auto text-right">
                 <a-button type="primary" shape="circle" @click.stop="changeWait(true)" :disabled="!(item.callState == 'callState' && item.hasCamera == 1 && item.hasMike == 1)">
@@ -18,11 +18,11 @@
 
 <script setup lang="ts">
 import useContactsStore from '@/store/contacts/index'
-import { UserItemDto } from '@/store/contacts/types'
+import { ContactsItemDto } from '@/store/contacts/types'
 import { storeToRefs } from 'pinia'
 
 interface Props {
-    data?: Array<UserItemDto>
+    data?: Array<ContactsItemDto>
 }
 const ps = withDefaults(defineProps<Props>(), {
     data: () => []
@@ -30,9 +30,9 @@ const ps = withDefaults(defineProps<Props>(), {
 //拨打视频
 const { changeWait, setChooseUser } = useContactsStore()
 //当前联系人
-const { chooseUser } = storeToRefs(useContactsStore())
+const { chooseContactsItem } = storeToRefs(useContactsStore())
 //点击联系人
-const handleClick = (item: UserItemDto) => {
+const handleClick = (item: ContactsItemDto) => {
     setChooseUser(item)
 }
 onBeforeUnmount(() => {

src/views/remote/contacts/contactsListChoose.vue

@@ -13,10 +13,10 @@
 </template>
 
 <script setup lang="ts">
-import { UserItemDto } from '@/store/contacts/types'
+import { ContactsItemDto } from '@/store/contacts/types'
 
 interface Props {
-    data?: Array<UserItemDto>
+    data?: Array<ContactsItemDto>
 }
 const ps = withDefaults(defineProps<Props>(), {
     data: () => []

src/views/remote/contacts/eventList.vue

@@ -36,11 +36,11 @@ const beginTime = ref('')
 const endTime = ref('')
 const keyword = ref('')
 //当前联系人
-const { chooseUser } = storeToRefs(useContactsStore())
+const { chooseContactsItem } = storeToRefs(useContactsStore())
 //表格搜索
 const getEventList = (pageIndex: number, pageSize: number) => {
     const params = {
-        userId: chooseUser?.value?.id,
+        userId: chooseContactsItem?.value?.id,
         pageIndex,
         pageSize,
         uid: 2,
@@ -77,7 +77,7 @@ const {
     // Method实例获取函数，它将接收page和pageSize，并返回一个Method实例
     (pageIndex: number, pageSize: number) => getEventList(pageIndex, pageSize),
     {
-        watchingStates: [beginTime, endTime, () => chooseUser?.value?.id, keyword],
+        watchingStates: [beginTime, endTime, () => chooseContactsItem?.value?.id, keyword],
         // 请求前的初始数据（接口返回的数据格式）
         initialData: {
             total: 0,
@@ -90,7 +90,7 @@ const {
         total: (res) => parseInt(res.data.total),
         data: (res) => res.data.list,
         sendable: () => {
-            return chooseUser?.value?.id ? true : false
+            return chooseContactsItem?.value?.id ? true : false
         }
     }
 )