加图标

src/app/layout/layout.component.html

@@ -5,17 +5,17 @@
         <div style="height: 54px;"></div>
       </span>
       <span *ngIf="isCollapsed" style="width: calc(50% - 64px);display: block;">
-        <i class="iconfont icon-cloud"></i>
+        <!--<i class="iconfont icon-cloud"></i>-->
       </span>
     </div>
     <app-leftmenu #leftmenu [isCollapsed]="isCollapsed" [selectedItem]="selectedItem"></app-leftmenu>
   </nz-sider>
   <nz-layout>
     <nz-header class="logoBackground bottomLine" style="padding:0;position:fixed; width:100%;z-index: 99;border-bottom: 1px solid rgb(230, 230, 230);">
-      <i class="iconfont trigger textStyle1 whenHover" [class.icon-toFold]="!isCollapsed"
-         [class.icon-toOpen]="isCollapsed" (click)="changeCollapsed()"></i>
+      <i class="io trigger textStyle1 whenHover" [class.i-shou]="!isCollapsed"
+         [class.i-fang]="isCollapsed" (click)="changeCollapsed()"></i>
       <label class="linkToPersonSetting whenHover textStyle1" routerLink="/app/system/person">
-        <i class="iconfont icon-user"></i>
+        <i class="io i-person"></i>
         {{'person' | translate}}
       </label>
       <label class="loginOut whenHover textStyle1" (click)="loginOut()">
@@ -32,6 +32,6 @@
   </nz-layout>
 </nz-layout>
 <ng-template #trigger>
-  <i class="iconfont icon-up"></i>
+  <i class="io i-shang"></i>
 </ng-template>
 <!--<div class="footer"></div>-->

src/app/layout/layout.component.scss

@@ -46,6 +46,6 @@ ul {
   width: 199px;
 }
 
-.width-80{
+.width-60{
   width: 79px;
 }

src/app/layout/layout.module.ts

@@ -11,10 +11,8 @@ import {FooterComponent} from './footer/footer.component';
 import {BreadcrumbComponent} from './breadcrumb/breadcrumb.component';
 import {HomeComponent} from '../main/home/home.component';
 import {LayoutRoutingModule} from '../router.module';
-import {PersonComponent} from '../main/person/person.component';
 import {RoleComponent} from '../main/role/role.component';
 import {UserComponent} from '../main/user/user.component';
-import {OperateComponent} from '../main/operate/operate.component';
 import {LogComponent} from '../main/log/log.component';
 // 通用组件
 import {SearchDateComponent} from '../component/search-date/search-date.component';
@@ -48,11 +46,9 @@ import {TransferComponent} from '../component/transfer/transfer.component';
     FooterComponent,
     BreadcrumbComponent,
     HomeComponent,
-    PersonComponent,
     UserComponent,
     RoleComponent,
     LogComponent,
-    OperateComponent,
     SearchDateComponent,
     SearchItemComponent,
     SearchSelectComponent,

src/app/layout/leftmenu/leftmenu.component.html

@@ -3,7 +3,7 @@
     <div class="first-floor textStyle1 whenHover" [title]="item.name | translate" *ngIf="(item.child && item.child.length > 0) || item.type" (click)="selectFirstFloor(item)" [ngClass]="{'isSelectedFirst': isSelected[0] === item.name, 'isSelectedSecond': isSelected[0] === item.name && item.type === 1}">
       <i [class]="item.icon" [ngClass]="{'iconLeft': !isCollapsed,'iconLeftCos': isCollapsed}"></i>
       <span *ngIf="!isCollapsed">{{item.name | translate}}</span>
-      <i class="iconfont iconRight" [ngClass]="{'icon-down': !isOpen[item.name] && !item.type && !isCollapsed,'icon-up': isOpen[item.name] && !item.type && !isCollapsed, 'icon-right': isCollapsed && !item.type}"></i>
+      <i class="io iconRight" [ngClass]="{'i-xia': !isOpen[item.name] && !item.type && !isCollapsed,'i-shang': isOpen[item.name] && !item.type && !isCollapsed, 'i-you': isCollapsed && !item.type}"></i>
     </div>
     <div *ngIf="isOpen[item.name] && !isCollapsed" class="menuSecond whenHover">
       <div class="second-floor whenHover textStyle2" [title]="one.name | translate" *ngFor="let one of item.child"

src/app/layout/leftmenu/leftmenu.component.ts

@@ -25,14 +25,25 @@ export class LeftmenuComponent implements OnInit, OnDestroy {
   }
   dataArr = [{
     name: 'home',
-    icon: 'iconfont icon-home',
+    icon: 'io i-shouye',
     type: 1,
     child: []
   }, {
-    name: 'system',
-    icon: 'iconfont icon-setting',
+    name: 'deviceCenter',
+    icon: 'io i-shebei',
     type: 0,
-    child: [{name: 'person'}, {name: 'role'}, {name: 'user'}, {name: 'operate'}, {name: 'log'}]
+    child: [{name: 'gatewayMgr'}, {name: 'sensorMgr'}, {name: 'moduleMgr'},
+      {name: 'topicModuleMgr'}, {name: 'setModuleMgr'}, {name: 'mqttSetMgr'}]
+  }, {
+    name: 'systemMgr',
+    icon: 'io i-shezhi',
+    type: 0,
+    child: [{name: 'userCenter'}, {name: 'customCenter'}, {name: 'partMgr'}, {name: 'areaMgr'}, {name: 'logMgr'}]
+  }, {
+    name: 'dataCenter',
+    icon: 'io i-ico_data',
+    type: 0,
+    child: [{name: 'currentData'}, {name: 'dataSum'}, {name: 'historyData'}]
   }];
   isOpen = {monitoring: false, deviceManage: false, pileManage: false, moduleCenter: false, systemSet: false};
   isSelected = ['', ''];

src/app/main/operate/operate.component.html

-<p>
-  operate works!
-</p>

src/app/main/operate/operate.component.ts

-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-operate',
-  templateUrl: './operate.component.html',
-  styles: []
-})
-export class OperateComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit() {
-  }
-
-}

