Merge remote-tracking branch 'origin/master'

张含笑

2026-01-27 9645d9638c563999a8ed3c3787ab81d41e92f032

 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"