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

zhaowei

2025-06-19 b7ad54294da15dccc59f7b6c879af3e000024d9d

1、全局树组件多选设备抽屉组件增加点击树节点名称也可以选中当前节点
2、设备监控页面布局图查看设备详情时首次进入清空上一次设备信息（由于数据为定时刷新不能每次获取数据均清空）
3、设备类型管理页面调整设备类型图片尺寸以解决表格错行问题
4、设备管理页面添加或编辑设备弹窗选择设备时增加点击行即可选中

 src/views/dnc/base/modules/DeviceCustomTypeManagement/DeviceCustomTypeManagementModal.vue

@@ -43,7 +43,7 @@
          <a-col :span="24">
            <a-form-model-item label="设备组编号" :labelCol="labelColLong" :wrapperCol="wrapperColLong"
                               prop="equipmentIds">
              <a-input-search v-model="model.equipmentIds" :disabled="!model.productionId" @search="deviceSearch"
              <a-input-search v-model="model.equipmentIds" readOnly :disabled="!model.productionId" @search="deviceSearch"
                              enter-button :placeholder='!model.productionId?"请选择车间":"请选择设备组编号"'/>
            </a-form-model-item>
          </a-col>
@@ -98,7 +98,7 @@
        ],
        equipmentIds: [
          {
            required: true, message: '请选择设备编号!'
            required: true, message: '请选择设备编号!',trigger:'change'
          }
        ]
      },

 src/views/dnc/base/modules/ProductStructure/Document/NcDocumentSearchNcModal.vue

@@ -67,7 +67,7 @@
            <a-table :columns="columns" :data-source="dataSource" bordered :pagination="false" :loading="loading"
                     :rowSelection="{selectedRowKeys: selectedRowKeys,selectedRows:selectionRows, onChange: onSelectChange}"
                     @change="handleTableChange" :customRow="customRow"
                     :scroll="{y:456}" :size="size" rowKey="docId">
                     :scroll="{y:52*7}" :size="size" rowKey="docId">

              <!-- 字符串超长截取省略号显示-->
              <span slot="docName" slot-scope="text">

 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 = [];

 src/views/mdc/base/EquipmentList.vue

@@ -77,7 +77,6 @@
      <a-table
        ref="table"
        bordered
        size="middle"
        rowKey="id"
        :scroll="{x:'max-content',y:465}"
        :columns="columns"

 src/views/mdc/base/MdcEquipmentTypeList.vue

@@ -13,10 +13,6 @@
            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
              <!--<a @click="handleToggleSearch" style="margin-left: 8px">-->
                <!--{{ toggleSearchStatus ? '收起' : '展开' }}-->
                <!--<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
              <!--</a>-->
            </span>
          </a-col>
        </a-row>
@@ -27,12 +23,6 @@
    <!-- 操作按钮区域 -->
    <div class="table-operator">
      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <!--<a-button type="primary" icon="download" @click="handleExportXls('设备类型')">导出</a-button>-->
      <!--<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
        <!--<a-button type="primary" icon="import">导入</a-button>-->
      <!--</a-upload>-->
      <!-- 高级查询区域 -->
      <!--<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
@@ -62,25 +52,9 @@
        @change="handleTableChange"
        :scroll="{x:'max-content',y:465}"
      >

        <template slot="htmlSlot" slot-scope="text">
          <div v-html="text"></div>
        </template>
        <template slot="imgSlot" slot-scope="text,record">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
        </template>
        <template slot="fileSlot" slot-scope="text">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
          <a-button
            v-else
            :ghost="true"
            type="primary"
            icon="download"
            size="small"
            @click="downloadFile(text)">
            下载
          </a-button>
          <img v-else :src="getImgView(text)" :preview="record.id" height="20" alt="" style="max-width:80px;"/>
        </template>

        <span slot="action" slot-scope="text, record">
@@ -101,7 +75,6 @@
            </a-menu>
          </a-dropdown>
        </span>

      </a-table>
    </div>


 src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue

@@ -99,8 +99,7 @@

              <a-descriptions
                title="运行数据"
                v-show="runData"
                v-if="resultData.driveType != 'PLC'"
                v-if="runData&&runData.length>0&&resultData.driveType != 'PLC'"
                :column="4"
                class="operationData"
              >
