Commit f30eb7a0 authored by van.chen's avatar van.chen

提交一下

parent 4d8a2d86
<button nz-button class="btnAll" [nzLoading]="isLoading" (click)="back()"><span>{{'back' | translate}}</span></button>
import { Component, OnInit, Input } from '@angular/core';
@Component({
selector: 'app-back',
templateUrl: './back.component.html',
styles: []
})
export class BackComponent implements OnInit {
constructor() { }
@Input() isLoading = false;
ngOnInit() {
}
back() {
window.history.back();
}
}
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-loading',
templateUrl: './loading.component.html',
styles: []
})
export class LoadingComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}
......@@ -24,7 +24,7 @@
</nz-header>
<nz-content id="layoutCon" style="margin-top:64px;overflow: auto;">
<app-breadcrumb [title]="title" [bcShow]="bcShow"></app-breadcrumb>
<div style="overflow-y: auto;overflow-x: auto;width: 100%;height: 100%">
<div style="overflow-y: auto;overflow-x: auto;width: 100%;" [ngClass]="{'fullPart': !bcShow, 'halfPart': bcShow}">
<router-outlet></router-outlet>
</div>
</nz-content>
......
......@@ -49,3 +49,11 @@ ul {
.width-60{
width: 79px;
}
.halfPart{
height: calc(100% - 52px);
}
.fullPart {
height: 100%;
}
......@@ -14,11 +14,25 @@ import {LayoutRoutingModule} from '../router.module';
import {RoleComponent} from '../main/role/role.component';
import {UserComponent} from '../main/user/user.component';
import {LogComponent} from '../main/log/log.component';
import {GatewayComponent} from '../main/gateway/gateway.component';
import {GatewaySeeComponent} from '../main/gateway-see/gateway-see.component';
import {AreaMgrComponent} from '../main/area-mgr/area-mgr.component';
import {ModuleMgrComponent} from '../main/module-mgr/module-mgr.component';
import {MqttSetMgrComponent} from '../main/mqtt-set-mgr/mqtt-set-mgr.component';
import {DataSumComponent} from '../main/data-sum/data-sum.component';
import {HistoryDataComponent} from '../main/history-data/history-data.component';
import {CurrentDataComponent} from '../main/current-data/current-data.component';
import {PartMgrComponent} from '../main/part-mgr/part-mgr.component';
import {SetModuleMgrComponent} from '../main/set-module-mgr/set-module-mgr.component';
import {TopicModuleMgrComponent} from '../main/topic-module-mgr/topic-module-mgr.component';
import {SensorMgrComponent} from '../main/sensor-mgr/sensor-mgr.component';
import {SensorDetailComponent} from '../main/sensor-detail/sensor-detail.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';
@NgModule({
imports: [
......@@ -49,10 +63,24 @@ import {TransferComponent} from '../component/transfer/transfer.component';
UserComponent,
RoleComponent,
LogComponent,
GatewayComponent,
SearchDateComponent,
SearchItemComponent,
SearchSelectComponent,
TransferComponent
TransferComponent,
GatewaySeeComponent,
BackComponent,
AreaMgrComponent,
ModuleMgrComponent,
MqttSetMgrComponent,
DataSumComponent,
HistoryDataComponent,
CurrentDataComponent,
PartMgrComponent,
SetModuleMgrComponent,
TopicModuleMgrComponent,
SensorMgrComponent,
SensorDetailComponent
]
})
export class LayoutModule {
......
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-area-mgr',
templateUrl: './area-mgr.component.html',
styles: []
})
export class AreaMgrComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-current-data',
templateUrl: './current-data.component.html',
styles: []
})
export class CurrentDataComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-data-sum',
templateUrl: './data-sum.component.html',
styles: []
})
export class DataSumComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}
<div @fade class="tableBar" style="padding: 0 15px;">
<div class="backBtnOnTabset">
<app-back [isLoading]="isLoading"></app-back>
</div>
<nz-tabset>
<nz-tab nzTitle="传感器">
<nz-table #nzTable
[nzData]="data"
[nzSize]="'middle'"
nzShowSizeChanger
[nzShowPagination]="true"
[nzLoading]="isLoading">
<thead nz-thead>
<tr>
<th nz-th><span>{{'sensorName' | translate}}</span></th>
<th nz-th><span>{{'wayNum' | translate}}</span></th>
<th nz-th><span>{{'createTime' | 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 class="canClick" (click)="toDetail(one)">{{i + 1}}</td>
<td nz-td>{{one.userName}}</td>
<td nz-td>{{one.realName}}</td>
<td nz-td>{{i}}</td>
</tr>
</tbody>
</nz-table>
</nz-tab>
<nz-tab nzTitle="通道">
<nz-table #nzTable2
[nzData]="data"
[nzSize]="'middle'"
nzShowSizeChanger
[nzShowPagination]="true"
[nzLoading]="isLoading">
<thead nz-thead>
<tr>
<th nz-th><span>{{'wayIndex' | translate}}</span></th>
<th nz-th><span>{{'sensorSN' | translate}}</span></th>
<th nz-th><span>{{'wayName' | translate}}</span></th>
<th nz-th><span>{{'wayAlias' | 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>{{'oper' | translate}}</span></th>
</tr>
</thead>
<tbody nz-tbody>
<tr *ngFor="let one of nzTable2.data, let i = index">
<td nz-td>{{i + 1}}</td>
<td nz-td>{{one.userName}}</td>
<td nz-td>{{one.realName}}</td>
<td nz-td>{{one.loginTime}}</td>
<td nz-td>{{'web'}}</td>
<td nz-td>{{one.userName}}</td>
<td nz-td>{{one.realName}}</td>
<td nz-td>{{one.loginTime}}</td>
<td nz-td>{{'web'}}</td>
<td nz-td>{{one.userName}}</td>
<td nz-td>{{one.realName}}</td>
<td nz-td>{{one.loginTime}}</td>
<td nz-td>
<span class="deleteFontColor">{{'delete' | translate}}</span>
</td>
</tr>
</tbody>
</nz-table>
</nz-tab>
</nz-tabset>
</div>
import { Component, OnInit } from '@angular/core';
import {fadeIn} from '../../animation/fade-in';
import {ApiService} from '../../service/api';
import {NzMessageService} from 'ng-zorro-antd';
import {Router} from '@angular/router';
@Component({
selector: 'app-gateway-see',
templateUrl: './gateway-see.component.html',
styles: [],
animations: [fadeIn]
})
export class GatewaySeeComponent implements OnInit {
isLoading = false;
data = [];
constructor(private api: ApiService, private message: NzMessageService, private router: Router) { }
ngOnInit() {
this.init();
}
init() {
this.getData();
}
next = (data) => {
if (data && data.constructor === Array) {
this.data = data;
} else if (data.code === 1) {
this.message.success(data && data.message ? data.message : '操作成功');
} else if (data.code === 0) {
this.message.error(data && data.message ? data.message : '操作失败');
} else {
this.message.error(data && data.message ? data.message : '获取数据失败');
}
}
getData() {
this.api.role.getAll(['', this.next]);
}
toDetail() {
this.router.navigate(['/app/deviceCenter/sensorMgr/sensorDetail']);
}
}
<div class="searchBar" @fade>
<app-search-item [label]="'gatewayName' | translate" [(value)]="query.gatewayName"></app-search-item>
<app-search-item [label]="'gatewaySN' | translate" [(value)]="query.gatewaySN"></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>-->
</div>
</div>
<div class="tableBar" @fade>
<nz-table #nzTable
[nzData]="data"
[nzShowPagination]="false"
[nzLoading]="isLoading">
<thead nz-thead>
<tr>
<th
nzShowCheckbox
[(nzChecked)]="isAllCheck"
[nzDisabled]="data.length===0"
[nzIndeterminate]="isIndeterminate"
(nzCheckedChange)="checkAll($event)"
></th>
<th nz-th><span>{{'gatewayName' | translate}}</span></th>
<th nz-th><span>{{'gatewaySN' | translate}}</span></th>
<th nz-th><span>{{'type' | translate}}</span></th>
<th nz-th><span>{{'simCardNum' | translate}}</span></th>
<th nz-th><span>{{'off/on' | translate}}</span></th>
<th nz-th><span>{{'belongCompany' | translate}}</span></th>
<th nz-th
nzShowFilter
[nzFilterMultiple]="false"
[nzFilters]="listOfBind"
(nzFilterChange)="filter($event)">
<span>{{'isbind' | 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 nzShowCheckbox [(nzChecked)]="checkArray[i]" (nzCheckedChange)="oneCheck(i)"></td>
<td nz-td class="canClick" (click)="toSee(one)">设备{{i}}</td>
<td nz-td>{{one.realName}}</td>
<td nz-td>{{one.userName}}</td>
<td nz-td>{{one.nickName}}</td>
<td nz-td>{{one.email}}</td>
<td nz-td>{{one.phone}}</td>
<td nz-td>{{one.roleName}}</td>
<td nz-td>{{one.roleName}}</td>
</tr>
</tbody>
</nz-table>
<div class="btnLine whenOneLine" style="text-align: left; margin-top: 10px;">
<button nz-button [nzType]="'primary'" [nzLoading]="isLoading" (click)="delete()"><span>{{'delete' | translate}}</span></button>
<button nz-button class="btnAll" [nzLoading]="isLoading" (click)="bind()"><span>{{'bind' | translate}}</span></button>
<button nz-button [nzType]="'primary'" [nzLoading]="isLoading" (click)="divide()"><span>{{'divide' | translate}}</span></button>
<button nz-button class="btnAll" [nzLoading]="isLoading" (click)="unbind()"><span>{{'unbind' | translate}}</span></button>
<button nz-button [nzType]="'primary'" [nzLoading]="isLoading" (click)="update()"><span>{{'update' | translate}}</span></button>
</div>
<div class="pagePart whenOneLine">
<nz-pagination [nzPageIndex]="page" [nzTotal]="total" [nzPageSize]="rows" [nzShowTotal]="totalTemplate"></nz-pagination>
<ng-template #totalTemplate> 共 {{ total }} 项 </ng-template>
</div>
</div>
import {Component, OnInit} from '@angular/core';
import {fadeIn} from '../../animation/fade-in';
import {ApiService} from '../../service/api';
import {NzMessageService} from 'ng-zorro-antd';
import {Router} from '@angular/router';
@Component({
selector: 'app-gateway',
templateUrl: './gateway.component.html',
styles: [`
:host ::ng-deep .anticon-filter {
left: 73px;
}
.btnPart {
padding: 10px;
}
`],
animations: [fadeIn]
})
export class GatewayComponent implements OnInit {
data = [];
query = {
gatewayName: '',
gatewaySN: ''
};
isLoading = false;
isAllCheck = false;
isIndeterminate = false;
checkArray = [];
page = 1;
rows = 10;
total = 125;
listOfBind = [{text: '全部', value: 1}, {text: '已绑定', value: 2}, {text: '未绑定', value: 3}];
constructor(private api: ApiService, private message: NzMessageService, private router: Router) {
}
ngOnInit() {
this.init();
}
init() {
this.getData();
}
next = (data) => {
if (data && data.rows && data.rows.constructor === Array) {
this.data = data.rows;
this.total = data.total;
this.initCheckArray(data.rows.length, false);
} else if (data.code === 1) {
this.message.success(data && data.message ? data.message : '操作成功');
} else if (data.code === 0) {
this.message.error(data && data.message ? data.message : '操作失败');
} else {
this.message.error(data && data.message ? data.message : '获取数据失败');
}
this.isLoading = false;
};
getData() {
this.isLoading = true;
this.api.loginlog.getAll(this.page, this.rows, ['', this.next]);
}
initCheckArray(n, b) {
const obj = [];
while (n > 0) {
obj.push(b);
n--;
}
this.checkArray = obj;
}
onSearch() {
}
onGetAll() {
}
checkAll(e) {
this.isIndeterminate = false;
this.initCheckArray(this.checkArray.length, e);
}
oneCheck(i) {
const x = this.checkArray.filter(k => k).length;
if (x === this.checkArray.length) {
this.isIndeterminate = false;
this.isAllCheck = true;
} else if (x === 0) {
this.isIndeterminate = false;
this.isAllCheck = false;
} else {
this.isIndeterminate = true;
this.isAllCheck = false;
}
}
filter(a, b) {
console.log(a, b);
}
delete() {}
divide() {}
bind() {}
unbind() {}
update() {}
toSee(e) {
this.router.navigate(['/app/deviceCenter/gatewayMgr/gatewaySee']);
}
}
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-history-data',
templateUrl: './history-data.component.html',
styles: []
})
export class HistoryDataComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-module-mgr',
templateUrl: './module-mgr.component.html',
styles: []
})
export class ModuleMgrComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-mqtt-set-mgr',
templateUrl: './mqtt-set-mgr.component.html',
styles: []
})
export class MqttSetMgrComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-part-mgr',
templateUrl: './part-mgr.component.html',
styles: []
})
export class PartMgrComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}
<div @fade class="tableBar" style="padding: 0 15px;">
<div class="backBtnOnTabset">
<app-back [isLoading]="isLoading"></app-back>
</div>
<nz-tabset>
<nz-tab nzTitle="传感器">
<nz-table #nzTable
[nzData]="data"
[nzSize]="'middle'"
nzShowSizeChanger
[nzShowPagination]="true"
[nzLoading]="isLoading">
<thead nz-thead>
<tr>
<th nz-th><span>{{'sensorName' | translate}}</span></th>
<th nz-th><span>{{'wayNum' | translate}}</span></th>
<th nz-th><span>{{'createTime' | 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 class="canClick" (click)="toDetail(one)">{{i + 1}}</td>
<td nz-td>{{one.userName}}</td>
<td nz-td>{{one.realName}}</td>
<td nz-td>{{i}}</td>
</tr>
</tbody>
</nz-table>
</nz-tab>
<nz-tab nzTitle="通道">
<nz-table #nzTable2
[nzData]="data"
[nzSize]="'middle'"
nzShowSizeChanger
[nzShowPagination]="true"
[nzLoading]="isLoading">
<thead nz-thead>
<tr>
<th nz-th><span>{{'wayIndex' | translate}}</span></th>
<th nz-th><span>{{'sensorSN' | translate}}</span></th>
<th nz-th><span>{{'wayName' | translate}}</span></th>
<th nz-th><span>{{'wayAlias' | 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>{{'oper' | translate}}</span></th>
</tr>
</thead>
<tbody nz-tbody>
<tr *ngFor="let one of nzTable2.data, let i = index">
<td nz-td>{{i + 1}}</td>
<td nz-td>{{one.userName}}</td>
<td nz-td>{{one.realName}}</td>
<td nz-td>{{one.loginTime}}</td>
<td nz-td>{{'web'}}</td>
<td nz-td>{{one.userName}}</td>
<td nz-td>{{one.realName}}</td>
<td nz-td>{{one.loginTime}}</td>
<td nz-td>{{'web'}}</td>
<td nz-td>{{one.userName}}</td>
<td nz-td>{{one.realName}}</td>
<td nz-td>{{one.loginTime}}</td>
<td nz-td>
<span class="deleteFontColor">{{'delete' | translate}}</span>
</td>
</tr>
</tbody>
</nz-table>
</nz-tab>
</nz-tabset>
</div>
import { Component, OnInit } from '@angular/core';
import {ApiService} from '../../service/api';
import {NzMessageService} from 'ng-zorro-antd';
import {Router} from '@angular/router';
import {fadeIn} from '../../animation/fade-in';
@Component({
selector: 'app-sensor-detail',
templateUrl: './sensor-detail.component.html',
styles: [],
animations: [fadeIn]
})
export class SensorDetailComponent implements OnInit {
isLoading = false;
data = [];
constructor(private api: ApiService, private message: NzMessageService, private router: Router) { }
ngOnInit() {
this.init();
}
init() {
this.getData();
}
next = (data) => {
if (data && data.constructor === Array) {
this.data = data;
} else if (data.code === 1) {
this.message.success(data && data.message ? data.message : '操作成功');
} else if (data.code === 0) {
this.message.error(data && data.message ? data.message : '操作失败');
} else {
this.message.error(data && data.message ? data.message : '获取数据失败');
}
}
getData() {
this.api.role.getAll(['', this.next]);
}
toDetail() {
this.router.navigate(['/app/deviceCenter/sensorMgr/sensorDetail']);
}
}
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-sensor-mgr',
templateUrl: './sensor-mgr.component.html',
styles: []
})
export class SensorMgrComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-set-module-mgr',
templateUrl: './set-module-mgr.component.html',
styles: []
})
export class SetModuleMgrComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-topic-module-mgr',
templateUrl: './topic-module-mgr.component.html',
styles: []
})
export class TopicModuleMgrComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}
......@@ -5,6 +5,19 @@ import { HomeComponent } from './main/home/home.component';
import {LogComponent} from './main/log/log.component';
import {RoleComponent} from './main/role/role.component';
import {UserComponent} from './main/user/user.component';
import {GatewayComponent} from './main/gateway/gateway.component';
import {GatewaySeeComponent} from './main/gateway-see/gateway-see.component';
import {AreaMgrComponent} from './main/area-mgr/area-mgr.component';
import {ModuleMgrComponent} from './main/module-mgr/module-mgr.component';
import {MqttSetMgrComponent} from './main/mqtt-set-mgr/mqtt-set-mgr.component';
import {DataSumComponent} from './main/data-sum/data-sum.component';
import {HistoryDataComponent} from './main/history-data/history-data.component';
import {CurrentDataComponent} from './main/current-data/current-data.component';
import {PartMgrComponent} from './main/part-mgr/part-mgr.component';
import {SetModuleMgrComponent} from './main/set-module-mgr/set-module-mgr.component';
import {TopicModuleMgrComponent} from './main/topic-module-mgr/topic-module-mgr.component';
import {SensorMgrComponent} from './main/sensor-mgr/sensor-mgr.component';
import {SensorDetailComponent} from './main/sensor-detail/sensor-detail.component';
const AppRoutes: Routes = [
{path: '', redirectTo: '/extra/login', pathMatch: 'full'},
......@@ -22,9 +35,23 @@ const routes: Routes = [
children: [
{path: '', redirectTo: '/extra/login', pathMatch: 'full'},
{path: 'home', component: HomeComponent},
{path: 'deviceCenter/gatewayMgr', component: GatewayComponent},
{path: 'deviceCenter/gatewayMgr/gatewaySee', component: GatewaySeeComponent},
{path: 'deviceCenter/sensorMgr', component: SensorMgrComponent},
{path: 'deviceCenter/sensorMgr/sensorDetail', component: SensorDetailComponent},
{path: 'deviceCenter/moduleMgr', component: ModuleMgrComponent},
{path: 'deviceCenter/topicModuleMgr', component: TopicModuleMgrComponent},
{path: 'deviceCenter/setModuleMgr', component: SetModuleMgrComponent},
{path: 'deviceCenter/mqttSetMgr', component: MqttSetMgrComponent},
{path: 'systemMgr/userCenter', component: UserComponent},
{path: 'systemMgr/customCenter', component: UserComponent},
{path: 'systemMgr/roleMgr', component: RoleComponent},
{path: 'systemMgr/partMgr', component: PartMgrComponent},
{path: 'systemMgr/areaMgr', component: AreaMgrComponent},
{path: 'systemMgr/logMgr', component: LogComponent},
{path: 'dataCenter/currentData', component: CurrentDataComponent},
{path: 'dataCenter/dataSum', component: DataSumComponent},
{path: 'dataCenter/historyData', component: HistoryDataComponent},
]
}
];
......
{
"-----------菜单-----------": "-----------菜单-----------",
"system": "系统管理",
"log": "登陆日志",
"operate": "操作日志",
"user": "后台用户管理",
"role": "角色管理",
"person": "个人设置",
"home": "首页",
"deviceCenter": "设备中心",
"gatewayMgr": "网关管理",
"sensorMgr": "传感器管理",
"moduleMgr": "模块管理",
"topicModuleMgr": "主题模板管理",
"setModuleMgr": "配置模板管理",
"mqttSetMgr": "MQTT账户管理",
"systemMgr": "系统管理",
"userCenter": "用户中心",
"customCenter": "客户中心",
"partMgr": "场景管理",
"areaMgr": "区域管理",
"logMgr": "日志管理",
"dataCenter": "数据中心",
"currentData": "实时数据",
"dataSum": "数据统计",
"historyData": "历史数据",
"-----------常用-----------": "-----------常用-----------",
"signOut": "登出",
"num": "序号",
......@@ -25,6 +36,10 @@
"confirm": "确认",
"email": "邮箱",
"phone": "手机号码",
"bind": "绑定",
"divide": "分配",
"unbind": "解绑",
"update": "修改",
"-----------业务-----------": "-----------业务-----------",
"loginName": "登录名",
"userRealName": "用户姓名",
......@@ -54,21 +69,11 @@
"noLoginTips": "您尚未登录,请登录",
"wrongServerWithCode": "服务器异常,错误代码: ",
"wrongServer": "服务器异常, 请稍后再试",
"deviceCenter": "设备中心",
"gatewayMgr": "网关管理",
"sensorMgr": "传感器管理",
"moduleMgr": "模块管理",
"topicModuleMgr": "主题模板管理",
"setModuleMgr": "配置模板管理",
"mqttSetMgr": "MQTT账户管理",
"systemMgr": "系统管理",
"userCenter": "用户中心",
"customCenter": "客户中心",
"partMgr": "场景管理",
"areaMgr": "区域管理",
"logMgr": "日志管理",
"dataCenter": "数据中心",
"currentData": "实时数据",
"dataSum": "数据统计",
"historyData": "历史数据"
"gatewayName": "网关名称",
"gatewaySN": "网关序列号",
"type": "类型",
"simCardNum": "SIM卡号",
"off/on": "卸载/挂载",
"belongCompany": "所属公司",
"isbind": "是否绑定"
}
{
"-----------菜单-----------": "-----------菜单-----------",
"system": "系统管理",
"log": "登陆日志",
"operate": "操作日志",
"user": "后台用户管理",
"role": "角色管理",
"person": "个人设置",
"home": "首页",
"deviceCenter": "设备中心",
"gatewayMgr": "网关管理",
"sensorMgr": "传感器管理",
"moduleMgr": "模块管理",
"topicModuleMgr": "主题模板管理",
"setModuleMgr": "配置模板管理",
"mqttSetMgr": "MQTT账户管理",
"systemMgr": "系统管理",
"userCenter": "用户中心",
"customCenter": "客户中心",
"partMgr": "场景管理",
"areaMgr": "区域管理",
"logMgr": "日志管理",
"dataCenter": "数据中心",
"currentData": "实时数据",
"dataSum": "数据统计",
"historyData": "历史数据",
"-----------常用-----------": "-----------常用-----------",
"signOut": "登出",
"num": "序号",
......@@ -25,6 +36,10 @@
"confirm": "确认",
"email": "邮箱",
"phone": "手机号码",
"bind": "绑定",
"divide": "分配",
"unbind": "解绑",
"update": "修改",
"-----------业务-----------": "-----------业务-----------",
"loginName": "登录名",
"userRealName": "用户姓名",
......@@ -54,21 +69,11 @@
"noLoginTips": "您尚未登录,请登录",
"wrongServerWithCode": "服务器异常,错误代码: ",
"wrongServer": "服务器异常, 请稍后再试",
"deviceCenter": "设备中心",
"gatewayMgr": "网关管理",
"sensorMgr": "传感器管理",
"moduleMgr": "模块管理",
"topicModuleMgr": "主题模板管理",
"setModuleMgr": "配置模板管理",
"mqttSetMgr": "MQTT账户管理",
"systemMgr": "系统管理",
"userCenter": "用户中心",
"customCenter": "客户中心",
"partMgr": "场景管理",
"areaMgr": "区域管理",
"logMgr": "日志管理",
"dataCenter": "数据中心",
"currentData": "实时数据",
"dataSum": "数据统计",
"historyData": "历史数据"
"gatewayName": "网关名称",
"gatewaySN": "网关序列号",
"type": "类型",
"simCardNum": "SIM卡号",
"off/on": "卸载/挂载",
"belongCompany": "所属公司",
"isbind": "是否绑定"
}
{
"-----------菜单-----------": "-----------菜单-----------",
"system": "系统管理",
"log": "登陆日志",
"operate": "操作日志",
"user": "后台用户管理",
"role": "角色管理",
"person": "个人设置",
"home": "首页",
"deviceCenter": "设备中心",
"gatewayMgr": "网关管理",
"sensorMgr": "传感器管理",
"moduleMgr": "模块管理",
"topicModuleMgr": "主题模板管理",
"setModuleMgr": "配置模板管理",
"mqttSetMgr": "MQTT账户管理",
"systemMgr": "系统管理",
"userCenter": "用户中心",
"customCenter": "客户中心",
"partMgr": "场景管理",
"areaMgr": "区域管理",
"logMgr": "日志管理",
"dataCenter": "数据中心",
"currentData": "实时数据",
"dataSum": "数据统计",
"historyData": "历史数据",
"-----------常用-----------": "-----------常用-----------",
"signOut": "登出",
"num": "序号",
......@@ -25,6 +36,11 @@
"confirm": "确认",
"email": "邮箱",
"phone": "手机号码",
"bind": "绑定",
"divide": "分配",
"unbind": "解绑",
"update": "修改",
"back": "返回",
"-----------业务-----------": "-----------业务-----------",
"loginName": "登录名",
"userRealName": "用户姓名",
......@@ -54,21 +70,29 @@
"noLoginTips": "您尚未登录,请登录",
"wrongServerWithCode": "服务器异常,错误代码: ",
"wrongServer": "服务器异常, 请稍后再试",
"deviceCenter": "设备中心",
"gatewayMgr": "网关管理",
"sensorMgr": "传感器管理",
"moduleMgr": "模块管理",
"topicModuleMgr": "主题模板管理",
"setModuleMgr": "配置模板管理",
"mqttSetMgr": "MQTT账户管理",
"systemMgr": "系统管理",
"userCenter": "用户中心",
"customCenter": "客户中心",
"partMgr": "场景管理",
"areaMgr": "区域管理",
"logMgr": "日志管理",
"dataCenter": "数据中心",
"currentData": "实时数据",
"dataSum": "数据统计",
"historyData": "历史数据"
"gatewayName": "网关名称",
"gatewaySN": "网关序列号",
"type": "类型",
"simCardNum": "SIM卡号",
"off/on": "卸载/挂载",
"belongCompany": "所属公司",
"isbind": "是否绑定",
"gatewaySee": "查看网关",
"gatewayDetail": "网关详情",
"sensorName": "传感器名称",
"wayNum": "通道数",
"createTime": "创建时间",
"wayIndex": "通道编号",
"sensorSN": "传感器序列号",
"wayName": "通道名称",
"wayAlias": "通道别名",
"per": "单位",
"wayType": "通道类型",
"max": "最大值",
"min": "最小值",
"alarmMax": "报警上限",
"alarmMaxMax": "报警上上限",
"alarmMin": "报警下限",
"alarmMinMin": "报警下下限",
"sensorDetail": "传感器详情"
}
......@@ -6,7 +6,7 @@
}
html:lang(zh) .sg-common-class, html:lang(zh) body {
font-family: "Microsoft Yahei", 微软雅黑, Arial, STXihei, "boschsans", "Helvetica Neue", Helvetica, 华文细黑, sans-serif;
font-family: "Microsoft Yahei", 微软雅黑, Arial, STXihei, "boschsans", "Helvetica Neue", Helvetica, 华文细黑, sans-serif;
}
html, body, div, span, applet, object, iframe,
......@@ -45,34 +45,31 @@ ol, ul {
}
/*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
*::-webkit-scrollbar
{
*::-webkit-scrollbar {
width: 12px;
height: 12px;
background-color: #F5F5F5;
}
/*定义滚动条轨道 内阴影+圆角*/
*::-webkit-scrollbar-track
{
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.1);
*::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.1);
border-radius: 12px;
background-color: #F5F5F5;
}
/*定义滑块 内阴影+圆角*/
*::-webkit-scrollbar-thumb
{
*::-webkit-scrollbar-thumb {
border-radius: 12px;
//-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);
//-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);
background-color: #c0c0c0;
}
// 表格中删除的字体颜色
.deleteFontColor {
color: red;
cursor: pointer;
}
.deleteFontColor {
color: red;
cursor: pointer;
}
.deleteFontColor:hover {
color: red;
......@@ -84,11 +81,11 @@ ol, ul {
}
//页面标准按钮样式
.btnDel {
color: #ff2c32;
background-color: #FFFFFF;
border-color: #d9d9d9;
}
.btnDel {
color: #ff2c32;
background-color: #FFFFFF;
border-color: #d9d9d9;
}
.btnDel:hover, .btnDel:focus, .btnDel:active {
background-color: #ff2c32;
......@@ -149,6 +146,7 @@ ol, ul {
margin: 10px 10px 0 10px;
padding: 15px;
background-color: #fff;
position: relative;
}
.searchItem {
......@@ -205,6 +203,12 @@ ol, ul {
}
}
.contentItem {
display: inline-block !important;
width: 100%;
min-width: 485px;
}
@media screen and (min-width: 1280px) {
.searchItem {
width: 33.333%;
......@@ -218,15 +222,15 @@ ol, ul {
.item-input-group {
width: 68%;
}
}
.btnLine.whenOneLine, .pagePart.whenOneLine {
display: inline-flex;
vertical-align: bottom;
}
.contentItem {
display: inline-block !important;
width: 100%;
min-width: 485px;
}
.btnLine.whenOneLine {
width: calc(100% - 420px);
}
@media screen and (min-width: 1280px) {
.contentItem {
width: 50%;
}
......@@ -276,11 +280,12 @@ ol, ul {
}
.tableBar {
//white-space: nowrap;
//overflow-x: auto;
//white-space: nowrap;
//overflow-x: auto;
margin: 10px;
padding: 15px;
background-color: #fff;
position: relative;
}
.infoText {
......@@ -349,3 +354,20 @@ span.addSpan {
.hidden {
display: none;
}
.pagePart {
margin-top: 10px;
display: inline-block;
}
.canClick {
color: #1890ff;
cursor: pointer;
}
.backBtnOnTabset {
position: absolute;
right: 16px;
top: 5px;
z-index: 2;
}
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