From 10b7496b270349993e5d7cbb07ecef27220d4472 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Thu, 10 Feb 2022 11:20:18 +0800
Subject: [PATCH] edit

---
 .../pro/components/menu/menu.component.html   |  2 +-
 .../role-management.component.ts              |  6 +-
 .../components/freight/list/list.component.ts |  2 +-
 src/assets/mocks/menu-data.json               | 78 +++----------------
 src/assets/mocks/platform/tms-obc-web.json    |  1 -
 src/index.html                                | 25 +++---
 src/styles.less                               |  2 +-
 7 files changed, 30 insertions(+), 86 deletions(-)

diff --git a/src/app/layout/pro/components/menu/menu.component.html b/src/app/layout/pro/components/menu/menu.component.html
index e22c57b2..272c43b3 100644
--- a/src/app/layout/pro/components/menu/menu.component.html
+++ b/src/app/layout/pro/components/menu/menu.component.html
@@ -3,7 +3,7 @@
     <i *ngSwitchCase="'icon'" nz-icon [nzType]="i.value" class="alain-pro__menu-icon"></i>
     <i *ngSwitchCase="'iconfont'" nz-icon [nzIconfont]="i.iconfont" class="alain-pro__menu-icon icon"></i>
     <img *ngSwitchCase="'img'" src="{{ i.value }}" class="anticon alain-pro__menu-icon alain-pro__menu-img" />
-    <i *ngSwitchDefault class="anticon alain-pro__menu-icon {{ i.value }}"></i>
+    <i *ngSwitchDefault class="icon alain-pro__menu-icon {{ i.value }}"></i>
   </ng-container>
 </ng-template>
 <ng-template #mainLink let-i>
diff --git a/src/app/routes/sys-setting/components/role-management/role-management.component.ts b/src/app/routes/sys-setting/components/role-management/role-management.component.ts
index 8f86f246..5273fe0c 100644
--- a/src/app/routes/sys-setting/components/role-management/role-management.component.ts
+++ b/src/app/routes/sys-setting/components/role-management/role-management.component.ts
@@ -42,11 +42,13 @@ export class RoleManagementComponent implements OnInit {
       buttons: [
         {
           text: '编辑',
-          click: item => this.roleAction(item)
+          click: item => this.roleAction(item),
+          iif: item => item.roleName !== '超级管理员'
         },
         {
           text: '删除',
-          click: item => this.deleteAction(item)
+          click: item => this.deleteAction(item),
+          iif: item => item.roleName !== '超级管理员'
         }
       ]
     }
diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts
index 854afb2c..b0b85ca1 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/list.component.ts
@@ -197,7 +197,7 @@ export class FreightComponentsListComponent implements OnInit {
         className: 'text-center',
         buttons: [
           {
-            text: '查看',
+            text: '查看<br/>',
             click: item => {
               this.router.navigate(['./detail', item.id], { relativeTo: this.ar });
               // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 902d08bf..b1507efc 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -8,84 +8,66 @@
         "children": [
           {
             "text": "用户中心",
-            "icon": {
-              "type": "iconfont",
-              "value": "icon-yonghu-copy",
-              "iconfont": "icon-yonghu-copy"
-            },
+            "icon": "iconfont icon-yonghu-copy",
             "group": true,
             "children": [
               {
                 "text": "货主管理",
-                "icon": "anticon anticon-dashboard",
-                "link": "/demo/zorro",
                 "children": [
                   {
                     "text": "企业列表",
-                    "icon": "anticon anticon-dashboard",
                     "link": "/usercenter/freight/list"
                   },
                   {
                     "text": "道运证",
                     "hide": true,
-                    "icon": "anticon anticon-dashboard",
                     "link": "/usercenter/freight/list/view/:id"
                   },
                   {
                     "text": "货主详情",
                     "hide": true,
-                    "icon": "anticon anticon-dashboard",
                     "link": "/usercenter/freight/list/detail/:id"
                   },
                   {
                     "text": "企业认证",
                     "hide": true,
-                    "icon": "anticon anticon-dashboard",
                     "link": "/usercenter/freight/new"
                   },
                   {
                     "text": "企业审核列表",
-                    "icon": "anticon anticon-dashboard",
                     "link": "/usercenter/freight/enterprise"
                   },
                   {
                     "text": "企业审核列表详情",
                     "hide": true,
-                    "icon": "anticon anticon-dashboard",
                     "link": "/usercenter/freight/enterprise/view/:id"
                   },
                   {
                     "text": "货主员工列表",
-                    "icon": "anticon anticon-dashboard",
                     "link": "/usercenter/freight/user"
                   },
                   {
                     "text": "货主员工详情",
                     "hide": true,
-                    "icon": "anticon anticon-dashboard",
                     "link": "/usercenter/freight/user/view/:id"
                   }
                 ]
               },
               {
                 "text": "司机管理",
-                "icon": "anticon anticon-dashboard",
                 "link": "/demo/zorro",
                 "children": [
                   {
                     "text": "司机列表",
-                    "icon": "anticon anticon-dashboard",
                     "link": "/usercenter/driver"
                   },
                   {
                     "text": "司机详情",
                     "hide": true,
-                    "icon": "anticon anticon-dashboard",
                     "link": "/usercenter/driver/detail/:id"
                   },
                   {
                     "text": "车队长列表",
-                    "icon": "anticon anticon-dashboard",
                     "link": "/usercenter/driver/captain"
                   }
                 ]
@@ -94,11 +76,7 @@
           },
           {
             "text": "运力管理",
-            "icon": {
-              "type": "iconfont",
-              "value": "icon-yunli-copy",
-              "iconfont": "icon-yunli-copy"
-            },
+            "icon": "iconfont icon-yunli-copy",
             "group": true,
             "children": [
               {
@@ -123,34 +101,26 @@
           },
           {
             "text": "货源管理",
-            "icon": {
-              "type": "iconfont",
-              "value": "icon-huoyuan-copy",
-              "iconfont": "icon-huoyuan-copy"
-            },
+            "icon": "iconfont icon-huoyuan-copy",
             "group": true,
             "children": [
               {
                 "text": "货源管理",
-                "icon": "anticon anticon-dashboard",
                 "link": "/supply-management/index",
                 "reuse": true
               },
               {
                 "text": "货源详情",
-                "icon": "anticon anticon-dashboard",
                 "link": "/supply-management/bulk-detail",
                 "hide": true
               },
               {
                 "text": "修改货源",
-                "icon": "anticon anticon-dashboard",
                 "link": "/supply-management/vehicle-amend/:id",
                 "hide": true
               },
               {
                 "text": "货源详情",
-                "icon": "anticon anticon-dashboard",
                 "link": "/supply-management/vehicle-detail/:id",
                 "hide": true
               }
@@ -158,11 +128,7 @@
           },
           {
             "text": "订单管理",
-            "icon": {
-              "type": "iconfont",
-              "value": "icon-dingdan-copy",
-              "iconfont": "icon-dingdan-copy"
-            },
+            "icon": "iconfont icon-dingdan-copy",
             "group": true,
             "children": [
               {
@@ -203,11 +169,7 @@
           },
           {
             "text": "运单管理",
-            "icon": {
-              "type": "iconfont",
-              "value": "icon-yundan-copy",
-              "iconfont": "icon-yundan-copy"
-            },
+            "icon": "iconfont icon-yundan-copy",
             "group": true,
             "children": [
               {
@@ -236,11 +198,7 @@
           },
           {
             "text": "保险管理",
-            "icon": {
-              "type": "iconfont",
-              "value": "icon-yundan-copy",
-              "iconfont": "icon-yundan-copy"
-            },
+            "icon": "iconfont icon-yundan-copy",
             "group": true,
             "children": [
               {
@@ -251,11 +209,7 @@
           },
           {
             "text": "财务管理",
-            "icon": {
-              "type": "iconfont",
-              "value": "icon-caiwu-copy",
-              "iconfont": "icon-caiwu-copy"
-            },
+            "icon": "iconfont icon-caiwu-copy",
             "group": true,
             "children": [
               {
@@ -358,11 +312,7 @@
           },
           {
             "text": "票务管理",
-            "icon":  {
-              "type": "iconfont",
-              "value": "icon-piaowu-copy",
-              "iconfont": "icon-piaowu-copy"
-            },
+            "icon": "iconfont icon-piaowu-copy",
             "group": true,
             "children": [
               {
@@ -440,11 +390,7 @@
           },
           {
             "text": "合同管理",
-            "icon":  {
-              "type": "iconfont",
-              "value": "icon-hetong-copy",
-              "iconfont": "icon-hetong-copy"
-            },
+            "icon": "iconfont icon-hetong-copy",
             "group": true,
             "children": [
               {
@@ -463,11 +409,7 @@
           },
           {
             "text": "系统设置",
-            "icon": {
-              "type": "iconfont",
-              "value": "icon-shezhi-copy",
-              "iconfont": "icon-shezhi-copy"
-            },
+            "icon": "iconfont icon-shezhi-copy",
             "group": true,
             "children": [
               {
diff --git a/src/assets/mocks/platform/tms-obc-web.json b/src/assets/mocks/platform/tms-obc-web.json
index 8c6cf6f7..ff23805c 100644
--- a/src/assets/mocks/platform/tms-obc-web.json
+++ b/src/assets/mocks/platform/tms-obc-web.json
@@ -12,7 +12,6 @@
             {
               "text": "货主管理",
               "icon": "anticon anticon-dashboard",
-              "link": "/demo/zorro",
               "children": [
                 {
                   "text": "企业列表",
diff --git a/src/index.html b/src/index.html
index 3caa1964..ca137d18 100644
--- a/src/index.html
+++ b/src/index.html
@@ -18,6 +18,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta http-equiv="x-ua-compatible" content="ie=edge" />
   <link rel="icon" type="image/x-icon" href="favicon.ico" />
+  <link rel="stylesheet" href="https://at.alicdn.com/t/font_3153207_udngwyp35db.css" />
   <!-- Apple Touch Icon -->
   <!-- <link rel="apple-touch-icon" href="custom-icon.png"> -->
   <style type="text/css">
@@ -65,18 +66,18 @@
   }
 
   var zoom = window.devicePixelRatio || window.screen.deviceXDPI / window.screen.logicalXDPI;
-        if (!!window.ActiveXObject || "ActiveXObject" in window) { 
-            if (zoom != 1 && zoom !=2 && zoom !=3) {  
-                alert('系统检测到您的设备对显示进行放大，可能导致页面显示不全,请调整后打开/或使用其他浏览器！')
-            }
-        } else {
-            if(document.body.clientWidth>=1280){
-            if (zoom != 1 && zoom !=2 && zoom !=3) {  
-                var c = document.querySelector('body');
-                c.style.zoom = -0.62 * zoom + 1.65;  
-            }
-           }
-        }
+  if (!!window.ActiveXObject || "ActiveXObject" in window) {
+    if (zoom != 1 && zoom != 2 && zoom != 3) {
+      alert('系统检测到您的设备对显示进行放大，可能导致页面显示不全,请调整后打开/或使用其他浏览器！')
+    }
+  } else {
+    if (document.body.clientWidth >= 1280) {
+      if (zoom != 1 && zoom != 2 && zoom != 3) {
+        var c = document.querySelector('body');
+        c.style.zoom = -0.62 * zoom + 1.65;
+      }
+    }
+  }
 </script>
 <!-- <script type="text/javascript" src='//webapi.amap.com/maps?v=2.0&key=63f9573ca55fef2b92d4ffe0c85dea8f'></script>
 <script src="//webapi.amap.com/ui/1.1/main.js?v=1.1.1"></script> -->
\ No newline at end of file
diff --git a/src/styles.less b/src/styles.less
index b9f97916..a25a53de 100644
--- a/src/styles.less
+++ b/src/styles.less
@@ -8,11 +8,11 @@
 
 .icon {
     width    : 18px;
-    height   : 18px;
     fill     : currentColor;
     overflow : hidden;
     font-size: 18px !important;
     color    : #ffffff;
+    margin-right: 10px;
 }
 
 @layout-gutter: 8px;