@@ -170,13 +169,13 @@
      runData: [],
      // xyzAliasesList: [],
      //主轴倍率
      spindlebeilv: 0,
        spindlebeilv: null,
      //进给倍率
      feedbeilv: 0,
        feedbeilv: null,
      // 主轴负荷
      spindleload: 0,
        spindleload: null,
      //快速进给倍率
      rapidfeed: 0,
        rapidfeed: null,
      visible: false,
      resultData: {},
      url: {
@@ -1263,6 +1262,16 @@

    },

      resetData() {
        this.resultData = {}
        this.spindlebeilv = null
        this.feedbeilv = null
        this.spindleload = null
        this.rapidfeed = null
        this.runData = []
        this.xyzList = null
      },

    mouseEnterItem(e) {
      console.log(e, e.target, e.target.clientWidth, e.target.scrollWidth)
      if (e.target.clientWidth >= e.target.scrollWidth) {

 src/views/mdc/base/modules/DeviceBaseInfo/EquipmentLayout.vue

@@ -71,6 +71,7 @@
          })
          return false
        }
        this.$refs.equipmentDetailModal.resetData()
        this.$refs.equipmentDetailModal.initData(item.id)
        this.$refs.equipmentDetailModal.timerModel(item.id)
      }

 src/views/mdc/base/modules/DeviceParamThresholdManagement/ParamThresholdModal.vue

