提交一下

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

@@ -20,24 +20,40 @@
             (nzPageSizeChange)="searchData()">
     <thead nz-thead>
     <tr>
-      <th nz-th><span>{{'num' | translate}}</span></th>
-      <th nz-th><span>{{'topicModuleName' | translate}}</span></th>
-      <th nz-th><span>{{'front' | translate}}</span></th>
-      <th nz-th><span>{{'belongCompany' | translate}}</span></th>
-      <th nz-th><span>{{'createTime' | translate}}</span></th>
-      <th nz-th><span>{{'remark' | translate}}</span></th>
+      <th nz-th><span>{{'moduleNum' | translate}}</span></th>
+      <th nz-th><span>{{'moduleName' | translate}}</span></th>
+      <th nz-th><span>{{'moduleAlias' | translate}}</span></th>
+      <th nz-th><span>{{'per' | translate}}</span></th>
+      <th nz-th><span>{{'wayType' | translate}}</span></th>
+      <th nz-th><span>{{'max' | translate}}</span></th>
+      <th nz-th><span>{{'min' | translate}}</span></th>
+      <th nz-th><span>{{'alarmMax' | translate}}</span></th>
+      <th nz-th><span>{{'alarmMaxMax' | translate}}</span></th>
+      <th nz-th><span>{{'alarmMin' | translate}}</span></th>
+      <th nz-th><span>{{'alarmMinMin' | translate}}</span></th>
+      <th nz-th><span>{{'isAlarm' | translate}}</span></th>
       <th nz-th><span>{{'oper' | translate}}</span></th>
     </tr>
     </thead>
     <tbody nz-tbody>
     <tr *ngFor="let one of nzTable.data, let i = index">
       <td nz-td>{{i + 1}}</td>
-      <td nz-td class="canClick" (click)="toDetail()">{{one.userName}}</td>
       <td nz-td>{{one.realName}}</td>
       <td nz-td>{{one.loginTime}}</td>
-      <td nz-td>{{'webPlatform' | translate}}</td>
-      <td nz-td>{{one.ipAddress}}</td>
-      <td nz-td>{{one.ipAddress}}</td>
+      <td nz-td>{{one.userName}}</td>
+      <td nz-td>{{one.realName}}</td>
+      <td nz-td>{{one.loginTime}}</td>
+      <td nz-td>{{one.userName}}</td>
+      <td nz-td>{{one.realName}}</td>
+      <td nz-td>{{one.loginTime}}</td>
+      <td nz-td>{{one.userName}}</td>
+      <td nz-td>{{one.realName}}</td>
+      <td nz-td>{{one.loginTime}}</td>
+      <td nz-td>
+        <span class="editSpan" (click)="update(one)">{{'update' | translate}}</span>
+        <nz-divider nzType="vertical"></nz-divider>
+        <span class="deleteFontColor" (click)="deleteConfirm(one)">{{'delete' | translate}}</span>
+      </td>
     </tr>
     </tbody>
   </nz-table>

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

@@ -71,7 +71,7 @@ export class ModuleDetailComponent implements OnInit {
     }
   }
 
-  toDetail() {
-    this.router.navigate(['/app/deviceCenter/moduleMgr/moduleDetail']);
-  }
+  update(one) {}
+
+  deleteConfirm(one) {}
 }

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

 <div class="searchBar" @fade>
-  <app-search-date [label]="'topicModuleName' | translate" [(value)]="req.startTime" showTime="true"></app-search-date>
+  <app-search-date [label]="'moduleName' | translate" [(value)]="req.startTime" showTime="true"></app-search-date>
   <div class="btnLine">
     <button nz-button [nzType]="'primary'" [nzLoading]="isLoading" (click)="onSearch()"><span>{{'search' | translate}}</span></button>
     <button nz-button class="btnAll" [nzLoading]="isLoading" (click)="onGetAll()"><span>{{'allData' | translate}}</span></button>
@@ -21,10 +21,8 @@
     <thead nz-thead>
     <tr>
       <th nz-th><span>{{'num' | translate}}</span></th>
-      <th nz-th><span>{{'topicModuleName' | translate}}</span></th>
-      <th nz-th><span>{{'front' | translate}}</span></th>
-      <th nz-th><span>{{'belongCompany' | translate}}</span></th>
-      <th nz-th><span>{{'createTime' | translate}}</span></th>
+      <th nz-th><span>{{'moduleName' | translate}}</span></th>
+      <th nz-th><span>{{'wayNum' | translate}}</span></th>
       <th nz-th><span>{{'remark' | translate}}</span></th>
       <th nz-th><span>{{'oper' | translate}}</span></th>
     </tr>
@@ -34,10 +32,14 @@
       <td nz-td>{{i + 1}}</td>
       <td nz-td class="canClick" (click)="toDetail()">{{one.userName}}</td>
       <td nz-td>{{one.realName}}</td>
-      <td nz-td>{{one.loginTime}}</td>
-      <td nz-td>{{'webPlatform' | translate}}</td>
-      <td nz-td>{{one.ipAddress}}</td>
       <td nz-td>{{one.ipAddress}}</td>
+      <td nz-td>
+        <span class="editSpan" (click)="update(one)">{{'update' | translate}}</span>
+        <nz-divider nzType="vertical"></nz-divider>
+        <span class="deleteFontColor" (click)="deleteConfirm(one)">{{'delete' | translate}}</span>
+        <nz-divider nzType="vertical"></nz-divider>
+        <span class="addSpan" (click)="saveOther(one)">{{'saveOther' | translate}}</span>
+      </td>
     </tr>
     </tbody>
   </nz-table>

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

