diff --git a/proxy.config.json b/proxy.config.json index 07408fe..e2148be 100644 --- a/proxy.config.json +++ b/proxy.config.json @@ -1,6 +1,6 @@ { "/api": { - "target": "http://121.36.37.70:8906/", + "target": "https://znaq.sinochemoilmarketing.com/", "测试1": "http://121.36.37.70:8906/", "测试2": "https://znaq.sinochemoilmarketing.com/", "测试3": "https://gas.anxincloud.cn/", @@ -8,7 +8,7 @@ "changeOrigin": true }, "/signalr": { - "target": "http://121.36.37.70:8906/", + "target": "https://znaq.sinochemoilmarketing.com/", "secure": false, "ws": true, "logLevel": "debug" diff --git a/src/app/pages/audit/audit-record/audit-record.component.html b/src/app/pages/audit/audit-record/audit-record.component.html index ee83f18..daf5e33 100644 --- a/src/app/pages/audit/audit-record/audit-record.component.html +++ b/src/app/pages/audit/audit-record/audit-record.component.html @@ -29,7 +29,7 @@ + [nzExpandedIcon]="multiExpandedIconTpl" [nzHideUnMatched]="true"> diff --git a/src/app/pages/plan-admin/file-license-list/file-license-list.component.html b/src/app/pages/plan-admin/file-license-list/file-license-list.component.html index 5b375c8..bf20453 100644 --- a/src/app/pages/plan-admin/file-license-list/file-license-list.component.html +++ b/src/app/pages/plan-admin/file-license-list/file-license-list.component.html @@ -7,7 +7,7 @@ + [nzExpandedIcon]="multiExpandedIconTpl" [nzHideUnMatched]="true"> diff --git a/src/app/pages/plan-admin/update-license-list/update-license-list.component.html b/src/app/pages/plan-admin/update-license-list/update-license-list.component.html index 2049407..17afe07 100644 --- a/src/app/pages/plan-admin/update-license-list/update-license-list.component.html +++ b/src/app/pages/plan-admin/update-license-list/update-license-list.component.html @@ -16,7 +16,7 @@ + [nzExpandedIcon]="multiExpandedIconTpl" [nzHideUnMatched]="true"> diff --git a/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.html b/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.html index 3c0f5a6..3c98186 100644 --- a/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.html +++ b/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.html @@ -64,7 +64,7 @@ + [nzExpandedIcon]="multiExpandedIconTpl" [nzHideUnMatched]="true"> diff --git a/src/app/pages/records/oil-unloading-process-list/oil-unloading-process-list.component.html b/src/app/pages/records/oil-unloading-process-list/oil-unloading-process-list.component.html index 9bfaea5..808be7f 100644 --- a/src/app/pages/records/oil-unloading-process-list/oil-unloading-process-list.component.html +++ b/src/app/pages/records/oil-unloading-process-list/oil-unloading-process-list.component.html @@ -54,7 +54,7 @@ + nzPlaceHolder="请选择所属机构" [nzExpandedIcon]="multiExpandedIconTpl" [nzHideUnMatched]="true"> @@ -150,7 +150,8 @@ 查看 删除 + style="color: #FF4B65;cursor: pointer;margin-left: 6px;" + (click)="delete(item)">删除 diff --git a/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html b/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html index 0115ba8..cc073d0 100644 --- a/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html +++ b/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html @@ -70,7 +70,7 @@ + nzPlaceHolder="请选择所属机构" [nzExpandedIcon]="multiExpandedIconTpl" [nzHideUnMatched]="true"> diff --git a/src/app/pages/today-warning-admin/today-warning-admin.component.html b/src/app/pages/today-warning-admin/today-warning-admin.component.html index 4c0e9f8..4cec5da 100644 --- a/src/app/pages/today-warning-admin/today-warning-admin.component.html +++ b/src/app/pages/today-warning-admin/today-warning-admin.component.html @@ -24,7 +24,7 @@ + [nzExpandedIcon]="multiExpandedIconTpl" [nzHideUnMatched]="true"> diff --git a/src/app/system-management/role/addrole/addrole.component.html b/src/app/system-management/role/addrole/addrole.component.html index f994027..5989d56 100644 --- a/src/app/system-management/role/addrole/addrole.component.html +++ b/src/app/system-management/role/addrole/addrole.component.html @@ -33,18 +33,18 @@ 菜单 - - + + - - - - - + + + + + - + \ No newline at end of file diff --git a/src/app/system-management/role/editrole/editrole.component.html b/src/app/system-management/role/editrole/editrole.component.html index c392399..ef2c138 100644 --- a/src/app/system-management/role/editrole/editrole.component.html +++ b/src/app/system-management/role/editrole/editrole.component.html @@ -27,18 +27,18 @@ 菜单 - - + + - - - - - + + + + + - + \ No newline at end of file diff --git a/src/app/system-management/role/menus/menus.component.html b/src/app/system-management/role/menus/menus.component.html index 0688cc2..0f81da3 100644 --- a/src/app/system-management/role/menus/menus.component.html +++ b/src/app/system-management/role/menus/menus.component.html @@ -3,8 +3,9 @@ 菜单 - + diff --git a/src/app/system-management/user/adduser/adduser.component.html b/src/app/system-management/user/adduser/adduser.component.html index 574f77d..1351028 100644 --- a/src/app/system-management/user/adduser/adduser.component.html +++ b/src/app/system-management/user/adduser/adduser.component.html @@ -21,7 +21,7 @@ + [nzExpandedIcon]="multiExpandedIconTpl" [nzHideUnMatched]="true"> diff --git a/src/app/system-management/user/edituser/edituser.component.html b/src/app/system-management/user/edituser/edituser.component.html index b069993..e5e73ac 100644 --- a/src/app/system-management/user/edituser/edituser.component.html +++ b/src/app/system-management/user/edituser/edituser.component.html @@ -21,7 +21,7 @@ + [nzExpandedIcon]="multiExpandedIconTpl" [nzHideUnMatched]="true">