Merge branch 'dev' into dev_tides

Crunchy

2025-04-29 e5454b769d44a34af423bf87ac8a740bf8c20341

 src/views/CNAS/resourceDemand/device/component/management.vue

@@ -1,7 +1,7 @@
<!-- 设备工具明细 -->
<template>
   <div class="role_manage">
    <div class="search">
    <div class="search" v-show="!showData">
      <div>
        <el-form :model="queryParams" ref="queryParams" size="small" :inline="true">
          <el-form-item label="状态" prop="deviceStatus" class="form-item">
@@ -444,11 +444,9 @@
         labelPosition: 'right',
         dialogVisible: false,
         dialogVisible2: false,
         addPower: false,
         showData: false, // 数采配置页面
         tableList: [],
         addDia: true,
         addPower: true,
         //设备类型列表
         equipmentList: [],
         // 负责人列表