@@ -61,7 +61,7 @@ export class ModuleMgrComponent implements OnInit {
       this.message.error(data.message || this.translate.instant('wrongToGetData'));
     }
     this.isLoading = false;
-  };
+  }
 
   searchData() {
     if (this.req.startTime || this.req.endTime) {
@@ -74,4 +74,10 @@ export class ModuleMgrComponent implements OnInit {
   toDetail() {
     this.router.navigate(['/app/deviceCenter/moduleMgr/moduleDetail']);
   }
+
+  saveOther(one) {}
+
+  update(one) {}
+
+  deleteConfirm(one) {}
 }

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

@@ -21,11 +21,10 @@
     <thead nz-thead>
     <tr>
       <th nz-th><span>{{'num' | translate}}</span></th>
-      <th nz-th><span>{{'topicModuleName' | translate}}</span></th>
-      <th nz-th><span>{{'front' | translate}}</span></th>
-      <th nz-th><span>{{'belongCompany' | translate}}</span></th>
-      <th nz-th><span>{{'createTime' | translate}}</span></th>
-      <th nz-th><span>{{'remark' | translate}}</span></th>
+      <th nz-th><span>{{'topicName' | translate}}</span></th>
+      <th nz-th><span>{{'topicType' | translate}}</span></th>
+      <th nz-th><span>{{'dataType' | translate}}</span></th>
+      <th nz-th><span>{{'inTime' | translate}}</span></th>
       <th nz-th><span>{{'oper' | translate}}</span></th>
     </tr>
     </thead>
@@ -36,8 +35,11 @@
       <td nz-td>{{one.realName}}</td>
       <td nz-td>{{one.loginTime}}</td>
       <td nz-td>{{'webPlatform' | translate}}</td>
-      <td nz-td>{{one.ipAddress}}</td>
-      <td nz-td>{{one.ipAddress}}</td>
+      <td nz-td>
+        <span class="editSpan" (click)="update(one)">{{'update' | translate}}</span>
+        <nz-divider nzType="vertical"></nz-divider>
+        <span class="deleteFontColor" (click)="deleteConfirm(one)">{{'delete' | translate}}</span>
+      </td>
     </tr>
     </tbody>
   </nz-table>

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

@@ -70,4 +70,8 @@ export class TopicModuleDetailComponent implements OnInit {
       this.getData();
     }
   }
+
+  update(one) {}
+
+  deleteConfirm(one) {}
 }

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

@@ -37,7 +37,13 @@
       <td nz-td>{{one.loginTime}}</td>
       <td nz-td>{{'webPlatform' | translate}}</td>
       <td nz-td>{{one.ipAddress}}</td>
-      <td nz-td>{{one.ipAddress}}</td>
+      <td nz-td>
+        <span class="editSpan" (click)="update(one)">{{'update' | translate}}</span>
+        <nz-divider nzType="vertical"></nz-divider>
+        <span class="deleteFontColor" (click)="deleteConfirm(one)">{{'delete' | translate}}</span>
+        <nz-divider nzType="vertical"></nz-divider>
+        <span class="addSpan" (click)="saveOther(one)">{{'saveOther' | translate}}</span>
+      </td>
     </tr>
     </tbody>
   </nz-table>

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

@@ -74,4 +74,10 @@ export class TopicModuleMgrComponent implements OnInit {
   toDetail() {
     this.router.navigate(['/app/deviceCenter/topicModuleMgr/topicModuleDetail']);
   }
+
+  saveOther(one) {}
+
+  update(one) {}
+
+  deleteConfirm(one) {}
 }

src/assets/i18n/en.json

@@ -113,5 +113,11 @@
   "addSensor": "新增传感器",
   "selectTime": "选择时间",
   "moduleName": "通道模板名称",
-  "topicModuleName": "主题配置模板名称"
+  "topicModuleName": "主题配置模板名称",
+  "moduleDetail": "通道模板详情",
+  "topicModuleDetail": "主题配置模板详情",
+  "moduleNum": "通道编号",
+  "moduleAlias": "通道别名",
+  "isAlarm": "是否报警",
+  "saveOther": "另存为"
 }

src/assets/i18n/jpn.json

@@ -113,5 +113,11 @@
   "addSensor": "新增传感器",
   "selectTime": "选择时间",
   "moduleName": "通道模板名称",
-  "topicModuleName": "主题配置模板名称"
+  "topicModuleName": "主题配置模板名称",
+  "moduleDetail": "通道模板详情",
+  "topicModuleDetail": "主题配置模板详情",
+  "moduleNum": "通道编号",
+  "moduleAlias": "通道别名",
+  "isAlarm": "是否报警",
+  "saveOther": "另存为"
 }

src/assets/i18n/zh.json

@@ -115,5 +115,9 @@
   "moduleName": "通道模板名称",
   "topicModuleName": "主题配置模板名称",
   "moduleDetail": "通道模板详情",
-  "topicModuleDetail": "主题配置模板详情"
+  "topicModuleDetail": "主题配置模板详情",
+  "moduleNum": "通道编号",
+  "moduleAlias": "通道别名",
+  "isAlarm": "是否报警",
+  "saveOther": "另存为"
 }