mdm-client 1.0.2 → 1.0.3

package/src/components/other/addressBook.vue

@@ -73,6 +73,31 @@
               </template>
             </vue-virtual-tree>
 
+            <!-- volte树 -->
+            <vue-virtual-tree
+              v-show="activeTab === 'volte'"
+              ref="volteTreeRef"
+              :data="volteTreeData"
+              :props="{ children: 'children', label: 'label' }"
+              node-key="id"
+              show-checkbox
+              :height="dynamicTreeHeight"
+              :item-height="36"
+              @check="handleNodeCheck"
+              :filter-node-method="filterNode"
+            >
+              <template #default="{ node, data }">
+                <span class="custom-tree-node">
+                  <span class="custom-tree-node-label" :title="node.label" v-if="data.isDept">{{
+                    node.label
+                  }}</span>
+                  <span class="custom-tree-node-user" v-else>
+                    <span :class="['custom-tree-node-icon']"></span>
+                    <span class="custom-tree-node-label" :title="node.label">{{ node.label }}</span>
+                  </span>
+                </span>
+              </template>
+            </vue-virtual-tree>
             <!-- 常用分组树 -->
             <vue-virtual-tree
               v-show="activeTab === '常用分组'"
@@ -165,7 +190,9 @@
           <div class="checkutl">
             <div v-for="item of tempInviteList" :key="item.id" class="userFlex">
               <div class="label">
-                <span :class="['custom-item-icon', getInviteItemIconClass(item)]"></span> {{ item.label }}
+                <span :class="['custom-item-icon', getInviteItemIconClass(item)]"></span>
+                <span>{{ item.label }}</span>
+                <span :class="getChosenItemPlatformClass(item)"></span>
               </div>
               <div class="close" @click="removeInviteItem(item)"></div>
             </div>
@@ -207,7 +234,7 @@
 
 <script>
 import { debounce } from "lodash-es";
-import { mittBus, ShowMessage, deleteCommonGroupAndUser, getAddressOrgTree, getAddressAppTree, getCommonOrgTree, queryEquipmentAddressBook, queryMonitorAddressBook } from "../../utils/index";
+import { mittBus, ShowMessage, deleteCommonGroupAndUser, getAddressOrgTree, getAddressAppTree, getCommonOrgTree, queryEquipmentAddressBook, queryMonitorAddressBook, getVolteAddressBook } from "../../utils/index";
 import VueVirtualTree from "@fit2cloud-ui/vue-virtual-tree";
 import CustomGroupDialog from "./customGroupDialog.vue";
 import EditGroupDialog from "./editGroupDialog.vue";
