1、全局树组件多选设备抽屉组件增加点击树节点名称也可以选中当前节点 2、设备监控页面布局图查看设备详情时首次进入清空上一次设备信息（由于数据为定时刷新...

zhaowei

2025-06-19 b7ad54294da15dccc59f7b6c879af3e000024d9d

 src/views/mdc/base/AlarmManager.vue

@@ -7,32 +7,6 @@
        @keyup.enter.native="searchQuery"
      >
        <a-row :gutter="24">
          <!--<a-col-->
            <!--:xl="4"-->
            <!--:lg="4"-->
            <!--:md="4"-->
            <!--:sm="24"-->
          <!--&gt;-->
            <!--<a-form-item label="设备编号">-->
              <!--<a-input-->
                <!--placeholder="请输入设备编号"-->
                <!--v-model="queryParam.equipmentId"-->
              <!--&gt;</a-input>-->
            <!--</a-form-item>-->
          <!--</a-col>-->
          <!--<a-col-->
            <!--:xl="4"-->
            <!--:lg="4"-->
            <!--:md="4"-->
            <!--:sm="24"-->
          <!--&gt;-->
            <!--<a-form-item label="设备名称">-->
              <!--<a-input-->
                <!--placeholder="请输入设备名称"-->
                <!--v-model="queryParam.equipmentName"-->
              <!--&gt;</a-input>-->
            <!--</a-form-item>-->
          <!--</a-col>-->
          <a-col
            :xl="6"
            :lg="7"
@@ -40,11 +14,6 @@
            :sm="24"
          >
            <a-form-item label="控制系统类型">
              <!--<j-dict-select-tag-->
                <!--placeholder="请选择控制系统类型"-->
                <!--v-model="queryParam.driveType"-->
                <!--dictCode="mdc_driveType"-->
              <!--/>-->
              <a-auto-complete
                v-model="queryParam.driveType"
                :data-source="driveTypeList"
@@ -102,13 +71,6 @@
                icon="reload"
                style="margin-left: 8px"
              >重置</a-button>
              <!--<a-->
                <!--@click="handleToggleSearch"-->
                <!--style="margin-left: 8px"-->
              <!--&gt;-->
                <!--{{ toggleSearchStatus ? '收起' : '展开' }}-->
                <!--<a-icon :type="toggleSearchStatus ? 'up' : 'down'" />-->
              <!--</a>-->
            </span>
          </a-col>
        </a-row>
@@ -123,24 +85,6 @@
        type="primary"
        icon="plus"
      >新增</a-button>
      <!--<a-button-->
        <!--@click="handleAdd"-->
        <!--type="primary"-->
        <!--icon="plus"-->
      <!--&gt;设备新增</a-button>-->
      <!--<a-upload-->
        <!--name="file"-->
        <!--:showUploadList="false"-->
        <!--:multiple="false"-->
        <!--:headers="tokenHeader"-->
        <!--:action="importExcelUrl"-->
        <!--@change="handleImportExcel"-->
      <!--&gt;-->
        <!--<a-button-->
          <!--type="primary"-->
          <!--icon="import"-->
        <!--&gt;导入</a-button>-->
      <!--</a-upload>-->
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item
@@ -202,18 +146,15 @@
      </a-table>
    </div>

    <!--<alarm-manager-modal ref="modalForm" @ok="modalFormOk"></alarm-manager-modal>-->
    <alarm-manager-form ref="modalFormType" @ok="modalFormOk" :driveTypeList="driveTypeList" :filterOption="filterOption"></alarm-manager-form>
    <alarm-manager-edit ref="modalFormEdit" @ok="modalFormOk"></alarm-manager-edit>
  </a-card>
</template>

<script>

  import '@/assets/less/TableExpand.less'
  import { mixinDevice } from '@/utils/mixin'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  // import MdcDriveTypeParamConfigModal from './modules/mdcDriveTypeParamConfig/MdcDriveTypeParamConfigModal'
  import AlarmManagerModal from './modules/alarmManager/alarmManagerModal'
  import AlarmManagerForm from './modules/alarmManager/alarmManagerForm'
  import AlarmManagerEdit from './modules/alarmManager/alarmManagerEdit'
@@ -255,29 +196,15 @@
              return parseInt(index) + 1;
            }
          },
          // {
          //   title: '设备编号',
          //   align: "center",
          //   // sorter: true,
          //   dataIndex: 'equipmentId'
          // },
          // {
          //   title: '设备名称',
          //   align: "center",
          //   // sorter: true,
          //   dataIndex: 'equipmentName'
          // },
          {
            title: '报警号',
            align: "center",
            // sorter: true,
            dataIndex: 'alarmCode',
            width:400
          },
          {
            title: '报警内容',
            align: "center",
            // sorter: true,
            dataIndex: 'alarmContent',
            width:400
          },
@@ -285,22 +212,14 @@
          {
            title: '设备驱动类型',
            align: "center",
            // sorter: true,
            dataIndex: 'driveType',
            width:400
          },
          // {
          //   title: '是否过滤',
          //   align: "center",
          //   dataIndex: 'isUse',
          //   customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isUse'], text) : ''),
          // },
          {
            dataIndex:'isUse_dictText',
            title: '是否启用',
            align: "center",
            width:380
           // dictCode:'alarm_is_use'
          },
          {
            title: '操作',
@@ -328,11 +247,6 @@
      this.getSuperFieldList();
      this.getDriveTypeByApi()
    },
    computed: {
      // importExcelUrl: function () {
      //   return `${window._CONFIG['domianURL']}${this.url.importExcelUrl}`;
      // },
    },
    methods: {
      handleEdit: function (record) {
        this.$refs.modalFormEdit.edit(record);
@@ -343,8 +257,6 @@
        this.$refs.modalFormType.add();
        this.$refs.modalFormType.title = "新增";
        this.$refs.modalFormType.disableSubmit = false
      },
      initDictConfig() {
      },
      getSuperFieldList() {
        let fieldList = [];