1.以下页面增加“是否为标签”：①通道模板详情、及添加/修改弹窗；②传感器主题详情、及添加/修改弹窗

2.以下页面增加“批量数据存储间隔时间”：主题配置模板详情页面、及新增/修改弹窗

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

@@ -23,6 +23,7 @@
       <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>{{'isTag' | translate}}</span></th>
       <th nz-th><span>{{'isAlarm' | translate}}</span></th>
       <th nz-th><span>{{'oper' | translate}}</span></th>
     </tr>
@@ -40,6 +41,7 @@
       <td nz-td>{{one.upperAlarmLimit}}</td>
       <td nz-td>{{one.alarmDown}}</td>
       <td nz-td>{{one.lowerAlarmLimit}}</td>
+      <td nz-td>{{one.isTag === 1 ? '是' : '否'}}</td>
       <td nz-td>{{one.isAlarm === 1 ? '是' : '否'}}</td>
       <td nz-td>
         <span class="editSpan" (click)="update(one)">{{'update' | translate}}</span>
@@ -59,6 +61,17 @@
                        [(value)]="req.name"></app-search-item>
       <app-search-select isMust="true" inModal="true" [label]="'wayType' | translate" [(value)]="req.type"
                          [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-input">
+          <nz-radio-group [(ngModel)]="req.isTag">
+            <label nz-radio [nzValue]="1">是</label>
+            <label nz-radio [nzValue]="0">否</label>
+          </nz-radio-group>
+        </div>
+      </div>
+
       <div class="searchItem inModal">
         <div class="item-label"><span class="deleteFontColor">* </span>{{'isAlarm' | translate}}</div>
         <div class="item-input">
@@ -83,6 +96,9 @@
                        [label]="'per' | translate" [(value)]="req.unit"></app-search-item>
       <app-search-item isMust="true" inModal="true" [label]="'wayDescription' | translate"
                        [(value)]="req.description"></app-search-item>
+
+      <div class="searchItem inModal" style="height: 30px;">
+      </div>
       <app-search-item inModal="true" [label]="'min' | translate" [(value)]="req.rangeMin"></app-search-item>
       <app-search-item *ngIf="req.isAlarm" inModal="true" [label]="'alarmMin' | translate"
                        [(value)]="req.alarmDown"></app-search-item>

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

@@ -80,10 +80,10 @@ export class ModuleDetailComponent implements OnInit {
     this.isUpdate = false;
     this.isV = true;
     this.try = {
-      trans: {name: 'wayName', alias: 'wayAlias', description: 'wayDescription', type: 'per', isAlarm: 'isAlarm',
-        alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin',
+      trans: {name: 'wayName', alias: 'wayAlias', description: 'wayDescription', type: 'per', isTag: 'isTag',
+        isAlarm: 'isAlarm', alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin',
         lowerAlarmLimit: 'alarmMinMin', alarmInterval: 'alarmInterval', rangeMin: 'min'},
-      field: ['probesModelNo', 'name', 'alias', 'description', 'type', 'isAlarm'],
+      field: ['probesModelNo', 'name', 'alias', 'description', 'type', 'isTag', 'isAlarm'],
       canFloat2: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'rangeMin'],
       num: ['alarmInterval'],
       eng: ['name', 'alias']
@@ -96,10 +96,10 @@ export class ModuleDetailComponent implements OnInit {
     this.req.oldName = one.name;
     this.isV = true;
     this.try = {
-      trans: {name: 'wayName', alias: 'wayAlias', description: 'wayDescription', type: 'per', isAlarm: 'isAlarm',
-        alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin',
+      trans: {name: 'wayName', alias: 'wayAlias', description: 'wayDescription', type: 'per', isTag: 'isTag',
+        isAlarm: 'isAlarm', alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin',
         lowerAlarmLimit: 'alarmMinMin', alarmInterval: 'alarmInterval', rangeMin: 'min'},
-      field: ['probesModelNo', 'name', 'alias', 'description', 'type', 'isAlarm'],
+      field: ['probesModelNo', 'name', 'alias', 'description', 'type', 'isTag', 'isAlarm'],
       canFloat2: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'rangeMin'],
       num: ['alarmInterval'],
       eng: ['name', 'alias']

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

@@ -24,6 +24,7 @@
       <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>{{'isTag' | translate}}</span></th>
       <th nz-th><span>{{'isAlarm' | translate}}</span></th>
       <th nz-th><span>{{'oper' | translate}}</span></th>
     </tr>
@@ -41,6 +42,7 @@
       <td nz-td>{{one.upperAlarmLimit}}</td>
       <td nz-td>{{one.alarmDown}}</td>
       <td nz-td>{{one.lowerAlarmLimit}}</td>
+      <td nz-td>{{one.isTag === 1 ? '是': '否'}}</td>
       <td nz-td>{{one.isAlarm === 1 ? '是': '否'}}</td>
       <td nz-td>
         <span class="editSpan" (click)="update(one)">{{'update' | translate}}</span>
@@ -59,6 +61,17 @@
                        [(value)]="req.name"></app-search-item>
       <app-search-select isMust="true" inModal="true" [label]="'wayType' | translate" [(value)]="req.type"
                          [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-input">
+          <nz-radio-group [(ngModel)]="req.isTag">
+            <label nz-radio [nzValue]="1">是</label>
+            <label nz-radio [nzValue]="0">否</label>
+          </nz-radio-group>
+        </div>
+      </div>
+
       <div class="searchItem inModal">
         <div class="item-label"><span class="deleteFontColor">* </span>{{'isAlarm' | translate}}</div>
         <div class="item-input">
@@ -83,6 +96,10 @@
                        [label]="'per' | translate" [(value)]="req.unit"></app-search-item>
       <app-search-item isMust="true" inModal="true" [label]="'wayDescription' | translate"
                        [(value)]="req.description"></app-search-item>
+
+      <div class="searchItem inModal" style="height: 30px;">
+      </div>
+
       <app-search-item inModal="true" [label]="'min' | translate" [(value)]="req.rangeMin"></app-search-item>
       <app-search-item *ngIf="req.isAlarm" inModal="true" [label]="'alarmMin' | translate"
                        [(value)]="req.alarmDown"></app-search-item>

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

@@ -71,10 +71,10 @@ export class SensorTopicWayComponent implements OnInit {
     this.isUpdate = false;
     this.isV = true;
     this.try = {
-      trans: {name: 'wayName', alias: 'wayAlias', description: 'wayDescription', type: 'per', isAlarm: 'isAlarm',
-        alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin',
+      trans: {name: 'wayName', alias: 'wayAlias', description: 'wayDescription', type: 'per', isTag: 'isTag',
+        isAlarm: 'isAlarm', alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin',
         lowerAlarmLimit: 'alarmMinMin', alarmInterval: 'alarmInterval', rangeMin: 'min'},
-      field: ['deviceNo', 'topicName', 'name', 'alias', 'description', 'type', 'isAlarm'],
+      field: ['deviceNo', 'topicName', 'name', 'alias', 'description', 'type', 'isTag', 'isAlarm'],
       canFloat2: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'rangeMin'],
       num: ['alarmInterval'],
       eng: ['name', 'alias']
@@ -87,10 +87,10 @@ export class SensorTopicWayComponent implements OnInit {
     this.req.oldName = one.name;
     this.isV = true;
     this.try = {
-      trans: {name: 'wayName', alias: 'wayAlias', description: 'wayDescription', type: 'per', isAlarm: 'isAlarm',
-        alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin',
+      trans: {name: 'wayName', alias: 'wayAlias', description: 'wayDescription', type: 'per', isTag: 'isTag',
+        isAlarm: 'isAlarm', alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin',
         lowerAlarmLimit: 'alarmMinMin', alarmInterval: 'alarmInterval', rangeMin: 'min'},
-      field: ['deviceNo', 'topicName', 'name', 'alias', 'description', 'type', 'isAlarm'],
+      field: ['deviceNo', 'topicName', 'name', 'alias', 'description', 'type', 'isTag', 'isAlarm'],
       canFloat2: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'rangeMin'],
       num: ['alarmInterval'],
       eng: ['name', 'alias']

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

@@ -15,6 +15,7 @@
       <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>{{'dataInterval' | translate}}</span></th>
       <th nz-th><span>{{'inTime' | translate}}</span></th>
       <th nz-th><span>{{'oper' | translate}}</span></th>
     </tr>
@@ -26,6 +27,7 @@
       <td nz-td>{{one.topicType === 0 ? '推送主题' : one.topicType === 1 ? '订阅主题':
         one.topicType === 2 ?'推送订阅主题' : one.topicType === 3 ? '告警主题' : '通知主题'}}</td>
       <td nz-td>{{one.dataType === 0 ? 'json' : 'bin'}}</td>
+      <td nz-td>{{one.dataInterval}}</td>
       <td nz-td>{{one.interval}}</td>
       <td nz-td>
         <span class="editSpan" (click)="update(one)">{{'update' | translate}}</span>

src/assets/i18n/en.json

@@ -120,5 +120,6 @@
   "moduleNum": "通道编号",
   "moduleAlias": "通道别名",
   "isAlarm": "是否报警",
+  "isTag": "是否为标签",
   "saveOther": "另存为"
 }

src/assets/i18n/jpn.json

@@ -120,5 +120,6 @@
   "moduleNum": "通道编号",
   "moduleAlias": "通道别名",
   "isAlarm": "是否报警",
+  "isTag": "是否为标签",
   "saveOther": "另存为"
 }

src/assets/i18n/zh.json

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