Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-27 7319ec49da9f1490ad35f47e0da62546d1cc7ff4

 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
   })
}