Merge remote-tracking branch 'origin/master'

张含笑

2026-01-26 a7b4da4fb176cfbca00d6ac4c06db56720a13e0c

 applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue

@@ -50,7 +50,7 @@
         </el-row>
      </div>
      <template #footer>
         <el-button color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
         <el-button v-if="dialogMode != 'view'" color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
      </template>
   </el-dialog>
</template>