@@ -244,13 +271,14 @@ export default {
       // 树数据
       treeData: [],
       appTreeData: [],
+      volteTreeData: [],
       groupTreeData: [],
       equipmentTreeData: [],
       monitorTreeData: [],
       
       // 标签页相关
       activeTab: "组织架构",
-      tabList: ["组织架构", "人员", "设备", "监控", "常用分组"],
+      tabList: ["组织架构", "人员", "volte", "设备", "监控", "常用分组"],
       
       // 搜索相关
       filterText: "",
@@ -341,6 +369,8 @@ export default {
         this.$refs.orgTreeRef.filter(val);
       } else if (this.activeTab === "人员" && this.$refs.appTreeRef) {
         this.$refs.appTreeRef.filter(val);
+      } else if (this.activeTab === "volte" && this.$refs.volteTreeRef) {
+        this.$refs.volteTreeRef.filter(val);
       } else if (this.activeTab === "常用分组" && this.$refs.groupTreeRef) {
         this.$refs.groupTreeRef.filter(val);
       } else if (this.activeTab === "设备" && this.$refs.equipmentTreeRef) {
@@ -354,10 +384,11 @@ export default {
     mittBus.on("getaddressBookUser", (e) => {
       this.filterText = "";
       // 转换props.inviteList的数据格式以适配新的tree结构
-      this.tempInviteList = this.inviteList.map((item) => {
-        // 如果已经是新格式，直接使用
-        return item;
-      });
+      // this.tempInviteList = this.inviteList.map((item) => {
+      //   // 如果已经是新格式，直接使用
+      //   return item;
+      // });
+      this.tempInviteList = []
       this.isaddressShow = true;
       if (e) {
         this.isInner = e.isInner;
@@ -397,6 +428,14 @@ export default {
         this.appTreeData = res.data.data;
       }
     },
+
+    // 获取volte树数据
+    async getVolteTreeData() {
+      const res = await getVolteAddressBook({}, { baseUrl: this.baseUrl, token: this.token });
+      if(res.data?.code == 200) {
+        this.volteTreeData = res.data.data;
+      }
+    },
     
     // 获取常用分组树数据
     async getGroupTreeData() {
@@ -426,6 +465,7 @@ export default {
     async getAllTreeData() {
       await this.getOrgTreeData();
       await this.getAppTreeData();
+      await this.getVolteTreeData();
       await this.getGroupTreeData();
       await this.getEquipmentTreeData();
       await this.getMonitorTreeData();
@@ -474,13 +514,39 @@ export default {
       // 将当前树的新叶子节点添加进来
       const mergedList = [...otherTreeNodes];
 
-      // 添加新节点，避免重复
+      // 添加新节点，避免重复（基于source+id组合判断）
+      const validNewNodes = [];
       newLeafNodes.forEach((node) => {
-        if (!mergedList.some((item) => item.id === node.id)) {
-          mergedList.push(node);
+        if (!mergedList.some((item) => item.id === node.id && item.source === node.source)) {
+          validNewNodes.push(node);
         }
       });
-
+      // 检查 volte 用户数量限制（限制volte用户总数，不限于当前标签页）
+      const currentVolteCount = mergedList.filter(user => user.source === 'volte').length;
+      const newVolteNodes = validNewNodes.filter(node => node.source === 'volte');
+
+      if (currentVolteCount + newVolteNodes.length > 10) {
+        // 超出限制，需要处理
+        if (this.activeTab === 'volte') {
+          // 如果当前在volte标签页，清空当前树的选中状态并提示
+          this.$refs.volteTreeRef && this.$refs.volteTreeRef.setCheckedKeys([]);
+          this.showMessage.message('warning', '单次VoLTE呼叫仅支持选择10人');
+          // 只保留其他树的选中状态，不添加新的volte节点
+          this.chosenList = otherTreeNodes;
+          return;
+        } else {
+          // 如果不在volte标签页，只添加非volte节点，并提示volte限制
+          const nonVolteNodes = validNewNodes.filter(node => node.source !== 'volte');
+          if (newVolteNodes.length > 0) {
+            this.showMessage.message('warning', '单次VoLTE呼叫仅支持选择10人，VoLTE用户未添加');
+          }
+          mergedList.push(...nonVolteNodes);
+          this.chosenList = mergedList;
+          return;
+        }
+      }
+      // 添加所有有效的新节点
+      mergedList.push(...validNewNodes);
       this.chosenList = mergedList;
     },
     
@@ -491,6 +557,8 @@ export default {
         this.$refs.orgTreeRef.setCheckedKeys([]);
       } else if (this.activeTab === "人员" && this.$refs.appTreeRef) {
         this.$refs.appTreeRef.setCheckedKeys([]);
+      } else if (this.activeTab === "volte" && this.$refs.volteTreeRef) {
+        this.$refs.volteTreeRef.setCheckedKeys([]);
       } else if (this.activeTab === "常用分组" && this.$refs.groupTreeRef) {
         this.$refs.groupTreeRef.setCheckedKeys([]);
       } else if (this.activeTab === "设备" && this.$refs.equipmentTreeRef) {
@@ -500,7 +568,7 @@ export default {
       }
       
       // 然后根据chosenList设置选中状态
-      const selectedIds = this.chosenList.map((user) => user.id);
+      const selectedIds = this.chosenList.filter(user => user.source === this.activeTab).map((user) => user.id);
 
       if (this.activeTab === "组织架构" && this.$refs.orgTreeRef) {
         selectedIds.forEach((id) => {
@@ -510,6 +578,10 @@ export default {
         selectedIds.forEach((id) => {
           this.$refs.appTreeRef.setChecked(id, true, false);
         });
+      } else if (this.activeTab === "volte" && this.$refs.volteTreeRef) {
+        selectedIds.forEach((id) => {
+          this.$refs.volteTreeRef.setChecked(id, true, false);
+        });
       } else if (this.activeTab === "常用分组" && this.$refs.groupTreeRef) {
         selectedIds.forEach((id) => {
           this.$refs.groupTreeRef.setChecked(id, true, false);
@@ -541,17 +613,40 @@ export default {
     
     // 根据邀请列表项类型获取图标类名
     getInviteItemIconClass(item) {
-      if (item.source !== '设备' && item.source !== '监控') return 'custom-item-icon-person';
-      return item.source === '设备' ? 'custom-item-icon-device' : 'custom-item-icon-monitor';
+      if (item.source !== '设备' && item.source !== '监控' && item.source !== 'volte') return 'custom-item-icon-person';
+      if (item.source === '设备') return 'custom-item-icon-device';
+      if (item.source === '监控') return 'custom-item-icon-monitor';
+      if (item.source === 'volte') return 'custom-item-icon-person'; // volte 使用人员图标
+      return 'custom-item-icon-person';
+    },
+    getChosenItemPlatformClass(item) {
+      if(item.source === "组织架构") {
+        return 'platform platform-mini'
+      } else if(item.source === "人员") {
+        return 'platform platform-application'
+      } else if(item.source === "常用分组") {
+        if(item.original === '组织架构') {
+          return 'platform platform-mini'
+        } else if(item.original === '人员') {
+          return 'platform platform-application'
+        } else if(item.original === 'volte') {
+          return 'platform platform-volte'
+        } else {
+          return 'platform platform-unknown'
+        }
+      } else if(item.source === "volte") {
+        return 'platform platform-volte'
+      } else {
+        return 'platform platform-unknown'
+      }
     },
-    
     getinvitation() {
       this.$refs.inviteNonContactDialogRef.open();
     },
 
     addOutterContactToChosenList(outterContact) {
-      // 检查是否已存在
-      if (this.tempInviteList.find((item) => item.id === outterContact.id)) {
+      // 改进的存在性检查：结合source和手机号进行查找
+      if (this.tempInviteList.find((item) => item.phone === outterContact.phone && item.source === outterContact.source)) {
         this.showMessage.message("error", "该人员已存在");
         return;
       }
@@ -612,13 +707,13 @@ export default {
     },
 
     removeInviteItem(item) {
-      const index = this.tempInviteList.findIndex((user) => user.id === item.id);
+      const index = this.tempInviteList.findIndex((user) => user.id === item.id && user.source === item.source);
       if (index !== -1) {
         this.isSyncing = true;
         this.tempInviteList.splice(index, 1);
 
         // 同步到chosenList
-        const chosenIndex = this.chosenList.findIndex((user) => user.id === item.id);
+        const chosenIndex = this.chosenList.findIndex((user) => user.id === item.id && user.source === item.source);
         if (chosenIndex !== -1) {
           this.chosenList.splice(chosenIndex, 1);
         }
@@ -639,6 +734,9 @@ export default {
         if (this.$refs.monitorTreeRef) {
           this.$refs.monitorTreeRef.setChecked(item.id, false);
         }
+        if( this.$refs.volteTreeRef) {
+          this.$refs.volteTreeRef.setChecked(item.id, false);
+        }
         this.$nextTick(() => {
           this.isSyncing = false;
         });
@@ -1055,6 +1153,18 @@ export default {
                 100%;
               }
             }
+            .platform {
+              display: none;
+              width: 16px;
+              height: 16px;
+              margin-left: 5px;
+              &-mini {
+                background: url("../../assets/image/common/platform_mini_icon.png") no-repeat center / 100% 100%;
+              }
+              &-volte {
+                background: url("../../assets/image/common/platform_volte_icon.png") no-repeat center / 100% 100%;
+              }
+            }
           }
 
           .close {
@@ -1063,6 +1173,16 @@ export default {
             height: 16px;
             background: var(--close-icon) no-repeat center / 100% 100%;
           }
+
+          &:hover {
+            .platform {
+              display: inline-block;
+              &-unknown,
+              &-application {
+                display: none;
+              }
+            }
+          }
         }
       }
     }

package/src/components/other/customGroupDialog.vue

@@ -81,7 +81,8 @@ export default {
               userID: item.id,
               userName: item.label,
               phone: item.phone,
-              loginCode: item?.loginCode ? item.loginCode : ""
+              loginCode: item?.loginCode ? item.loginCode : "",
+              source: item.source,
             }
           }),
         }, {

package/src/components/other/editGroupDialog.vue

@@ -97,6 +97,7 @@ export default {
                 avatar: item?.avatar ?? "",
                 phone: item.phone,
                 loginCode: item?.loginCode ? item.loginCode : "",
+                source: item.original ?? ""
               }
             });
           }
@@ -134,6 +135,7 @@ export default {
                 userName: item.label,
                 phone: item.phone,
                 loginCode: item?.loginCode ? item.loginCode : "",
+                source: item.source,
               }
             })
           }, {

package/src/components/other/memberManage.vue

@@ -23,6 +23,7 @@
                 <span class="name">{{ item.name }}</span>
                 <span class="host" v-if="item.metadata?.isOwner">主持人</span>
                 <span class="host-co" v-else-if="item.metadata?.isCoHost">联席主持人</span>
+                <div :class="getPlatformClass(item.metadata?.platformID)"></div>
               </div>
               <div class="member-list-item-group">
                 <div
@@ -70,6 +71,7 @@
                   <span class="name">{{ item.userName }}</span>
                   <span class="host" v-if="item.metadata?.isOwner">主持人</span>
                   <span class="host-co" v-else-if="item.metadata?.isCoHost">联席主持人</span>
+                  <div :class="getPlatformClass(item?.platformID)"></div>
                 </div>
                 <div class="member-list-item-group">
                   <div class="text-btn text-btn-remove" @click="removeUnjoinItem(item)">移除</div>
@@ -177,7 +179,31 @@ export default {
         return false;
       }
     },
-    
+    // 根据平台ID获取对应的图标样式
+    getPlatformClass(platformID) {
+      let className = "";
+      switch (platformID) {
+        case 0:
+          className = "platform platform-pc";
+          break;
+        case 1:
+          className = "platform platform-app";
+          break;
+        case 4:
+          className = "platform platform-volte";
+          break;
+        case 7:
+          className = "platform platform-mini";
+          break;
+        case 30:
+          className = "platform platform-application";
+          break;
+        default:
+          className = "platform platform-unknown";
+          break;
+      }
+      return className;
+    },
     switchMemberCameraStatus(identity, isMute) {
       this.$emit("participantCameraSwitch", {
         identity,
@@ -399,6 +425,28 @@ export default {
                 border: 1px solid #0CFE3D;
               }
             }
+            .platform {
+              width: 20px;
+              height: 20px;
+              margin-left: 8px;
+              display: none;
+              &-pc {
+                background: url("../../assets/image/common/platform_pc_icon.png") no-repeat center /
+                  100% 100%;
+              }
+              &-app {
+                background: url("../../assets/image/common/platform_app_icon.png") no-repeat center /
+                  100% 100%;
+              }
+              &-volte {
+                background: url("../../assets/image/common/platform_volte_icon.png") no-repeat center /
+                  100% 100%;
+              }
+              &-mini {
+                background: url("../../assets/image/common/platform_mini_icon.png") no-repeat center /
+                  100% 100%;
+              }
+            }
             .icon-btn {
               width: 16px;
               height: 16px;
@@ -425,9 +473,9 @@ export default {
               }
             }
             .text-btn {
-              width: 80px;
-              height: 32px;
-              line-height: 32px;
+              width: 60px;
+              height: 28px;
+              line-height: 28px;
               text-align: center;
               border-radius: 8px;
               cursor: pointer;
@@ -445,6 +493,15 @@ export default {
                 color: #ffffff;
               }
             }
+            &:hover {
+              .platform {
+                display: block;
+                &-application,
+                &-unkown {
+                  display: none;
+                }
+              }
+            }
           }
         }
         &-expand {

package/src/main.js

@@ -1,9 +1,9 @@
 import Vue from 'vue'
 import App from './App.vue'
 // 测试
-// import liveComponent from '../index'
+import liveComponent from '../index'
 // npm
-import MDMClient from "mdm-client"
+// import MDMClient from "mdm-client"
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css';
 
@@ -11,9 +11,9 @@ import 'element-ui/lib/theme-chalk/index.css';
 Vue.config.productionTip = false
 Vue.use(ElementUI)
 // 测试
-// Vue.use(liveComponent)
+Vue.use(liveComponent)
 // npm
-Vue.use(MDMClient)
+// Vue.use(MDMClient)
 
 
 new Vue({

package/src/utils/api.js

@@ -80,3 +80,12 @@ export const queryMonitorAddressBook = (params = {}, { baseUrl, token } = {}) =>
     },
   });
 };
+// 获取volte用户树
+export const getVolteAddressBook = (params = {}, { baseUrl, token } = {}) => {
+  return http.post("/api/v1/meeting/queryVolteAddressBook", params, {
+    baseURL: baseUrl,
+    headers: {
+      satoken: token,
+    },
+  });
+}