Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 2m29s
All checks were successful
CI / Docker-Build (push) Successful in 2m29s
commit0a2641c20f
Author: joylink_zhaoerwei <Bob_Engineer@163.com> Date: Wed Mar 27 13:43:00 2024 +0800 一键生成继电器修改:增加边界条件的判断 commite2ac7e4ae5
Author: joylink_zhaoerwei <Bob_Engineer@163.com> Date: Wed Mar 27 12:14:15 2024 +0800 继电器K变大写
This commit is contained in:
parent
504b8cf825
commit
5fcc66b2dc
@ -435,7 +435,11 @@ export function creatCiCjListByCombinationtype(
|
||||
ciCjList.cjList[i] = new relayCabinetGraphicData.CjDataSet();
|
||||
ciCjList.cjList[i].name = 'D' + (i + 1);
|
||||
for (let j = 0; j < rows; j++) {
|
||||
if (i < cols - 1 || (i == cols - 1 && j < allCjData.length % rows)) {
|
||||
if (
|
||||
i < cols - 1 ||
|
||||
(i == cols - 1 && j < allCjData.length % rows) ||
|
||||
(i == cols - 1 && allCjData.length % rows == 0)
|
||||
) {
|
||||
ciCjList.cjList[i].bitList[j] = allCjData[i * rows + j];
|
||||
} else {
|
||||
ciCjList.cjList[i].bitList[j] = new relayCabinetGraphicData.CjData();
|
||||
|
@ -684,7 +684,7 @@ const garageDoorCjList = [
|
||||
],
|
||||
[
|
||||
{
|
||||
code: 'kMJ',
|
||||
code: 'KMJ',
|
||||
position: PostionType.Q,
|
||||
},
|
||||
],
|
||||
|
@ -99,7 +99,7 @@ upScreenDoorQdList.forEach((qdData) => {
|
||||
const garageDoorQdList = [
|
||||
{
|
||||
code: 'CKM',
|
||||
refDeviceCodes: [['kMJ'], ['GMJ']],
|
||||
refDeviceCodes: [['KMJ'], ['GMJ']],
|
||||
},
|
||||
];
|
||||
|
||||
|
@ -453,7 +453,7 @@ const garageDoorCombinations = [
|
||||
model: RelayModelType.JWXC_1700,
|
||||
},
|
||||
{
|
||||
code: 'kMJ',
|
||||
code: 'KMJ',
|
||||
model: RelayModelType.JWXC_1700,
|
||||
},
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user