|
|
@@ -357,7 +357,7 @@
|
|
|
<!-- 第二行:地图类型 -->
|
|
|
<div class="config-row" style="display: flex; flex-wrap: wrap; gap: 20px;">
|
|
|
<el-form-item label="地图类型" class="config-item"
|
|
|
- :style="(selectedBlocklyPoint.type === 'task' || selectedBlocklyPoint.type === 'item') ? 'width: calc(50% - 20px);' : 'width: 100%;'">
|
|
|
+ :style="(selectedBlocklyPoint.type === 'task' || selectedBlocklyPoint.type === 'item' || selectedBlocklyPoint.type === 'mark') ? 'width: calc(50% - 20px);' : 'width: 100%;'">
|
|
|
<el-select
|
|
|
v-model="selectedBlocklyPoint.type"
|
|
|
placeholder="选择地图类型"
|
|
|
@@ -388,18 +388,39 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
|
- label="限制通行"
|
|
|
- class="config-item"
|
|
|
- v-if="selectedBlocklyPoint.type === 'task'"
|
|
|
- style="width: calc(50% - 20px);"
|
|
|
+ label="限制通行"
|
|
|
+ class="config-item"
|
|
|
+ v-if="selectedBlocklyPoint.type === 'task'"
|
|
|
+ style="width: calc(50% - 20px);"
|
|
|
>
|
|
|
<el-switch
|
|
|
- v-model="selectedBlocklyPoint.noPassing"
|
|
|
- active-text="是"
|
|
|
- inactive-text="否"
|
|
|
- size="large"
|
|
|
+ v-model="selectedBlocklyPoint.noPassing"
|
|
|
+ active-text="是"
|
|
|
+ inactive-text="否"
|
|
|
+ size="large"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
+
|
|
|
+ <el-form-item
|
|
|
+ label="标记标签"
|
|
|
+ class="config-item"
|
|
|
+ v-if="selectedBlocklyPoint.type === 'mark'"
|
|
|
+ style="width: calc(50% - 20px);"
|
|
|
+ >
|
|
|
+ <el-select
|
|
|
+ v-model="selectedBlocklyPoint.mark"
|
|
|
+ placeholder="标记标签"
|
|
|
+ clearable
|
|
|
+ size="large"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="dict in getStrDictOptions(DICT_TYPE.BLOCKLY_MAP_MARK)"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
</div>
|
|
|
|
|
|
<!-- 第三行:图标上传 -->
|
|
|
@@ -565,6 +586,7 @@ interface BlocklyWalkablePoint {
|
|
|
walkable: boolean
|
|
|
type: string
|
|
|
must: boolean
|
|
|
+ mark: String
|
|
|
noPassing: boolean
|
|
|
img: string
|
|
|
endImg: string
|
|
|
@@ -696,6 +718,7 @@ const selectBlocklyCell = (cell: { x: number, y: number }) => {
|
|
|
walkable: false,
|
|
|
type: '',
|
|
|
must: false,
|
|
|
+ mark: '',
|
|
|
noPassing: false,
|
|
|
img: '',
|
|
|
endImg: '',
|
|
|
@@ -826,6 +849,7 @@ const open = async (type: string, id?: number) => {
|
|
|
walkable: true,
|
|
|
type: p.type || '',
|
|
|
must: p.must || false,
|
|
|
+ mark: p.mark || '',
|
|
|
noPassing: p.noPassing || false,
|
|
|
img: p.img || '',
|
|
|
endImg: p.endImg || '',
|