diff --git a/src/pages.json b/src/pages.json index bd3cafa..9f637f0 100644 --- a/src/pages.json +++ b/src/pages.json @@ -218,6 +218,14 @@ "path": "pages/notification/notification", "type": "page" }, + { + "path": "pages/personnel-passage/traffic-correlation", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom" + } + }, { "path": "pages/reset-password/reset-password", "type": "page", @@ -278,21 +286,6 @@ "style": { "navigationStyle": "custom" } - }, - { - "path": "pages/personnel-passage/access-authority/access-authority", - "type": "page", - "layout": "default", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "pages/personnel-passage/access-control/access-control", - "type": "page", - "style": { - "navigationStyle": "custom" - } } ], "subPackages": [] diff --git a/src/pages/home/home.vue b/src/pages/home/home.vue index 0bcc274..a6e3671 100644 --- a/src/pages/home/home.vue +++ b/src/pages/home/home.vue @@ -123,13 +123,13 @@ id: 106, icon: 'https://file.hikmall.com/prod/image/635392a7f5e04e75bb657b6cc6e2abc8.png', name: '通行权限', - url: '/pages/personnel-passage/access-authority/access-authority' + url: '/pages/personnel-passage/traffic-correlation' }, { id: 230, icon: 'https://file.hikmall.com/prod/image/d1d07b3125f841848c3c3eb94509b2ae.png', name: '门禁控制', - url: '/pages/personnel-passage/access-control/access-control' + url: '/pages/personnel-passage/traffic-correlation' }, { id: 302, @@ -144,7 +144,8 @@ { id: 299, icon: 'https://file.hikmall.com/prod/image/771a717eb8d74f5bba71db68c9605a0f.png', - name: '通行记录' + name: '通行记录', + url: '/pages/personnel-passage/traffic-correlation' }, { id: 387, diff --git a/src/pages/personnel-passage/access-authority/access-authority.vue b/src/pages/personnel-passage/AccessAuthority/AccessAuthority.vue similarity index 95% rename from src/pages/personnel-passage/access-authority/access-authority.vue rename to src/pages/personnel-passage/AccessAuthority/AccessAuthority.vue index 11b5c0d..660976b 100644 --- a/src/pages/personnel-passage/access-authority/access-authority.vue +++ b/src/pages/personnel-passage/AccessAuthority/AccessAuthority.vue @@ -9,12 +9,6 @@ diff --git a/src/pages/personnel-passage/traffic-correlation.vue b/src/pages/personnel-passage/traffic-correlation.vue new file mode 100644 index 0000000..d95f3f6 --- /dev/null +++ b/src/pages/personnel-passage/traffic-correlation.vue @@ -0,0 +1,65 @@ + +{ + layout: 'default', + style: { + navigationStyle: 'custom' + } +} + + + + + + + diff --git a/src/static/images/personnelPassage/icon_address.png b/src/static/images/personnelPassage/icon_address.png new file mode 100644 index 0000000..f8f3a13 Binary files /dev/null and b/src/static/images/personnelPassage/icon_address.png differ diff --git a/src/static/images/personnelPassage/icon_message.png b/src/static/images/personnelPassage/icon_message.png new file mode 100644 index 0000000..0678e15 Binary files /dev/null and b/src/static/images/personnelPassage/icon_message.png differ diff --git a/src/static/images/personnelPassage/icon_time.png b/src/static/images/personnelPassage/icon_time.png new file mode 100644 index 0000000..caf5cc1 Binary files /dev/null and b/src/static/images/personnelPassage/icon_time.png differ diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts index 7b6105e..51ebdf9 100644 --- a/src/types/uni-pages.d.ts +++ b/src/types/uni-pages.d.ts @@ -26,6 +26,7 @@ interface NavigateToOptions { "/pages/info-publish/notice-manage" | "/pages/login/login" | "/pages/notification/notification" | + "/pages/personnel-passage/traffic-correlation" | "/pages/reset-password/reset-password" | "/pages/workbench/workbench" | "/pages/attendance/attendance-add-group/attendance-add-group" | @@ -33,9 +34,7 @@ interface NavigateToOptions { "/pages/attendance/attendance-add-group/attendance-staff" | "/pages/attendance/attendance-add-group/attendance-time" | "/pages/attendance/attendance-add-group/outside-rules" | - "/pages/attendance/attendance-add-group/special-date-set" | - "/pages/personnel-passage/access-authority/access-authority" | - "/pages/personnel-passage/access-control/access-control"; + "/pages/attendance/attendance-add-group/special-date-set"; } interface RedirectToOptions extends NavigateToOptions {}