diff --git a/src/locales/language/zh.json b/src/locales/language/zh.json index d696bedd..e57d6fbe 100644 --- a/src/locales/language/zh.json +++ b/src/locales/language/zh.json @@ -76,6 +76,7 @@ "predictionData": "预测数据", "reanalysisData": "再分析数据", "publicMeteorologicalData": "公开气象数据", + "associateMeteorologicalData": "关联气象数据", "timeSeriesChangeChart": "时序变化展示图", "averageWindSpeed": "平均风速", "maximumWindSpeed": "最大风速", diff --git a/src/pages/sjtb/configTask/dataTable/antvX6.ts b/src/pages/sjtb/configTask/dataTable/antvX6.ts index 1cbad7f0..e36e399f 100644 --- a/src/pages/sjtb/configTask/dataTable/antvX6.ts +++ b/src/pages/sjtb/configTask/dataTable/antvX6.ts @@ -90,7 +90,7 @@ export class X6Graph { this.menuElement = document.createElement('div'); this.menuElement.style.cssText = ` position: absolute; - width: 100px; + width: 120px; background: white; border: 1px solid #ccc; border-radius: 4px; @@ -101,7 +101,7 @@ export class X6Graph { font-family: sans-serif; `; - // 1. 新增“配置”菜单项 + // 1. 配置同步字段:新增“配置”菜单项 const configItem = document.createElement('div'); configItem.style.cssText = ` padding: 6px 12px; @@ -109,7 +109,7 @@ export class X6Graph { font-size: 14px; border-bottom: 1px solid #f0f0f0; /* 分隔线,区分两个选项 */ `; - configItem.textContent = '配置'; + configItem.textContent = '配置同步字段'; configItem.addEventListener('click', () => { const nodeId = this.menuElement?.getAttribute('data-node-id'); if (nodeId) { @@ -195,7 +195,36 @@ export class X6Graph { configItem.style.background = 'white'; }); - // 2. 原有“删除”菜单项(保持不变,调整顺序在配置项下方) + // 2. 配置同步数量 + const syncNumItem = document.createElement('div'); + syncNumItem.style.cssText = ` + padding: 6px 12px; + cursor: pointer; + font-size: 14px; + border-bottom: 1px solid #f0f0f0; /* 分隔线,区分两个选项 */ + `; + syncNumItem.textContent = '配置同步数量'; + syncNumItem.addEventListener('click', () => { + const nodeId = this.menuElement?.getAttribute('data-node-id'); + if (nodeId) { + const graph = this.getGraph(); + const targetNode = graph.getCellById(nodeId) as Node; + const nodeLevel = targetNode.getData().level; + + // TODO:配置同步数量逻辑 + + } + this.hideMenu(); + }); + // 配置同步数量菜单悬停效果 + syncNumItem.addEventListener('mouseenter', () => { + syncNumItem.style.background = '#f0f0f0'; + }); + syncNumItem.addEventListener('mouseleave', () => { + syncNumItem.style.background = 'white'; + }); + + // 3. 原有“删除”菜单项(保持不变,调整顺序在配置项下方) const deleteItem = document.createElement('div'); deleteItem.style.cssText = ` padding: 6px 12px; @@ -230,6 +259,7 @@ export class X6Graph { // 3. 将两个菜单项添加到菜单容器(配置项在上,删除项在下) this.menuElement.appendChild(configItem); + this.menuElement.appendChild(syncNumItem); this.menuElement.appendChild(deleteItem); document.body.appendChild(this.menuElement); } diff --git a/src/pages/symn/index.vue b/src/pages/symn/index.vue index 17c5cd14..51a1ed40 100644 --- a/src/pages/symn/index.vue +++ b/src/pages/symn/index.vue @@ -969,6 +969,7 @@ getStations(); + @@ -1116,6 +1117,7 @@ getStations(); + @@ -1160,7 +1162,7 @@ getStations(); - + @@ -1287,6 +1292,7 @@ getStations(); + diff --git a/src/pages/tqybjs/index.vue b/src/pages/tqybjs/index.vue index ab24cc4b..b58e9d63 100644 --- a/src/pages/tqybjs/index.vue +++ b/src/pages/tqybjs/index.vue @@ -47,13 +47,14 @@ watch(drawerVisible, (newValue) => { // 回放 function handleSendData(params: any) { console.log('选中的回放数据,需要传至gis --->', params); - EventBusTool.getEventBus().publish('playData', { - key: 'show', - }); delete params.key delete params.endTime playbackSearchData(params, false, (res) => { console.log(res); + // 将请求前的传递方法放到这里:只有请求成功后才会传递 + EventBusTool.getEventBus().publish('playData', { + key: 'show', + }); if (params.timeBatch) { timeBatch.value = params.timeBatch; } @@ -236,6 +237,9 @@ onMounted(() => { + + 建设中... + diff --git a/src/pages/tqybjs/tab-1/index.vue b/src/pages/tqybjs/tab-1/index.vue index 21676114..e256b48a 100644 --- a/src/pages/tqybjs/tab-1/index.vue +++ b/src/pages/tqybjs/tab-1/index.vue @@ -1,11 +1,11 @@