mdm-client 1.0.3 → 1.0.4

package/src/components/other/addressBook.vue

@@ -47,6 +47,31 @@
               </template>
             </vue-virtual-tree>
 
+            <!-- 会议终端树 -->
+             <vue-virtual-tree
+              v-show="activeTab === '会议终端'"
+              ref="terminalTreeRef"
+              :data="terminalTreeData"
+              :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 === '人员'"
@@ -192,6 +217,15 @@
               <div class="label">
                 <span :class="['custom-item-icon', getInviteItemIconClass(item)]"></span>
                 <span>{{ item.label }}</span>
+                <!-- 会议终端：小输入框编辑会议ID，Enter/失焦提交 -->
+                <el-input
+                  v-if="item.source === '会议终端' && item.callMethod == 1"
+                  v-model="item._callMeetingID"
+                  class="terminal-id-input"
+                  placeholder="请输入会议ID"
+                  @keyup.enter="confirmTerminalMeetingId(item)"
+                  @blur="confirmTerminalMeetingId(item)"
+                />
                 <span :class="getChosenItemPlatformClass(item)"></span>
               </div>
               <div class="close" @click="removeInviteItem(item)"></div>
@@ -234,7 +268,7 @@
 
 <script>
 import { debounce } from "lodash-es";
-import { mittBus, ShowMessage, deleteCommonGroupAndUser, getAddressOrgTree, getAddressAppTree, getCommonOrgTree, queryEquipmentAddressBook, queryMonitorAddressBook, getVolteAddressBook } from "../../utils/index";
+import { mittBus, ShowMessage, deleteCommonGroupAndUser, getAddressOrgTree, getAddressAppTree, getCommonOrgTree, queryEquipmentAddressBook, queryMonitorAddressBook, getVolteAddressBook, getMeetingRoomAddressBook, updateConfTerminal } from "../../utils/index";
 import VueVirtualTree from "@fit2cloud-ui/vue-virtual-tree";
 import CustomGroupDialog from "./customGroupDialog.vue";
 import EditGroupDialog from "./editGroupDialog.vue";
@@ -263,6 +297,12 @@ export default {
       type: String,
       default: "",
     },
