joylink
/
rts-sim-testing-client
6
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://120.46.212.6:3000/joylink/rts-sim-testing-client into develop

This commit is contained in:
joylink_fanyuhong 2024-03-27 14:11:53 +08:00
parent f21690988d 0a2641c20f
commit 43a8993eb9
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/drawApp/relayCabinetLayoutApp.ts
View File

@ -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();

2
src/layouts/RelayCabinetLayout/GeneraterCiCjConfig.ts
View File

@ -684,7 +684,7 @@ const garageDoorCjList = [
],
[
{
code: 'kMJ',
code: 'KMJ',
position: PostionType.Q,
},
],

2
src/layouts/RelayCabinetLayout/GeneraterCiQdConfig.ts
View File

@ -99,7 +99,7 @@ upScreenDoorQdList.forEach((qdData) => {
const garageDoorQdList = [
{
code: 'CKM',
refDeviceCodes: [['kMJ'], ['GMJ']],
refDeviceCodes: [['KMJ'], ['GMJ']],
},
];

2
src/layouts/RelayCabinetLayout/GeneraterRelayLayoutConfig.ts
View File

@ -453,7 +453,7 @@ const garageDoorCombinations = [
model: RelayModelType.JWXC_1700,
},
{
code: 'kMJ',
code: 'KMJ',
model: RelayModelType.JWXC_1700,
},
{