@@ -226,6 +226,7 @@
       * @param value 驱动参数类型选中项
       */
      handleDriveTypeChange(value) {
        this.paramList = []
        api.getParamListByDriveTypeApi(value)
          .then(res => {
            if (res.success) {

 src/views/mdc/base/modules/EquipmentAvailCompare/EquipmentAvailCompareMain.vue

@@ -18,14 +18,14 @@
              </a-col>
              <a-col :md="5" :sm="5" :xs="5">
                <a-form-item label="时间">
                  <a-range-picker @change="dateParamChange" v-model="dates" format="YYYYMMDD"/>
                  <a-range-picker @change="dateParamChange" v-model="dates" format="YYYYMMDD" :allow-clear="false"/>
                </a-form-item>
              </a-col>
              <a-col :md="6" :sm="6" :xs="6">
                <a-form-item label="时间段">
                  <a-time-picker :default-value="moment('00:00', 'HH:mm')" format="HH:mm" @change="onChangeStart"/>
                  <a-time-picker :default-value="moment('00:00', 'HH:mm')" format="HH:mm" @change="onChangeStart" :allow-clear="false"/>
                  至
                  <a-time-picker :default-value="moment('08:00', 'HH:mm')" format="HH:mm" @change="onChangeEnd"/>
                  <a-time-picker :default-value="moment('08:00', 'HH:mm')" format="HH:mm" @change="onChangeEnd" :allow-clear="false"/>
                </a-form-item>
              </a-col>
              <a-col :md="2" :sm="3" :xs="3">
@@ -236,7 +236,6 @@
        }
      },
      searchQuery() {
        if (this.queryParam.startTime && this.queryParam.endTime && this.dates && this.dates.length > 0) {
          this.loading = true
          this.spaceTime = []
          this.usingRates = []
@@ -271,12 +270,6 @@
          }).finally(() => {
            this.loading = false
          })
        } else {
          this.$notification.warning({
            message: '消息',
            description: '请选择时间或时间段'
          })
        }
      },
      searchReset() {
        this.loading = true

 src/views/mdc/base/modules/EquipmentDayAvail/EquipmentDayAvailMain.vue

@@ -18,7 +18,7 @@
              </a-col>
              <a-col :md="4" :sm="4" :xs="4">
                <a-form-item label="日期">
                  <a-date-picker v-model="queryParam.dateTime" :disabledDate="disabledDate" format='YYYYMMDD'
                  <a-date-picker v-model="queryParam.dateTime" :disabledDate="disabledDate" format='YYYYMMDD' :allow-clear="false"
                                 @change="dataChange"/>
                </a-form-item>
              </a-col>
@@ -292,81 +292,6 @@
          })
        }
      },
      searchReset() {
        this.spaceTime = []
        this.useingRates = []
        if (this.queryParams.typeTree == '1') {
          this.typeTree = this.queryParams.typeTree
          this.typeParent = this.queryParams.parentId
          this.typeEquipment = this.queryParams.equipmentId
          this.queryParams = {}
          this.queryParam = {}
          this.queryParams.typeTree = this.typeTree
          this.queryParams.parentId = this.typeParent
          if (this.queryParams.parentId != '') {
            this.queryParams.equipmentId = ''
            this.initEquipment()
          } else {
            if (this.queryParams.equipmentId == this.queryParamEquip.equipmentId) {
              this.queryParams.equipmentId = this.typeEquipment
            } else {
              this.queryParams.equipmentId = this.queryParamEquip.equipmentId
            }
          }
          getAction(this.url.dayUtilizationRate, this.queryParams).then((res) => {
            if (res.success) {
              this.spaceTime = res.result.dateList
              for (var i = 0; i < res.result.dayRateDto.length; i++) {
                this.useingRates.push(this.numFilter(res.result.dayRateDto[i].utilizationRate))
              }
              this.drawTu()
            } else {
              this.$notification.warning({
                message: '消息',
                description: res.message
              })
            }
          }).finally(() => {
            this.loading = false
          })
        } else {
          this.typeTree = this.queryParams.typeTree
          this.typeParent = this.queryParams.parentId
          this.typeEquipment = this.queryParams.equipmentId
          this.queryParams = {}
          this.queryParam = {}
          this.dates = []
          this.queryParams.typeTree = this.typeTree
          this.queryParams.parentId = this.typeParent
          if (this.queryParams.parentId != '') {
            this.queryParams.equipmentId = ''
            this.initEquipment()
          } else {
            if (this.queryParams.equipmentId == this.queryParamEquip.equipmentId) {
              this.queryParams.equipmentId = this.typeEquipment
            } else {
              this.queryParams.equipmentId = this.queryParamEquip.equipmentId
            }
          }
          getAction(this.url.dayUtilizationRate, this.queryParams).then((res) => {
            if (res.success) {
              this.spaceTime = res.result.dateList
              for (var i = 0; i < res.result.dayRateDto.length; i++) {
                this.useingRates.push(this.numFilter(res.result.dayRateDto[i].utilizationRate))
              }
              this.drawTu()
            } else {
              this.$notification.warning({
                message: '消息',
                description: res.message
              })
            }
          }).finally(() => {
            this.loading = false
          })
        }

      },
      initEquipment(id) {
        let _this = this
        getAction(this.url.getEquipmentByPid, { pid: id }).then((res) => {
@@ -423,9 +348,7 @@
    },
    created() {
      let collectTime = moment(moment().add(-1, 'd'), 'YYYY-MM-DD')

      this.queryParams.collectTime = collectTime

      this.queryParam.dateTime = this.queryParams.collectTime.format('YYYYMMDD')
      this.queryParams.typeTree = '1'
      this.initEquipment()

 src/views/mdc/base/modules/EquipmentList/DeviceListModal.vue

@@ -6,13 +6,13 @@
      <div class="table-page-search-wrapper">
        <a-form layout="inline" @keyup.enter.native="searchQuery">
          <a-row :gutter="24">
            <a-col :md="7" :sm="7">
            <a-col :md="9" :sm="9">
              <a-form-item label="统一编码">
                <a-input placeholder="请输入统一编码检索" v-model="queryParam.equipmentid"></a-input>
              </a-form-item>
            </a-col>

            <a-col :md="7" :sm="7">
            <a-col :md="9" :sm="9">
              <a-form-item label="设备名称">
                <a-input placeholder="请输入设备名称检索" v-model="queryParam.equipmentname"></a-input>
              </a-form-item>
@@ -21,7 +21,7 @@
            <a-col :md="3" :sm="3">
              <a-space>
                <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
                <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
                <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
              </a-space>
            </a-col>
          </a-row>
@@ -30,8 +30,8 @@

      <!-- table区域-begin -->
      <div>
        <a-table ref="table" size="middle" bordered rowKey="id" :scroll="{  y: 300 }" :columns="columns"
                 :dataSource="dataSource" :pagination="ipagination" :loading="loading"
        <a-table bordered rowKey="equipmentid" :scroll="{  y: 300 }" :columns="columns"
                 :dataSource="dataSource" :pagination="ipagination" :loading="loading" :customRow="customRow"
                 :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'radio'}"
                 @change="handleTableChange">
        </a-table>
@@ -42,215 +42,106 @@
</template>

<script>
  import {
    ajaxGetSelectItems
  } from '@/api/api'
  import JDictSelectTag from '@/components/dict/JDictSelectTag'
  import {
    deleteAction,
    requestPut,
    getAction
  } from '@/api/manage'
  import {
    JeecgListMixin
  } from '@/mixins/JeecgListMixin'
  import JInput from '@/components/jeecg/JInput'
  import JEllipsis from '@/components/jeecg/JEllipsis'
  import Tooltip from 'ant-design-vue/es/tooltip'
  import JDate from '@/components/jeecg/JDate'
  import moment from 'moment'
  import { filterObj } from '@/utils/util';
  import { getAction } from '@/api/manage'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'

  export default {
    name: 'DeviceListModel',
    mixins: [JeecgListMixin],
    components: {
      JDictSelectTag,
      JEllipsis,
      JInput,
      Tooltip,
      JDate
    },
    props: {
      status: {
        type: Number,
        default: 1
      }
    },
    data() {
      return {
        title:'',
        visible: false,
        disableMixinCreated: true,
        queryParam: {},
        columns: [{
        columns: [
          {
          title: '统一编码',
          align: 'center',
          dataIndex: 'equipmentid',
            dataIndex: 'equipmentid'
        },
          {
            title: '设备名称',
            align: 'center',
            dataIndex: 'equipmentname',
            dataIndex: 'equipmentname'
          },
          {
            title: '设备型号',
            align: 'center',
            dataIndex: 'equipmentmodel',
            dataIndex: 'equipmentmodel'
          },
          // {
          //   title: '设备类型',
          //   align: 'center',
          //   dataIndex: 'equipmentType',
          // },
          {
            title: '机床IP',
            align: 'center',
            dataIndex: 'equipmentip',
            dataIndex: 'equipmentip'
          },
          {
            title: '驱动类型',
            align: 'center',
            dataIndex: 'drivetype',
            dataIndex: 'drivetype'
          },
          {
            title: '端口',
            align: 'center',
            dataIndex: 'dataport',
            dataIndex: 'dataport'
          },
          {
            title: '数控系统',
            align: 'center',
            dataIndex: 'controlsystem',
            dataIndex: 'controlsystem'
          }
        ],
        /* 排序参数 */
        isorter: {
          column: '',
          order: ''
        },
        url: {
          list: '/mdc/equipment/list',
        },

          list: '/mdc/equipment/list'
      }
    },
    created() {

      }
    },
    methods: {
      openPage() {
        this.visible = true
        this.onClearSelected()
        this.dataSource = [];
        // this.queryParam = {
        //   status: this.status
        // };
        this.loadData();
        this.dataSource = []
        this.loadData()
      },
      getQueryParams() {
        //获取查询条件
        let sqp = {}
        if(this.superQueryParams){
          sqp['superQueryParams']=encodeURI(this.superQueryParams)
          sqp['superQueryMatchType'] = this.superQueryMatchType
        }
        var param = Object.assign(sqp, this.queryParam);
        // param.field = this.getQueryField();
        param.pageNo = this.ipagination.current;
        param.pageSize = this.ipagination.pageSize;
        //获取用户定制的参数属性
        // if (this.getCustomQueryParams) {
        //   param = this.getCustomQueryParams(param);
        //   if(!param){
        //     return false;
        //   }
        // }

        return filterObj(param);
      /**
       * 自定义表格行
       * @param record 表格行信息
       * @returns {{style: {cursor: string}, on: {click: on.click}}}
       */
      customRow(record) {
        return {
          style: {
            cursor: 'pointer'
      },
      loadData(arg) {
        if(!this.url.list){
          this.$message.error("请设置url.list属性!")
          return
          on: {
            click: () => {
              this.onSelectChange([record.equipmentid], [record])
        }
        //加载数据 若传入参数1则加载第一页的内容
        if (arg === 1) {
          this.ipagination.current = 1;
        }
        var params = this.getQueryParams();//查询条件
        }
      },

        if(!params){
          return false;
        }

        this.loading = true;
        getAction(this.url.list, params).then((res) => {
          if (res.success) {
            // console.log(res)
            //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
            this.dataSource = res.result.records||res.result;
            if(res.result.total)
            {
              this.ipagination.total = res.result.total;
            }else{
              this.ipagination.total = 0;
            }
            //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
          }else{
            // this.$message.warning(res.message)
            this.$notification.warning({
              message:'消息',
              description:res.message
            });
          }
        }).finally(() => {
          this.loading = false
        })
      },
      getQueryField() {
        //TODO 字段权限控制
        // var str = "";
        // this.columns.forEach(function (value) {
        //   str +=  value.dataIndex +"," ;
        // });
        // return str;
      },
      modalFormOk(val) {
        // 新增/修改 成功时，重载列表
        this.loadData();
        this.selectedRowKeys = [val.id];
      },
      searchQuery() {
        this.loadData();
        this.onClearSelected()
      },
      searchReset() {
        this.queryParam = {}
        this.loadData();
        this.onClearSelected()
      },
      close() {
        this.$emit('close')
        this.visible = false
      },

      handleCancel() {
        this.close()
      },

      handleOk() {
        this.$emit('sendSelectionRows', this.selectionRows[0])
        this.close()
      },
    },
      }
    }
  }
</script>
<style>
  @import '~@assets/less/common.less';

  .frozenRowClass {
    color: #c9c9c9;
  }

  .success {
    color: green;
  }

  .error {
    color: red;
  }
</style>

 src/views/mdc/base/modules/EquipmentList/UserModal.vue

@@ -40,7 +40,7 @@
              <a-select :disabled="disableSubmit" placeholder="请选择设备类型" allow-clear
                        :triggerChange="true"
                        v-model="model.equipmentType">
                <a-select-option v-for='item in selectList' :key='item.id' :value='item.equipmentTypeName'>
                <a-select-option v-for='item in equipmentTypeList' :key='item.id' :value='item.equipmentTypeName'>
                  {{item.equipmentTypeName}}
                </a-select-option>
              </a-select>
@@ -49,9 +49,8 @@
          <a-col :span="12">
            <a-form-model-item label="车间分配" v-show="!productionDisabled"
                               ref="selectedProduction" prop="selectedProduction">
              <!--<j-select-equipment-production  v-decorator="['selectedProduction',{rules:[{required:true,message:'请选择车间!'}]}]" :multi="false" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-equipment-production>-->
              <j-select-equipment-production :disabled="disableSubmit" v-model="model.selectedProduction" :multi="false"
                                             @back="backProductionInfo" :backProduction="true"
                                             @back="backProductionInfo" :backProduction="true" :allowClear="false"
                                             :treeProductOpera="true"></j-select-equipment-production>
            </a-form-model-item>

@@ -67,7 +66,7 @@
              <a-select :disabled="disableSubmit" placeholder="请选择设备类型"
                        :triggerChange="true"
                        v-model="model.equipmentType">
                <a-select-option v-for='item in selectList' :key='item.id' :value='item.equipmentTypeName'>
                <a-select-option v-for='item in equipmentTypeList' :key='item.id' :value='item.equipmentTypeName'>
                  {{item.equipmentTypeName}}
                </a-select-option>
              </a-select>
@@ -204,15 +203,9 @@

<script>
  import pick from 'lodash.pick'
  import moment from 'moment'
  import Vue from 'vue'
  import { ACCESS_TOKEN } from '@/store/mutation-types'
  import { getAction } from '@/api/manage'
  import { addEquipment, editEquipment } from '@/api/api'
  import { disabledAuthFilter } from '@/utils/authFilter'
  import { duplicateCheck } from '@/api/api'
  import JSelectEquipmentProduction from '../../../../../components/jeecgbiz/JSelectEquipmentProduction'
  import JSelectProduction from '../../../../../components/jeecgbiz/JSelectProduction'
  import DeviceListModel from './DeviceListModal'
  import JSelectEquipmentDepart from '../../../../../components/jeecgbiz/JSelectEquipmentDepart'
  import { mapActions } from 'vuex'
@@ -220,7 +213,6 @@
  export default {
    name: 'UserModal',
    components: {
      JSelectProduction,
      JSelectEquipmentDepart,
      JSelectEquipmentProduction,
      DeviceListModel
@@ -231,13 +223,11 @@
        productionDisabled: false, //是否是我的车间调用该页面
        roleDisabled: false, //是否是角色维护调用该页面
        modalWidth: 900,
        confirmDirty: false,
        userId: '', //保存用户id
        disableSubmit: true,
        dateFormat: 'YYYY-MM-DD',
        form: this.$form.createForm(this),
        validatorRules: {
          equipmentId: [{ required: true, message: '请选择设备编号!' }],
          equipmentId: [{ required: true, message: '请选择设备编号!', trigger: 'change' }],
          selectedProduction: [{ required: true, message: '请选择车间' }],
          teamCode: [{ required: true, message: '请选择配送小组' }]
        },
@@ -273,41 +263,27 @@
          xs: { span: 24 },
          sm: { span: 19 }
        },
        uploadLoading: false,
        confirmLoading: false,
        headers: {},
        systemType: false,
        systemValue: '3',
        url: {
          fileUpload: window._CONFIG['domianURL'] + '/sys/common/upload',
          userWithDepart: '/mdc/mdcEquipment/equipmentDepartList', // 引入为指定用户查看部门信息需要的url
          //引入为指定用户查看车间信息需要的url
          userProductionList: '/mdc/mdcEquipment/equipmentProductionList',
          userId: '/sys/user/generateUserId', // 引入生成添加用户情况下的url
          syncUserByUserName: '/act/process/extActProcess/doSyncUserByUserName',//同步用户到工作流
          queryTenantList: '/sys/tenant/queryList',
          check: '/sys/duplicate/check',
          queryEquipmentType: '/mdc/mdcEquipmentType/queryEquipmentType'
        },
        tenantsOptions: [],
        rolesOptions: [],
        nextDepartOptions: [],
        nextProductionOptions: [],
        selectList: [],
        equipmentTypeList: [],
        isDepartType: ''
      }
    },
    created() {
      const token = Vue.ls.get(ACCESS_TOKEN)
      this.headers = { 'X-Access-Token': token }
      this.queryGroup()
      this.queryTreeData()
      this.getAppPlatformName()
    },
    computed: {
      uploadAction: function() {
        return this.url.fileUpload
      }
    },
    methods: {
      ...mapActions(['QueryDepartTree']),
@@ -316,13 +292,11 @@
          if (res.success) {
            this.isDepartType = res.result[0].value
          } else {
            // this.$message.warn(res.message)
            this.$notification.warning({
              message: '消息',
              description: res.message
            })
          }
        }).finally(() => {
        })
      },
      getAppPlatformName() {
@@ -335,7 +309,7 @@
      queryGroup() {
        getAction(this.url.queryEquipmentType).then(res => {
          if (res.success) {
            this.selectList = res.result
            this.equipmentTypeList = res.result
          } else {
            this.$notification.warning({
              message: '消息',
@@ -347,7 +321,6 @@
        })
      },
      getDeviceRows(val) {
        console.log(val)
        if (val.equipmentid) {
          this.model.equipmentId = val.equipmentid
          this.model.equipmentName = val.equipmentname
@@ -400,9 +373,6 @@
        if (record.hasOwnProperty('id')) {
          that.getUserDeparts(record.id)
        }
      },
      isDisabledAuth(code) {
        return disabledAuthFilter(code)
      },
      // 根据屏幕变化,设置抽屉尺寸
      resetScreenSize() {
@@ -486,7 +456,6 @@
        this.nextProductionOptions = []
        this.departIdShow = false
      },
      moment,
      handleSubmit() {
        const that = this
        // 触发表单验证
@@ -529,18 +498,6 @@
            return false
          }
        })
      },

      handleConfirmBlur(e) {
        const value = e.target.value
        this.confirmDirty = this.confirmDirty || !!value
      },
      identityChange(e) {
        if (e.target.value === 1) {
          this.departIdShow = false
        } else {
          this.departIdShow = true
        }
      },
      /**
       * 编辑或查看详情数据时清除抽屉表单验证

 src/views/mdc/base/modules/PartsMatchingManagement/PartsMatchingForm.vue

@@ -40,7 +40,7 @@
          </a-col>
          <a-col :span="24">
            <a-form-model-item label="日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="theDate">
              <a-date-picker v-model="model.theDate" :disabled="disabled" format="YYYY-MM-DD"
              <a-date-picker v-model="model.theDate" :disabled="disabled" format="YYYY-MM-DD" :allow-clear="false"
                             value-format="YYYY-MM-DD" style="width: 100%"></a-date-picker>
            </a-form-model-item>
          </a-col>
@@ -87,7 +87,7 @@
        confirmLoading: false,
        validatorRules: {
          equipmentIds: [
            { required: true, message: '请选择设备!' }
            { required: true, message: '请选择设备!', trigger: 'change' }
          ],
          partId: [
            { required: true, message: '请输入零件号!' }
@@ -126,7 +126,6 @@
      },
      edit(record) {
        this.model = Object.assign({}, { equipmentIds: record.equipmentId }, record)
        console.log('model', this.model)
        this.visible = true
      },
      inputNumberChange() {
@@ -179,7 +178,6 @@
       */
      selectOK(data) {
        this.$set(this.model, 'equipmentIds', data.join(','))
        if (this.model.equipmentIds) this.$refs.form.clearValidate('equipmentIds')
      }
    }
  }

 src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue

@@ -85,7 +85,7 @@
            span: 24
          },
          sm: {
            span: 6
            span: 4
          }
        },
        wrapperCol: {

 src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue

@@ -106,7 +106,7 @@
            span: 24
          },
          sm: {
            span: 6
            span: 4
          }
        },
        wrapperCol: {

 src/views/mdc/base/modules/comparativeAnalysis/ComparativeAnalysisMain.vue

@@ -5,11 +5,6 @@
      <div style="width: 100%; background-color: #fff" class="table-page-search-wrapper">
        <a-form layout="inline" @keyup.enter.native="searchQuery">
          <a-row :gutter="24">
            <!--<a-col :md="5" :sm="5">-->
            <!--<a-form-item label="名称">-->
            <!--<a-input placeholder="输入设备名称查询" :readOnly="readOnly" v-model="queryParam.tierName"></a-input>-->
            <!--</a-form-item>-->
            <!--</a-col>-->
            <a-col :md="5" :sm="5">
              <a-form-item label="设备">
                <a-input-search :readOnly="true" v-model="queryParam.equipmentId" @search="deviceSearch"
@@ -19,9 +14,6 @@

            <a-col :md="5" :sm="5">
              <a-form-item label="驱动类型">
                <!--<j-dict-select-tag placeholder="请选择驱动类型"-->
                <!--:triggerChange="true" dictCode="mdc_driveType"-->
                <!--v-model="queryParam.driveType" allow-clear/>-->
                <a-auto-complete
                  v-model="queryParam.driveType"
                  :data-source="driveTypeList"
@@ -33,10 +25,10 @@
            </a-col>
            <a-col :md="6" :sm="6" :xs="6">
              <a-form-item label="时间">
                <a-range-picker @change="dateParamChange" v-model="dates" format="YYYYMMDD"/>
                <a-range-picker @change="dateParamChange" v-model="dates" format="YYYYMMDD" :allow-clear="false"/>
              </a-form-item>
            </a-col>
            <a-col>
            <a-col :md="3" :sm="3" :xs="3">
              <a-space>
                <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
                <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
@@ -89,7 +81,6 @@

  export default {
    name: 'ComparativeAnalysisMain',
    // mixins: [JeecgListMixin],
    components: {
      Tooltip,
      ComparativeAnalysisBar,
@@ -170,12 +161,14 @@
      tabChange(val) {
        this.activeKey = val
      },

      dateParamChange(v1, v2) {
        // console.log(v1,v2)
        this.queryParam.startTime = v2[0]
        this.queryParam.endTime = v2[1]
        console.log(v2[0], v2[1])
      },

      loadAnalysis() {
        getAction(this.url.comparativeAnalysis, this.queryParam).then(res => {
          if (res.success) {
@@ -190,8 +183,8 @@
          this.loading = false
        })
      },

      searchQuery() {
        if (this.dates && this.dates.length > 0) {
          this.AnalysisList = []
          this.AnalysisBarList = []
          this.AnalysisGauge = []
@@ -224,14 +217,8 @@
          }).finally(() => {
            this.loading = false
          })
        } else {
          this.$notification.warning({
            message: '提示',
            description: '请选择时间'
          })
        }

      },

      searchReset() {
        this.AnalysisList = []
        this.AnalysisBarList = []
@@ -243,7 +230,11 @@
          this.typeEquipment = this.queryParams.equipmentId
          this.queryParams = {}
          this.queryParam = {}
          this.dates = []
          this.dates = [moment().subtract('days', 7), moment().subtract('days', 0)]
          this.queryParam.startTime = moment(this.dates[0]).format('YYYYMMDD')
          this.queryParams.startTime = moment(this.dates[0]).format('YYYYMMDD')
          this.queryParam.endTime = moment(this.dates[1]).format('YYYYMMDD')
          this.queryParams.endTime = moment(this.dates[1]).format('YYYYMMDD')
          this.queryParams.typeTree = this.typeTree
          this.queryParams.parentId = this.typeParent
          if (this.queryParams.parentId != '') {
@@ -262,7 +253,6 @@
              this.AnalysisGauge = res.result.meters
              this.AnalysisPie.push(res.result.pieCharts)
            } else {
              // this.$message.warning(res.message)
              this.$notification.warning({
                message: '消息',
                description: res.message
@@ -277,7 +267,11 @@
          this.typeEquipment = this.queryParams.equipmentId
          this.queryParams = {}
          this.queryParam = {}
          this.dates = []
          this.dates = [moment().subtract('days', 7), moment().subtract('days', 0)]
          this.queryParam.startTime = moment(this.dates[0]).format('YYYYMMDD')
          this.queryParams.startTime = moment(this.dates[0]).format('YYYYMMDD')
          this.queryParam.endTime = moment(this.dates[1]).format('YYYYMMDD')
          this.queryParams.endTime = moment(this.dates[1]).format('YYYYMMDD')
          this.queryParams.typeTree = this.typeTree
          this.queryParams.parentId = this.typeParent
          if (this.queryParams.parentId != '') {
@@ -296,7 +290,6 @@
              this.AnalysisGauge = res.result.meters
              this.AnalysisPie.push(res.result.pieCharts)
            } else {
              // this.$message.warning(res.message)
              this.$notification.warning({
                message: '消息',
                description: res.message
@@ -307,6 +300,7 @@
          })
        }
      },

      /**
       * 调用接口获取控制系统类型
       */
@@ -315,6 +309,7 @@
          this.driveTypeList = res.result.map(item => item.value)
        })
      },

      /**
       * 联想输入框筛选功能
       * @param input 输入的内容
@@ -326,119 +321,8 @@
          option.componentOptions.children[0].text.toUpperCase().indexOf(input.toUpperCase()) >= 0
        )
      },
      // onChange(value, dateString) {
      //   // console.log('Selected Time: ', value);
      //   // console.log('Formatted Selected Time: ', dateString);
      // },
      // searchReset() {
      //   if(this.queryParams.typeTree == "1"){
      //     this.typeTree = this.queryParams.typeTree
      //     this.typeParent =  this.queryParams.parentId
      //     this.typeEquipment = this.queryParams.equipmentId
      //     this.queryParams = {}
      //     this.queryParam = {}
      //     this.dates = []
      //     this.queryParams.typeTree = this.typeTree
      //     this.queryParams.parentId = this.typeParent
      //     if(this.queryParams.parentId !=  ""){
      //       this.queryParams.equipmentId =  ""
      //     }else{
      //       if(this.queryParams.equipmentId == this.queryParamEquip.equipmentId){
      //         this.queryParams.equipmentId =  this.typeEquipment
      //       }else{
      //         this.queryParams.equipmentId = this.queryParamEquip.equipmentId
      //       }
      //
      //     }
      //
      //     this.ipagination.current = 1
      //     this.ResetloadData();
      //   }else{
      //     this.typeTree = this.queryParams.typeTree
      //     this.typeParent =  this.queryParams.parentId
      //     // this.typeEquipment = this.queryParams.equipmentId
      //     this.queryParams = {}
      //     this.queryParam = {}
      //     this.dates = []
      //     this.queryParams.typeTree = this.typeTree
      //     this.queryParams.parentId = this.typeParent
      //     // this.queryParams.equipmentId =  this.typeEquipment
      //     this.ipagination.current = 1
      //     this.ResetloadData();
      //   }
      //
      // },
      // ResetloadData() {
      //   if(!this.url.list){
      //     this.$message.error("请设置url.list属性!")
      //     return
      //   }
      //   var params = {}
      //   params.typeTree = this.queryParams.typeTree
      //   params.parentId = this.queryParams.parentId
      //   params.equipmentId = this.queryParams.equipmentId
      //   this.loading = true;
      //   getAction(this.url.list, params).then((res) => {
      //     if (res.success) {
      //       this.dataSource = res.result.records||res.result;
      //     }else{
      //       this.$message.warning(res.message)
      //     }
      //   }).finally(() => {
      //     this.loading = false
      //   })
      // },
      // searchQuery(){
      //   if(this.queryParams.typeTree == "1"){
      //     this.queryParams.parentId =  this.queryParamEquip.parentId
      //     // this.queryParams.equipmentId =  this.queryParamEquip.equipmentId
      //
      //   }else{
      //     this.queryParams.parentId = this.queryParamPeople.parentId
      //
      //     // this.queryParams.equipmentId = ""
      //   }
      //   this.dataSource = [];
      //   //获取查询条件
      //   let  param = {}
      //   param.parentId = this.queryParams.parentId;
      //   param.equipmentId = this.queryParams.equipmentId;
      //   param.startTime = this.queryParam.startTime;
      //   param.driveType = this.queryParam.driveType;
      //   param.endTime =  this.queryParam.endTime;
      //   getAction(this.url.list,param).then((res) => {
      //     if(res.success){
      //       this.dataSource = res.result.records||res.result;
      //     }else{
      //       this.$message.warning(res.message)
      //     }
      //   }).finally(() => {
      //     this.loading = false
      //   })
      // },
      // loadData() {
      //   if(!this.url.list){
      //     this.$message.error("请设置url.list属性!")
      //     return
      //   }
      //   //加载数据 若传入参数1则加载第一页的内容
      //   var params = {}
      //   this.loading = true;
      //   params.startTime = this.queryParam.startTime;
      //   params.endTime =  this.queryParam.endTime;
      //   params.typeTree = this.queryParams.typeTree
      //   getAction(this.url.list, params).then((res) => {
      //     if (res.success) {
      //       this.dataSource = res.result.records||res.result;
      //     }else{
      //       this.$message.warning(res.message)
      //     }
      //   }).finally(() => {
      //     this.loading = false
      //   })
      // },

      deviceSearch() {
        console.log('触发')
        this.$refs.selectDeviceDrawer.visible = true
        this.$refs.selectDeviceDrawer.selectedRowKeys = []
        this.$refs.selectDeviceDrawer.selectedRows = []
@@ -450,11 +334,6 @@
       * @param data 已选择的设备
       */
      selectOK(data) {
        // let params = {}
        // params.equipmentIdList = []
        // for (var a = 0; a < data.length; a++) {
        //   params.equipmentIdList.push(data[a])
        // }
        console.log('data=', data)
        this.queryParam.equipmentId = data.join(',')
        console.log('queryParam', this.queryParam.equipmentId)

 src/views/system/modules/SelectDeviceDrawer.vue

@@ -8,15 +8,24 @@
  >

    <a-spin :spinning="loading">
      <!-- showLine -->
      <div class="content-container">
      <a-form>
        <a-form-item>
          <a-input-search @search="handleSearch" style="width:100%;" placeholder="检索 类别编码/名称" allowClear
                          v-model="searchInput" @change="handleChange"/>
        </a-form-item>
        <a-form-item label="车间层级：">

          <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
            <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{
            checkedKeys.length }}</a>项&nbsp;&nbsp;
            <a style="margin-left: 24px" @click="checkedKeys=[]">清空</a>
          </div>
        </a-form>

        <div>
          <a-tree showLine ref="tree" :expandedKeys.sync="expandedKeys" :autoExpandParent="autoExpandParent"
                  :treeData="treeDataSource" checkable @check="onCheck" v-model="checkedKeys"
                  @select="handleSelectChange"
                  @expand="onExpand">
            <template slot="title" slot-scope="{ title, parentId, entity, key}">
              <span v-if="title.indexOf(searchValue) > -1">{{ title.substr(0, title.indexOf(searchValue)) }}
@@ -26,9 +35,8 @@
              <span v-else>{{ title }}</span>
            </template>
          </a-tree>
        </a-form-item>
      </a-form>

        </div>
      </div>
    </a-spin>


@@ -227,11 +235,20 @@
      refreshTree() {
        this.queryTreeData()
      },


      /**
       * 节点被选中时触发（点击名称）
       * @param selectedKeys 选中的节点key集合
       * @param event 事件对象
       */
      handleSelectChange(selectedKeys, event) {
        event.node.$el.childNodes[1].click()
      },

      onCheck(value, obj) {
        this.checkedKeys = value
        console.log('obj,', obj)
        this.deviceNodes = obj.checkedNodes.filter(item => item.data.props.equipmentId).map(item => item.data.props.equipmentId)
        console.log(this.deviceNodes)
      },
      handleCancel() {
        this.visible = false