Merge remote-tracking branch 'origin/master'

zhangherong

2025-06-02 d0223045d2dd1cccc26c995c972e80e60bd19b26

 src/views/mdc/base/EquipmentList.vue

@@ -13,8 +13,8 @@
          </a-col>

          <a-col :md="4" :sm="4">
            <a-form-item label="设备名称">
              <a-input placeholder="请输入设备名称" v-model="queryParam.equipmentName"></a-input>
            <a-form-item label="安装位置">
              <a-input placeholder="请输入安装位置" v-model="queryParam.equipmentName"></a-input>
            </a-form-item>
          </a-col>

@@ -23,20 +23,6 @@
              <!--<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>
          </a-col>

@@ -165,7 +151,7 @@
            width: 200
          },
          {
            title: '设备名称',
            title: '安装位置',
            align: 'center',
            width: 200,
            dataIndex: 'equipmentName'
@@ -264,10 +250,17 @@
                  // sorter: true
                },
                {
                  title: '安装位置',
                  align: 'center',
                  dataIndex: 'equipmentName',
                  width: 200
                  // sorter: true
                },
                {
                  title: '设备名称',
                  align: 'center',
                  width: 200,
                  dataIndex: 'equipmentName'
                  dataIndex: 'equipmentAddress'
                },
                {
                  title: '车间',
@@ -337,7 +330,7 @@
                  // sorter: true
                },
                {
                  title: '设备名称',
                  title: '安装位置',
                  align: 'center',
                  width: 200,
                  dataIndex: 'equipmentName'