fix: 更新图标资源,替换区域13相关的暗黑和亮色主题图标,并调整编辑器工具栏按钮配置

This commit is contained in:
xudan 2025-07-09 15:25:51 +08:00
parent ec0b182671
commit 6ad9743e98
9 changed files with 281 additions and 13 deletions

268
scene-examples.json Normal file
View File

@ -0,0 +1,268 @@
{
"scale": 1,
"origin": {
"x": -5275.099999999977,
"y": -5630.349999999977
},
"robotGroups": [
{
"id": "1762B341",
"label": "RG1762B341",
"robots": [
"1941043233861808129",
"1941043156577562626",
"1940687369300742146",
"1941042930152255490",
"1941354540007919618",
"1941042677302833154",
"1941042647254839298",
"1941042563083546625",
"1941042262079320065",
"1941042192294490113",
"1940666495151509506",
"1941044747288326146",
"1941368881327370242",
"1941041959426732034",
"1942475536999866370"
]
}
],
"robots": [
{
"id": "1941043233861808129",
"label": "AMB-20",
"brand": 1,
"type": 1,
"ip": "192.45.45.20",
"gid": "1762B341"
},
{
"id": "1941043156577562626",
"label": "AMB-19",
"brand": 1,
"type": 1,
"ip": "192.45.45.19",
"gid": "1762B341"
},
{
"id": "1940687369300742146",
"label": "AMB-18",
"brand": 1,
"type": 1,
"ip": "192.45.45.18",
"gid": "1762B341"
},
{
"id": "1941042930152255490",
"label": "AMB-17",
"brand": 1,
"type": 1,
"ip": "192.45.45.17",
"gid": "1762B341"
},
{
"id": "1941354540007919618",
"label": "AMB-16",
"brand": 1,
"type": 1,
"ip": "192.45.45.16",
"gid": "1762B341"
},
{
"id": "1941042677302833154",
"label": "AMB-13",
"brand": 1,
"type": 1,
"ip": "192.45.45.11",
"gid": "1762B341"
},
{
"id": "1941042647254839298",
"label": "AMB-12",
"brand": 1,
"type": 1,
"ip": "192.45.45.12",
"gid": "1762B341"
},
{
"id": "1941042563083546625",
"label": "AMB-11",
"brand": 1,
"type": 1,
"ip": "192.45.45.11",
"gid": "1762B341"
},
{
"id": "1941042262079320065",
"label": "AMB-07",
"brand": 1,
"type": 1,
"ip": "192.45.45.7",
"gid": "1762B341"
},
{
"id": "1941042192294490113",
"label": "AMB-06",
"brand": 1,
"type": 1,
"ip": "192.45.45.6",
"gid": "1762B341"
},
{
"id": "1940666495151509506",
"label": "AMB-05",
"brand": 1,
"type": 1,
"ip": "192.45.45.5",
"gid": "1762B341"
},
{
"id": "1941044747288326146",
"label": "AMB-03",
"brand": 1,
"type": 1,
"ip": "192.45.45.3",
"gid": "1762B341"
},
{
"id": "1941368881327370242",
"label": "AMB-02",
"brand": 1,
"type": 1,
"ip": "192.168.9.2",
"gid": "1762B341"
},
{
"id": "1941041959426732034",
"label": "AMB-01",
"brand": 1,
"type": 1,
"ip": "192.45.45.3",
"gid": "1762B341"
},
{
"id": "1942475536999866370",
"label": "AMB-14",
"brand": 1,
"type": 2,
"ip": "172.31.57.14",
"gid": "1762B341"
}
],
"points": [
{
"id": "3365",
"name": "AP1",
"x": 4059.9,
"y": 4128.15,
"type": 15,
"config": {},
"properties": [
{
"key": "spin",
"type": "bool",
"value": "ZmFsc2U=",
"boolValue": false
}
]
},
{
"id": "3366",
"name": "AP2",
"x": 4199.9,
"y": 4128.15,
"type": 15,
"config": {},
"properties": [
{
"key": "spin",
"type": "bool",
"value": "ZmFsc2U=",
"boolValue": false
}
]
}
],
"areas": [
{
"id": "028e874",
"name": "A028e874",
"x": 5226.5,
"y": 6884.65,
"w": 315.1,
"h": 296.7,
"type": 13,
"config": {},
"maxAmr": 3,
"points": ["3428", "3429", "3436", "3437"]
},
{
"id": "1d473b97",
"name": "A1d473b97",
"x": 5216.2,
"y": 6512.55,
"w": 314.0,
"h": 251.2,
"type": 13,
"config": {},
"maxAmr": 3,
"points": ["3422", "3423", "3426", "3427"]
},
{
"id": "47123ebc",
"name": "A47123ebc",
"x": 5213.5,
"y": 6152.45,
"w": 314.0,
"h": 282.5,
"type": 13,
"config": {},
"maxAmr": 3,
"points": ["3414", "3415", "3416", "3419"]
},
{
"id": "46c753e",
"name": "A46c753e",
"x": 5209.6,
"y": 5489.55,
"w": 273.3,
"h": 282.3,
"type": 13,
"config": {},
"maxAmr": 3,
"points": ["3512", "3513", "3514", "3515"]
},
{
"id": "4034271a",
"name": "A4034271a",
"x": 5224.3,
"y": 4701.05,
"w": 258.6,
"h": 247.7,
"type": 13,
"config": {},
"maxAmr": 3,
"points": ["3406", "3408", "3409", "3466"]
},
{
"id": "129b8c73",
"name": "A129b8c73",
"x": 4555.0,
"y": 4701.05,
"w": 551.2,
"h": 244.5,
"type": 13,
"config": {},
"maxAmr": 3,
"points": ["3405", "3407", "3498", "3499"]
}
],
"blocks": "",
"id": 3364,
"name": "beidaceshi_4",
"width": 94.744,
"height": 73.441,
"setting": "",
"ratio": 100
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 660 B

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 590 B

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 578 B

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 578 B

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 568 B

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 536 B

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -42,7 +42,7 @@ const canDelete = computed<boolean>(() => editor.value.current.value?.name === '
<template>
<a-space class="toolbar" :size="0">
<!-- <a-button
<a-button
class="icon-btn tool-btn"
:class="{ active: mode === MapAreaType.库区 }"
size="large"
@ -50,16 +50,8 @@ const canDelete = computed<boolean>(() => editor.value.current.value?.name === '
@click="mode = MapAreaType.库区"
>
<i class="icon" :class="mode === MapAreaType.库区 ? 'area1-active' : 'area1'" />
</a-button> -->
<a-button
class="icon-btn tool-btn"
:class="{ active: mode === MapAreaType.约束区 }"
size="large"
:title="$t('添加约束区')"
@click="mode = MapAreaType.约束区"
>
<i class="icon" :class="mode === MapAreaType.约束区 ? 'area1-active' : 'area1'" />
</a-button>
<a-button
class="icon-btn tool-btn ml-12"
:class="{ active: mode === MapAreaType.互斥区 }"
@ -78,7 +70,15 @@ const canDelete = computed<boolean>(() => editor.value.current.value?.name === '
>
<i class="icon" :class="mode === MapAreaType.非互斥区 ? 'area12-active' : 'area12'" />
</a-button>
<a-button
class="icon-btn tool-btn"
:class="{ active: mode === MapAreaType.约束区 }"
size="large"
:title="$t('添加约束区')"
@click="mode = MapAreaType.约束区"
>
<i class="icon" :class="mode === MapAreaType.约束区 ? 'area13-active' : 'area13'" />
</a-button>
<a-divider class="size-24 mh-8" type="vertical" />
<a-button class="icon-btn tool-btn" size="large" :title="$t('保存')" @click="updateScene">

View File

@ -189,9 +189,9 @@ const handleAutoSaveAndRestoreViewState = async () => {
show-group-edit
/>
</a-tab-pane>
<!-- <a-tab-pane key="2" :tab="$t('库区')">
<a-tab-pane key="2" :tab="$t('库区')">
<PenGroups v-if="editor" :token="EDITOR_KEY" :current="current?.id" only-area1 />
</a-tab-pane> -->
</a-tab-pane>
<a-tab-pane key="3" :tab="$t('高级组')">
<PenGroups v-if="editor" :token="EDITOR_KEY" :current="current?.id" />
</a-tab-pane>