传感器的批量操作,按钮颜色

src/app/component/back/back.component.html

-<button nz-button class="btnAll" [nzLoading]="isLoading" (click)="back()"><span>{{'back' | translate}}</span></button>
+<button nz-button class="searchBtn" [nzLoading]="isLoading" (click)="back()"><span>{{'back' | translate}}</span></button>

src/app/layout/layout.module.ts

@@ -6,6 +6,13 @@ import {CommonModule} from '@angular/common';
 import {NZ_MESSAGE_CONFIG} from 'ng-zorro-antd';
 import {NgxEchartsModule} from 'ngx-echarts';
 import {LayoutComponent} from './layout.component';
+// 通用组件
+import {SearchDateComponent} from '../component/search-date/search-date.component';
+import {SearchItemComponent} from '../component/search-item/search-item.component';
+import {SearchSelectComponent} from '../component/search-select/search-select.component';
+import {TransferComponent} from '../component/transfer/transfer.component';
+import {BackComponent} from '../component/back/back.component';
+
 import {LeftmenuComponent} from './leftmenu/leftmenu.component';
 import {FooterComponent} from './footer/footer.component';
 import {BreadcrumbComponent} from './breadcrumb/breadcrumb.component';
@@ -32,12 +39,7 @@ import {TopicModuleDetailComponent} from '../main/topic-module-detail/topic-modu
 import {TopicModuleWayComponent} from '../main/topic-module-way/topic-module-way.component';
 import {InfluxdbComponent} from '../main/influxdb/influxdb.component';
 import {SensorTopicWayComponent} from '../main/sensor-topic-way/sensor-topic-way.component';
