Merge remote-tracking branch 'origin/master'

zhuzhuanzhuan

2023-12-13 6178db93d6204bc6f83c0634b1ae3be539cd1c9a

Merge remote-tracking branch 'origin/master'

 src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue

@@ -84,13 +84,13 @@
                <a-descriptions-item label="设备名称">{{resultData.equipmentName}}</a-descriptions-item>
                <a-descriptions-item label="IP地址">{{resultData.equipmentIP}}</a-descriptions-item>
                <a-descriptions-item label="端口号">{{resultData.dataPort}}</a-descriptions-item>
                <a-descriptions-item label="系统版本号">{{resultData.SystemVersion}}</a-descriptions-item>
                <a-descriptions-item label="系统版本号">{{resultData.systemVersion}}</a-descriptions-item>
                <a-descriptions-item label="驱动类型">{{resultData.driveType}}</a-descriptions-item>
                <a-descriptions-item label="系统型号">{{resultData.SystemType}}</a-descriptions-item>
                <a-descriptions-item label="系统型号">{{resultData.systemType}}</a-descriptions-item>
                <a-descriptions-item label="设备类型">{{resultData.deviceType}}</a-descriptions-item>
                <a-descriptions-item label="设备功率">{{resultData.devicePower}}</a-descriptions-item>
                <a-descriptions-item label="有效轴数">{{resultData.ValidAxis}}</a-descriptions-item>
                <a-descriptions-item label="最大轴数">{{resultData.MaxAxis}}</a-descriptions-item>
                <a-descriptions-item label="有效轴数">{{resultData.validAxis}}</a-descriptions-item>
                <a-descriptions-item label="最大轴数">{{resultData.maxAxis}}</a-descriptions-item>
                <a-descriptions-item label="备注">{{resultData.remark}}</a-descriptions-item>

              </a-descriptions>