最新修改

proxy.config.json

 {
   "/asset/*": {
-    "target": "http://192.168.19.200:8081",
+    "target": "http://localhost:8081",
     "secure": false,
     "logLevel": "debug",
     "changeOrigin": true

src/app/layout/default/assets/assets.component.ts

@@ -173,12 +173,12 @@ export class AssetsComponent implements OnInit {
           icon: "<i class='iconfont icon-discardedDisposal'></i>",
           text: "资产处置",
           link: "/admin/assets-used/discardedDisposal"
-        },
-        {
-          icon: "<i class='iconfont icon-assetsUseRecord'></i>",
-          text: "资产使用记录",
-          link: "/admin/assets-used/assetsUseRecord"
         }
+        // {
+        //   icon: "<i class='iconfont icon-assetsUseRecord'></i>",
+        //   text: "资产使用记录",
+        //   link: "/admin/assets-used/assetsUseRecord"
+        // }
       ]
     },
     {

src/app/layout/default/check/check.component.html

@@ -9,6 +9,6 @@
         <div (click)="onExpend(item)">{{item.expend?'更多':'收起'}}</div>
       </Flex>
     </div>
-    <Grid [activeStyle]="true" [hasLine]="false" [data]="item.children" (onClick)="click($event)"></Grid>
+    <Grid class="primary" [activeStyle]="true" [hasLine]="false" [data]="item.children" (onClick)="click($event)"></Grid>
   </ng-container>
 </div>
\ No newline at end of file

src/app/layout/default/tabbar/tabbar.component.html

@@ -4,40 +4,40 @@
 
 
 
-
-   <TabBarItem [title]="'盘点'" [key]="0" [icon]="icon1" [selectedIcon]="icon11">
-     <ng-template #icon1>
+   <TabBarItem [title]="' 消息中心'" [key]="1" [badge]="2" [icon]="icon2" [selectedIcon]="icon22">
+    <ng-template #icon2>
       <div style="width:22px;height: 22px;">
-         <span class="iconfont icon-check text-lg"></span>
+        <span class="iconfont icon-msg text-lg"></span>
       </div>
     </ng-template>
-     <ng-template #icon11>
+    <ng-template #icon22>
       <div style="width:22px;height: 22px;">
-         <span class="iconfont icon-check text-primary text-lg"></span>
+        <span class="iconfont icon-msg text-primary text-lg"></span>
       </div>
     </ng-template>
-     <app-check></app-check>
+    <app-message></app-message>
   </TabBarItem>
 
 
-
-   <TabBarItem [title]="' 消息中心'" [key]="1" [badge]="2" [icon]="icon2" [selectedIcon]="icon22">
-     <ng-template #icon2>
+   <TabBarItem [title]="'盘点'" [key]="0" [icon]="icon1" [selectedIcon]="icon11">
+     <ng-template #icon1>
        <div style="width:22px;height: 22px;">
-         <span class="iconfont icon-msg text-lg"></span>
+         <span class="iconfont icon-check text-lg"></span>
        </div>
      </ng-template>
-     <ng-template #icon22>
+     <ng-template #icon11>
        <div style="width:22px;height: 22px;">
-         <span class="iconfont icon-msg text-primary text-lg"></span>
+         <span class="iconfont icon-check text-primary text-lg"></span>
        </div>
      </ng-template>
-     <app-message></app-message>
+     <app-check></app-check>
    </TabBarItem>
 
 
 
-   <TabBarItem [title]="'资产'" [key]="2" [icon]="icon3" [selectedIcon]="icon33">
+
+
+   <TabBarItem [title]="'功能模块'" [key]="2" [icon]="icon3" [selectedIcon]="icon33">
      <ng-template #icon3>
        <div style="width:22px;height: 22px;">
          <span class="iconfont icon-asset text-lg"></span>

src/app/layout/passport/passport.component.html

@@ -3,7 +3,7 @@
     <div class="top">
       <div class="head">
         <p>
-          <img src="./assets/logo.png" alt="">
+          <img src="./assets/logo.jpg" alt="">
         </p>
         <span class="title">路桥资产管理系统</span>
       </div>

src/app/layout/passport/passport.component.less

@@ -2,5 +2,7 @@
   text-align: center;
   font-size: 20px;
   padding: 50px 0;
-
+  img{
+    width:263px;
+  }
 }

src/global.scss

@@ -36,13 +36,18 @@
     font-size: 20px;
     display: block;
     height: 40px;
-    background: #108ee9;
+    background: #616d75;
     display: flex;
     align-items: center;
     justify-content: center;
     border-radius: 100%;
     color: #fff;
 }
+.primary{
+    .am-grid .am-grid-item-content .iconfont::before{
+        background: #108ee9;
+    }
+}
 
 .am-list-content {
     >div {