{{ $t('onlineMembersDialog.editStatus') }}
-
- {{ $t('onlineMembersDialog.currentEditor') }}：
- {{ currentEditor || $t('onlineMembersDialog.none') }}
-
-
- {{ $t('onlineMembersDialog.editingObject') }}：
- {{ editingObject || $t('onlineMembersDialog.none') }}
-
-
- {{ $t('onlineMembersDialog.editingTime') }}：
- {{ editingTime || $t('onlineMembersDialog.none') }}
-
+ {{ $t('onlineMembersDialog.noActiveEditing') }}
+ | {{ $t('onlineMembersDialog.colUser') }} | +{{ $t('onlineMembersDialog.editingObject') }} | +{{ $t('onlineMembersDialog.editingTime') }} | +
|---|---|---|
| {{ activityUserName(row) }} | +{{ formatEditingObjectLabel(row) }} | +{{ formatEditingDuration(row) }} | +
{{ $t('onlineMembersDialog.selectStatus') }}
-
- {{ $t('onlineMembersDialog.selectedObject') }}：
- {{ selectedObject || $t('onlineMembersDialog.none') }}
-
-
- {{ $t('onlineMembersDialog.selectedCount') }}：
- {{ selectedCount }} {{ $t('onlineMembersDialog.unit') }}
-
+ {{ $t('onlineMembersDialog.noActiveSelection') }}
+ | {{ $t('onlineMembersDialog.colUser') }} | +{{ $t('onlineMembersDialog.selectedObject') }} | +{{ $t('onlineMembersDialog.selectedCount') }} | +
|---|---|---|
| {{ activityUserName(row) }} | +{{ selectionSummaryText(row) }} | +{{ selectionCountText(row) }} | +
+
+ ![]()
+
@@ -264,12 +289,39 @@
-
+ {{ message.content }}
+
+ {{ message.content }}
+
+
+ ![]()
+
{{ message.content }}
+
+ {{ message.content }}
+
+
+
import { listObjectLog, rollbackObjectLog } from '@/api/system/objectLog'
+import request from '@/utils/request'
const STORAGE_KEY_PREFIX = 'onlineMembersPanel_'
const OP_TYPE_MAP = { 1: '新增', 2: '修改', 3: '删除', 4: '选择', 5: '回滚' }
@@ -342,6 +395,11 @@ export default {
currentUserId: {
type: [Number, String],
default: null
+ },
+ /** 来自 WebSocket 的房间用户当前操作（编辑/选中） */
+ userActivities: {
+ type: Array,
+ default: () => []
}
},
data() {
@@ -365,13 +423,9 @@ export default {
{ id: 5, userId: 5, userName: 'sunqi', name: '孙七', role: '分析师', status: '在线', isEditing: false, avatar: 'https://cube.elemecdn.com/4/88/03b0d39583f48206768a7534e55bcpng.png' }
],
- // 当前操作状态
- currentEditor: '张三',
- editingObject: 'J-20 歼击机',
- editingTime: 'K+00:45:23',
- selectedObject: 'Alpha进场航线',
- selectedCount: 1,
-
+ activityNow: Date.now(),
+ activityTickTimer: null,
+
// 操作日志（来自接口，支持分页）
operationLogs: [],
logTotal: 0,
@@ -385,7 +439,8 @@ export default {
newMessage: '',
chatMode: 'group',
privateChatTarget: null,
- privateContactPending: null
+ privateContactPending: null,
+ chatImageUploading: false
};
},
computed: {
@@ -415,6 +470,18 @@ export default {
if (m) return m.name || m.userName || '';
return this.$t('onlineMembersDialog.selectMemberToChat');
},
+ activityRowsEditing() {
+ const list = this.userActivities || [];
+ return list.filter(a => a && a.editing);
+ },
+ activityRowsSelection() {
+ const list = this.userActivities || [];
+ return list.filter(a => {
+ if (!a || !a.selection) return false;
+ const n = Number(a.selection.count);
+ return !isNaN(n) && n > 0;
+ });
+ },
panelStyle() {
const pad = 16
const effW = Math.min(this.panelWidth, Math.max(320, window.innerWidth - pad))
@@ -571,6 +638,8 @@ export default {
if (log.objectType === 'route') return '航线';
if (log.objectType === 'waypoint') return '航点';
if (log.objectType === 'platform') return '平台模板';
+ if (log.objectType === 'room_platform_icon') return '地图平台';
+ if (log.objectType === 'room_platform_icon_style') return '地图平台样式';
return log.objectType;
},
computeFieldChanges(log) {
@@ -587,7 +656,12 @@ export default {
const keys = new Set();
if (before) Object.keys(before).forEach(k => keys.add(k));
if (after) Object.keys(after).forEach(k => keys.add(k));
- const prefer = ['name', 'type', 'callSign', 'iconUrl', 'specsJson'];
+ const prefer = log.objectType === 'room_platform_icon'
+ ? ['platformName', 'lng', 'lat', 'heading', 'iconScale', 'roomId', 'platformId', 'platformType', 'iconUrl', 'sortOrder']
+ : log.objectType === 'room_platform_icon_style'
+ ? ['platformColor', 'labelFontColor', 'labelFontSize', 'platformSize', 'detectionZones', 'powerZones',
+ 'detectionZoneRadius', 'detectionZoneColor', 'powerZoneRadius', 'powerZoneAngle', 'powerZoneColor']
+ : ['name', 'type', 'callSign', 'iconUrl', 'specsJson'];
const orderedKeys = [...prefer, ...[...keys].filter(k => !prefer.includes(k))];
orderedKeys.forEach(k => {
const bv = before ? before[k] : undefined;
@@ -604,7 +678,27 @@ export default {
type: '类型',
callSign: '呼号',
iconUrl: '图标',
- specsJson: '参数(JSON)'
+ specsJson: '参数(JSON)',
+ platformName: '平台名称',
+ lng: '经度',
+ lat: '纬度',
+ heading: '朝向(度)',
+ iconScale: '图标缩放',
+ roomId: '房间ID',
+ platformId: '平台库ID',
+ platformType: '平台类型',
+ sortOrder: '排序',
+ platformColor: '图标颜色',
+ labelFontColor: '标牌颜色',
+ labelFontSize: '标牌字号',
+ platformSize: '平台大小',
+ detectionZones: '探测区配置',
+ powerZones: '威力区配置',
+ detectionZoneRadius: '探测区半径(km)',
+ detectionZoneColor: '探测区颜色',
+ powerZoneRadius: '威力区半径(km)',
+ powerZoneAngle: '威力区夹角(度)',
+ powerZoneColor: '威力区颜色'
};
changes.push({
field: k,
@@ -736,6 +830,66 @@ export default {
const el = this.$refs.chatContent;
if (el) el.scrollTop = el.scrollHeight;
},
+ isChatImageMessage(msg) {
+ return !!(msg && msg.imageUrl && String(msg.imageUrl).trim() && String(msg.imageUrl) !== 'null')
+ },
+ resolveChatContentImageUrl(url) {
+ if (!url) return ''
+ const s = String(url).trim()
+ if (!s || s === 'null') return ''
+ if (s.startsWith('http') || s.startsWith('data:') || s.startsWith('blob:')) return s
+ const baseUrl = process.env.VUE_APP_BACKEND_URL || (window.location.origin + (process.env.VUE_APP_BASE_API || ''))
+ return baseUrl + (s.startsWith('/') ? s : '/' + s)
+ },
+ openChatImagePreview(url) {
+ if (!url) return
+ window.open(url, '_blank', 'noopener,noreferrer')
+ },
+ triggerChatImagePick() {
+ if (this.chatMode === 'private' && !this.privateChatTarget) return
+ const input = this.$refs.chatImageInput
+ if (input) input.click()
+ },
+ async onChatImageSelected(ev) {
+ const input = ev && ev.target
+ const file = input && input.files && input.files[0]
+ if (input) input.value = ''
+ if (!file || !file.type || !file.type.startsWith('image/')) return
+ const maxBytes = 5 * 1024 * 1024
+ if (file.size > maxBytes) {
+ this.$message.warning(this.$t('onlineMembersDialog.imageTooLarge'))
+ return
+ }
+ if (this.chatMode === 'private' && !this.privateChatTarget) return
+ if (!this.sendChat || !this.sendPrivateChat) return
+ this.chatImageUploading = true
+ try {
+ const fd = new FormData()
+ fd.append('file', file)
+ const res = await request.post('/common/upload', fd)
+ if (res.code !== 200 || !res.url) {
+ throw new Error(res.msg || 'upload failed')
+ }
+ const caption = (this.newMessage || '').trim()
+ if (this.chatMode === 'group') {
+ this.sendChat({ content: caption, messageType: 'image', imageUrl: res.url })
+ } else {
+ const target = this.selectedPrivateMember
+ if (!target) return
+ this.sendPrivateChat(target.userId, target.userName, {
+ content: caption,
+ messageType: 'image',
+ imageUrl: res.url
+ })
+ }
+ this.newMessage = ''
+ this.$nextTick(() => this.scrollChatToBottom())
+ } catch (e) {
+ this.$message.error(this.$t('onlineMembersDialog.imageUploadFailed'))
+ } finally {
+ this.chatImageUploading = false
+ }
+ },
resolveAvatarUrl(av) {
if (!av) return '';
if (av.startsWith('http')) return av;
@@ -779,6 +933,66 @@ export default {
clearPrivateChatTarget() {
this.privateChatTarget = null;
this.privateContactPending = null;
+ },
+ activityUserName(row) {
+ const e = row && row.editor ? row.editor : {};
+ return e.nickName || e.userName || this.$t('onlineMembersDialog.none');
+ },
+ objectTypeLabel(type) {
+ if (type === 'route') return this.$t('onlineMembersDialog.typeRoute');
+ if (type === 'platform') return this.$t('onlineMembersDialog.typePlatform');
+ if (type === 'waypoint') return this.$t('onlineMembersDialog.typeWaypoint');
+ return type || '';
+ },
+ formatEditingObjectLabel(row) {
+ const ed = row && row.editing ? row.editing : {};
+ const label = ed.objectLabel != null && String(ed.objectLabel).trim() !== '' ? String(ed.objectLabel) : '';
+ const t = this.objectTypeLabel(ed.objectType);
+ if (label && t) return `${t}：${label}`;
+ if (label) return label;
+ return t || this.$t('onlineMembersDialog.none');
+ },
+ formatEditingDuration(row) {
+ const ed = row && row.editing ? row.editing : {};
+ const started = ed.startedAt;
+ if (started == null) return '—';
+ const sec = Math.max(0, Math.floor((this.activityNow - Number(started)) / 1000));
+ return this.formatElapsedSeconds(sec);
+ },
+ formatElapsedSeconds(totalSec) {
+ const h = Math.floor(totalSec / 3600);
+ const m = Math.floor((totalSec % 3600) / 60);
+ const s = totalSec % 60;
+ const pad = n => String(n).padStart(2, '0');
+ if (h > 0) return `${h}:${pad(m)}:${pad(s)}`;
+ return `${pad(m)}:${pad(s)}`;
+ },
+ selectionSummaryText(row) {
+ const s = row && row.selection ? row.selection : {};
+ if (s.summary != null && String(s.summary).trim() !== '') return String(s.summary);
+ const items = Array.isArray(s.items) ? s.items : [];
+ if (!items.length) return this.$t('onlineMembersDialog.none');
+ return items.map(i => (i && i.label) || '').filter(Boolean).join('、') || this.$t('onlineMembersDialog.none');
+ },
+ selectionCountText(row) {
+ const s = row && row.selection ? row.selection : {};
+ const n = Number(s.count);
+ const c = isNaN(n) ? 0 : n;
+ return `${c} ${this.$t('onlineMembersDialog.unit')}`;
+ },
+ startActivityTickIfNeeded() {
+ if (!this.value || this.activeTab !== 'current') return;
+ if (this.activityTickTimer != null) return;
+ this.activityNow = Date.now();
+ this.activityTickTimer = setInterval(() => {
+ this.activityNow = Date.now();
+ }, 1000);
+ },
+ stopActivityTick() {
+ if (this.activityTickTimer != null) {
+ clearInterval(this.activityTickTimer);
+ this.activityTickTimer = null;
+ }
}
},
watch: {
@@ -786,6 +1000,9 @@ export default {
if (val) {
this.loadPosition();
if (this.activeTab === 'logs') this.fetchOperationLogs();
+ this.startActivityTickIfNeeded();
+ } else {
+ this.stopActivityTick();
}
},
activeTab(newVal) {
@@ -793,6 +1010,8 @@ export default {
if (newVal === 'chat') {
this.$nextTick(() => this.scrollChatToBottom());
}
+ if (newVal === 'current') this.startActivityTickIfNeeded();
+ else this.stopActivityTick();
},
chatMessages: {
handler() {
@@ -822,6 +1041,9 @@ export default {
chatMode() {
this.privateContactPending = null;
}
+ },
+ beforeDestroy() {
+ this.stopActivityTick();
}
};
@@ -1120,6 +1342,42 @@ export default {
font-weight: 500;
}
+.activity-empty {
+ font-size: 13px;
+ color: #86909c;
+ padding: 8px 0;
+}
+
+.activity-table {
+ width: 100%;
+ border-collapse: collapse;
+ font-size: 13px;
+}
+
+.activity-table th,
+.activity-table td {
+ text-align: left;
+ padding: 8px 6px;
+ border-bottom: 1px solid rgba(0, 0, 0, 0.06);
+ vertical-align: top;
+}
+
+.activity-table th {
+ color: #86909c;
+ font-weight: 600;
+ font-size: 12px;
+}
+
+.activity-table tbody tr:last-child td {
+ border-bottom: none;
+}
+
+.activity-duration {
+ white-space: nowrap;
+ color: #4e5969;
+ font-variant-numeric: tabular-nums;
+}
+
/* 操作日志样式 */
.operation-logs {
position: relative;
@@ -1653,6 +1911,56 @@ export default {
box-shadow: 0 6px 20px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.04);
}
+.chat-image-file-input {
+ position: absolute;
+ width: 0;
+ height: 0;
+ opacity: 0;
+ pointer-events: none;
+}
+
+.chat-image-btn {
+ flex-shrink: 0;
+ height: 44px;
+ width: 44px;
+ padding: 0;
+ border-radius: 8px;
+ border: 1px solid #e8eaed;
+ background: #f9fafb;
+}
+
+.chat-image-btn:hover:not(.is-disabled) {
+ border-color: var(--chat-primary);
+ color: var(--chat-primary);
+}
+
+.chat-msg-image {
+ display: block;
+ max-width: 220px;
+ max-height: 220px;
+ width: auto;
+ height: auto;
+ border-radius: 8px;
+ cursor: pointer;
+ vertical-align: top;
+}
+
+.chat-msg-caption {
+ margin-top: 8px;
+ font-size: 14px;
+ line-height: 1.4;
+ white-space: pre-wrap;
+ word-break: break-word;
+}
+
+.other-message .chat-msg-caption {
+ color: #1d2129;
+}
+
+.self-message .chat-msg-caption {
+ color: rgba(255, 255, 255, 0.95);
+}
+
.chat-input-field {
flex: 1;
min-width: 0;
From 547688f96f310950ed021b70dd6fbc9239102e70 Mon Sep 17 00:00:00 2001
From: cuitw <1051735452@qq.com>
Date: Tue, 31 Mar 2026 08:37:40 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?=
=?UTF-8?q?=E5=AE=8C=E5=96=84=EF=BC=88=E5=B9=B3=E5=8F=B0=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/views/childRoom/LeftMenu.vue | 25 +++++++----
ruoyi-ui/src/views/childRoom/index.vue | 59 +++++++++----------------
ruoyi-ui/src/views/dialogs/IconSelectDialog.vue | 18 ++++++--
3 files changed, 53 insertions(+), 49 deletions(-)
diff --git a/ruoyi-ui/src/views/childRoom/LeftMenu.vue b/ruoyi-ui/src/views/childRoom/LeftMenu.vue
index 749ce85..fb8a2d5 100644
--- a/ruoyi-ui/src/views/childRoom/LeftMenu.vue
+++ b/ruoyi-ui/src/views/childRoom/LeftMenu.vue
@@ -113,6 +113,11 @@ export default {
type: Array,
default: () => []
},
+ /** 与 index 中 defaultMenuItems 一致，用于从选择图标中恢复内置项时使用稳定 id */
+ defaultMenuItems: {
+ type: Array,
+ default: () => []
+ },
position: {
type: String,
default: 'left'
@@ -175,18 +180,22 @@ export default {
},
confirmAddIcons(selectedItems) {
+ const defaults = this.defaultMenuItems || []
selectedItems.forEach(item => {
- const newId = Date.now().toString() + Math.random().toString(36).substr(2, 9)
- const newMenuItem = {
- id: newId,
- name: item.name,
- icon: item.icon,
- action: item.id
+ const preset = defaults.find(d => d.id === item.id)
+ if (preset) {
+ this.localMenuItems.push({ ...preset })
+ } else {
+ const newId = Date.now().toString() + Math.random().toString(36).substr(2, 9)
+ this.localMenuItems.push({
+ id: newId,
+ name: item.name,
+ icon: item.icon,
+ action: item.id
+ })
}
- this.localMenuItems.push(newMenuItem)
})
this.$emit('update:menuItems', this.localMenuItems)
- this.$emit('add-items', selectedItems)
},
quickDelete(item) {
diff --git a/ruoyi-ui/src/views/childRoom/index.vue b/ruoyi-ui/src/views/childRoom/index.vue
index 299f23d..f7ad240 100644
--- a/ruoyi-ui/src/views/childRoom/index.vue
+++ b/ruoyi-ui/src/views/childRoom/index.vue
@@ -180,14 +180,14 @@
:menu-items="menuItems"
:active-menu="activeMenu"
:is-edit-mode="isIconEditMode"
- :available-icons="topNavItems"
+ :available-icons="iconPickerCatalog"
+ :default-menu-items="defaultMenuItems"
:position="menuPosition"
@hide="hideMenu"
@select="selectMenu"
@menu-action="handleMenuAction"
@update:menu-items="updateMenuItems"
@drag-end="handleMenuDragEnd"
- @add-items="handleAddMenuItems"
@delete="handleDeleteMenuItem"
@save-menu-items="handleSaveMenuItems"
@exit-icon-edit="exitIconEdit"
@@ -1071,6 +1071,13 @@ export default {
if (editor && Number(editor.userId) !== Number(myId)) ids.push(Number(rid));
});
return ids;
+ },
+ /** 左侧「选择图标」：全部默认菜单样式 + 不与默认 id 重复的扩展项 */
+ iconPickerCatalog() {
+ const defs = this.defaultMenuItems || [];
+ const seen = new Set(defs.map(d => d.id));
+ const extras = (this.topNavItems || []).filter(t => !seen.has(t.id));
+ return [...defs, ...extras];
}
},
mounted() {
@@ -3789,19 +3796,6 @@ export default {
this.menuItems = newItems
},
- handleAddMenuItems(selectedItems) {
- selectedItems.forEach(item => {
- const newId = Date.now().toString() + Math.random().toString(36).substr(2, 9)
- const newMenuItem = {
- id: newId,
- name: item.name,
- icon: item.icon,
- action: item.id
- }
- this.menuItems.push(newMenuItem)
- })
- },
-
handleMenuAction(actionId) {
const actionMap = {
'savePlan': () => this.savePlan(),
@@ -4495,43 +4489,32 @@ export default {
}
},
- /** 加载当前用户的左侧菜单配置（登录且有过保存时生效） */
+ /** 加载当前用户的左侧菜单配置（以数据库为准，不自动补回已删除的默认项） */
async loadUserMenuConfig() {
try {
const res = await getMenuConfig()
const data = res && res.data
if (!data) return
- if (data.menuItems) {
+ if (data.menuItems != null && data.menuItems !== '') {
let arr = []
try {
arr = typeof data.menuItems === 'string' ? JSON.parse(data.menuItems) : data.menuItems
- } catch (e) { /* 解析失败保留默认 */ }
- if (Array.isArray(arr) && arr.length > 0) {
- const defaultMap = (this.defaultMenuItems || []).reduce((m, it) => { m[it.id] = it; return m }, {})
- const savedIds = new Set(arr.map(i => i.id))
- // 合并缺失的默认项（如新增的4T），按 defaultMenuItems 顺序插入
- const defaultOrder = (this.defaultMenuItems || []).map(d => d.id)
- defaultOrder.forEach(defId => {
- if (!savedIds.has(defId) && defaultMap[defId]) {
- const insertAfterId = defaultOrder[defaultOrder.indexOf(defId) - 1]
- const refIdx = insertAfterId ? arr.findIndex(i => i.id === insertAfterId) : -1
- const insertIdx = refIdx >= 0 ? refIdx + 1 : 0
- arr.splice(insertIdx, 0, { ...defaultMap[defId] })
- savedIds.add(defId)
- }
- })
- this.menuItems = arr.map(item => {
- const def = defaultMap[item.id]
- if (def) return { ...item, name: def.name, icon: def.icon, action: def.action }
- return item
- })
+ } catch (e) {
+ return
}
+ if (!Array.isArray(arr)) return
+ const defaultMap = (this.defaultMenuItems || []).reduce((m, it) => { m[it.id] = it; return m }, {})
+ this.menuItems = arr.map(item => {
+ const def = defaultMap[item.id]
+ if (def) return { ...item, name: def.name, icon: def.icon, action: def.action }
+ return item
+ })
}
if (data.position && ['left', 'top', 'bottom'].includes(data.position)) {
this.menuPosition = data.position
}
} catch (e) {
- // 未登录或接口失败则使用默认菜单，不提示
+ // 未登录或接口失败则使用 mounted 中的默认菜单，不提示
}
},
diff --git a/ruoyi-ui/src/views/dialogs/IconSelectDialog.vue b/ruoyi-ui/src/views/dialogs/IconSelectDialog.vue
index 459dde0..e307dbc 100644
--- a/ruoyi-ui/src/views/dialogs/IconSelectDialog.vue
+++ b/ruoyi-ui/src/views/dialogs/IconSelectDialog.vue
@@ -16,7 +16,8 @@
:class="{ selected: selectedIcons.includes(item.id) }"
@click="toggleIcon(item)"
>
-
+