Commit 49e7b381 authored by limingzhe's avatar limingzhe

fix: debug

parent a030d1cf
...@@ -1823,6 +1823,8 @@ cc.Class({ ...@@ -1823,6 +1823,8 @@ cc.Class({
colorNode.y += this.colorBg.height / 2; colorNode.y += this.colorBg.height / 2;
const pointColor = new cc.Color(); const pointColor = new cc.Color();
pointColor.r = color[0] * 1.2 pointColor.r = color[0] * 1.2
pointColor.g = color[1] * 1.2 pointColor.g = color[1] * 1.2
pointColor.b = color[2] * 1.2 pointColor.b = color[2] * 1.2
...@@ -1843,7 +1845,7 @@ cc.Class({ ...@@ -1843,7 +1845,7 @@ cc.Class({
const colorPoints = this.colorRectCheckArr[i].colorPoints; const colorPoints = this.colorRectCheckArr[i].colorPoints;
const pointsMax = this.colorRectCheckArr[i].pointsMax; const pointsMax = this.colorRectCheckArr[i].pointsMax;
if (colorPoints.length / pointsMax >= 0.7) { if (colorPoints.length / pointsMax >= 0.5) {
const key = this.colorRectCheckArr[i].data.index + 1; const key = this.colorRectCheckArr[i].data.index + 1;
answerData[key] = {colorRectCheckItem: this.colorRectCheckArr[i], isFinish: true}; answerData[key] = {colorRectCheckItem: this.colorRectCheckArr[i], isFinish: true};
...@@ -4276,6 +4278,10 @@ cc.Class({ ...@@ -4276,6 +4278,10 @@ cc.Class({
w *= this.colorBg.width; w *= this.colorBg.width;
h *= this.colorBg.height; h *= this.colorBg.height;
x = Math.round(x * 100) / 100;
y = Math.round(y * 100) / 100;
w = Math.round(w * 100) / 100;
h = Math.round(h * 100) / 100;
const rect = { const rect = {
x:- w/2, x:- w/2,
......
...@@ -283,7 +283,7 @@ ...@@ -283,7 +283,7 @@
</div> </div>
<div style="margin-top: 30px;"></div> <div style="margin-top: 30px;"></div>
<h2>标记组合并识别设置:</h2> <h2>标记组合并识别设置(选填)</h2>
<div style="padding: 10px; border: 2px solid #ccc; border-radius: 10px; width: 350px;"> <div style="padding: 10px; border: 2px solid #ccc; border-radius: 10px; width: 350px;">
<div *ngIf="checkHasCombineGroup()" style="position: relative;"> <div *ngIf="checkHasCombineGroup()" style="position: relative;">
<button nz-button nzType="default" nzShape="circle" (click)="addItemCombineGroup()" style="position: absolute; top: -40px; right: 0;"> <button nz-button nzType="default" nzShape="circle" (click)="addItemCombineGroup()" style="position: absolute; top: -40px; right: 0;">
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
<div style="margin-top: 40px;"> <div style="margin-top: 40px;">
<div *ngFor="let cgItem of item.itemCombineGroup; let i = index" style="width: 100%; padding-right: 50px; position: relative; margin-top: 10px;"> <div *ngFor="let cgItem of item.itemCombineGroup; let i = index" style="width: 100%; padding-right: 50px; position: relative; margin-top: 10px;">
<nz-select [(ngModel)]="item.itemCombineGroup[i]" nzMode="multiple" (ngModelChange)="onItemCombineGroupChange()" nzPlaceHolder="Please select" style="width: 100%;"> <nz-select [(ngModel)]="item.itemCombineGroup[i]" nzMode="multiple" (ngModelChange)="onItemCombineGroupChange()" nzPlaceHolder="Please select" style="width: 100%;">
<nz-option *ngFor="let option of item.hotZoneItemArr2; let j = index" [nzLabel]="'sign-item-' + j" [nzValue]="j"></nz-option> <nz-option *ngFor="let option of item.hotZoneItemArr2; let j = index" [nzLabel]="'sign-item-' + (j+1)" [nzValue]="j"></nz-option>
</nz-select> </nz-select>
<button nz-button nzType="danger" nzShape="circle" (click)="deleteItemCombineGroup(i)" style="position: absolute; right: 0;"> <button nz-button nzType="danger" nzShape="circle" (click)="deleteItemCombineGroup(i)" style="position: absolute; right: 0;">
<span nz-icon nzType="delete"></span> <span nz-icon nzType="delete"></span>
......
...@@ -329,10 +329,10 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy, AfterViewIni ...@@ -329,10 +329,10 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy, AfterViewIni
checkHasCombineGroup() { checkHasCombineGroup() {
let count = 0; let count = 0;
if (!this.item?.hotZoneItemArr2) { if (!this.item?.hotZoneItemArr) {
return false; return false;
} }
this.item.hotZoneItemArr2.forEach(item => { this.item.hotZoneItemArr.forEach(item => {
item.gIdx == '4'; item.gIdx == '4';
count++; count++;
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment