Commit 8227bcb0 authored by 陈娇's avatar 陈娇

去掉必填项-test

parent 66be95b0
Pipeline #3030 passed with stage
in 0 seconds
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<ng-container *ngIf="item.isDisplay"> <ng-container *ngIf="item.isDisplay">
<div class="first-floor textStyle1 whenHover" [title]="item.name | translate" *ngIf="(item.child && item.child.length > 0) || item.type" (click)="selectFirstFloor(item)" [ngClass]="{'isSelectedFirst': isSelected[0] === item.name, 'isSelectedSecond': isSelected[0] === item.name && item.type === 1}"> <div class="first-floor textStyle1 whenHover" [title]="item.name | translate" *ngIf="(item.child && item.child.length > 0) || item.type" (click)="selectFirstFloor(item)" [ngClass]="{'isSelectedFirst': isSelected[0] === item.name, 'isSelectedSecond': isSelected[0] === item.name && item.type === 1}">
<i [class]="item.icon" [ngClass]="{'iconLeft': !isCollapsed,'iconLeftCos': isCollapsed}"></i> <i [class]="item.icon" [ngClass]="{'iconLeft': !isCollapsed,'iconLeftCos': isCollapsed}"></i>
<span *ngIf="!isCollapsed">{{item.name | translate}}3333</span> <span *ngIf="!isCollapsed">{{item.name | translate}}</span>
<i class="io iconRight" [ngClass]="{'i-xia': !isOpen[item.name] && !item.type && !isCollapsed,'i-shang': isOpen[item.name] && !item.type && !isCollapsed, 'i-you': isCollapsed && !item.type}"></i> <i class="io iconRight" [ngClass]="{'i-xia': !isOpen[item.name] && !item.type && !isCollapsed,'i-shang': isOpen[item.name] && !item.type && !isCollapsed, 'i-you': isCollapsed && !item.type}"></i>
</div> </div>
<div *ngIf="isOpen[item.name] && !isCollapsed" class="menuSecond whenHover"> <div *ngIf="isOpen[item.name] && !isCollapsed" class="menuSecond whenHover">
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<div class="second-floor whenHover textStyle2" *ngIf="one.isDisplay" [title]="one.name | translate" <div class="second-floor whenHover textStyle2" *ngIf="one.isDisplay" [title]="one.name | translate"
(click)="selectSecondFloor(item.name, one.name)" (click)="selectSecondFloor(item.name, one.name)"
[ngClass]="{'isSelectedSecond': isSelected[0] === item.name && isSelected[1] === one.name}"> [ngClass]="{'isSelectedSecond': isSelected[0] === item.name && isSelected[1] === one.name}">
{{one.name | translate}}1111 {{one.name | translate}}
</div> </div>
</ng-container> </ng-container>
</div> </div>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<div class="second-floor-cos whenHover textStyle2" *ngIf="one.isDisplay" <div class="second-floor-cos whenHover textStyle2" *ngIf="one.isDisplay"
(click)="selectSecondFloor(item.name, one.name)" (click)="selectSecondFloor(item.name, one.name)"
[ngClass]="{'isSelectedSecond': isSelected[0] === item.name && isSelected[1] === one.name}"> [ngClass]="{'isSelectedSecond': isSelected[0] === item.name && isSelected[1] === one.name}">
{{one.name | translate}}2222 {{one.name | translate}}
</div> </div>
</ng-container> </ng-container>
</div> </div>
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
optL="a" optV="b"></app-search-select> optL="a" optV="b"></app-search-select>
<app-search-select isMust="true" inModal="true" [label]="'dataType' | translate" [(value)]="req.dataType" <app-search-select isMust="true" inModal="true" [label]="'dataType' | translate" [(value)]="req.dataType"
[data]="[{a: 'json', b: 0}, {a: 'bin', b: 1}]" optL="a" optV="b"></app-search-select> [data]="[{a: 'json', b: 0}, {a: 'bin', b: 1}]" optL="a" optV="b"></app-search-select>
<app-search-select *ngIf="!isUpdate" isMust="true" inModal="true" [label]="'probesModel' | translate" [(value)]="req.probesModelNo" <app-search-select *ngIf="!isUpdate" inModal="true" [label]="'probesModel' | translate" [(value)]="req.probesModelNo"
[data]="probesModels" optL="probesModelName" optV="probesModelNo"></app-search-select> [data]="probesModels" optL="probesModelName" optV="probesModelNo"></app-search-select>
<app-search-item inModal="true" [label]="'dataInterval' | translate" [(value)]="req.dataInterval"></app-search-item> <app-search-item inModal="true" [label]="'dataInterval' | translate" [(value)]="req.dataInterval"></app-search-item>
<!--<app-search-item isMust="true" inModal="true" [label]="'frequency' | translate" [(value)]="req.frequency"></app-search-item>--> <!--<app-search-item isMust="true" inModal="true" [label]="'frequency' | translate" [(value)]="req.frequency"></app-search-item>-->
......
...@@ -120,6 +120,7 @@ export class TopicModuleMgrComponent implements OnInit { ...@@ -120,6 +120,7 @@ export class TopicModuleMgrComponent implements OnInit {
} }
save(v) { save(v) {
debugger;
this.isLoading = true; this.isLoading = true;
if (!this.ck.formCheck(this[v], this.try)) { if (!this.ck.formCheck(this[v], this.try)) {
this.isLoading = false; this.isLoading = false;
......
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