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 @@
-
+
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: '查看
',
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 @@
+