1：修复分页不能点击 2：通道默认值 3：头部增加用户名

src/app/layout/layout.component.html

@@ -15,6 +15,8 @@
       <i class="io trigger textStyle1 whenHover" [class.i-shou]="!isCollapsed"
          [class.i-fang]="isCollapsed" (click)="changeCollapsed()"></i>
       <label class="loginOut whenHover textStyle1" (click)="loginOut()">
+        <nz-avatar nzSize="small" nzIcon="user"></nz-avatar>
+        <span style="margin: 0 10px">{{userName}}</span>
         <i class="io i-out"></i>
       </label>
     </nz-header>

src/app/layout/layout.component.ts

@@ -17,6 +17,7 @@ export class LayoutComponent implements OnInit {
   title;
   bcShow = true;
   selectedItem;
+  userName;
   @ViewChild('trigger') customTrigger: TemplateRef<void>;
   @ViewChild('leftmenu') leftmenu: LeftmenuComponent;
 
@@ -66,6 +67,11 @@ export class LayoutComponent implements OnInit {
             .replace(/\/oldData/g, '/dataMonitoring').split('/');
         }
       });
+
+    // 获取登录用户信息
+    this.api.user.getSelfInfo(['', (data: any) => {
+      this.userName = data.userName;
+    }]);
   }
 
   loginOut() {

src/app/main/gateway/gateway.component.html

@@ -75,7 +75,7 @@
     </tr>
     </tbody>
   </nz-table>
-  <div class="btnLine whenOneLine" style="position: absolute;bottom: 30px;">
+  <div class="btnLine" style="position: absolute;bottom: 30px;">
     <button nz-button [nzType]="'primary'" class="delBtn" [nzLoading]="isLoading" [disabled]="!isCheckedOne" (click)="allDelete()">
       <span>{{'delete' | translate}}</span></button>
     <button nz-button class="searchBtn" [nzLoading]="isLoading" [disabled]="!canbind" (click)="allBind()">

src/app/main/module-detail/module-detail.component.html

@@ -63,7 +63,9 @@
                          [data]="[{a: 'AI'}, {a: 'AO'}, {a: 'DI'}, {a: 'DO'}]" optL="a" optV="a"></app-search-select>
 
       <div class="searchItem inModal">
-        <div class="item-label"><span class="deleteFontColor">* </span>{{'isTag' | translate}}</div>
+        <div class="item-label"><span class="deleteFontColor">* </span>{{'isId' | translate}}
+          <span nz-tooltip nzTitle="一般通道是id的才选"><i nz-icon nzType="question-circle" nzTheme="outline"></i></span>
+        </div>
         <div class="item-input">
           <nz-radio-group [(ngModel)]="req.isTag">
             <label nz-radio [nzValue]="1">是</label>

src/app/main/module-detail/module-detail.component.ts

@@ -76,7 +76,7 @@ export class ModuleDetailComponent implements OnInit {
   }
 
   add() {
-    this.req = {unit: '-'};
+    this.req = {unit: '-', isTag: 0, isAlarm: 0};
     this.isUpdate = false;
     this.isV = true;
     this.try = {

src/app/main/sensor-mgr/sensor-mgr.component.html

@@ -74,7 +74,7 @@
     </tr>
     </tbody>
   </nz-table>
-  <div class="btnLine whenOneLine" style="position: absolute;bottom: 30px;">
+  <div class="btnLine" style="position: absolute;bottom: 30px;">
     <button nz-button class="delBtn" [nzType]="'primary'" [nzLoading]="isLoading" [disabled]="!isCheckedOne" (click)="allDelete()">
       <span>{{'delete' | translate}}</span></button>
     <button nz-button class="searchBtn" [nzLoading]="isLoading" [disabled]="!canbind" (click)="allBind()"><span>{{'bind' | translate}}</span>

src/app/main/sensor-topic-way/sensor-topic-way.component.html

@@ -63,7 +63,9 @@
                          [data]="[{a: 'AI'}, {a: 'AO'}, {a: 'DI'}, {a: 'DO'}]" optL="a" optV="a"></app-search-select>
 
       <div class="searchItem inModal">
-        <div class="item-label"><span class="deleteFontColor">* </span>{{'isTag' | translate}}</div>
+        <div class="item-label"><span class="deleteFontColor">* </span>{{'isTag' | translate}}
+          <span nz-tooltip nzTitle="一般通道是id的才选"><i nz-icon nzType="question-circle" nzTheme="outline"></i></span>
+        </div>
         <div class="item-input">
           <nz-radio-group [(ngModel)]="req.isTag">
             <label nz-radio [nzValue]="1">是</label>

src/app/main/sensor-topic-way/sensor-topic-way.component.ts

@@ -67,7 +67,7 @@ export class SensorTopicWayComponent implements OnInit {
   }
 
   add() {
-    this.req = {unit: '-'};
+    this.req = {unit: '-', isTag: 0, isAlarm: 0};
     this.isUpdate = false;
     this.isV = true;
     this.try = {

src/app/main/topic-module-way/topic-module-way.component.html

@@ -61,7 +61,9 @@
                          [data]="[{a: 'AI'}, {a: 'AO'}, {a: 'DI'}, {a: 'DO'}]" optL="a" optV="a"></app-search-select>
 
       <div class="searchItem inModal">
-        <div class="item-label"><span class="deleteFontColor">* </span>{{'isTag' | translate}}</div>
+        <div class="item-label"><span class="deleteFontColor">* </span>{{'isId' | translate}}
+          <span nz-tooltip nzTitle="一般通道是id的才选"><i nz-icon nzType="question-circle" nzTheme="outline"></i></span>
+        </div>
         <div class="item-input">
           <nz-radio-group [(ngModel)]="req.isTag">
             <label nz-radio [nzValue]="1">是</label>

src/app/main/topic-module-way/topic-module-way.component.ts

@@ -76,7 +76,7 @@ export class TopicModuleWayComponent implements OnInit {
   }
 
   add() {
-    this.req = {unit: '-'};
+    this.req = {unit: '-', isTag: 0, isAlarm: 0};
     this.isUpdate = false;
     this.isV = true;
     this.try = {

src/assets/i18n/en.json

@@ -121,5 +121,6 @@
   "moduleAlias": "通道别名",
   "isAlarm": "是否报警",
   "isTag": "是否为标签",
+  "isId": "是否为索引",
   "saveOther": "另存为"
 }

src/assets/i18n/jpn.json

@@ -121,5 +121,6 @@
   "moduleAlias": "通道别名",
   "isAlarm": "是否报警",
   "isTag": "是否为标签",
+  "isId": "是否为索引",
   "saveOther": "另存为"
 }

src/assets/i18n/zh.json

@@ -121,6 +121,7 @@
   "moduleAlias": "通道别名",
   "isAlarm": "是否报警",
   "isTag": "是否为标签",
+  "isId": "是否为索引",
   "saveOther": "另存为",
   "addWay": "添加通道",
   "alarmInterval": "报警时间间隔/ms",