-// 通用组件
-import {SearchDateComponent} from '../component/search-date/search-date.component';
-import {SearchItemComponent} from '../component/search-item/search-item.component';
-import {SearchSelectComponent} from '../component/search-select/search-select.component';
-import {TransferComponent} from '../component/transfer/transfer.component';
-import {BackComponent} from '../component/back/back.component';
+import {CompanyComponent} from '../main/company/company.component';
 
 @NgModule({
   imports: [
@@ -66,6 +68,7 @@ import {BackComponent} from '../component/back/back.component';
     BreadcrumbComponent,
     HomeComponent,
     UserComponent,
+    CompanyComponent,
     RoleComponent,
     LogComponent,
     GatewayComponent,

src/app/main/company/company.component.html

+<div class="searchBar" @fade>
+  <div class="btnLine">
+    <button nz-button [nzType]="'primary'" class="searchBtn" [nzLoading]="isLoading" (click)="add()">
+      <span>{{'addCompany' | translate}}</span></button>
+  </div>
+</div>
+<div class="tableBar" @fade>
+  <nz-table #nzTable
+            [nzData]="data"
+            [nzLoading]="isLoading"
+            [nzFrontPagination]="false">
+    <thead nz-thead>
+    <tr>
+      <th nz-th><span>{{'num' | translate}}</span></th>
+      <th nz-th><span>{{'companyName' | translate}}</span></th>
+      <th nz-th><span>{{'companyAlias' | translate}}</span></th>
+      <th nz-th><span>{{'province' | translate}}</span></th>
+      <th nz-th><span>{{'city' | translate}}</span></th>
+      <th nz-th><span>{{'area' | translate}}</span></th>
+      <th nz-th><span>{{'address' | translate}}</span></th>
+      <th nz-th><span>{{'manager' | translate}}</span></th>
+      <th nz-th><span>{{'phone' | 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>{{one.companyName}}</td>
+      <td nz-td>{{one.companyAlias}}</td>
+      <td nz-td>{{one.province}}</td>
+      <td nz-td>{{one.city}}</td>
+      <td nz-td>{{one.area}}</td>
+      <td nz-td>{{one.address}}</td>
+      <td nz-td>{{one.manager}}</td>
+      <td nz-td>{{one.phone}}</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>
+</div>
+
+<nz-modal [(nzVisible)]="isAddConV" [nzTitle]="isUpdate ? ('updateCompany' | translate) : ('addCompany' | translate)"
+          [nzContent]="con1" nzWidth="500"
+          [nzFooter]="foot1" (nzOnCancel)="cancel('isAddConV')" nzMaskClosable="false">
+  <ng-template #con1>
+    <app-search-item isMust="true" inModal="true" [label]="'companyName' | translate"
+                     [(value)]="req.companyName"></app-search-item>
+    <app-search-item isMust="true" inModal="true" [label]="'companyAlias' | translate"
+                     [(value)]="req.companyAlias"></app-search-item>
+    <app-search-select *ngIf="!isUpdate" isMust="true" inModal="true" [label]="'maxRole' | translate"
+                       [(value)]="req.roleNo" optV="roleNo" optL="roleName"
+                       [data]="roles"></app-search-select>
+    <app-search-select isMust="true" (valueChange)="getCitys()" inModal="true" [label]="'province' | translate"
+                       [(value)]="req.province" [data]="procs" optL="province" optV="province"></app-search-select>
+    <app-search-select isMust="true" (valueChange)="getAreas()" inModal="true" [label]="'city' | translate"
+                       [(value)]="req.city" [data]="citys" optL="city" optV="city"></app-search-select>
+    <app-search-select isMust="true" inModal="true" [label]="'area' | translate"
+                     [(value)]="req.area" [data]="areas" optV="area" optL="area"></app-search-select>
+    <app-search-item isMust="true" inModal="true" [label]="'address' | translate"
+                     [(value)]="req.address"></app-search-item>
+    <app-search-item isMust="true" inModal="true" [label]="'manager' | translate"
+                     [(value)]="req.manager"></app-search-item>
+    <app-search-item isMust="true" inModal="true" [label]="'phone' | translate"
+                     [(value)]="req.phone"></app-search-item>
+    <app-search-item isMust="true" inModal="true" [label]="'logo' | translate"
+                     [(value)]="req.logo"></app-search-item>
+    <app-search-item inModal="true" [label]="'remark' | translate"
+                     [(value)]="req.remark"></app-search-item>
+  </ng-template>
+  <ng-template #foot1>
+    <button nz-button nzType="default" [nzLoading]="isLoading" (click)="cancel()">
+      <span>{{'cancel' | translate}}</span></button>
+    <button nz-button class="searchBtn" nzType="primary" [nzLoading]="isLoading" (click)="save('req')">
+      <span>{{'confirm' | translate}}</span></button>
+  </ng-template>
+</nz-modal>

src/app/main/company/company.component.ts

+import { Component, OnInit } from '@angular/core';
+import {fadeIn} from '../../animation/fade-in';
+import {ApiService} from '../../service/api';
+import {NzMessageService, NzModalService} from 'ng-zorro-antd';
+import {Router} from '@angular/router';
+import {TranslateService} from '@ngx-translate/core';
+import {CheckService} from '../../service/check';
+
+@Component({
+  selector: 'app-company',
+  templateUrl: './company.component.html',
+  styles: [],
+  animations: [fadeIn]
+})
+export class CompanyComponent implements OnInit {
+
+  constructor(private api: ApiService, private message: NzMessageService, private router: Router,
+              private modalService: NzModalService, private translate: TranslateService,
+              private ck: CheckService) { }
+
+  isLoading = false;
+  data = [];
+  req: any = {};
+  roles = [];
+  isAddConV = false;
+  isUpdate = false;
+  procs = [];
+  citys = [];
+  areas = [];
+  ngOnInit() {
+    this.init();
+  }
+
+  init() {
+    this.getData();
+    this.getProc();
+    this.getRoles();
+  }
+
+  next = (data) => {
+    if (data.constructor === Array) {
+      this.data = data;
+    } else if (data.code === 1) {
+      this.message.success(data.message ? data.message : '操作成功');
+      this.getData();
+    } else if (data.code === 0) {
+      this.message.error(data.message ? data.message : '操作失败');
+    } else {
+      this.message.error(data.message ? data.message : '获取数据失败');
+    }
+    this.isLoading = false;
+  }
+
+  getData() {
+    this.isLoading = true;
+    this.api.company.getAll(['', this.next]);
+  }
+
+  getProc() {
+    this.api.province.getAll(['', (data) => {
+      if (data.constructor === Array) {
+        this.procs = data;
+      } else {
+        this.message.error(data.message ? data.message : '获取数据失败');
+      }
+    }]);
+  }
+
+  getCitys(province, city) {
+    this.api.city.getByProvince([{province}, (data) => {
+      if (data.constructor === Array) {
+        this.citys = data;
+        this.req.city = city;
+      } else {
+        this.message.error(data.message ? data.message : '获取数据失败');
+      }
+    }]);
+  }
+
+  getAreas(city, area) {
+    this.api.area.getByCity([{city}, (data) => {
+      if (data.constructor === Array) {
+        this.areas = data;
+        this.req.area = area;
+      } else {
+        this.message.error(data.message ? data.message : '获取数据失败');
+      }
+    }]);
+  }
+
+  getRoles() {
+    this.api.role.getAll(['', (data) => {
+      if (data.constructor === Array) {
+        this.roles = data;
+      } else {
+        this.message.error(data.message ? data.message : '获取数据失败');
+      }
+    }]);
+  }
+
+  update(one) {
+    this.isUpdate = true;
+    this.req = {...one};
+    this.isAddConV = true;
+    this.getCitys(one.province, one.city);
+    this.getAreas(one.city, one.area);
+  }
+
+  deleteConfirm(one) {
+    this.modalService.confirm({
+      nzTitle  : '<i> </i>',
+      nzContent: '<b>' + this.translate.instant('confirmDeleteThisRecord') + '</b>',
+      nzOnOk   : () => this.delete(one)
+    });
+  }
+
+  delete(one) {
+    this.isLoading = true;
+    this.api.company.delCompany([{companyNo: one.companyNo}, this.next]);
+  }
+
+  add() {
+    this.req = {};
+    this.isUpdate = false;
+    this.isAddConV = true;
+  }
+
+  cancel() {
+    this.isAddConV = false;
+  }
+
+  save(v) {
+    this.isAddConV = false;
+  }
+}

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

@@ -2,13 +2,13 @@
   <app-search-item [label]="'gatewayName' | translate" [(value)]="query.name"></app-search-item>
   <app-search-item [label]="'gatewaySN' | translate" [(value)]="query.sn"></app-search-item>
   <div class="btnLine">
-    <button nz-button [nzType]="'primary'" [nzLoading]="isLoading" (click)="onSearch()">
+    <button nz-button [nzType]="'primary'" class="searchBtn" [nzLoading]="isLoading" (click)="onSearch()">
       <span>{{'search' | translate}}</span></button>
-    <button nz-button class="btnAll" [nzLoading]="isLoading" (click)="onGetAll()"><span>{{'allData' | translate}}</span>
+    <button nz-button class="searchBtn" [nzLoading]="isLoading" (click)="onGetAll()"><span>{{'allData' | translate}}</span>
     </button>
-    <button nz-button class="btnAdd" [nzLoading]="isLoading" (click)="multiAdd()">
+    <button nz-button class="searchBtn" [nzLoading]="isLoading" (click)="multiAdd()">
       <span>{{'multiAdd' | translate}}</span></button>
-    <button nz-button [nzType]="'primary'" [nzLoading]="isLoading" (click)="add()">
+    <button nz-button [nzType]="'primary'" class="searchBtn" [nzLoading]="isLoading" (click)="add()">
       <span>{{'addGateway' | translate}}</span></button>
   </div>
 </div>
@@ -49,7 +49,7 @@
     </thead>
     <tbody nz-tbody>
     <tr *ngFor="let one of nzTable.data,let i = index">
-      <td nzShowCheckbox [(nzChecked)]="one.checked" (nzCheckedChange)="oneCheck()"></td>
+      <td nzShowCheckbox [(nzChecked)]="one.checked" (nzCheckedChange)="oneCheck(i)"></td>
       <td nz-td class="canClick" (click)="toSee(one)">{{one.name}}</td>
       <td nz-td>{{one.sn}}</td>
       <td nz-td>{{one.type}}</td>
@@ -76,14 +76,14 @@
     </tbody>
   </nz-table>
   <div class="btnLine whenOneLine" style="position: absolute;bottom: 30px;">
-    <button nz-button [nzType]="'primary'" [nzLoading]="isLoading" [disabled]="!isCheckedOne" (click)="allDelete()">
+    <button nz-button [nzType]="'primary'" class="delBtn" [nzLoading]="isLoading" [disabled]="!isCheckedOne" (click)="allDelete()">
       <span>{{'delete' | translate}}</span></button>
-    <button nz-button class="btnAll" [nzLoading]="isLoading" [disabled]="!canbind" (click)="allBind()">
+    <button nz-button class="searchBtn" [nzLoading]="isLoading" [disabled]="!canbind" (click)="allBind()">
       <span>{{'bind' | translate}}</span>
     </button>
-    <button nz-button [nzType]="'primary'" [nzLoading]="isLoading" [disabled]="!canUnbind" (click)="allUnbind()">
+    <button nz-button [nzType]="'primary'" class="unbindBtn" [nzLoading]="isLoading" [disabled]="!canUnbind" (click)="allUnbind()">
       <span>{{'unbind' | translate}}</span></button>
-    <button nz-button class="btnAll" [nzLoading]="isLoading" [disabled]="!isCheckedOne" (click)="allDivide()">
+    <button nz-button class="searchBtn" [nzLoading]="isLoading" [disabled]="!isCheckedOne" (click)="allDivide()">
       <span>{{'divide' | translate}}</span>
     </button>
     <!--<button nz-button [nzType]="'primary'" [nzLoading]="isLoading" [disabled]="!isCheckedOne" (click)="allUpdate()">-->
@@ -118,7 +118,7 @@
   <ng-template #foot1>
     <button nz-button nzType="default" [nzLoading]="isLoading" (click)="cancel('isAddConV')">
       <span>{{'cancel' | translate}}</span></button>
-    <button nz-button nzType="primary" [nzLoading]="isLoading" (click)="save('req')">
+    <button nz-button class="searchBtn" nzType="primary" [nzLoading]="isLoading" (click)="save('req')">
       <span>{{'confirm' | translate}}</span></button>
   </ng-template>
 </nz-modal>
@@ -145,7 +145,7 @@
   <ng-template #foot2>
     <button nz-button nzType="default" [nzLoading]="isLoading" (click)="cancel('isMultiAddConV')">
       <span>{{'cancel' | translate}}</span></button>
-    <button nz-button nzType="primary" [nzLoading]="isLoading" (click)="save('req')">
+    <button nz-button class="searchBtn" nzType="primary" [nzLoading]="isLoading" (click)="save('req')">
       <span>{{'confirm' | translate}}</span></button>
   </ng-template>
 </nz-modal>
@@ -174,7 +174,7 @@
   <ng-template #foot3>
     <button nz-button nzType="default" [nzLoading]="isLoading" (click)="cancel('isBindConV')">
       <span>{{'cancel' | translate}}</span></button>
-    <button nz-button nzType="primary" [nzLoading]="isLoading" (click)="save('req3')">
+    <button nz-button class="searchBtn" nzType="primary" [nzLoading]="isLoading" (click)="save('req3')">
       <span>{{'confirm' | translate}}</span></button>
   </ng-template>
 </nz-modal>
@@ -189,7 +189,7 @@
   <ng-template #foot4>
     <button nz-button nzType="default" [nzLoading]="isLoading" (click)="cancel('isDivideConV')">
       <span>{{'cancel' | translate}}</span></button>
-    <button nz-button nzType="primary" [nzLoading]="isLoading" (click)="save('req4')">
+    <button nz-button class="searchBtn" nzType="primary" [nzLoading]="isLoading" (click)="save('req4')">
       <span>{{'confirm' | translate}}</span></button>
   </ng-template>
 </nz-modal>

src/app/main/gateway/gateway.component.ts

@@ -68,7 +68,7 @@ export class GatewayComponent implements OnInit {
       this.canBindGateways =  data.rows.filter(one => !one.pDeviceNo);
       this.data = data.rows;
       this.total = data.total;
-      this.oneCheck();
+      this.oneCheck(-1);
     } else if (data.code === 1) {
       this.message.success(data && data.message ? data.message : '操作成功');
       this.isAddConV = false;
@@ -149,7 +149,7 @@ export class GatewayComponent implements OnInit {
     if (b) {
       this.isCheckedOne = true;
     }
-    this.data.map((one) => one.checked = b);
+    this.data.map((one, index) => {one.checked = b; one.cI = b ? index : null; });
   }
 
   checkAll(e) {
@@ -158,7 +158,7 @@ export class GatewayComponent implements OnInit {
     this.checkCanBind();
   }
 
-  oneCheck() {
+  oneCheck(i) {
     this.isCheckedOne = true;
     this.isIndeterminate = false;
     this.isAllCheck = false;
@@ -169,8 +169,16 @@ export class GatewayComponent implements OnInit {
       this.isCheckedOne = false;
       this.canbind = false;
       this.canUnbind = false;
+      this.data.map(one => one.cI = null);
     } else {
       this.isIndeterminate = true;
+      // 如果这个刚刚点击的是被选中, 那么这个cI(check的序列号index)直接赋值就行
+      if (i >= 0 && this.data[i].checked) {
+        this.data[i].cI = sum - 1;
+        // 如果这个刚刚点击的是取消选中,那么需要将这个的序列号清空, 后面所有的序列号都-1
+      } else if (!this.data[i].checked) {
+        this.data.map(one => one.cI = one.cI > this.data[i].cI ? one.cI - 1 : one.cI);
+      }
     }
     this.checkCanBind();
   }
@@ -298,11 +306,9 @@ export class GatewayComponent implements OnInit {
       this.req3.pDeviceNo = this.req3.device.deviceNo;
       this.req3.influxdbDatabaseNo = this.req3.device.influxdbDatabaseNo ? this.req3.device.influxdbDatabaseNo : 'ITN78344312655581185';
       this.req3.device = null;
-      let i = 0;
       this.data.map((one) => {
         if (one.checked) {
-          this.req3.bindDeviceAddressVos.push({deviceNo: one.deviceNo, address: Number(this.req3.address) + i});
-          i++;
+          this.req3.bindDeviceAddressVos.push({deviceNo: one.deviceNo, address: Number(this.req3.address) + one.cI});
         }
       });
       this.api.device.batchBindDevice([this.req3, this.next]);
@@ -359,6 +365,7 @@ export class GatewayComponent implements OnInit {
   allBind() {
     this.isMulti = true;
     this.req3 = {};
+    this.selectedGateways = [];
     this.try = {
       trans: {address: 'bindStartTongxinAddr'},
       field: ['address'],

src/app/main/home/home.component.html

-Hello world!

src/app/main/influxdb/influxdb.component.html

@@ -2,9 +2,9 @@
   <app-search-select [(value)]="companyNo" [label]="'selectCompany' | translate" optL="companyName"
                      [data]="companys" optV="companyNo"></app-search-select>
   <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>
-    <button nz-button class="btnAdd" [nzLoading]="isLoading" (click)="add()"><span>{{'add' | translate}}</span></button>
+    <button nz-button class="searchBtn" [nzType]="'primary'" [nzLoading]="isLoading" (click)="onSearch()"><span>{{'search' | translate}}</span></button>
+    <button nz-button class="searchBtn" [nzLoading]="isLoading" (click)="onGetAll()"><span>{{'allData' | translate}}</span></button>
+    <button nz-button class="searchBtn" [nzLoading]="isLoading" (click)="add()"><span>{{'add' | translate}}</span></button>
   </div>
 </div>
 <div class="tableBar" @fade>
@@ -59,6 +59,6 @@
   </ng-template>
   <ng-template #modalFooter>
     <button nz-button nzType="default" [nzLoading]="isLoading" (click)="cancel()"><span>{{'cancel' | translate}}</span></button>
-    <button nz-button nzType="primary" [nzLoading]="isLoading" (click)="save()"><span>{{'confirm' | translate}}</span></button>
+    <button nz-button class="searchBtn" nzType="primary" [nzLoading]="isLoading" (click)="save()"><span>{{'confirm' | translate}}</span></button>
   </ng-template>
 </nz-modal>

src/app/main/log/log.component.html

@@ -2,8 +2,8 @@
   <app-search-date [label]="'startTime' | translate" [(value)]="req.startTime" showTime="true"></app-search-date>
   <app-search-date [label]="'endTime' | translate" [(value)]="req.endTime" 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>
+    <button nz-button class="searchBtn" [nzType]="'primary'" [nzLoading]="isLoading" (click)="onSearch()"><span>{{'search' | translate}}</span></button>
+    <button nz-button class="searchBtn" [nzLoading]="isLoading" (click)="onGetAll()"><span>{{'allData' | translate}}</span></button>
   </div>
 </div>
 <div class="tableBar" @fade>

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

@@ -101,7 +101,7 @@
   <ng-template #foot1>
     <button nz-button nzType="default" [nzLoading]="isLoading" (click)="cancel()"><span>{{'cancel' | translate}}</span>
     </button>
-    <button nz-button nzType="primary" [nzLoading]="isLoading" (click)="save()"><span>{{'confirm' | translate}}</span>
+    <button nz-button nzType="primary" class="searchBtn" class="searchBtn" [nzLoading]="isLoading" (click)="save()"><span>{{'confirm' | translate}}</span>
     </button>
   </ng-template>
 </nz-modal>

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

 <div class="searchBar" @fade>
   <app-search-item [label]="'moduleName' | translate" [(value)]="moduleName"></app-search-item>
   <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>
-    <button nz-button class="btnAdd" [nzLoading]="isLoading" (click)="add()"><span>{{'add' | translate}}</span></button>
+    <button nz-button class="searchBtn" [nzType]="'primary'" [nzLoading]="isLoading" (click)="onSearch()"><span>{{'search' | translate}}</span></button>
+    <button nz-button class="searchBtn" [nzLoading]="isLoading" (click)="onGetAll()"><span>{{'allData' | translate}}</span></button>
+    <button nz-button class="searchBtn" [nzLoading]="isLoading" (click)="add()"><span>{{'add' | translate}}</span></button>
   </div>
 </div>
 <div class="tableBar" @fade>
@@ -47,7 +47,7 @@
   </ng-template>
   <ng-template #foot1>
     <button nz-button nzType="default" [nzLoading]="isLoading" (click)="cancel('isAddConV')"><span>{{'cancel' | translate}}</span></button>
-    <button nz-button nzType="primary" [nzLoading]="isLoading" (click)="save('req')"><span>{{'confirm' | translate}}</span></button>
+    <button nz-button nzType="primary" class="searchBtn" [nzLoading]="isLoading" (click)="save('req')"><span>{{'confirm' | translate}}</span></button>
   </ng-template>
 </nz-modal>
 
@@ -60,6 +60,6 @@
   </ng-template>
   <ng-template #foot2>
     <button nz-button nzType="default" [nzLoading]="isLoading" (click)="cancel('isSaveOther')"><span>{{'cancel' | translate}}</span></button>
-    <button nz-button nzType="primary" [nzLoading]="isLoading" (click)="save('req2')"><span>{{'confirm' | translate}}</span></button>
+    <button nz-button nzType="primary" class="searchBtn" [nzLoading]="isLoading" (click)="save('req2')"><span>{{'confirm' | translate}}</span></button>
   </ng-template>
 </nz-modal>

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

-<p>
-  part-mgr works!
-</p>
+<div class="tableBar" @fade>
+  <nz-table #nzTable
+            [nzData]="data"
+            [nzLoading]="isLoading"
+            [nzFrontPagination]="false">
+    <thead nz-thead>
+    <tr>
+      <th nz-th><span>{{'num' | translate}}</span></th>
+      <th nz-th><span>{{'companyName' | translate}}</span></th>
+      <th nz-th><span>{{'sceneName' | translate}}</span></th>
+      <th nz-th><span>{{'remark' | 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>{{one.companyName}}</td>
+      <td nz-td>{{one.sceneName}}</td>
+      <td nz-td>{{one.remark}}</td>
+    </tr>
+    </tbody>
+  </nz-table>
+</div>

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

 import { Component, OnInit } from '@angular/core';
+import {ApiService} from '../../service/api';
+import {NzMessageService, NzModalService} from 'ng-zorro-antd';
+import {Router} from '@angular/router';
+import {TranslateService} from '@ngx-translate/core';
+import {CheckService} from '../../service/check';
+import {fadeIn} from '../../animation/fade-in';
 
 @Component({
   selector: 'app-part-mgr',
   templateUrl: './part-mgr.component.html',
-  styles: []
+  styles: [],
+  animations: [fadeIn]
 })
 export class PartMgrComponent implements OnInit {
 
-  constructor() { }
+  constructor(private api: ApiService, private message: NzMessageService, private router: Router,
+              private modalService: NzModalService, private translate: TranslateService,
+              private ck: CheckService) { }
 
+  isLoading = false;
+  data = [];
   ngOnInit() {
+    this.init();
   }
 
+  init() {
+    this.getData();
+  }
+
+  next = (data) => {
+    if (data.constructor === Array) {
+      this.data = data;
+    } else {
+      this.message.error(data.message ? data.message : '获取数据失败');
+    }
+  }
+
+  getData() {
+    this.isLoading = false;
+    this.api.scence.getAll(['', this.next]);
+  }
 }

src/app/main/role/role.component.html

 <!--<div class="searchBar" @fade>-->
   <!--<div class="btnLine">-->
-    <button nz-button [nzType]="'primary'" [nzLoading]="isLoading" (click)="add()"><span>{{'add' | translate}}</span></button>
+    <button nz-button [nzType]="'primary'" class="searchBtn" [nzLoading]="isLoading" (click)="add()"><span>{{'add' | translate}}</span></button>
     <!--<button nz-button class="btnAll" [nzLoading]="isLoading" (click)="onGetAll()"><span>{{'allData' | translate}}</span></button>-->
   <!--</div>-->
 <!--</div>-->
@@ -57,6 +57,6 @@
   </ng-template>
   <ng-template #modalFooter>
     <button nz-button nzType="default" [nzLoading]="isLoading" (click)="cancel()"><span>{{'cancel' | translate}}</span></button>
-    <button nz-button nzType="primary" [nzLoading]="isLoading" (click)="save()"><span>{{'confirm' | translate}}</span></button>
+    <button nz-button nzType="primary" class="searchBtn" [nzLoading]="isLoading" (click)="save()"><span>{{'confirm' | translate}}</span></button>
   </ng-template>
 </nz-modal>

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

@@ -7,11 +7,11 @@
       <div class="subTitle">
         {{'sensor' | translate}} {{name}} {{'topic' | translate}}{{'detail' | translate}}
         <div class="backBtnOnTabset" style="top: -2px">
-          <button nz-button nzType="primary" style="margin-right: 10px" [nzLoading]="isLoading" (click)="saveOther()"><span>
+          <button nz-button nzType="primary" class="searchBtn" style="margin-right: 10px" [nzLoading]="isLoading" (click)="saveOther()"><span>
             {{'isSaveOtherTopicModel' | translate}}</span></button>
-          <button nz-button nzType="primary" style="margin-right: 10px" [nzLoading]="isLoading" (click)="add()"><span>
+          <button nz-button nzType="primary" class="searchBtn" style="margin-right: 10px" [nzLoading]="isLoading" (click)="add()"><span>
             {{'addTopic' | translate}}</span></button>
-          <button nz-button class="btnAll" [nzLoading]="isLoading" (click)="changeModel()"><span>
+          <button nz-button class="searchBtn" [nzLoading]="isLoading" (click)="changeModel()"><span>
             {{'changeModel' | translate}}</span></button>
         </div>
       </div>
@@ -100,7 +100,7 @@
     <nz-tab nzTitle="运行状态">
       <div class="subTitle">
         <div class="backBtnOnTabset" style="top: -2px">
-          <button nz-button class="btnAll" [nzLoading]="isLoading" (click)="refresh()"><span>
+          <button nz-button class="searchBtn" [nzLoading]="isLoading" (click)="refresh()"><span>
             {{'refresh' | translate}}</span></button>
         </div>
       </div>
@@ -169,14 +169,14 @@
               <app-search-date *ngIf="selectTime3 === 0" inModal="true" [label]="'endTime' | translate" [(value)]="req3.endTime"
                                showTime="true"></app-search-date>
             </div>
-            <button nz-button [nzType]="'primary'" [nzLoading]="isLoading" (click)="onSearch()">
+            <button nz-button class="searchBtn" [nzType]="'primary'" [nzLoading]="isLoading" (click)="onSearch()">
               <span>{{'search' | translate}}</span></button>
             <nz-tabset style="border-top: 1px solid #cccccc">
               <nz-tab nzTitle="表格">111</nz-tab>
               <nz-tab nzTitle="图表">222</nz-tab>
             </nz-tabset>
             <div class="btnLine">
-              <button nz-button [nzType]="'default'" [nzLoading]="isLoading" (click)="isClose = false;">
+              <button nz-button class="searchBtn" [nzType]="'default'" [nzLoading]="isLoading" (click)="isClose = false;">
                 <span>{{'close' | translate}}</span></button>
             </div>
           </div>
@@ -256,7 +256,7 @@
   <ng-template #foot1>
     <button nz-button nzType="default" [nzLoading]="isLoading" (click)="cancel()">
       <span>{{'cancel' | translate}}</span></button>
-    <button nz-button nzType="primary" [nzLoading]="isLoading" (click)="save('req')">
+    <button nz-button class="searchBtn" nzType="primary" [nzLoading]="isLoading" (click)="save('req')">
       <span>{{'confirm' | translate}}</span></button>
   </ng-template>
 </nz-modal>
@@ -270,7 +270,7 @@
   <ng-template #foot2>
     <button nz-button nzType="default" [nzLoading]="isLoading" (click)="cancel()">
       <span>{{'cancel' | translate}}</span></button>
-    <button nz-button nzType="primary" [nzLoading]="isLoading" (click)="save('req5')">
+    <button nz-button class="searchBtn" nzType="primary" [nzLoading]="isLoading" (click)="save('req5')">
       <span>{{'confirm' | translate}}</span></button>
   </ng-template>
 </nz-modal>
@@ -312,7 +312,7 @@
   </ng-template>
   <ng-template #foot3>
     <button nz-button nzType="default" [nzLoading]="isLoading" (click)="cancel()"><span>{{'cancel' | translate}}</span></button>
-    <button nz-button nzType="primary" [nzLoading]="isLoading" (click)="save('req2')"><span>{{'confirm' | translate}}</span></button>
+    <button nz-button class="searchBtn" nzType="primary" [nzLoading]="isLoading" (click)="save('req2')"><span>{{'confirm' | translate}}</span></button>
   </ng-template>
 </nz-modal>
 
@@ -326,6 +326,6 @@
   </ng-template>
   <ng-template #foot4>
     <button nz-button nzType="default" [nzLoading]="isLoading" (click)="cancel()"><span>{{'cancel' | translate}}</span></button>
-    <button nz-button nzType="primary" [nzLoading]="isLoading" (click)="save('req4')"><span>{{'confirm' | translate}}</span></button>
+    <button nz-button nzType="primary" class="searchBtn" [nzLoading]="isLoading" (click)="save('req4')"><span>{{'confirm' | translate}}</span></button>
   </ng-template>
 </nz-modal>

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

@@ -2,13 +2,13 @@
   <app-search-item [label]="'sensorName' | translate" [(value)]="query.name"></app-search-item>
   <app-search-item [label]="'sensorSN' | translate" [(value)]="query.sn"></app-search-item>
   <div class="btnLine">
-    <button nz-button [nzType]="'primary'" [nzLoading]="isLoading" (click)="onSearch()">
+    <button nz-button [nzType]="'primary'" class="searchBtn" [nzLoading]="isLoading" (click)="onSearch()">
       <span>{{'search' | translate}}</span></button>
-    <button nz-button class="btnAll" [nzLoading]="isLoading" (click)="onGetAll()"><span>{{'allData' | translate}}</span>
+    <button nz-button class="searchBtn" [nzLoading]="isLoading" (click)="onGetAll()"><span>{{'allData' | translate}}</span>
     </button>
-    <button nz-button class="btnAdd" [nzLoading]="isLoading" (click)="multiAdd()">
+    <button nz-button class="searchBtn" [nzLoading]="isLoading" (click)="multiAdd()">
       <span>{{'multiAdd' | translate}}</span></button>
-    <button nz-button [nzType]="'primary'" [nzLoading]="isLoading" (click)="add()">
+    <button nz-button [nzType]="'primary'" class="searchBtn" [nzLoading]="isLoading" (click)="add()">
       <span>{{'addSensor' | translate}}</span></button>
   </div>
 </div>
@@ -48,7 +48,7 @@
     </thead>
     <tbody nz-tbody>
     <tr *ngFor="let one of nzTable.data,let i = index">
-      <td nzShowCheckbox [(nzChecked)]="one.checked" (nzCheckedChange)="oneCheck()"></td>
+      <td nzShowCheckbox [(nzChecked)]="one.checked" (nzCheckedChange)="oneCheck(i)"></td>
       <td nz-td class="canClick" (click)="toSee(one)">{{one.name}}</td>
       <td nz-td>{{one.sn}}</td>
       <td nz-td>{{one.prefixName}}</td>
@@ -73,13 +73,13 @@
     </tbody>
   </nz-table>
   <div class="btnLine whenOneLine" style="position: absolute;bottom: 30px;">
-    <button nz-button [nzType]="'primary'" [nzLoading]="isLoading" [disabled]="!isCheckedOne" (click)="allDelete()">
+    <button nz-button class="delBtn" [nzType]="'primary'" [nzLoading]="isLoading" [disabled]="!isCheckedOne" (click)="allDelete()">
       <span>{{'delete' | translate}}</span></button>
-    <button nz-button class="btnAll" [nzLoading]="isLoading" [disabled]="!canbind" (click)="allBind()"><span>{{'bind' | translate}}</span>
+    <button nz-button class="searchBtn" [nzLoading]="isLoading" [disabled]="!canbind" (click)="allBind()"><span>{{'bind' | translate}}</span>
     </button>
-    <button nz-button [nzType]="'primary'" [nzLoading]="isLoading" [disabled]="!canUnbind" (click)="allUnbind()">
+    <button nz-button class="unbindBtn" [nzType]="'primary'" [nzLoading]="isLoading" [disabled]="!canUnbind" (click)="allUnbind()">
       <span>{{'unbind' | translate}}</span></button>
-    <button nz-button class="btnAll" [nzLoading]="isLoading" [disabled]="!isCheckedOne" (click)="allDivide()"><span>{{'divide' | translate}}</span>
+    <button nz-button class="searchBtn" [nzLoading]="isLoading" [disabled]="!isCheckedOne" (click)="allDivide()"><span>{{'divide' | translate}}</span>
     </button>
     <!--<button nz-button [nzType]="'primary'" [nzLoading]="isLoading" [disabled]="!isCheckedOne" (click)="allUpdate()">-->
       <!--<span>{{'update' | translate}}</span></button>-->
@@ -112,7 +112,7 @@
   </ng-template>
   <ng-template #foot1>
     <button nz-button nzType="default" [nzLoading]="isLoading" (click)="cancel()"><span>{{'cancel' | translate}}</span></button>
-    <button nz-button nzType="primary" [nzLoading]="isLoading" (click)="save('req')"><span>{{'confirm' | translate}}</span></button>
+    <button nz-button class="searchBtn" nzType="primary" [nzLoading]="isLoading" (click)="save('req')"><span>{{'confirm' | translate}}</span></button>
   </ng-template>
 </nz-modal>
 
@@ -139,7 +139,7 @@
   </ng-template>
   <ng-template #foot2>
     <button nz-button nzType="default" [nzLoading]="isLoading" (click)="cancel()"><span>{{'cancel' | translate}}</span></button>
-    <button nz-button nzType="primary" [nzLoading]="isLoading" (click)="save('req')"><span>{{'confirm' | translate}}</span></button>
+    <button nz-button class="searchBtn" nzType="primary" [nzLoading]="isLoading" (click)="save('req')"><span>{{'confirm' | translate}}</span></button>
   </ng-template>
 </nz-modal>
 
@@ -166,7 +166,7 @@
   <ng-template #foot3>
     <button nz-button nzType="default" [nzLoading]="isLoading" (click)="cancel()">
       <span>{{'cancel' | translate}}</span></button>
-    <button nz-button nzType="primary" [nzLoading]="isLoading" (click)="save('req3')">
+    <button nz-button class="searchBtn" nzType="primary" [nzLoading]="isLoading" (click)="save('req3')">
       <span>{{'confirm' | translate}}</span></button>
   </ng-template>
 </nz-modal>
@@ -179,6 +179,6 @@
   </ng-template>
   <ng-template #foot5>
     <button nz-button nzType="default" [nzLoading]="isLoading" (click)="cancel()"><span>{{'cancel' | translate}}</span></button>
-    <button nz-button nzType="primary" [nzLoading]="isLoading" (click)="save('req5')"><span>{{'confirm' | translate}}</span></button>
+    <button nz-button class="searchBtn" nzType="primary" [nzLoading]="isLoading" (click)="save('req5')"><span>{{'confirm' | translate}}</span></button>
   </ng-template>
 </nz-modal>

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

@@ -68,7 +68,7 @@ export class SensorMgrComponent implements OnInit {
     if (data && data.rows && data.rows.constructor === Array) {
       this.data = data.rows;
       this.total = data.total;
-      this.oneCheck();
+      this.oneCheck(-1);
     } else if (data.code === 1) {
       this.message.success(data && data.message ? data.message : '操作成功');
       this.cancel();
@@ -156,7 +156,7 @@ export class SensorMgrComponent implements OnInit {
     if (b) {
       this.isCheckedOne = true;
     }
-    this.data.map((one) => one.checked = b);
+    this.data.map((one, index) => {one.checked = b; one.cI = b ? index : null; });
   }
 
   checkAll(e) {
@@ -165,7 +165,7 @@ export class SensorMgrComponent implements OnInit {
     this.checkCanBind();
   }
 
-  oneCheck() {
+  oneCheck(i) {
     this.isCheckedOne = true;
     this.isIndeterminate = false;
     this.isAllCheck = false;
@@ -176,8 +176,16 @@ export class SensorMgrComponent implements OnInit {
       this.isCheckedOne = false;
       this.canbind = false;
       this.canUnbind = false;
+      this.data.map(one => one.cI = null);
     } else {
       this.isIndeterminate = true;
+      // 如果这个刚刚点击的是被选中, 那么这个cI(check的序列号index)直接赋值就行
+      if (i >= 0 && this.data[i].checked) {
+        this.data[i].cI = sum - 1;
+        // 如果这个刚刚点击的是取消选中,那么需要将这个的序列号清空, 后面所有的序列号都-1
+      } else if (!this.data[i].checked) {
+        this.data.map(one => one.cI = one.cI > this.data[i].cI ? one.cI - 1 : one.cI);
+      }
     }
     this.checkCanBind();
   }
@@ -327,11 +335,9 @@ export class SensorMgrComponent implements OnInit {
       this.req3.pDeviceNo = this.req3.device.deviceNo;
       this.req3.influxdbDatabaseNo = this.req3.device.influxdbDatabaseNo ? this.req3.device.influxdbDatabaseNo : 'ITN78344312655581185';
       this.req3.device = null;
-      let i = 0;
       this.data.map((one) => {
         if (one.checked) {
-          this.req3.bindDeviceAddressVos.push({deviceNo: one.deviceNo, address: Number(this.req3.address) + i});
-          i++;
+          this.req3.bindDeviceAddressVos.push({deviceNo: one.deviceNo, address: Number(this.req3.address) + one.cI});
         }
       });
       this.api.device.batchBindDevice([this.req3, this.next]);
@@ -388,6 +394,7 @@ export class SensorMgrComponent implements OnInit {
   allBind() {
     this.isMulti = true;
     this.req3 = {};
+    this.selectedGateways = [];
     this.try = {
       trans: {address: 'bindStartTongxinAddr'},
       field: ['address'],

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

 <div class="tableBar" @fade>
   <div class="btnLine" style="margin-bottom: 10px">
     <label class="subTitle"> {{topicName}} 主题{{'detail' | translate}}</label>
-    <button nz-button nzType="primary" style="margin-right: 10px" [nzLoading]="isLoading" (click)="saveOther()"><span>
+    <button nz-button class="searchBtn" nzType="primary" style="margin-right: 10px" [nzLoading]="isLoading" (click)="saveOther()"><span>
             {{'isSaveOtherProbesModel' | translate}}</span></button>
-    <button nz-button [nzType]="'primary'" [nzLoading]="isLoading" (click)="add()"><span>{{'addWay' | translate}}</span></button>
+    <button nz-button class="searchBtn" [nzType]="'primary'" [nzLoading]="isLoading" (click)="add()"><span>{{'addWay' | translate}}</span></button>
     <app-back [isLoading]="isLoading"></app-back>
   </div>
   <nz-table #nzTable
@@ -98,7 +98,7 @@
   </ng-template>
   <ng-template #foot1>
     <button nz-button nzType="default" [nzLoading]="isLoading" (click)="cancel()"><span>{{'cancel' | translate}}</span></button>
-    <button nz-button nzType="primary" [nzLoading]="isLoading" (click)="save('req')"><span>{{'confirm' | translate}}</span></button>
+    <button nz-button class="searchBtn" nzType="primary" [nzLoading]="isLoading" (click)="save('req')"><span>{{'confirm' | translate}}</span></button>
   </ng-template>
 </nz-modal>
 
@@ -111,6 +111,6 @@
   </ng-template>
   <ng-template #foot2>
     <button nz-button nzType="default" [nzLoading]="isLoading" (click)="cancel()"><span>{{'cancel' | translate}}</span></button>
-    <button nz-button nzType="primary" [nzLoading]="isLoading" (click)="save('req2')"><span>{{'confirm' | translate}}</span></button>
+    <button nz-button class="searchBtn" nzType="primary" [nzLoading]="isLoading" (click)="save('req2')"><span>{{'confirm' | translate}}</span></button>
   </ng-template>
 </nz-modal>

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

 <div class="tableBar" @fade>
   <div class="btnLine" style="margin-bottom: 10px">
     <label class="subTitle"> {{topicModelName}} 主题配置模板{{'detail' | translate}}</label>
-    <button nz-button class="btnAdd" [nzLoading]="isLoading" (click)="add()"><span>{{'addTopic' | translate}}</span></button>
+    <button nz-button class="searchBtn" [nzLoading]="isLoading" (click)="add()"><span>{{'addTopic' | translate}}</span></button>
     <app-back [isLoading]="isLoading"></app-back>
   </div>
   <nz-table #nzTable
@@ -52,6 +52,6 @@
   </ng-template>
   <ng-template #foot1>
     <button nz-button nzType="default" [nzLoading]="isLoading" (click)="cancel()"><span>{{'cancel' | translate}}</span></button>
-    <button nz-button nzType="primary" [nzLoading]="isLoading" (click)="save()"><span>{{'confirm' | translate}}</span></button>
+    <button nz-button class="searchBtn" nzType="primary" [nzLoading]="isLoading" (click)="save()"><span>{{'confirm' | translate}}</span></button>
   </ng-template>
 </nz-modal>

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

 <div class="searchBar" @fade>
   <app-search-item [label]="'topicModuleName' | translate" [(value)]="topicModuleName"></app-search-item>
   <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>
-    <button nz-button class="btnAdd" [nzLoading]="isLoading" (click)="add()"><span>{{'add' | translate}}</span></button>
+    <button nz-button [nzType]="'primary'" class="searchBtn" [nzLoading]="isLoading" (click)="onSearch()"><span>{{'search' | translate}}</span></button>
+    <button nz-button class="searchBtn" [nzLoading]="isLoading" (click)="onGetAll()"><span>{{'allData' | translate}}</span></button>
+    <button nz-button class="searchBtn" [nzLoading]="isLoading" (click)="add()"><span>{{'add' | translate}}</span></button>
   </div>
 </div>
 <div class="tableBar" @fade>
@@ -51,7 +51,7 @@
   </ng-template>
   <ng-template #foot1>
     <button nz-button nzType="default" [nzLoading]="isLoading" (click)="cancel('isAddConV')"><span>{{'cancel' | translate}}</span></button>
-    <button nz-button nzType="primary" [nzLoading]="isLoading" (click)="save('req')"><span>{{'confirm' | translate}}</span></button>
+    <button nz-button nzType="primary" class="searchBtn" [nzLoading]="isLoading" (click)="save('req')"><span>{{'confirm' | translate}}</span></button>
   </ng-template>
 </nz-modal>
 
@@ -64,6 +64,6 @@
   </ng-template>
   <ng-template #foot2>
     <button nz-button nzType="default" [nzLoading]="isLoading" (click)="cancel('isSaveOther')"><span>{{'cancel' | translate}}</span></button>
-    <button nz-button nzType="primary" [nzLoading]="isLoading" (click)="save('req2')"><span>{{'confirm' | translate}}</span></button>
+    <button nz-button nzType="primary" class="searchBtn" [nzLoading]="isLoading" (click)="save('req2')"><span>{{'confirm' | translate}}</span></button>
   </ng-template>
 </nz-modal>

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

 <div class="tableBar" @fade>
   <div class="btnLine" style="margin-bottom: 10px">
     <label class="subTitle"> {{topicName}} 通道模板{{'detail' | translate}}</label>
-    <button nz-button [nzType]="'primary'" [nzLoading]="isLoading" (click)="add()"><span>{{'addWay' | translate}}</span></button>
+    <button nz-button class="searchBtn" [nzType]="'primary'" [nzLoading]="isLoading" (click)="add()"><span>{{'addWay' | translate}}</span></button>
     <app-back [isLoading]="isLoading"></app-back>
   </div>
   <nz-table #nzTable
@@ -96,6 +96,6 @@
   </ng-template>
   <ng-template #foot1>
     <button nz-button nzType="default" [nzLoading]="isLoading" (click)="cancel()"><span>{{'cancel' | translate}}</span></button>
-    <button nz-button nzType="primary" [nzLoading]="isLoading" (click)="save()"><span>{{'confirm' | translate}}</span></button>
+    <button nz-button class="searchBtn" nzType="primary" [nzLoading]="isLoading" (click)="save()"><span>{{'confirm' | translate}}</span></button>
   </ng-template>
 </nz-modal>

src/app/main/user/user.component.html

 <div class="searchBar" @fade>
   <app-search-item [label]="'userName' | translate" [(value)]="userName"></app-search-item>
   <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>
-    <button nz-button class="btnAdd" [nzLoading]="isLoading" (click)="add()"><span>{{'add' | translate}}</span></button>
+    <button nz-button [nzType]="'primary'" class="searchBtn" [nzLoading]="isLoading" (click)="onSearch()"><span>{{'search' | translate}}</span></button>
+    <button nz-button class="searchBtn" [nzLoading]="isLoading" (click)="onGetAll()"><span>{{'allData' | translate}}</span></button>
+    <button nz-button class="searchBtn" [nzLoading]="isLoading" (click)="add()"><span>{{'add' | translate}}</span></button>
   </div>
 </div>
 <div class="tableBar" @fade>
@@ -62,6 +62,6 @@
   </ng-template>
   <ng-template #modalFooter>
     <button nz-button nzType="default" [nzLoading]="isLoading" (click)="cancel()"><span>{{'cancel' | translate}}</span></button>
-    <button nz-button nzType="primary" [nzLoading]="isLoading" (click)="save()"><span>{{'confirm' | translate}}</span></button>
+    <button nz-button nzType="primary" class="searchBtn" [nzLoading]="isLoading" (click)="save()"><span>{{'confirm' | translate}}</span></button>
   </ng-template>
 </nz-modal>

src/app/router.module.ts

@@ -23,6 +23,7 @@ import {TopicModuleDetailComponent} from './main/topic-module-detail/topic-modul
 import {TopicModuleWayComponent} from './main/topic-module-way/topic-module-way.component';
 import {InfluxdbComponent} from './main/influxdb/influxdb.component';
 import {SensorTopicWayComponent} from './main/sensor-topic-way/sensor-topic-way.component';
+import {CompanyComponent} from './main/company/company.component';
 
 const AppRoutes: Routes = [
   {path: '', redirectTo: '/extra/login', pathMatch: 'full'},
@@ -54,7 +55,7 @@ const routes: Routes = [
       {path: 'deviceCenter/mqttSetMgr', component: MqttSetMgrComponent},
       {path: 'systemMgr/userCenter', component: UserComponent},
       {path: 'systemMgr/influxdbMgr', component: InfluxdbComponent},
-      {path: 'systemMgr/customCenter', component: UserComponent},
+      {path: 'systemMgr/customCenter', component: CompanyComponent},
       {path: 'systemMgr/roleMgr', component: RoleComponent},
       {path: 'systemMgr/partMgr', component: PartMgrComponent},
       {path: 'systemMgr/areaMgr', component: AreaMgrComponent},

src/app/service/api.ts

@@ -14,6 +14,11 @@ export class ApiService {
   tokenLoseflag = 0;
   public url = environment.baseUrl;
 
+  public scence = {
+    getAll: (data) => this.trans('get', '/system/scence/getAll', data),
+    getByCompany: (data) => this.trans('post', '/system/scence/getByCompany', data),
+  };
+
   public loginlog = {
     getAll: (page, rows, data) => this.trans('get', '/system/loginlog/getAll?page=' + page + '&rows=' + rows, data),
     getByTime: (page, rows, data) => this.trans('post', '/system/loginlog/getByTime?page=' + page + '&rows=' + rows, data),
@@ -47,8 +52,8 @@ export class ApiService {
   };
 
   public area = {
-    getAll: (data) => this.trans('get', '/system/getAll', data),
-    getByCity: (data) => this.trans('post', '/system/getByCity', data),
+    getAll: (data) => this.trans('get', '/system/area/getAll', data),
+    getByCity: (data) => this.trans('post', '/system/area/getByCity', data),
   };
 
   public city = {

src/assets/i18n/zh.json

@@ -167,5 +167,15 @@
   "addNum": "新增数量",
   "startSN": "起始序列号",
   "confirmUnbindSelectedRecord": "确认解绑选中的这些设备吗",
-  "refresh": "刷新"
+  "refresh": "刷新",
+  "companyAlias": "公司别名",
+  "province": "所在省",
+  "city": "所在市",
+  "area": "所在区",
+  "address": "地址",
+  "manager": "管理员",
+  "addCompany": "新增公司",
+  "updateCompany": "编辑公司",
+  "maxRole": "公司最高权限",
+  "sceneName": "场景名称"
 }

src/environments/environment.ts

@@ -4,9 +4,9 @@
 
 export const environment = {
   production: false,
-  baseUrl: 'http://cloud-test.witium.com/api', // 对外访问测试网地址
+  // baseUrl: 'http://cloud-test.witium.com/api', // 对外访问测试网地址
   // baseUrl: 'http://172.16.1.53:8092', // cy
-  // baseUrl: 'http://172.16.1.52:8094', // zz
+  baseUrl: 'http://172.16.1.52:8094', // zz
   // baseUrl: 'http://172.16.1.13:8094', // 测试
 };
 

src/styles.scss

@@ -395,3 +395,20 @@ label.subTitle {
 .ant-table-body table thead tr th, table tbody tr {
   text-align: center;
 }
+
+button.searchBtn, button.searchBtn:hover, button.searchBtn:active, button.searchBtn::selection {
+  color: #ffffff;
+  background-color: #25a8e3;
+  border-color: #25a8e3;
+}
+button.delBtn, button.delBtn:hover, button.delBtn:active, button.delBtn::selection {
+  color: #ffffff;
+  background-color: #ff0000;
+  border-color: #ff0000;
+}
+
+button.unbindBtn, button.unbindBtn:hover, button.unbindBtn:active, button.unbindBtn::selection {
+  color: #ffffff;
+  background-color: #669966;
+  border-color: #669966;
+}