+    tabList: {
+      type: Array,
+      default: () => {
+        return ["组织架构", "人员", "会议终端", "volte", "设备", "监控", "常用分组"];
+      },
+    }
   },
   data() {
     return {
@@ -270,6 +310,7 @@ export default {
       
       // 树数据
       treeData: [],
+      terminalTreeData: [],
       appTreeData: [],
       volteTreeData: [],
       groupTreeData: [],
@@ -278,7 +319,6 @@ export default {
       
       // 标签页相关
       activeTab: "组织架构",
-      tabList: ["组织架构", "人员", "volte", "设备", "监控", "常用分组"],
       
       // 搜索相关
       filterText: "",
@@ -344,17 +384,17 @@ export default {
     
     // 监听对话框显示状态
     isaddressShow: {
-      async handler(newVal) {
+      handler(newVal) {
         if (newVal) {
           // 初始化选中状态
           this.isSyncing = true;
           this.chosenList = [...this.tempInviteList];
-          await this.$nextTick();
-          this.syncTreeSelectionFromChosenList();
-          // 更新树高度
-          await this.$nextTick();
-          this.updateTreeHeight();
-          this.isSyncing = false;
+          this.$nextTick(() => {
+            this.syncTreeSelectionFromChosenList();
+            // 更新树高度
+            this.updateTreeHeight();
+            this.isSyncing = false;
+          });
         }
       }
     }
@@ -377,7 +417,9 @@ export default {
         this.$refs.equipmentTreeRef.filter(val);
       } else if (this.activeTab === "监控" && this.$refs.monitorTreeRef) {
         this.$refs.monitorTreeRef.filter(val);
-      }
+      } else if (this.activeTab === "会议终端" && this.$refs.terminalTreeRef) {
+        this.$refs.terminalTreeRef.filter(val);
+      } 
     }, 300);
     
     // 监听mitt事件
@@ -460,7 +502,20 @@ export default {
         this.monitorTreeData = res.data.data;
       }
     },
-    
+    // 获取会议终端树数据
+    async getTerminalTreeData() {
+      try {
+        const res = await getMeetingRoomAddressBook({}, { baseUrl: this.baseUrl, token: this.token });
+        if (res.data?.code == 200) {
+          const data = res.data?.data || [];
+          this.terminalTreeData = data.length > 0 ? data : [];
+        } else {
+          this.terminalTreeData = [];
+        }
+      } catch (e) {
+        this.terminalTreeData = [];
+      }
+    },
     // 获取所有树数据
     async getAllTreeData() {
       await this.getOrgTreeData();
@@ -469,6 +524,7 @@ export default {
       await this.getGroupTreeData();
       await this.getEquipmentTreeData();
       await this.getMonitorTreeData();
+      await this.getTerminalTreeData();
     },
     
     // 过滤树节点的方法 - 虚拟树使用filter-node-method
@@ -496,16 +552,20 @@ export default {
         // 修改判断条件，只有当isDept为false时，才是叶子节点
         // isDept为true的节点(即使是空数组)都视为非叶子节点
         if (!node.isDept) {
-          leafNodes.push({
-            ...node,
-            source: this.activeTab, // 记录节点来源于哪个树
-          });
+          leafNodes.push(this.prepareChosenUser(node, this.activeTab));
         }
       });
 
       return leafNodes;
     },
-    
+    // 构建已选用户对象：当来源为“会议终端”时，初始化 _callMeetingID，避免输入框为空
+    prepareChosenUser(raw, source) {
+      const user = { ...raw, source };
+      if (source === '会议终端') {
+        user._callMeetingID = raw?.callMeetingID ?? '';
+      }
+      return user;
+    },
     // 更新chosenList，保留其他树的选中状态
     updateChosenListWithLeafNodes(newLeafNodes) {
       // 从chosenList中过滤掉当前激活树的节点
@@ -565,6 +625,8 @@ export default {
         this.$refs.equipmentTreeRef.setCheckedKeys([]);
       } else if (this.activeTab === "监控" && this.$refs.monitorTreeRef) {
         this.$refs.monitorTreeRef.setCheckedKeys([]);
+      } else if (this.activeTab === "会议终端" && this.$refs.terminalTreeRef) {
+        this.$refs.terminalTreeRef.setCheckedKeys([]);
       }
       
       // 然后根据chosenList设置选中状态
@@ -594,6 +656,10 @@ export default {
         selectedIds.forEach((id) => {
           this.$refs.monitorTreeRef.setChecked(id, true, false);
         });
+      } else if (this.activeTab === "会议终端" && this.$refs.terminalTreeRef) {
+        selectedIds.forEach((id) => {
+          this.$refs.terminalTreeRef.setChecked(id, true, false);
+        });
       }
     },
     
@@ -666,11 +732,11 @@ export default {
         this.showMessage.message("error", "请先选择要添加的人员");
         return;
       }
-      if(this.tempInviteList.some((item) => item.source === '设备' || item.source === '监控')) {
+      if(this.tempInviteList.some((item) => item.source === '设备' || item.source === '监控' || item.source === '会议终端')) {
         this.showMessage.message("info", "设备和监控人员暂不支持添加分组, 将不会被添加到常用分组");
       }
       // 确保数据格式正确
-      const formattedList = this.tempInviteList.filter((item) => item.source !== '设备' && item.source !== '监控').map((item) => {
+      const formattedList = this.tempInviteList.filter((item) => item.source !== '设备' && item.source !== '监控' && item.source !== '常用分组' && item.source !== '会议终端').map((item) => {
         return {
           id: item.id,
           label: item.label,
@@ -737,12 +803,33 @@ export default {
         if( this.$refs.volteTreeRef) {
           this.$refs.volteTreeRef.setChecked(item.id, false);
         }
+        if (this.$refs.terminalTreeRef) {
+          this.$refs.terminalTreeRef.setChecked(item.id, false);
+        }
         this.$nextTick(() => {
           this.isSyncing = false;
         });
       }
     },
 
+    // 更新会议终端会议ID（Enter/失焦）
+    async confirmTerminalMeetingId(user) {
+      const newId = (user._callMeetingID || '').toString().trim()
+      const oldId = (user.callMeetingID || '').toString().trim()
+      if (newId === oldId) return
+      try {
+        const res = await updateConfTerminal({ id: user.id, callMeetingID: newId }, { baseUrl: props.baseUrl, token: props.token })
+        if (res.data?.code == 200) {
+          user.callMeetingID = newId
+          this.showMessage.message('success', '会议ID已更新')
+        } else {
+          this.showMessage.message('error', res.data?.msg || '更新会议ID失败')
+        }
+      } catch (e) {
+        this.showMessage.message('error', e.message || '网络异常，更新会议ID失败')
+      }
+    },
+
     cancel() {
       this.tempInviteList = [];
       this.isaddressShow = false;
@@ -750,7 +837,7 @@ export default {
 
     confirm() {
       // 转换数据格式以保持向后兼容
-      const convertedList = this.tempInviteList.filter((item) => item.source !== '设备' && item.source !== '监控').map((item) => {
+      const convertedList = this.tempInviteList.filter((item) => item.source !== '设备' && item.source !== '监控' && item.source !== '会议终端').map((item) => {
         return {
           ...item,
         };
@@ -760,11 +847,17 @@ export default {
           ...item,
         };
       });
-
+      const convertedTerminalList = this.tempInviteList.filter(item => item.source === '会议终端')
+        .map(item => {
+          return {
+            ...item,
+          }
+        })
       this.$emit("inviteListUpdate", convertedList);
       if (this.isInner) {
         this.$emit("appendInvitePeople", convertedList);
         this.$emit("appendInviteDevice", convertedDeviceList);
+        this.$emit("appendInviteTerminal", convertedTerminalList);
       }
       this.isaddressShow = false;
     },
@@ -1134,6 +1227,30 @@ export default {
             font-size: 16px;
             color: var(--theme-font-color);
 
+            :deep(.el-input) {
+              margin-left: 8px;
+              width: 100px;
+              line-height: 28px;
+              height: 28px;
+              border: none;
+              .el-input__inner {
+                box-shadow: none;
+                background-color: transparent;
+                border-radius: 0px;
+                border: none;
+                border-bottom: 1px solid var(--input-border-color);
+                padding: 0 6px;
+                color: var(--theme-font-color);
+                font-size: 14px;
+                font-weight: 400;
+                line-height: 28px;
+                &::placeholder {
+                  color: var(--input-placeholder-color);
+                  font-family: var(--main-font);
+                }
+              }
+            }
+
             .custom-item-icon {
               width: 20px;
               height: 20px;

package/src/components/other/appointDialog.vue

@@ -123,7 +123,7 @@ export default {
 .appoint-dialog {
   width: 220px;
   position: absolute;
-  z-index: 100;
+  z-index: 2100;
   background: var(--dialog-bg);
   box-shadow: 0px 0px 8px 0px var(--dialog-shadow-color);
   border-radius: 8px;