src/views/mdc/base/EquipmentList.vue
@@ -20,23 +20,14 @@
          <a-col :md="4" :sm="4">
            <a-form-item label="车间名称">
              <!--<a-input placeholder="请输入车间名称" v-model="queryParam.productionName"></a-input>-->
              <a-tree-select v-model="queryParam.productionName" :treeData="workshopTreeData" placeholder="请选择车间"
                             :treeDefaultExpandedKeys="treeDefaultExpandedKeys"></a-tree-select>
            </a-form-item>
          </a-col>
          <a-col :md="4" :sm="4">
            <a-form-item label="设备级别">
              <j-dict-select-tag placeholder="请选择设备级别" dictCode="device_level" v-model="queryParam.deviceLevel"
                                 allow-clear/>
            </a-form-item>
          </a-col>
          <a-col :md="4" :sm="4">
            <a-form-item label="设备种类">
              <j-dict-select-tag placeholder="请选择设备种类" dictCode="device_category" v-model="queryParam.deviceCategory"
                                 allow-clear/>
            <a-form-item label="设备状态">
              <j-dict-select-tag  placeholder="请选择设备状态" :triggerChange="true" dictCode="mdc_equipment_status" v-model="queryParam.equipmentStatus" allow-clear/>
            </a-form-item>
          </a-col>
@@ -195,23 +186,16 @@
            dataIndex: 'equipmentIp'
          },
          {
            title: '设备功率',
            title: '机床端口',
            align: 'center',
            width: 200,
            dataIndex: 'devicePower'
            dataIndex: 'dataPort'
          },
          {
            title: '部门',
            align: 'center',
            width: 200,
            dataIndex: 'orgCodeTxt'
          },
          {
            title: '系统版本',
            align: 'center',
            width: 200,
            dataIndex: 'systemVersion'
          },
          {
            title: '操作',
@@ -260,52 +244,58 @@
                  title: '设备编号',
                  align: 'center',
                  dataIndex: 'equipmentId',
                  width: 200
                  width: 225
                  // sorter: true
                },
                {
                  title: '设备名称',
                  align: 'center',
                  width: 200,
                  width: 225,
                  dataIndex: 'equipmentName'
                },
                {
                  title: '车间',
                  align: 'center',
                  width: 200,
                  width: 225,
                  dataIndex: 'productionName'
                },
                {
                  title: '设备类型',
                  align: 'center',
                  width: 200,
                  width: 225,
                  dataIndex: 'equipmentType'
                },
                {
                  title: '驱动类型',
                  align: 'center',
                  width: 200,
                  width: 225,
                  dataIndex: 'driveType'
                  // sorter: true
                },
                {
                  title:'设备状态',
                  align:'center',
                  width: 100,
                  dataIndex:'equipmentStatus_dictText'
                },
                {
                  title:'设备属性',
                  align:'center',
                  width: 100,
                  dataIndex:'attribute_dictText'
                },
                {
                  title: '机床IP',
                  align: 'center',
                  width: 200,
                  width: 150,
                  dataIndex: 'equipmentIp'
                },
                {
                  title: '设备功率',
                  title: '机床端口',
                  align: 'center',
                  width: 200,
                  dataIndex: 'devicePower'
                },
                {
                  title: '系统版本',
                  align: 'center',
                  width: 200,
                  dataIndex: 'systemVersion'
                  dataIndex: 'dataPort'
                },
                {
                  title: '操作',
@@ -363,29 +353,28 @@
                  // sorter: true
                },
                {
                  title:'设备状态',
                  align:'center',
                  width: 100,
                  dataIndex:'equipmentStatus_dictText'
                },
                {
                  title: '机床IP',
                  align: 'center',
                  width: 200,
                  dataIndex: 'equipmentIp'
                },
                {
                  title: '设备功率',
                  title: '机床端口',
                  align: 'center',
                  width: 200,
                  dataIndex: 'devicePower'
                  dataIndex: 'dataPort'
                },
                {
                  title: '部门',
                  align: 'center',
                  width: 200,
                  dataIndex: 'orgCodeTxt'
                },
                {
                  title: '系统版本',
                  align: 'center',
                  width: 200,
                  dataIndex: 'systemVersion'
                },
                {
                  title: '操作',