src/app/main/person/person.component.html

-<p>
-  person works!
-</p>

src/app/main/person/person.component.ts

-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-person',
-  templateUrl: './person.component.html',
-  styles: []
-})
-export class PersonComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit() {
-  }
-
-}

src/app/router.module.ts

@@ -3,8 +3,6 @@ import { LayoutComponent } from './layout/layout.component';
 import { AuthService } from './service/auth';
 import { HomeComponent } from './main/home/home.component';
 import {LogComponent} from './main/log/log.component';
-import {OperateComponent} from './main/operate/operate.component';
-import {PersonComponent} from './main/person/person.component';
 import {RoleComponent} from './main/role/role.component';
 import {UserComponent} from './main/user/user.component';
 
@@ -24,11 +22,9 @@ const routes: Routes = [
     children: [
       {path: '', redirectTo: '/extra/login', pathMatch: 'full'},
       {path: 'home', component: HomeComponent},
-      {path: 'system/user', component: UserComponent},
-      {path: 'system/role', component: RoleComponent},
-      {path: 'system/person', component: PersonComponent},
-      {path: 'system/operate', component: OperateComponent},
-      {path: 'system/log', component: LogComponent},
+      {path: 'systemMgr/userCenter', component: UserComponent},
+      {path: 'systemMgr/roleMgr', component: RoleComponent},
+      {path: 'systemMgr/logMgr', component: LogComponent},
     ]
   }
 ];

src/assets/i18n/en.json

@@ -49,5 +49,26 @@
   "userImg": "用户头像",
   "editRole": "编辑角色",
   "addRole": "新增角色",
-  "confirmDeleteThisRecord": "确认删除这条记录吗"
+  "confirmDeleteThisRecord": "确认删除这条记录吗",
+  "loginOutValidityTips": "登录凭证失效,请重新登录",
+  "noLoginTips": "您尚未登录,请登录",
+  "wrongServerWithCode": "服务器异常,错误代码: ",
+  "wrongServer": "服务器异常, 请稍后再试",
+  "deviceCenter": "设备中心",
+  "gatewayMgr": "网关管理",
+  "sensorMgr": "传感器管理",
+  "moduleMgr": "模块管理",
+  "topicModuleMgr": "主题模板管理",
+  "setModuleMgr": "配置模板管理",
+  "mqttSetMgr": "MQTT账户管理",
+  "systemMgr": "系统管理",
+  "userCenter": "用户中心",
+  "customCenter": "客户中心",
+  "partMgr": "场景管理",
+  "areaMgr": "区域管理",
+  "logMgr": "日志管理",
+  "dataCenter": "数据中心",
+  "currentData": "实时数据",
+  "dataSum": "数据统计",
+  "historyData": "历史数据"
 }

src/assets/i18n/jpn.json

@@ -49,5 +49,26 @@
   "userImg": "用户头像",
   "editRole": "编辑角色",
   "addRole": "新增角色",
-  "confirmDeleteThisRecord": "确认删除这条记录吗"
+  "confirmDeleteThisRecord": "确认删除这条记录吗",
+  "loginOutValidityTips": "登录凭证失效,请重新登录",
+  "noLoginTips": "您尚未登录,请登录",
+  "wrongServerWithCode": "服务器异常,错误代码: ",
+  "wrongServer": "服务器异常, 请稍后再试",
+  "deviceCenter": "设备中心",
+  "gatewayMgr": "网关管理",
+  "sensorMgr": "传感器管理",
+  "moduleMgr": "模块管理",
+  "topicModuleMgr": "主题模板管理",
+  "setModuleMgr": "配置模板管理",
+  "mqttSetMgr": "MQTT账户管理",
+  "systemMgr": "系统管理",
+  "userCenter": "用户中心",
+  "customCenter": "客户中心",
+  "partMgr": "场景管理",
+  "areaMgr": "区域管理",
+  "logMgr": "日志管理",
+  "dataCenter": "数据中心",
+  "currentData": "实时数据",
+  "dataSum": "数据统计",
+  "historyData": "历史数据"
 }

src/assets/i18n/zh.json

@@ -53,5 +53,22 @@
   "loginOutValidityTips": "登录凭证失效,请重新登录",
   "noLoginTips": "您尚未登录,请登录",
   "wrongServerWithCode": "服务器异常,错误代码: ",
-  "wrongServer": "服务器异常, 请稍后再试"
+  "wrongServer": "服务器异常, 请稍后再试",
+  "deviceCenter": "设备中心",
+  "gatewayMgr": "网关管理",
+  "sensorMgr": "传感器管理",
+  "moduleMgr": "模块管理",
+  "topicModuleMgr": "主题模板管理",
+  "setModuleMgr": "配置模板管理",
+  "mqttSetMgr": "MQTT账户管理",
+  "systemMgr": "系统管理",
+  "userCenter": "用户中心",
+  "customCenter": "客户中心",
+  "partMgr": "场景管理",
+  "areaMgr": "区域管理",
+  "logMgr": "日志管理",
+  "dataCenter": "数据中心",
+  "currentData": "实时数据",
+  "dataSum": "数据统计",
+  "historyData": "历史数据"
 }

src/styles.scss

@@ -316,11 +316,6 @@ span.addSpan {
   position: relative;
 }
 
-.addIcon .iconfont {
-  font-size: 32px;
-  color: #52c41a;
-}
-
 .inModal {
   width: 100%;
 }