applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue
@@ -42,7 +42,9 @@ </el-col> <el-col :span="24"> <div class="label">触发条件</div> <div class="val">{{ formData.triggerCondition }}</div> <div class="val"> {{ getDictLabel(formData.triggerCondition, dictObj.triggeringCondition) }} </div> </el-col> <el-col :span="24"> <div class="label">响应机制</div> @@ -102,8 +104,11 @@ maxlength="200" placeholder="请输入" clearable /> </el-form-item> <el-form-item label="触发条件" prop="triggerCondition"> <el-input class="command-input" v-model="formData.triggerCondition" maxlength="200" placeholder="请输入" clearable /> <el-select class="command-select" popper-class="command-select-popper" v-model="formData.triggerCondition" placeholder="请选择" clearable> <el-option v-for="item in dictObj.triggeringCondition" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" /> </el-select> </el-form-item> <el-form-item label="管控级别" prop="controlLevel"> <el-select class="command-select" popper-class="command-select-popper" applications/drone-command/src/views/areaManage/partition/index.vue
@@ -42,7 +42,11 @@ {{ getDictLabel(row.areaType, dictObj.areaType) }} </template> </el-table-column> <el-table-column prop="triggerCondition" show-overflow-tooltip width="130" label="触发条件" /> <el-table-column prop="triggerCondition" show-overflow-tooltip width="130" label="触发条件"> <template v-slot="{ row }"> {{ getDictLabel(row.triggerCondition, dictObj.triggeringCondition) }} </template> </el-table-column> <el-table-column prop="responseMechanism" show-overflow-tooltip width="130" label="响应机制" /> <el-table-column prop="controlLevel" show-overflow-tooltip width="120" label="管控级别"> <template v-slot="{ row }"> @@ -168,13 +172,14 @@ const dictObj = ref({ areaType: [], //区域类型 controlLevel: [], //管控级别 triggeringCondition: [], //触发条件 deviceType: [], }) provide('dictObj', dictObj) // 获取字典 function getDictList() { getDictionaryByCode('areaType,controlLevel,deviceType').then(res => { getDictionaryByCode('areaType,controlLevel,deviceType,triggeringCondition').then(res => { dictObj.value = res.data.data }) } applications/drone-command/src/views/dataCockpit/components/templateComponents/EquipmentTemplate.vue
@@ -48,7 +48,7 @@ <div class="row"> <div class="col"> <span class="label">有效范围</span> {{ data.range }} {{ Number(data.range).toFixed(0) }}m </div> <div class="col"> <span class="label">设备型号</span>
