Commit aa33f36f9fdaf3c6db85b2b40146d47f7c4ff5b7

Authored by xp.Huang
2 parents a8dde75b c31d5aa4

Merge branch 'feat/tcp-product-thingsmodel-add-zoom-factory' into 'main_dev'

fix: 修复缩放因子参数丢失

See merge request yunteng/thingskit-scada!111
@@ -9023,7 +9023,7 @@ DataFormatPanel.prototype.addDataFont = function (container) { @@ -9023,7 +9023,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
9023 * @param {{orgId: string, deviceId: string, slaveDeviceId?: string, attr: string}} dataSource 9023 * @param {{orgId: string, deviceId: string, slaveDeviceId?: string, attr: string}} dataSource
9024 */ 9024 */
9025 function echoDataSource(dataSource = {}) { 9025 function echoDataSource(dataSource = {}) {
9026 - const { orgId, deviceId, deviceProfileId, deviceType, attr, method, deviceCode, registerAddress, thingsModelDataType, actionType, zoomFacor } = dataSource 9026 + const { orgId, deviceId, deviceProfileId, deviceType, attr, method, deviceCode, registerAddress, thingsModelDataType, actionType, zoomFactor } = dataSource
9027 const queue = [] 9027 const queue = []
9028 currentDataSource = { organizationId: orgId, deviceProfileId, deviceType } 9028 currentDataSource = { organizationId: orgId, deviceProfileId, deviceType }
9029 queue.push(getProduct(deviceType)) 9029 queue.push(getProduct(deviceType))
@@ -9054,7 +9054,7 @@ DataFormatPanel.prototype.addDataFont = function (container) { @@ -9054,7 +9054,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
9054 actionType, 9054 actionType,
9055 deviceName, 9055 deviceName,
9056 attrName, 9056 attrName,
9057 - zoomFacor 9057 + zoomFactor
9058 }) 9058 })
9059 9059
9060 }) 9060 })