diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/assets/overview_images/sub-tab-border-1366.png b/src/assets/overview_images/sub-tab-border-1366.png index 21c13c1..93bbefc 100644 --- a/src/assets/overview_images/sub-tab-border-1366.png +++ b/src/assets/overview_images/sub-tab-border-1366.png Binary files differ diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/assets/overview_images/sub-tab-border-1366.png b/src/assets/overview_images/sub-tab-border-1366.png index 21c13c1..93bbefc 100644 --- a/src/assets/overview_images/sub-tab-border-1366.png +++ b/src/assets/overview_images/sub-tab-border-1366.png Binary files differ diff --git a/src/assets/overview_images/sub-tab-border.png b/src/assets/overview_images/sub-tab-border.png index 008d28d..0f94da3 100644 --- a/src/assets/overview_images/sub-tab-border.png +++ b/src/assets/overview_images/sub-tab-border.png Binary files differ diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/assets/overview_images/sub-tab-border-1366.png b/src/assets/overview_images/sub-tab-border-1366.png index 21c13c1..93bbefc 100644 --- a/src/assets/overview_images/sub-tab-border-1366.png +++ b/src/assets/overview_images/sub-tab-border-1366.png Binary files differ diff --git a/src/assets/overview_images/sub-tab-border.png b/src/assets/overview_images/sub-tab-border.png index 008d28d..0f94da3 100644 --- a/src/assets/overview_images/sub-tab-border.png +++ b/src/assets/overview_images/sub-tab-border.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked-1366.png b/src/assets/overview_images/tab-index-checked-1366.png index 2171e1c..df63c85 100644 --- a/src/assets/overview_images/tab-index-checked-1366.png +++ b/src/assets/overview_images/tab-index-checked-1366.png Binary files differ diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/assets/overview_images/sub-tab-border-1366.png b/src/assets/overview_images/sub-tab-border-1366.png index 21c13c1..93bbefc 100644 --- a/src/assets/overview_images/sub-tab-border-1366.png +++ b/src/assets/overview_images/sub-tab-border-1366.png Binary files differ diff --git a/src/assets/overview_images/sub-tab-border.png b/src/assets/overview_images/sub-tab-border.png index 008d28d..0f94da3 100644 --- a/src/assets/overview_images/sub-tab-border.png +++ b/src/assets/overview_images/sub-tab-border.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked-1366.png b/src/assets/overview_images/tab-index-checked-1366.png index 2171e1c..df63c85 100644 --- a/src/assets/overview_images/tab-index-checked-1366.png +++ b/src/assets/overview_images/tab-index-checked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked.png b/src/assets/overview_images/tab-index-checked.png index 22f316b..d8af05f 100644 --- a/src/assets/overview_images/tab-index-checked.png +++ b/src/assets/overview_images/tab-index-checked.png Binary files differ diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/assets/overview_images/sub-tab-border-1366.png b/src/assets/overview_images/sub-tab-border-1366.png index 21c13c1..93bbefc 100644 --- a/src/assets/overview_images/sub-tab-border-1366.png +++ b/src/assets/overview_images/sub-tab-border-1366.png Binary files differ diff --git a/src/assets/overview_images/sub-tab-border.png b/src/assets/overview_images/sub-tab-border.png index 008d28d..0f94da3 100644 --- a/src/assets/overview_images/sub-tab-border.png +++ b/src/assets/overview_images/sub-tab-border.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked-1366.png b/src/assets/overview_images/tab-index-checked-1366.png index 2171e1c..df63c85 100644 --- a/src/assets/overview_images/tab-index-checked-1366.png +++ b/src/assets/overview_images/tab-index-checked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked.png b/src/assets/overview_images/tab-index-checked.png index 22f316b..d8af05f 100644 --- a/src/assets/overview_images/tab-index-checked.png +++ b/src/assets/overview_images/tab-index-checked.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked-1366.png b/src/assets/overview_images/tab-index-unchecked-1366.png index 59657f2..cd0dc63 100644 --- a/src/assets/overview_images/tab-index-unchecked-1366.png +++ b/src/assets/overview_images/tab-index-unchecked-1366.png Binary files differ diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/assets/overview_images/sub-tab-border-1366.png b/src/assets/overview_images/sub-tab-border-1366.png index 21c13c1..93bbefc 100644 --- a/src/assets/overview_images/sub-tab-border-1366.png +++ b/src/assets/overview_images/sub-tab-border-1366.png Binary files differ diff --git a/src/assets/overview_images/sub-tab-border.png b/src/assets/overview_images/sub-tab-border.png index 008d28d..0f94da3 100644 --- a/src/assets/overview_images/sub-tab-border.png +++ b/src/assets/overview_images/sub-tab-border.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked-1366.png b/src/assets/overview_images/tab-index-checked-1366.png index 2171e1c..df63c85 100644 --- a/src/assets/overview_images/tab-index-checked-1366.png +++ b/src/assets/overview_images/tab-index-checked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked.png b/src/assets/overview_images/tab-index-checked.png index 22f316b..d8af05f 100644 --- a/src/assets/overview_images/tab-index-checked.png +++ b/src/assets/overview_images/tab-index-checked.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked-1366.png b/src/assets/overview_images/tab-index-unchecked-1366.png index 59657f2..cd0dc63 100644 --- a/src/assets/overview_images/tab-index-unchecked-1366.png +++ b/src/assets/overview_images/tab-index-unchecked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked.png b/src/assets/overview_images/tab-index-unchecked.png index 2a247c0..f7a9f9f 100644 --- a/src/assets/overview_images/tab-index-unchecked.png +++ b/src/assets/overview_images/tab-index-unchecked.png Binary files differ diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/assets/overview_images/sub-tab-border-1366.png b/src/assets/overview_images/sub-tab-border-1366.png index 21c13c1..93bbefc 100644 --- a/src/assets/overview_images/sub-tab-border-1366.png +++ b/src/assets/overview_images/sub-tab-border-1366.png Binary files differ diff --git a/src/assets/overview_images/sub-tab-border.png b/src/assets/overview_images/sub-tab-border.png index 008d28d..0f94da3 100644 --- a/src/assets/overview_images/sub-tab-border.png +++ b/src/assets/overview_images/sub-tab-border.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked-1366.png b/src/assets/overview_images/tab-index-checked-1366.png index 2171e1c..df63c85 100644 --- a/src/assets/overview_images/tab-index-checked-1366.png +++ b/src/assets/overview_images/tab-index-checked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked.png b/src/assets/overview_images/tab-index-checked.png index 22f316b..d8af05f 100644 --- a/src/assets/overview_images/tab-index-checked.png +++ b/src/assets/overview_images/tab-index-checked.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked-1366.png b/src/assets/overview_images/tab-index-unchecked-1366.png index 59657f2..cd0dc63 100644 --- a/src/assets/overview_images/tab-index-unchecked-1366.png +++ b/src/assets/overview_images/tab-index-unchecked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked.png b/src/assets/overview_images/tab-index-unchecked.png index 2a247c0..f7a9f9f 100644 --- a/src/assets/overview_images/tab-index-unchecked.png +++ b/src/assets/overview_images/tab-index-unchecked.png Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" new file mode 100644 index 0000000..42e3ab7 --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" Binary files differ diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/assets/overview_images/sub-tab-border-1366.png b/src/assets/overview_images/sub-tab-border-1366.png index 21c13c1..93bbefc 100644 --- a/src/assets/overview_images/sub-tab-border-1366.png +++ b/src/assets/overview_images/sub-tab-border-1366.png Binary files differ diff --git a/src/assets/overview_images/sub-tab-border.png b/src/assets/overview_images/sub-tab-border.png index 008d28d..0f94da3 100644 --- a/src/assets/overview_images/sub-tab-border.png +++ b/src/assets/overview_images/sub-tab-border.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked-1366.png b/src/assets/overview_images/tab-index-checked-1366.png index 2171e1c..df63c85 100644 --- a/src/assets/overview_images/tab-index-checked-1366.png +++ b/src/assets/overview_images/tab-index-checked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked.png b/src/assets/overview_images/tab-index-checked.png index 22f316b..d8af05f 100644 --- a/src/assets/overview_images/tab-index-checked.png +++ b/src/assets/overview_images/tab-index-checked.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked-1366.png b/src/assets/overview_images/tab-index-unchecked-1366.png index 59657f2..cd0dc63 100644 --- a/src/assets/overview_images/tab-index-unchecked-1366.png +++ b/src/assets/overview_images/tab-index-unchecked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked.png b/src/assets/overview_images/tab-index-unchecked.png index 2a247c0..f7a9f9f 100644 --- a/src/assets/overview_images/tab-index-unchecked.png +++ b/src/assets/overview_images/tab-index-unchecked.png Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" new file mode 100644 index 0000000..42e3ab7 --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" new file mode 100644 index 0000000..d57441b --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" Binary files differ diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/assets/overview_images/sub-tab-border-1366.png b/src/assets/overview_images/sub-tab-border-1366.png index 21c13c1..93bbefc 100644 --- a/src/assets/overview_images/sub-tab-border-1366.png +++ b/src/assets/overview_images/sub-tab-border-1366.png Binary files differ diff --git a/src/assets/overview_images/sub-tab-border.png b/src/assets/overview_images/sub-tab-border.png index 008d28d..0f94da3 100644 --- a/src/assets/overview_images/sub-tab-border.png +++ b/src/assets/overview_images/sub-tab-border.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked-1366.png b/src/assets/overview_images/tab-index-checked-1366.png index 2171e1c..df63c85 100644 --- a/src/assets/overview_images/tab-index-checked-1366.png +++ b/src/assets/overview_images/tab-index-checked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked.png b/src/assets/overview_images/tab-index-checked.png index 22f316b..d8af05f 100644 --- a/src/assets/overview_images/tab-index-checked.png +++ b/src/assets/overview_images/tab-index-checked.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked-1366.png b/src/assets/overview_images/tab-index-unchecked-1366.png index 59657f2..cd0dc63 100644 --- a/src/assets/overview_images/tab-index-unchecked-1366.png +++ b/src/assets/overview_images/tab-index-unchecked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked.png b/src/assets/overview_images/tab-index-unchecked.png index 2a247c0..f7a9f9f 100644 --- a/src/assets/overview_images/tab-index-unchecked.png +++ b/src/assets/overview_images/tab-index-unchecked.png Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" new file mode 100644 index 0000000..42e3ab7 --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" new file mode 100644 index 0000000..d57441b --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" Binary files differ diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js index 6bd1506..dc5aa92 100644 --- a/src/router/modules/doorSys.js +++ b/src/router/modules/doorSys.js @@ -212,6 +212,27 @@ ] }, { + path: '/door/area', + component: Layout, + redirect: '/door/area', + name: 'DoorArea', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/door/area'], // 权限名称 + sys: '/door' + }, + children: [ + { + path: '/door/area/list', + name: 'DoorAreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } + } + ] + }, + { path: '/door/device', component: Layout, redirect: '/door/device', @@ -276,26 +297,5 @@ meta: { title: '营门出入次数统计', icon: '', permission: ['/door/statistics/doorCount'], keepAlive: true } } ] - }, - { - path: '/door/area', - component: Layout, - redirect: '/door/area', - name: 'DoorArea', - alwaysShow: true, - meta: { - title: '区域管理', - icon: 'icon-area', // 图标 - permission: ['/door/area'], // 权限名称 - sys: '/door' - }, - children: [ - { - path: '/door/area/list', - name: 'DoorAreaList', - component: () => import('@/views/area/areaList'), - meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } - } - ] } ] diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/assets/overview_images/sub-tab-border-1366.png b/src/assets/overview_images/sub-tab-border-1366.png index 21c13c1..93bbefc 100644 --- a/src/assets/overview_images/sub-tab-border-1366.png +++ b/src/assets/overview_images/sub-tab-border-1366.png Binary files differ diff --git a/src/assets/overview_images/sub-tab-border.png b/src/assets/overview_images/sub-tab-border.png index 008d28d..0f94da3 100644 --- a/src/assets/overview_images/sub-tab-border.png +++ b/src/assets/overview_images/sub-tab-border.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked-1366.png b/src/assets/overview_images/tab-index-checked-1366.png index 2171e1c..df63c85 100644 --- a/src/assets/overview_images/tab-index-checked-1366.png +++ b/src/assets/overview_images/tab-index-checked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked.png b/src/assets/overview_images/tab-index-checked.png index 22f316b..d8af05f 100644 --- a/src/assets/overview_images/tab-index-checked.png +++ b/src/assets/overview_images/tab-index-checked.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked-1366.png b/src/assets/overview_images/tab-index-unchecked-1366.png index 59657f2..cd0dc63 100644 --- a/src/assets/overview_images/tab-index-unchecked-1366.png +++ b/src/assets/overview_images/tab-index-unchecked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked.png b/src/assets/overview_images/tab-index-unchecked.png index 2a247c0..f7a9f9f 100644 --- a/src/assets/overview_images/tab-index-unchecked.png +++ b/src/assets/overview_images/tab-index-unchecked.png Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" new file mode 100644 index 0000000..42e3ab7 --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" new file mode 100644 index 0000000..d57441b --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" Binary files differ diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js index 6bd1506..dc5aa92 100644 --- a/src/router/modules/doorSys.js +++ b/src/router/modules/doorSys.js @@ -212,6 +212,27 @@ ] }, { + path: '/door/area', + component: Layout, + redirect: '/door/area', + name: 'DoorArea', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/door/area'], // 权限名称 + sys: '/door' + }, + children: [ + { + path: '/door/area/list', + name: 'DoorAreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } + } + ] + }, + { path: '/door/device', component: Layout, redirect: '/door/device', @@ -276,26 +297,5 @@ meta: { title: '营门出入次数统计', icon: '', permission: ['/door/statistics/doorCount'], keepAlive: true } } ] - }, - { - path: '/door/area', - component: Layout, - redirect: '/door/area', - name: 'DoorArea', - alwaysShow: true, - meta: { - title: '区域管理', - icon: 'icon-area', // 图标 - permission: ['/door/area'], // 权限名称 - sys: '/door' - }, - children: [ - { - path: '/door/area/list', - name: 'DoorAreaList', - component: () => import('@/views/area/areaList'), - meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } - } - ] } ] diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index ddc123c..a5137d5 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -16,7 +16,7 @@ position: relative; margin: 0 auto; .el-dialog__header { - background-color:rgb(48, 65, 86); + background-color: rgb(76, 142, 226); //background-color:rgb(47, 91, 114); .el-dialog__title{ color:white; diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/assets/overview_images/sub-tab-border-1366.png b/src/assets/overview_images/sub-tab-border-1366.png index 21c13c1..93bbefc 100644 --- a/src/assets/overview_images/sub-tab-border-1366.png +++ b/src/assets/overview_images/sub-tab-border-1366.png Binary files differ diff --git a/src/assets/overview_images/sub-tab-border.png b/src/assets/overview_images/sub-tab-border.png index 008d28d..0f94da3 100644 --- a/src/assets/overview_images/sub-tab-border.png +++ b/src/assets/overview_images/sub-tab-border.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked-1366.png b/src/assets/overview_images/tab-index-checked-1366.png index 2171e1c..df63c85 100644 --- a/src/assets/overview_images/tab-index-checked-1366.png +++ b/src/assets/overview_images/tab-index-checked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked.png b/src/assets/overview_images/tab-index-checked.png index 22f316b..d8af05f 100644 --- a/src/assets/overview_images/tab-index-checked.png +++ b/src/assets/overview_images/tab-index-checked.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked-1366.png b/src/assets/overview_images/tab-index-unchecked-1366.png index 59657f2..cd0dc63 100644 --- a/src/assets/overview_images/tab-index-unchecked-1366.png +++ b/src/assets/overview_images/tab-index-unchecked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked.png b/src/assets/overview_images/tab-index-unchecked.png index 2a247c0..f7a9f9f 100644 --- a/src/assets/overview_images/tab-index-unchecked.png +++ b/src/assets/overview_images/tab-index-unchecked.png Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" new file mode 100644 index 0000000..42e3ab7 --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" new file mode 100644 index 0000000..d57441b --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" Binary files differ diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js index 6bd1506..dc5aa92 100644 --- a/src/router/modules/doorSys.js +++ b/src/router/modules/doorSys.js @@ -212,6 +212,27 @@ ] }, { + path: '/door/area', + component: Layout, + redirect: '/door/area', + name: 'DoorArea', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/door/area'], // 权限名称 + sys: '/door' + }, + children: [ + { + path: '/door/area/list', + name: 'DoorAreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } + } + ] + }, + { path: '/door/device', component: Layout, redirect: '/door/device', @@ -276,26 +297,5 @@ meta: { title: '营门出入次数统计', icon: '', permission: ['/door/statistics/doorCount'], keepAlive: true } } ] - }, - { - path: '/door/area', - component: Layout, - redirect: '/door/area', - name: 'DoorArea', - alwaysShow: true, - meta: { - title: '区域管理', - icon: 'icon-area', // 图标 - permission: ['/door/area'], // 权限名称 - sys: '/door' - }, - children: [ - { - path: '/door/area/list', - name: 'DoorAreaList', - component: () => import('@/views/area/areaList'), - meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } - } - ] } ] diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index ddc123c..a5137d5 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -16,7 +16,7 @@ position: relative; margin: 0 auto; .el-dialog__header { - background-color:rgb(48, 65, 86); + background-color: rgb(76, 142, 226); //background-color:rgb(47, 91, 114); .el-dialog__title{ color:white; diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 65abe46..86f8b09 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -63,13 +63,17 @@ // menu hover .submenu-title-noDropdown, .el-submenu__title { + //font-size: 15; &:hover { background-color: $menuHover !important; } } - + .sidebar-container .is-active > .el-submenu__title { + color: white !important; + //background-color: $subMenuHover !important; + } .is-active>.el-submenu__title { - color: $menuActiveText !important; + //color: $menuActiveText !important; background-color: $menuHover !important; } .el-menu-item.is-active { diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/assets/overview_images/sub-tab-border-1366.png b/src/assets/overview_images/sub-tab-border-1366.png index 21c13c1..93bbefc 100644 --- a/src/assets/overview_images/sub-tab-border-1366.png +++ b/src/assets/overview_images/sub-tab-border-1366.png Binary files differ diff --git a/src/assets/overview_images/sub-tab-border.png b/src/assets/overview_images/sub-tab-border.png index 008d28d..0f94da3 100644 --- a/src/assets/overview_images/sub-tab-border.png +++ b/src/assets/overview_images/sub-tab-border.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked-1366.png b/src/assets/overview_images/tab-index-checked-1366.png index 2171e1c..df63c85 100644 --- a/src/assets/overview_images/tab-index-checked-1366.png +++ b/src/assets/overview_images/tab-index-checked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked.png b/src/assets/overview_images/tab-index-checked.png index 22f316b..d8af05f 100644 --- a/src/assets/overview_images/tab-index-checked.png +++ b/src/assets/overview_images/tab-index-checked.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked-1366.png b/src/assets/overview_images/tab-index-unchecked-1366.png index 59657f2..cd0dc63 100644 --- a/src/assets/overview_images/tab-index-unchecked-1366.png +++ b/src/assets/overview_images/tab-index-unchecked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked.png b/src/assets/overview_images/tab-index-unchecked.png index 2a247c0..f7a9f9f 100644 --- a/src/assets/overview_images/tab-index-unchecked.png +++ b/src/assets/overview_images/tab-index-unchecked.png Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" new file mode 100644 index 0000000..42e3ab7 --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" new file mode 100644 index 0000000..d57441b --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" Binary files differ diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js index 6bd1506..dc5aa92 100644 --- a/src/router/modules/doorSys.js +++ b/src/router/modules/doorSys.js @@ -212,6 +212,27 @@ ] }, { + path: '/door/area', + component: Layout, + redirect: '/door/area', + name: 'DoorArea', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/door/area'], // 权限名称 + sys: '/door' + }, + children: [ + { + path: '/door/area/list', + name: 'DoorAreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } + } + ] + }, + { path: '/door/device', component: Layout, redirect: '/door/device', @@ -276,26 +297,5 @@ meta: { title: '营门出入次数统计', icon: '', permission: ['/door/statistics/doorCount'], keepAlive: true } } ] - }, - { - path: '/door/area', - component: Layout, - redirect: '/door/area', - name: 'DoorArea', - alwaysShow: true, - meta: { - title: '区域管理', - icon: 'icon-area', // 图标 - permission: ['/door/area'], // 权限名称 - sys: '/door' - }, - children: [ - { - path: '/door/area/list', - name: 'DoorAreaList', - component: () => import('@/views/area/areaList'), - meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } - } - ] } ] diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index ddc123c..a5137d5 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -16,7 +16,7 @@ position: relative; margin: 0 auto; .el-dialog__header { - background-color:rgb(48, 65, 86); + background-color: rgb(76, 142, 226); //background-color:rgb(47, 91, 114); .el-dialog__title{ color:white; diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 65abe46..86f8b09 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -63,13 +63,17 @@ // menu hover .submenu-title-noDropdown, .el-submenu__title { + //font-size: 15; &:hover { background-color: $menuHover !important; } } - + .sidebar-container .is-active > .el-submenu__title { + color: white !important; + //background-color: $subMenuHover !important; + } .is-active>.el-submenu__title { - color: $menuActiveText !important; + //color: $menuActiveText !important; background-color: $menuHover !important; } .el-menu-item.is-active { diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 28c9c7f..1eadf2f 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -3,19 +3,19 @@ $themeColor:rgb(48, 65, 86); $menuText:#000000; $subMenuText:#000000; -$menuActiveText:rgb(27, 177, 165); +$menuActiveText: rgb(0, 56, 123); //$menuActiveText:#ffffff; $subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 //$subMenuActiveText:#000000; //https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; +$menuBg:#0077ff; //$menuBg:#ffffff; -$menuHover:#263445; +$menuHover:#0077ff; //$menuHover:#6666cc; -$subMenuBg:#1f2d3d; +$subMenuBg: #4c8ee2; //$subMenuBg:#fcfcfc; -$subMenuHover:#001528; +$subMenuHover: #0077ff; //$subMenuHover:#6666cc; $sideBarWidth: 180px; diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/assets/overview_images/sub-tab-border-1366.png b/src/assets/overview_images/sub-tab-border-1366.png index 21c13c1..93bbefc 100644 --- a/src/assets/overview_images/sub-tab-border-1366.png +++ b/src/assets/overview_images/sub-tab-border-1366.png Binary files differ diff --git a/src/assets/overview_images/sub-tab-border.png b/src/assets/overview_images/sub-tab-border.png index 008d28d..0f94da3 100644 --- a/src/assets/overview_images/sub-tab-border.png +++ b/src/assets/overview_images/sub-tab-border.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked-1366.png b/src/assets/overview_images/tab-index-checked-1366.png index 2171e1c..df63c85 100644 --- a/src/assets/overview_images/tab-index-checked-1366.png +++ b/src/assets/overview_images/tab-index-checked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked.png b/src/assets/overview_images/tab-index-checked.png index 22f316b..d8af05f 100644 --- a/src/assets/overview_images/tab-index-checked.png +++ b/src/assets/overview_images/tab-index-checked.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked-1366.png b/src/assets/overview_images/tab-index-unchecked-1366.png index 59657f2..cd0dc63 100644 --- a/src/assets/overview_images/tab-index-unchecked-1366.png +++ b/src/assets/overview_images/tab-index-unchecked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked.png b/src/assets/overview_images/tab-index-unchecked.png index 2a247c0..f7a9f9f 100644 --- a/src/assets/overview_images/tab-index-unchecked.png +++ b/src/assets/overview_images/tab-index-unchecked.png Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" new file mode 100644 index 0000000..42e3ab7 --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" new file mode 100644 index 0000000..d57441b --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" Binary files differ diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js index 6bd1506..dc5aa92 100644 --- a/src/router/modules/doorSys.js +++ b/src/router/modules/doorSys.js @@ -212,6 +212,27 @@ ] }, { + path: '/door/area', + component: Layout, + redirect: '/door/area', + name: 'DoorArea', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/door/area'], // 权限名称 + sys: '/door' + }, + children: [ + { + path: '/door/area/list', + name: 'DoorAreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } + } + ] + }, + { path: '/door/device', component: Layout, redirect: '/door/device', @@ -276,26 +297,5 @@ meta: { title: '营门出入次数统计', icon: '', permission: ['/door/statistics/doorCount'], keepAlive: true } } ] - }, - { - path: '/door/area', - component: Layout, - redirect: '/door/area', - name: 'DoorArea', - alwaysShow: true, - meta: { - title: '区域管理', - icon: 'icon-area', // 图标 - permission: ['/door/area'], // 权限名称 - sys: '/door' - }, - children: [ - { - path: '/door/area/list', - name: 'DoorAreaList', - component: () => import('@/views/area/areaList'), - meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } - } - ] } ] diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index ddc123c..a5137d5 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -16,7 +16,7 @@ position: relative; margin: 0 auto; .el-dialog__header { - background-color:rgb(48, 65, 86); + background-color: rgb(76, 142, 226); //background-color:rgb(47, 91, 114); .el-dialog__title{ color:white; diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 65abe46..86f8b09 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -63,13 +63,17 @@ // menu hover .submenu-title-noDropdown, .el-submenu__title { + //font-size: 15; &:hover { background-color: $menuHover !important; } } - + .sidebar-container .is-active > .el-submenu__title { + color: white !important; + //background-color: $subMenuHover !important; + } .is-active>.el-submenu__title { - color: $menuActiveText !important; + //color: $menuActiveText !important; background-color: $menuHover !important; } .el-menu-item.is-active { diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 28c9c7f..1eadf2f 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -3,19 +3,19 @@ $themeColor:rgb(48, 65, 86); $menuText:#000000; $subMenuText:#000000; -$menuActiveText:rgb(27, 177, 165); +$menuActiveText: rgb(0, 56, 123); //$menuActiveText:#ffffff; $subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 //$subMenuActiveText:#000000; //https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; +$menuBg:#0077ff; //$menuBg:#ffffff; -$menuHover:#263445; +$menuHover:#0077ff; //$menuHover:#6666cc; -$subMenuBg:#1f2d3d; +$subMenuBg: #4c8ee2; //$subMenuBg:#fcfcfc; -$subMenuHover:#001528; +$subMenuHover: #0077ff; //$subMenuHover:#6666cc; $sideBarWidth: 180px; diff --git a/src/utils/validate.js b/src/utils/validate.js index ce760ab..d651e43 100644 --- a/src/utils/validate.js +++ b/src/utils/validate.js @@ -105,14 +105,15 @@ // 手机号验证validator export const phoneValidator = (rule, value, callback) => { const reg = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/ + const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/ if (value !== '') { - if (reg.test(value) === false) { - callback(new Error('请输入正确的手机号')) + if (reg.test(value) === false && reg1.test(value) === false) { + callback(new Error('请输入正确的联系电话')) } else { callback() } } else { - callback(new Error('手机号不能为空')) + callback(new Error('联系电话不能为空')) } } @@ -140,7 +141,12 @@ const reg = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][\dABCDEFGHJKLNMxPQRSTUVWXYZ]{5}$/ const regNew = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][1-9DF][1-9ABCDEFGHJKLMNPQRSTUVWXYZ]\d{3}[1-9DF]$/ if (value !== '') { - if (reg.test(value) === false && regNew.test(value) === false) { + // if (reg.test(value) === false && regNew.test(value) === false) { + // callback(new Error('请输入正确的车牌号')) + // } else { + // callback() + // } + if (value.length!==7 && value.length!==8) { callback(new Error('请输入正确的车牌号')) } else { callback() diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/assets/overview_images/sub-tab-border-1366.png b/src/assets/overview_images/sub-tab-border-1366.png index 21c13c1..93bbefc 100644 --- a/src/assets/overview_images/sub-tab-border-1366.png +++ b/src/assets/overview_images/sub-tab-border-1366.png Binary files differ diff --git a/src/assets/overview_images/sub-tab-border.png b/src/assets/overview_images/sub-tab-border.png index 008d28d..0f94da3 100644 --- a/src/assets/overview_images/sub-tab-border.png +++ b/src/assets/overview_images/sub-tab-border.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked-1366.png b/src/assets/overview_images/tab-index-checked-1366.png index 2171e1c..df63c85 100644 --- a/src/assets/overview_images/tab-index-checked-1366.png +++ b/src/assets/overview_images/tab-index-checked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked.png b/src/assets/overview_images/tab-index-checked.png index 22f316b..d8af05f 100644 --- a/src/assets/overview_images/tab-index-checked.png +++ b/src/assets/overview_images/tab-index-checked.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked-1366.png b/src/assets/overview_images/tab-index-unchecked-1366.png index 59657f2..cd0dc63 100644 --- a/src/assets/overview_images/tab-index-unchecked-1366.png +++ b/src/assets/overview_images/tab-index-unchecked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked.png b/src/assets/overview_images/tab-index-unchecked.png index 2a247c0..f7a9f9f 100644 --- a/src/assets/overview_images/tab-index-unchecked.png +++ b/src/assets/overview_images/tab-index-unchecked.png Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" new file mode 100644 index 0000000..42e3ab7 --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" new file mode 100644 index 0000000..d57441b --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" Binary files differ diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js index 6bd1506..dc5aa92 100644 --- a/src/router/modules/doorSys.js +++ b/src/router/modules/doorSys.js @@ -212,6 +212,27 @@ ] }, { + path: '/door/area', + component: Layout, + redirect: '/door/area', + name: 'DoorArea', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/door/area'], // 权限名称 + sys: '/door' + }, + children: [ + { + path: '/door/area/list', + name: 'DoorAreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } + } + ] + }, + { path: '/door/device', component: Layout, redirect: '/door/device', @@ -276,26 +297,5 @@ meta: { title: '营门出入次数统计', icon: '', permission: ['/door/statistics/doorCount'], keepAlive: true } } ] - }, - { - path: '/door/area', - component: Layout, - redirect: '/door/area', - name: 'DoorArea', - alwaysShow: true, - meta: { - title: '区域管理', - icon: 'icon-area', // 图标 - permission: ['/door/area'], // 权限名称 - sys: '/door' - }, - children: [ - { - path: '/door/area/list', - name: 'DoorAreaList', - component: () => import('@/views/area/areaList'), - meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } - } - ] } ] diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index ddc123c..a5137d5 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -16,7 +16,7 @@ position: relative; margin: 0 auto; .el-dialog__header { - background-color:rgb(48, 65, 86); + background-color: rgb(76, 142, 226); //background-color:rgb(47, 91, 114); .el-dialog__title{ color:white; diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 65abe46..86f8b09 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -63,13 +63,17 @@ // menu hover .submenu-title-noDropdown, .el-submenu__title { + //font-size: 15; &:hover { background-color: $menuHover !important; } } - + .sidebar-container .is-active > .el-submenu__title { + color: white !important; + //background-color: $subMenuHover !important; + } .is-active>.el-submenu__title { - color: $menuActiveText !important; + //color: $menuActiveText !important; background-color: $menuHover !important; } .el-menu-item.is-active { diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 28c9c7f..1eadf2f 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -3,19 +3,19 @@ $themeColor:rgb(48, 65, 86); $menuText:#000000; $subMenuText:#000000; -$menuActiveText:rgb(27, 177, 165); +$menuActiveText: rgb(0, 56, 123); //$menuActiveText:#ffffff; $subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 //$subMenuActiveText:#000000; //https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; +$menuBg:#0077ff; //$menuBg:#ffffff; -$menuHover:#263445; +$menuHover:#0077ff; //$menuHover:#6666cc; -$subMenuBg:#1f2d3d; +$subMenuBg: #4c8ee2; //$subMenuBg:#fcfcfc; -$subMenuHover:#001528; +$subMenuHover: #0077ff; //$subMenuHover:#6666cc; $sideBarWidth: 180px; diff --git a/src/utils/validate.js b/src/utils/validate.js index ce760ab..d651e43 100644 --- a/src/utils/validate.js +++ b/src/utils/validate.js @@ -105,14 +105,15 @@ // 手机号验证validator export const phoneValidator = (rule, value, callback) => { const reg = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/ + const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/ if (value !== '') { - if (reg.test(value) === false) { - callback(new Error('请输入正确的手机号')) + if (reg.test(value) === false && reg1.test(value) === false) { + callback(new Error('请输入正确的联系电话')) } else { callback() } } else { - callback(new Error('手机号不能为空')) + callback(new Error('联系电话不能为空')) } } @@ -140,7 +141,12 @@ const reg = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][\dABCDEFGHJKLNMxPQRSTUVWXYZ]{5}$/ const regNew = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][1-9DF][1-9ABCDEFGHJKLMNPQRSTUVWXYZ]\d{3}[1-9DF]$/ if (value !== '') { - if (reg.test(value) === false && regNew.test(value) === false) { + // if (reg.test(value) === false && regNew.test(value) === false) { + // callback(new Error('请输入正确的车牌号')) + // } else { + // callback() + // } + if (value.length!==7 && value.length!==8) { callback(new Error('请输入正确的车牌号')) } else { callback() diff --git a/src/views/alarm/alarmList.vue b/src/views/alarm/alarmList.vue index 2601cfc..2956a74 100644 --- a/src/views/alarm/alarmList.vue +++ b/src/views/alarm/alarmList.vue @@ -46,7 +46,7 @@
-
数据列表
 +
数据列表
 导出 @@ -300,11 +300,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/assets/overview_images/sub-tab-border-1366.png b/src/assets/overview_images/sub-tab-border-1366.png index 21c13c1..93bbefc 100644 --- a/src/assets/overview_images/sub-tab-border-1366.png +++ b/src/assets/overview_images/sub-tab-border-1366.png Binary files differ diff --git a/src/assets/overview_images/sub-tab-border.png b/src/assets/overview_images/sub-tab-border.png index 008d28d..0f94da3 100644 --- a/src/assets/overview_images/sub-tab-border.png +++ b/src/assets/overview_images/sub-tab-border.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked-1366.png b/src/assets/overview_images/tab-index-checked-1366.png index 2171e1c..df63c85 100644 --- a/src/assets/overview_images/tab-index-checked-1366.png +++ b/src/assets/overview_images/tab-index-checked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked.png b/src/assets/overview_images/tab-index-checked.png index 22f316b..d8af05f 100644 --- a/src/assets/overview_images/tab-index-checked.png +++ b/src/assets/overview_images/tab-index-checked.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked-1366.png b/src/assets/overview_images/tab-index-unchecked-1366.png index 59657f2..cd0dc63 100644 --- a/src/assets/overview_images/tab-index-unchecked-1366.png +++ b/src/assets/overview_images/tab-index-unchecked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked.png b/src/assets/overview_images/tab-index-unchecked.png index 2a247c0..f7a9f9f 100644 --- a/src/assets/overview_images/tab-index-unchecked.png +++ b/src/assets/overview_images/tab-index-unchecked.png Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" new file mode 100644 index 0000000..42e3ab7 --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" new file mode 100644 index 0000000..d57441b --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" Binary files differ diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js index 6bd1506..dc5aa92 100644 --- a/src/router/modules/doorSys.js +++ b/src/router/modules/doorSys.js @@ -212,6 +212,27 @@ ] }, { + path: '/door/area', + component: Layout, + redirect: '/door/area', + name: 'DoorArea', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/door/area'], // 权限名称 + sys: '/door' + }, + children: [ + { + path: '/door/area/list', + name: 'DoorAreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } + } + ] + }, + { path: '/door/device', component: Layout, redirect: '/door/device', @@ -276,26 +297,5 @@ meta: { title: '营门出入次数统计', icon: '', permission: ['/door/statistics/doorCount'], keepAlive: true } } ] - }, - { - path: '/door/area', - component: Layout, - redirect: '/door/area', - name: 'DoorArea', - alwaysShow: true, - meta: { - title: '区域管理', - icon: 'icon-area', // 图标 - permission: ['/door/area'], // 权限名称 - sys: '/door' - }, - children: [ - { - path: '/door/area/list', - name: 'DoorAreaList', - component: () => import('@/views/area/areaList'), - meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } - } - ] } ] diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index ddc123c..a5137d5 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -16,7 +16,7 @@ position: relative; margin: 0 auto; .el-dialog__header { - background-color:rgb(48, 65, 86); + background-color: rgb(76, 142, 226); //background-color:rgb(47, 91, 114); .el-dialog__title{ color:white; diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 65abe46..86f8b09 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -63,13 +63,17 @@ // menu hover .submenu-title-noDropdown, .el-submenu__title { + //font-size: 15; &:hover { background-color: $menuHover !important; } } - + .sidebar-container .is-active > .el-submenu__title { + color: white !important; + //background-color: $subMenuHover !important; + } .is-active>.el-submenu__title { - color: $menuActiveText !important; + //color: $menuActiveText !important; background-color: $menuHover !important; } .el-menu-item.is-active { diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 28c9c7f..1eadf2f 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -3,19 +3,19 @@ $themeColor:rgb(48, 65, 86); $menuText:#000000; $subMenuText:#000000; -$menuActiveText:rgb(27, 177, 165); +$menuActiveText: rgb(0, 56, 123); //$menuActiveText:#ffffff; $subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 //$subMenuActiveText:#000000; //https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; +$menuBg:#0077ff; //$menuBg:#ffffff; -$menuHover:#263445; +$menuHover:#0077ff; //$menuHover:#6666cc; -$subMenuBg:#1f2d3d; +$subMenuBg: #4c8ee2; //$subMenuBg:#fcfcfc; -$subMenuHover:#001528; +$subMenuHover: #0077ff; //$subMenuHover:#6666cc; $sideBarWidth: 180px; diff --git a/src/utils/validate.js b/src/utils/validate.js index ce760ab..d651e43 100644 --- a/src/utils/validate.js +++ b/src/utils/validate.js @@ -105,14 +105,15 @@ // 手机号验证validator export const phoneValidator = (rule, value, callback) => { const reg = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/ + const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/ if (value !== '') { - if (reg.test(value) === false) { - callback(new Error('请输入正确的手机号')) + if (reg.test(value) === false && reg1.test(value) === false) { + callback(new Error('请输入正确的联系电话')) } else { callback() } } else { - callback(new Error('手机号不能为空')) + callback(new Error('联系电话不能为空')) } } @@ -140,7 +141,12 @@ const reg = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][\dABCDEFGHJKLNMxPQRSTUVWXYZ]{5}$/ const regNew = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][1-9DF][1-9ABCDEFGHJKLMNPQRSTUVWXYZ]\d{3}[1-9DF]$/ if (value !== '') { - if (reg.test(value) === false && regNew.test(value) === false) { + // if (reg.test(value) === false && regNew.test(value) === false) { + // callback(new Error('请输入正确的车牌号')) + // } else { + // callback() + // } + if (value.length!==7 && value.length!==8) { callback(new Error('请输入正确的车牌号')) } else { callback() diff --git a/src/views/alarm/alarmList.vue b/src/views/alarm/alarmList.vue index 2601cfc..2956a74 100644 --- a/src/views/alarm/alarmList.vue +++ b/src/views/alarm/alarmList.vue @@ -46,7 +46,7 @@
-
数据列表
 +
数据列表
 导出 @@ -300,11 +300,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue index 4b47872..1b5efe8 100644 --- a/src/views/alarm/alarmNow.vue +++ b/src/views/alarm/alarmNow.vue @@ -46,7 +46,7 @@
-
数据列表
 +
数据列表
 导出 @@ -66,8 +66,8 @@ @@ -291,11 +291,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/assets/overview_images/sub-tab-border-1366.png b/src/assets/overview_images/sub-tab-border-1366.png index 21c13c1..93bbefc 100644 --- a/src/assets/overview_images/sub-tab-border-1366.png +++ b/src/assets/overview_images/sub-tab-border-1366.png Binary files differ diff --git a/src/assets/overview_images/sub-tab-border.png b/src/assets/overview_images/sub-tab-border.png index 008d28d..0f94da3 100644 --- a/src/assets/overview_images/sub-tab-border.png +++ b/src/assets/overview_images/sub-tab-border.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked-1366.png b/src/assets/overview_images/tab-index-checked-1366.png index 2171e1c..df63c85 100644 --- a/src/assets/overview_images/tab-index-checked-1366.png +++ b/src/assets/overview_images/tab-index-checked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked.png b/src/assets/overview_images/tab-index-checked.png index 22f316b..d8af05f 100644 --- a/src/assets/overview_images/tab-index-checked.png +++ b/src/assets/overview_images/tab-index-checked.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked-1366.png b/src/assets/overview_images/tab-index-unchecked-1366.png index 59657f2..cd0dc63 100644 --- a/src/assets/overview_images/tab-index-unchecked-1366.png +++ b/src/assets/overview_images/tab-index-unchecked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked.png b/src/assets/overview_images/tab-index-unchecked.png index 2a247c0..f7a9f9f 100644 --- a/src/assets/overview_images/tab-index-unchecked.png +++ b/src/assets/overview_images/tab-index-unchecked.png Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" new file mode 100644 index 0000000..42e3ab7 --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" new file mode 100644 index 0000000..d57441b --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" Binary files differ diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js index 6bd1506..dc5aa92 100644 --- a/src/router/modules/doorSys.js +++ b/src/router/modules/doorSys.js @@ -212,6 +212,27 @@ ] }, { + path: '/door/area', + component: Layout, + redirect: '/door/area', + name: 'DoorArea', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/door/area'], // 权限名称 + sys: '/door' + }, + children: [ + { + path: '/door/area/list', + name: 'DoorAreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } + } + ] + }, + { path: '/door/device', component: Layout, redirect: '/door/device', @@ -276,26 +297,5 @@ meta: { title: '营门出入次数统计', icon: '', permission: ['/door/statistics/doorCount'], keepAlive: true } } ] - }, - { - path: '/door/area', - component: Layout, - redirect: '/door/area', - name: 'DoorArea', - alwaysShow: true, - meta: { - title: '区域管理', - icon: 'icon-area', // 图标 - permission: ['/door/area'], // 权限名称 - sys: '/door' - }, - children: [ - { - path: '/door/area/list', - name: 'DoorAreaList', - component: () => import('@/views/area/areaList'), - meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } - } - ] } ] diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index ddc123c..a5137d5 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -16,7 +16,7 @@ position: relative; margin: 0 auto; .el-dialog__header { - background-color:rgb(48, 65, 86); + background-color: rgb(76, 142, 226); //background-color:rgb(47, 91, 114); .el-dialog__title{ color:white; diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 65abe46..86f8b09 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -63,13 +63,17 @@ // menu hover .submenu-title-noDropdown, .el-submenu__title { + //font-size: 15; &:hover { background-color: $menuHover !important; } } - + .sidebar-container .is-active > .el-submenu__title { + color: white !important; + //background-color: $subMenuHover !important; + } .is-active>.el-submenu__title { - color: $menuActiveText !important; + //color: $menuActiveText !important; background-color: $menuHover !important; } .el-menu-item.is-active { diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 28c9c7f..1eadf2f 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -3,19 +3,19 @@ $themeColor:rgb(48, 65, 86); $menuText:#000000; $subMenuText:#000000; -$menuActiveText:rgb(27, 177, 165); +$menuActiveText: rgb(0, 56, 123); //$menuActiveText:#ffffff; $subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 //$subMenuActiveText:#000000; //https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; +$menuBg:#0077ff; //$menuBg:#ffffff; -$menuHover:#263445; +$menuHover:#0077ff; //$menuHover:#6666cc; -$subMenuBg:#1f2d3d; +$subMenuBg: #4c8ee2; //$subMenuBg:#fcfcfc; -$subMenuHover:#001528; +$subMenuHover: #0077ff; //$subMenuHover:#6666cc; $sideBarWidth: 180px; diff --git a/src/utils/validate.js b/src/utils/validate.js index ce760ab..d651e43 100644 --- a/src/utils/validate.js +++ b/src/utils/validate.js @@ -105,14 +105,15 @@ // 手机号验证validator export const phoneValidator = (rule, value, callback) => { const reg = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/ + const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/ if (value !== '') { - if (reg.test(value) === false) { - callback(new Error('请输入正确的手机号')) + if (reg.test(value) === false && reg1.test(value) === false) { + callback(new Error('请输入正确的联系电话')) } else { callback() } } else { - callback(new Error('手机号不能为空')) + callback(new Error('联系电话不能为空')) } } @@ -140,7 +141,12 @@ const reg = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][\dABCDEFGHJKLNMxPQRSTUVWXYZ]{5}$/ const regNew = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][1-9DF][1-9ABCDEFGHJKLMNPQRSTUVWXYZ]\d{3}[1-9DF]$/ if (value !== '') { - if (reg.test(value) === false && regNew.test(value) === false) { + // if (reg.test(value) === false && regNew.test(value) === false) { + // callback(new Error('请输入正确的车牌号')) + // } else { + // callback() + // } + if (value.length!==7 && value.length!==8) { callback(new Error('请输入正确的车牌号')) } else { callback() diff --git a/src/views/alarm/alarmList.vue b/src/views/alarm/alarmList.vue index 2601cfc..2956a74 100644 --- a/src/views/alarm/alarmList.vue +++ b/src/views/alarm/alarmList.vue @@ -46,7 +46,7 @@
-
数据列表
 +
数据列表
 导出 @@ -300,11 +300,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue index 4b47872..1b5efe8 100644 --- a/src/views/alarm/alarmNow.vue +++ b/src/views/alarm/alarmNow.vue @@ -46,7 +46,7 @@
-
数据列表
 +
数据列表
 导出 @@ -66,8 +66,8 @@ @@ -291,11 +291,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/alarm/alarmPosition.vue b/src/views/alarm/alarmPosition.vue index 402da42..2da9b2c 100644 --- a/src/views/alarm/alarmPosition.vue +++ b/src/views/alarm/alarmPosition.vue @@ -8,7 +8,7 @@ v-for="item in devList" :id="item.id" :key="item.id" - :style="{ position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" + :style="{ transform: 'rotate('+ item.angle +'deg)', position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" class="point-camera" @click="detailDev(item, $event)" />
@@ -363,12 +363,12 @@ height: 155px; } .dev-normal { - background: url("../../assets/overview_images/normal.png"); + background: url("../../assets/overview_images/dev-box.png"); background-size: contain; color: #00ff0c; } .dev-alarm { - background: url("../../assets/overview_images/alarm.png"); + background: url("../../assets/overview_images/dev-box.png"); background-size: contain; color: #ff0000; } @@ -665,10 +665,10 @@ } .dev-normal { - background: url("../../assets/overview_images/normal-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-alarm { - background: url("../../assets/overview_images/alarm-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-offline { background: url("../../assets/overview_images/offline-1366.png"); diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/assets/overview_images/sub-tab-border-1366.png b/src/assets/overview_images/sub-tab-border-1366.png index 21c13c1..93bbefc 100644 --- a/src/assets/overview_images/sub-tab-border-1366.png +++ b/src/assets/overview_images/sub-tab-border-1366.png Binary files differ diff --git a/src/assets/overview_images/sub-tab-border.png b/src/assets/overview_images/sub-tab-border.png index 008d28d..0f94da3 100644 --- a/src/assets/overview_images/sub-tab-border.png +++ b/src/assets/overview_images/sub-tab-border.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked-1366.png b/src/assets/overview_images/tab-index-checked-1366.png index 2171e1c..df63c85 100644 --- a/src/assets/overview_images/tab-index-checked-1366.png +++ b/src/assets/overview_images/tab-index-checked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked.png b/src/assets/overview_images/tab-index-checked.png index 22f316b..d8af05f 100644 --- a/src/assets/overview_images/tab-index-checked.png +++ b/src/assets/overview_images/tab-index-checked.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked-1366.png b/src/assets/overview_images/tab-index-unchecked-1366.png index 59657f2..cd0dc63 100644 --- a/src/assets/overview_images/tab-index-unchecked-1366.png +++ b/src/assets/overview_images/tab-index-unchecked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked.png b/src/assets/overview_images/tab-index-unchecked.png index 2a247c0..f7a9f9f 100644 --- a/src/assets/overview_images/tab-index-unchecked.png +++ b/src/assets/overview_images/tab-index-unchecked.png Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" new file mode 100644 index 0000000..42e3ab7 --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" new file mode 100644 index 0000000..d57441b --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" Binary files differ diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js index 6bd1506..dc5aa92 100644 --- a/src/router/modules/doorSys.js +++ b/src/router/modules/doorSys.js @@ -212,6 +212,27 @@ ] }, { + path: '/door/area', + component: Layout, + redirect: '/door/area', + name: 'DoorArea', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/door/area'], // 权限名称 + sys: '/door' + }, + children: [ + { + path: '/door/area/list', + name: 'DoorAreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } + } + ] + }, + { path: '/door/device', component: Layout, redirect: '/door/device', @@ -276,26 +297,5 @@ meta: { title: '营门出入次数统计', icon: '', permission: ['/door/statistics/doorCount'], keepAlive: true } } ] - }, - { - path: '/door/area', - component: Layout, - redirect: '/door/area', - name: 'DoorArea', - alwaysShow: true, - meta: { - title: '区域管理', - icon: 'icon-area', // 图标 - permission: ['/door/area'], // 权限名称 - sys: '/door' - }, - children: [ - { - path: '/door/area/list', - name: 'DoorAreaList', - component: () => import('@/views/area/areaList'), - meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } - } - ] } ] diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index ddc123c..a5137d5 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -16,7 +16,7 @@ position: relative; margin: 0 auto; .el-dialog__header { - background-color:rgb(48, 65, 86); + background-color: rgb(76, 142, 226); //background-color:rgb(47, 91, 114); .el-dialog__title{ color:white; diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 65abe46..86f8b09 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -63,13 +63,17 @@ // menu hover .submenu-title-noDropdown, .el-submenu__title { + //font-size: 15; &:hover { background-color: $menuHover !important; } } - + .sidebar-container .is-active > .el-submenu__title { + color: white !important; + //background-color: $subMenuHover !important; + } .is-active>.el-submenu__title { - color: $menuActiveText !important; + //color: $menuActiveText !important; background-color: $menuHover !important; } .el-menu-item.is-active { diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 28c9c7f..1eadf2f 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -3,19 +3,19 @@ $themeColor:rgb(48, 65, 86); $menuText:#000000; $subMenuText:#000000; -$menuActiveText:rgb(27, 177, 165); +$menuActiveText: rgb(0, 56, 123); //$menuActiveText:#ffffff; $subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 //$subMenuActiveText:#000000; //https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; +$menuBg:#0077ff; //$menuBg:#ffffff; -$menuHover:#263445; +$menuHover:#0077ff; //$menuHover:#6666cc; -$subMenuBg:#1f2d3d; +$subMenuBg: #4c8ee2; //$subMenuBg:#fcfcfc; -$subMenuHover:#001528; +$subMenuHover: #0077ff; //$subMenuHover:#6666cc; $sideBarWidth: 180px; diff --git a/src/utils/validate.js b/src/utils/validate.js index ce760ab..d651e43 100644 --- a/src/utils/validate.js +++ b/src/utils/validate.js @@ -105,14 +105,15 @@ // 手机号验证validator export const phoneValidator = (rule, value, callback) => { const reg = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/ + const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/ if (value !== '') { - if (reg.test(value) === false) { - callback(new Error('请输入正确的手机号')) + if (reg.test(value) === false && reg1.test(value) === false) { + callback(new Error('请输入正确的联系电话')) } else { callback() } } else { - callback(new Error('手机号不能为空')) + callback(new Error('联系电话不能为空')) } } @@ -140,7 +141,12 @@ const reg = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][\dABCDEFGHJKLNMxPQRSTUVWXYZ]{5}$/ const regNew = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][1-9DF][1-9ABCDEFGHJKLMNPQRSTUVWXYZ]\d{3}[1-9DF]$/ if (value !== '') { - if (reg.test(value) === false && regNew.test(value) === false) { + // if (reg.test(value) === false && regNew.test(value) === false) { + // callback(new Error('请输入正确的车牌号')) + // } else { + // callback() + // } + if (value.length!==7 && value.length!==8) { callback(new Error('请输入正确的车牌号')) } else { callback() diff --git a/src/views/alarm/alarmList.vue b/src/views/alarm/alarmList.vue index 2601cfc..2956a74 100644 --- a/src/views/alarm/alarmList.vue +++ b/src/views/alarm/alarmList.vue @@ -46,7 +46,7 @@
-
数据列表
 +
数据列表
 导出 @@ -300,11 +300,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue index 4b47872..1b5efe8 100644 --- a/src/views/alarm/alarmNow.vue +++ b/src/views/alarm/alarmNow.vue @@ -46,7 +46,7 @@
-
数据列表
 +
数据列表
 导出 @@ -66,8 +66,8 @@ @@ -291,11 +291,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/alarm/alarmPosition.vue b/src/views/alarm/alarmPosition.vue index 402da42..2da9b2c 100644 --- a/src/views/alarm/alarmPosition.vue +++ b/src/views/alarm/alarmPosition.vue @@ -8,7 +8,7 @@ v-for="item in devList" :id="item.id" :key="item.id" - :style="{ position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" + :style="{ transform: 'rotate('+ item.angle +'deg)', position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" class="point-camera" @click="detailDev(item, $event)" />
@@ -363,12 +363,12 @@ height: 155px; } .dev-normal { - background: url("../../assets/overview_images/normal.png"); + background: url("../../assets/overview_images/dev-box.png"); background-size: contain; color: #00ff0c; } .dev-alarm { - background: url("../../assets/overview_images/alarm.png"); + background: url("../../assets/overview_images/dev-box.png"); background-size: contain; color: #ff0000; } @@ -665,10 +665,10 @@ } .dev-normal { - background: url("../../assets/overview_images/normal-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-alarm { - background: url("../../assets/overview_images/alarm-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-offline { background: url("../../assets/overview_images/offline-1366.png"); diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue index 11dc51f..d3ff751 100644 --- a/src/views/area/areaList.vue +++ b/src/views/area/areaList.vue @@ -29,7 +29,7 @@
-
数据列表
 +
数据列表
 @@ -228,11 +228,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/assets/overview_images/sub-tab-border-1366.png b/src/assets/overview_images/sub-tab-border-1366.png index 21c13c1..93bbefc 100644 --- a/src/assets/overview_images/sub-tab-border-1366.png +++ b/src/assets/overview_images/sub-tab-border-1366.png Binary files differ diff --git a/src/assets/overview_images/sub-tab-border.png b/src/assets/overview_images/sub-tab-border.png index 008d28d..0f94da3 100644 --- a/src/assets/overview_images/sub-tab-border.png +++ b/src/assets/overview_images/sub-tab-border.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked-1366.png b/src/assets/overview_images/tab-index-checked-1366.png index 2171e1c..df63c85 100644 --- a/src/assets/overview_images/tab-index-checked-1366.png +++ b/src/assets/overview_images/tab-index-checked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked.png b/src/assets/overview_images/tab-index-checked.png index 22f316b..d8af05f 100644 --- a/src/assets/overview_images/tab-index-checked.png +++ b/src/assets/overview_images/tab-index-checked.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked-1366.png b/src/assets/overview_images/tab-index-unchecked-1366.png index 59657f2..cd0dc63 100644 --- a/src/assets/overview_images/tab-index-unchecked-1366.png +++ b/src/assets/overview_images/tab-index-unchecked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked.png b/src/assets/overview_images/tab-index-unchecked.png index 2a247c0..f7a9f9f 100644 --- a/src/assets/overview_images/tab-index-unchecked.png +++ b/src/assets/overview_images/tab-index-unchecked.png Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" new file mode 100644 index 0000000..42e3ab7 --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" new file mode 100644 index 0000000..d57441b --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" Binary files differ diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js index 6bd1506..dc5aa92 100644 --- a/src/router/modules/doorSys.js +++ b/src/router/modules/doorSys.js @@ -212,6 +212,27 @@ ] }, { + path: '/door/area', + component: Layout, + redirect: '/door/area', + name: 'DoorArea', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/door/area'], // 权限名称 + sys: '/door' + }, + children: [ + { + path: '/door/area/list', + name: 'DoorAreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } + } + ] + }, + { path: '/door/device', component: Layout, redirect: '/door/device', @@ -276,26 +297,5 @@ meta: { title: '营门出入次数统计', icon: '', permission: ['/door/statistics/doorCount'], keepAlive: true } } ] - }, - { - path: '/door/area', - component: Layout, - redirect: '/door/area', - name: 'DoorArea', - alwaysShow: true, - meta: { - title: '区域管理', - icon: 'icon-area', // 图标 - permission: ['/door/area'], // 权限名称 - sys: '/door' - }, - children: [ - { - path: '/door/area/list', - name: 'DoorAreaList', - component: () => import('@/views/area/areaList'), - meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } - } - ] } ] diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index ddc123c..a5137d5 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -16,7 +16,7 @@ position: relative; margin: 0 auto; .el-dialog__header { - background-color:rgb(48, 65, 86); + background-color: rgb(76, 142, 226); //background-color:rgb(47, 91, 114); .el-dialog__title{ color:white; diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 65abe46..86f8b09 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -63,13 +63,17 @@ // menu hover .submenu-title-noDropdown, .el-submenu__title { + //font-size: 15; &:hover { background-color: $menuHover !important; } } - + .sidebar-container .is-active > .el-submenu__title { + color: white !important; + //background-color: $subMenuHover !important; + } .is-active>.el-submenu__title { - color: $menuActiveText !important; + //color: $menuActiveText !important; background-color: $menuHover !important; } .el-menu-item.is-active { diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 28c9c7f..1eadf2f 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -3,19 +3,19 @@ $themeColor:rgb(48, 65, 86); $menuText:#000000; $subMenuText:#000000; -$menuActiveText:rgb(27, 177, 165); +$menuActiveText: rgb(0, 56, 123); //$menuActiveText:#ffffff; $subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 //$subMenuActiveText:#000000; //https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; +$menuBg:#0077ff; //$menuBg:#ffffff; -$menuHover:#263445; +$menuHover:#0077ff; //$menuHover:#6666cc; -$subMenuBg:#1f2d3d; +$subMenuBg: #4c8ee2; //$subMenuBg:#fcfcfc; -$subMenuHover:#001528; +$subMenuHover: #0077ff; //$subMenuHover:#6666cc; $sideBarWidth: 180px; diff --git a/src/utils/validate.js b/src/utils/validate.js index ce760ab..d651e43 100644 --- a/src/utils/validate.js +++ b/src/utils/validate.js @@ -105,14 +105,15 @@ // 手机号验证validator export const phoneValidator = (rule, value, callback) => { const reg = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/ + const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/ if (value !== '') { - if (reg.test(value) === false) { - callback(new Error('请输入正确的手机号')) + if (reg.test(value) === false && reg1.test(value) === false) { + callback(new Error('请输入正确的联系电话')) } else { callback() } } else { - callback(new Error('手机号不能为空')) + callback(new Error('联系电话不能为空')) } } @@ -140,7 +141,12 @@ const reg = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][\dABCDEFGHJKLNMxPQRSTUVWXYZ]{5}$/ const regNew = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][1-9DF][1-9ABCDEFGHJKLMNPQRSTUVWXYZ]\d{3}[1-9DF]$/ if (value !== '') { - if (reg.test(value) === false && regNew.test(value) === false) { + // if (reg.test(value) === false && regNew.test(value) === false) { + // callback(new Error('请输入正确的车牌号')) + // } else { + // callback() + // } + if (value.length!==7 && value.length!==8) { callback(new Error('请输入正确的车牌号')) } else { callback() diff --git a/src/views/alarm/alarmList.vue b/src/views/alarm/alarmList.vue index 2601cfc..2956a74 100644 --- a/src/views/alarm/alarmList.vue +++ b/src/views/alarm/alarmList.vue @@ -46,7 +46,7 @@
-
数据列表
 +
数据列表
 导出 @@ -300,11 +300,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue index 4b47872..1b5efe8 100644 --- a/src/views/alarm/alarmNow.vue +++ b/src/views/alarm/alarmNow.vue @@ -46,7 +46,7 @@
-
数据列表
 +
数据列表
 导出 @@ -66,8 +66,8 @@ @@ -291,11 +291,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/alarm/alarmPosition.vue b/src/views/alarm/alarmPosition.vue index 402da42..2da9b2c 100644 --- a/src/views/alarm/alarmPosition.vue +++ b/src/views/alarm/alarmPosition.vue @@ -8,7 +8,7 @@ v-for="item in devList" :id="item.id" :key="item.id" - :style="{ position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" + :style="{ transform: 'rotate('+ item.angle +'deg)', position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" class="point-camera" @click="detailDev(item, $event)" />
@@ -363,12 +363,12 @@ height: 155px; } .dev-normal { - background: url("../../assets/overview_images/normal.png"); + background: url("../../assets/overview_images/dev-box.png"); background-size: contain; color: #00ff0c; } .dev-alarm { - background: url("../../assets/overview_images/alarm.png"); + background: url("../../assets/overview_images/dev-box.png"); background-size: contain; color: #ff0000; } @@ -665,10 +665,10 @@ } .dev-normal { - background: url("../../assets/overview_images/normal-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-alarm { - background: url("../../assets/overview_images/alarm-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-offline { background: url("../../assets/overview_images/offline-1366.png"); diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue index 11dc51f..d3ff751 100644 --- a/src/views/area/areaList.vue +++ b/src/views/area/areaList.vue @@ -29,7 +29,7 @@
-
数据列表
 +
数据列表
 @@ -228,11 +228,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue index 703ec7d..eff1053 100644 --- a/src/views/area/defenceDetail.vue +++ b/src/views/area/defenceDetail.vue @@ -4,13 +4,13 @@ - + - + @@ -19,13 +19,13 @@ - + - + @@ -42,7 +42,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/assets/overview_images/sub-tab-border-1366.png b/src/assets/overview_images/sub-tab-border-1366.png index 21c13c1..93bbefc 100644 --- a/src/assets/overview_images/sub-tab-border-1366.png +++ b/src/assets/overview_images/sub-tab-border-1366.png Binary files differ diff --git a/src/assets/overview_images/sub-tab-border.png b/src/assets/overview_images/sub-tab-border.png index 008d28d..0f94da3 100644 --- a/src/assets/overview_images/sub-tab-border.png +++ b/src/assets/overview_images/sub-tab-border.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked-1366.png b/src/assets/overview_images/tab-index-checked-1366.png index 2171e1c..df63c85 100644 --- a/src/assets/overview_images/tab-index-checked-1366.png +++ b/src/assets/overview_images/tab-index-checked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked.png b/src/assets/overview_images/tab-index-checked.png index 22f316b..d8af05f 100644 --- a/src/assets/overview_images/tab-index-checked.png +++ b/src/assets/overview_images/tab-index-checked.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked-1366.png b/src/assets/overview_images/tab-index-unchecked-1366.png index 59657f2..cd0dc63 100644 --- a/src/assets/overview_images/tab-index-unchecked-1366.png +++ b/src/assets/overview_images/tab-index-unchecked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked.png b/src/assets/overview_images/tab-index-unchecked.png index 2a247c0..f7a9f9f 100644 --- a/src/assets/overview_images/tab-index-unchecked.png +++ b/src/assets/overview_images/tab-index-unchecked.png Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" new file mode 100644 index 0000000..42e3ab7 --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" new file mode 100644 index 0000000..d57441b --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" Binary files differ diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js index 6bd1506..dc5aa92 100644 --- a/src/router/modules/doorSys.js +++ b/src/router/modules/doorSys.js @@ -212,6 +212,27 @@ ] }, { + path: '/door/area', + component: Layout, + redirect: '/door/area', + name: 'DoorArea', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/door/area'], // 权限名称 + sys: '/door' + }, + children: [ + { + path: '/door/area/list', + name: 'DoorAreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } + } + ] + }, + { path: '/door/device', component: Layout, redirect: '/door/device', @@ -276,26 +297,5 @@ meta: { title: '营门出入次数统计', icon: '', permission: ['/door/statistics/doorCount'], keepAlive: true } } ] - }, - { - path: '/door/area', - component: Layout, - redirect: '/door/area', - name: 'DoorArea', - alwaysShow: true, - meta: { - title: '区域管理', - icon: 'icon-area', // 图标 - permission: ['/door/area'], // 权限名称 - sys: '/door' - }, - children: [ - { - path: '/door/area/list', - name: 'DoorAreaList', - component: () => import('@/views/area/areaList'), - meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } - } - ] } ] diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index ddc123c..a5137d5 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -16,7 +16,7 @@ position: relative; margin: 0 auto; .el-dialog__header { - background-color:rgb(48, 65, 86); + background-color: rgb(76, 142, 226); //background-color:rgb(47, 91, 114); .el-dialog__title{ color:white; diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 65abe46..86f8b09 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -63,13 +63,17 @@ // menu hover .submenu-title-noDropdown, .el-submenu__title { + //font-size: 15; &:hover { background-color: $menuHover !important; } } - + .sidebar-container .is-active > .el-submenu__title { + color: white !important; + //background-color: $subMenuHover !important; + } .is-active>.el-submenu__title { - color: $menuActiveText !important; + //color: $menuActiveText !important; background-color: $menuHover !important; } .el-menu-item.is-active { diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 28c9c7f..1eadf2f 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -3,19 +3,19 @@ $themeColor:rgb(48, 65, 86); $menuText:#000000; $subMenuText:#000000; -$menuActiveText:rgb(27, 177, 165); +$menuActiveText: rgb(0, 56, 123); //$menuActiveText:#ffffff; $subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 //$subMenuActiveText:#000000; //https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; +$menuBg:#0077ff; //$menuBg:#ffffff; -$menuHover:#263445; +$menuHover:#0077ff; //$menuHover:#6666cc; -$subMenuBg:#1f2d3d; +$subMenuBg: #4c8ee2; //$subMenuBg:#fcfcfc; -$subMenuHover:#001528; +$subMenuHover: #0077ff; //$subMenuHover:#6666cc; $sideBarWidth: 180px; diff --git a/src/utils/validate.js b/src/utils/validate.js index ce760ab..d651e43 100644 --- a/src/utils/validate.js +++ b/src/utils/validate.js @@ -105,14 +105,15 @@ // 手机号验证validator export const phoneValidator = (rule, value, callback) => { const reg = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/ + const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/ if (value !== '') { - if (reg.test(value) === false) { - callback(new Error('请输入正确的手机号')) + if (reg.test(value) === false && reg1.test(value) === false) { + callback(new Error('请输入正确的联系电话')) } else { callback() } } else { - callback(new Error('手机号不能为空')) + callback(new Error('联系电话不能为空')) } } @@ -140,7 +141,12 @@ const reg = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][\dABCDEFGHJKLNMxPQRSTUVWXYZ]{5}$/ const regNew = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][1-9DF][1-9ABCDEFGHJKLMNPQRSTUVWXYZ]\d{3}[1-9DF]$/ if (value !== '') { - if (reg.test(value) === false && regNew.test(value) === false) { + // if (reg.test(value) === false && regNew.test(value) === false) { + // callback(new Error('请输入正确的车牌号')) + // } else { + // callback() + // } + if (value.length!==7 && value.length!==8) { callback(new Error('请输入正确的车牌号')) } else { callback() diff --git a/src/views/alarm/alarmList.vue b/src/views/alarm/alarmList.vue index 2601cfc..2956a74 100644 --- a/src/views/alarm/alarmList.vue +++ b/src/views/alarm/alarmList.vue @@ -46,7 +46,7 @@
-
数据列表
 +
数据列表
 导出 @@ -300,11 +300,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue index 4b47872..1b5efe8 100644 --- a/src/views/alarm/alarmNow.vue +++ b/src/views/alarm/alarmNow.vue @@ -46,7 +46,7 @@
-
数据列表
 +
数据列表
 导出 @@ -66,8 +66,8 @@ @@ -291,11 +291,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/alarm/alarmPosition.vue b/src/views/alarm/alarmPosition.vue index 402da42..2da9b2c 100644 --- a/src/views/alarm/alarmPosition.vue +++ b/src/views/alarm/alarmPosition.vue @@ -8,7 +8,7 @@ v-for="item in devList" :id="item.id" :key="item.id" - :style="{ position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" + :style="{ transform: 'rotate('+ item.angle +'deg)', position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" class="point-camera" @click="detailDev(item, $event)" />
@@ -363,12 +363,12 @@ height: 155px; } .dev-normal { - background: url("../../assets/overview_images/normal.png"); + background: url("../../assets/overview_images/dev-box.png"); background-size: contain; color: #00ff0c; } .dev-alarm { - background: url("../../assets/overview_images/alarm.png"); + background: url("../../assets/overview_images/dev-box.png"); background-size: contain; color: #ff0000; } @@ -665,10 +665,10 @@ } .dev-normal { - background: url("../../assets/overview_images/normal-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-alarm { - background: url("../../assets/overview_images/alarm-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-offline { background: url("../../assets/overview_images/offline-1366.png"); diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue index 11dc51f..d3ff751 100644 --- a/src/views/area/areaList.vue +++ b/src/views/area/areaList.vue @@ -29,7 +29,7 @@
-
数据列表
 +
数据列表
 @@ -228,11 +228,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue index 703ec7d..eff1053 100644 --- a/src/views/area/defenceDetail.vue +++ b/src/views/area/defenceDetail.vue @@ -4,13 +4,13 @@ - + - + @@ -19,13 +19,13 @@ - + - + @@ -42,7 +42,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/src/views/area/defenceList.vue b/src/views/area/defenceList.vue index 8649918..cb9c4b8 100644 --- a/src/views/area/defenceList.vue +++ b/src/views/area/defenceList.vue @@ -29,7 +29,7 @@
-
数据列表
 +
数据列表
 @@ -104,8 +104,8 @@ align: 'center' }, { - text: '设备状态', - value: 'deviceState', + text: '区域类别', + value: 'areaTypeName', align: 'center' }, { @@ -253,11 +253,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/assets/overview_images/sub-tab-border-1366.png b/src/assets/overview_images/sub-tab-border-1366.png index 21c13c1..93bbefc 100644 --- a/src/assets/overview_images/sub-tab-border-1366.png +++ b/src/assets/overview_images/sub-tab-border-1366.png Binary files differ diff --git a/src/assets/overview_images/sub-tab-border.png b/src/assets/overview_images/sub-tab-border.png index 008d28d..0f94da3 100644 --- a/src/assets/overview_images/sub-tab-border.png +++ b/src/assets/overview_images/sub-tab-border.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked-1366.png b/src/assets/overview_images/tab-index-checked-1366.png index 2171e1c..df63c85 100644 --- a/src/assets/overview_images/tab-index-checked-1366.png +++ b/src/assets/overview_images/tab-index-checked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked.png b/src/assets/overview_images/tab-index-checked.png index 22f316b..d8af05f 100644 --- a/src/assets/overview_images/tab-index-checked.png +++ b/src/assets/overview_images/tab-index-checked.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked-1366.png b/src/assets/overview_images/tab-index-unchecked-1366.png index 59657f2..cd0dc63 100644 --- a/src/assets/overview_images/tab-index-unchecked-1366.png +++ b/src/assets/overview_images/tab-index-unchecked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked.png b/src/assets/overview_images/tab-index-unchecked.png index 2a247c0..f7a9f9f 100644 --- a/src/assets/overview_images/tab-index-unchecked.png +++ b/src/assets/overview_images/tab-index-unchecked.png Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" new file mode 100644 index 0000000..42e3ab7 --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" new file mode 100644 index 0000000..d57441b --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" Binary files differ diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js index 6bd1506..dc5aa92 100644 --- a/src/router/modules/doorSys.js +++ b/src/router/modules/doorSys.js @@ -212,6 +212,27 @@ ] }, { + path: '/door/area', + component: Layout, + redirect: '/door/area', + name: 'DoorArea', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/door/area'], // 权限名称 + sys: '/door' + }, + children: [ + { + path: '/door/area/list', + name: 'DoorAreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } + } + ] + }, + { path: '/door/device', component: Layout, redirect: '/door/device', @@ -276,26 +297,5 @@ meta: { title: '营门出入次数统计', icon: '', permission: ['/door/statistics/doorCount'], keepAlive: true } } ] - }, - { - path: '/door/area', - component: Layout, - redirect: '/door/area', - name: 'DoorArea', - alwaysShow: true, - meta: { - title: '区域管理', - icon: 'icon-area', // 图标 - permission: ['/door/area'], // 权限名称 - sys: '/door' - }, - children: [ - { - path: '/door/area/list', - name: 'DoorAreaList', - component: () => import('@/views/area/areaList'), - meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } - } - ] } ] diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index ddc123c..a5137d5 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -16,7 +16,7 @@ position: relative; margin: 0 auto; .el-dialog__header { - background-color:rgb(48, 65, 86); + background-color: rgb(76, 142, 226); //background-color:rgb(47, 91, 114); .el-dialog__title{ color:white; diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 65abe46..86f8b09 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -63,13 +63,17 @@ // menu hover .submenu-title-noDropdown, .el-submenu__title { + //font-size: 15; &:hover { background-color: $menuHover !important; } } - + .sidebar-container .is-active > .el-submenu__title { + color: white !important; + //background-color: $subMenuHover !important; + } .is-active>.el-submenu__title { - color: $menuActiveText !important; + //color: $menuActiveText !important; background-color: $menuHover !important; } .el-menu-item.is-active { diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 28c9c7f..1eadf2f 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -3,19 +3,19 @@ $themeColor:rgb(48, 65, 86); $menuText:#000000; $subMenuText:#000000; -$menuActiveText:rgb(27, 177, 165); +$menuActiveText: rgb(0, 56, 123); //$menuActiveText:#ffffff; $subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 //$subMenuActiveText:#000000; //https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; +$menuBg:#0077ff; //$menuBg:#ffffff; -$menuHover:#263445; +$menuHover:#0077ff; //$menuHover:#6666cc; -$subMenuBg:#1f2d3d; +$subMenuBg: #4c8ee2; //$subMenuBg:#fcfcfc; -$subMenuHover:#001528; +$subMenuHover: #0077ff; //$subMenuHover:#6666cc; $sideBarWidth: 180px; diff --git a/src/utils/validate.js b/src/utils/validate.js index ce760ab..d651e43 100644 --- a/src/utils/validate.js +++ b/src/utils/validate.js @@ -105,14 +105,15 @@ // 手机号验证validator export const phoneValidator = (rule, value, callback) => { const reg = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/ + const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/ if (value !== '') { - if (reg.test(value) === false) { - callback(new Error('请输入正确的手机号')) + if (reg.test(value) === false && reg1.test(value) === false) { + callback(new Error('请输入正确的联系电话')) } else { callback() } } else { - callback(new Error('手机号不能为空')) + callback(new Error('联系电话不能为空')) } } @@ -140,7 +141,12 @@ const reg = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][\dABCDEFGHJKLNMxPQRSTUVWXYZ]{5}$/ const regNew = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][1-9DF][1-9ABCDEFGHJKLMNPQRSTUVWXYZ]\d{3}[1-9DF]$/ if (value !== '') { - if (reg.test(value) === false && regNew.test(value) === false) { + // if (reg.test(value) === false && regNew.test(value) === false) { + // callback(new Error('请输入正确的车牌号')) + // } else { + // callback() + // } + if (value.length!==7 && value.length!==8) { callback(new Error('请输入正确的车牌号')) } else { callback() diff --git a/src/views/alarm/alarmList.vue b/src/views/alarm/alarmList.vue index 2601cfc..2956a74 100644 --- a/src/views/alarm/alarmList.vue +++ b/src/views/alarm/alarmList.vue @@ -46,7 +46,7 @@
-
数据列表
 +
数据列表
 导出 @@ -300,11 +300,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue index 4b47872..1b5efe8 100644 --- a/src/views/alarm/alarmNow.vue +++ b/src/views/alarm/alarmNow.vue @@ -46,7 +46,7 @@
-
数据列表
 +
数据列表
 导出 @@ -66,8 +66,8 @@ @@ -291,11 +291,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/alarm/alarmPosition.vue b/src/views/alarm/alarmPosition.vue index 402da42..2da9b2c 100644 --- a/src/views/alarm/alarmPosition.vue +++ b/src/views/alarm/alarmPosition.vue @@ -8,7 +8,7 @@ v-for="item in devList" :id="item.id" :key="item.id" - :style="{ position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" + :style="{ transform: 'rotate('+ item.angle +'deg)', position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" class="point-camera" @click="detailDev(item, $event)" />
@@ -363,12 +363,12 @@ height: 155px; } .dev-normal { - background: url("../../assets/overview_images/normal.png"); + background: url("../../assets/overview_images/dev-box.png"); background-size: contain; color: #00ff0c; } .dev-alarm { - background: url("../../assets/overview_images/alarm.png"); + background: url("../../assets/overview_images/dev-box.png"); background-size: contain; color: #ff0000; } @@ -665,10 +665,10 @@ } .dev-normal { - background: url("../../assets/overview_images/normal-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-alarm { - background: url("../../assets/overview_images/alarm-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-offline { background: url("../../assets/overview_images/offline-1366.png"); diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue index 11dc51f..d3ff751 100644 --- a/src/views/area/areaList.vue +++ b/src/views/area/areaList.vue @@ -29,7 +29,7 @@
-
数据列表
 +
数据列表
 @@ -228,11 +228,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue index 703ec7d..eff1053 100644 --- a/src/views/area/defenceDetail.vue +++ b/src/views/area/defenceDetail.vue @@ -4,13 +4,13 @@ - + - + @@ -19,13 +19,13 @@ - + - + @@ -42,7 +42,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/src/views/area/defenceList.vue b/src/views/area/defenceList.vue index 8649918..cb9c4b8 100644 --- a/src/views/area/defenceList.vue +++ b/src/views/area/defenceList.vue @@ -29,7 +29,7 @@
-
数据列表
 +
数据列表
 @@ -104,8 +104,8 @@ align: 'center' }, { - text: '设备状态', - value: 'deviceState', + text: '区域类别', + value: 'areaTypeName', align: 'center' }, { @@ -253,11 +253,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue index 633e353..ddb215f 100644 --- a/src/views/car/carAdd.vue +++ b/src/views/car/carAdd.vue @@ -4,7 +4,8 @@ - + + @@ -137,7 +138,10 @@ phone: row.phone, remark: row.remark } - this.getStaffList() + getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { + this.staffList = response.data + console.log(response) + }) } else if (dialogStatus === 'detail') { this.isDetailMode = true this.isEditMode = false @@ -152,7 +156,10 @@ deptName: row.deptName, ownerName: row.ownerName } - this.getStaffList() + getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { + this.staffList = response.data + console.log(response) + }) } }, // 清除数据 @@ -186,6 +193,7 @@ }) }, getStaffList(){ + this.dataForm.ownerId = '' getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { this.staffList = response.data console.log(response) diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/assets/overview_images/sub-tab-border-1366.png b/src/assets/overview_images/sub-tab-border-1366.png index 21c13c1..93bbefc 100644 --- a/src/assets/overview_images/sub-tab-border-1366.png +++ b/src/assets/overview_images/sub-tab-border-1366.png Binary files differ diff --git a/src/assets/overview_images/sub-tab-border.png b/src/assets/overview_images/sub-tab-border.png index 008d28d..0f94da3 100644 --- a/src/assets/overview_images/sub-tab-border.png +++ b/src/assets/overview_images/sub-tab-border.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked-1366.png b/src/assets/overview_images/tab-index-checked-1366.png index 2171e1c..df63c85 100644 --- a/src/assets/overview_images/tab-index-checked-1366.png +++ b/src/assets/overview_images/tab-index-checked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked.png b/src/assets/overview_images/tab-index-checked.png index 22f316b..d8af05f 100644 --- a/src/assets/overview_images/tab-index-checked.png +++ b/src/assets/overview_images/tab-index-checked.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked-1366.png b/src/assets/overview_images/tab-index-unchecked-1366.png index 59657f2..cd0dc63 100644 --- a/src/assets/overview_images/tab-index-unchecked-1366.png +++ b/src/assets/overview_images/tab-index-unchecked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked.png b/src/assets/overview_images/tab-index-unchecked.png index 2a247c0..f7a9f9f 100644 --- a/src/assets/overview_images/tab-index-unchecked.png +++ b/src/assets/overview_images/tab-index-unchecked.png Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" new file mode 100644 index 0000000..42e3ab7 --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" new file mode 100644 index 0000000..d57441b --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" Binary files differ diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js index 6bd1506..dc5aa92 100644 --- a/src/router/modules/doorSys.js +++ b/src/router/modules/doorSys.js @@ -212,6 +212,27 @@ ] }, { + path: '/door/area', + component: Layout, + redirect: '/door/area', + name: 'DoorArea', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/door/area'], // 权限名称 + sys: '/door' + }, + children: [ + { + path: '/door/area/list', + name: 'DoorAreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } + } + ] + }, + { path: '/door/device', component: Layout, redirect: '/door/device', @@ -276,26 +297,5 @@ meta: { title: '营门出入次数统计', icon: '', permission: ['/door/statistics/doorCount'], keepAlive: true } } ] - }, - { - path: '/door/area', - component: Layout, - redirect: '/door/area', - name: 'DoorArea', - alwaysShow: true, - meta: { - title: '区域管理', - icon: 'icon-area', // 图标 - permission: ['/door/area'], // 权限名称 - sys: '/door' - }, - children: [ - { - path: '/door/area/list', - name: 'DoorAreaList', - component: () => import('@/views/area/areaList'), - meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } - } - ] } ] diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index ddc123c..a5137d5 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -16,7 +16,7 @@ position: relative; margin: 0 auto; .el-dialog__header { - background-color:rgb(48, 65, 86); + background-color: rgb(76, 142, 226); //background-color:rgb(47, 91, 114); .el-dialog__title{ color:white; diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 65abe46..86f8b09 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -63,13 +63,17 @@ // menu hover .submenu-title-noDropdown, .el-submenu__title { + //font-size: 15; &:hover { background-color: $menuHover !important; } } - + .sidebar-container .is-active > .el-submenu__title { + color: white !important; + //background-color: $subMenuHover !important; + } .is-active>.el-submenu__title { - color: $menuActiveText !important; + //color: $menuActiveText !important; background-color: $menuHover !important; } .el-menu-item.is-active { diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 28c9c7f..1eadf2f 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -3,19 +3,19 @@ $themeColor:rgb(48, 65, 86); $menuText:#000000; $subMenuText:#000000; -$menuActiveText:rgb(27, 177, 165); +$menuActiveText: rgb(0, 56, 123); //$menuActiveText:#ffffff; $subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 //$subMenuActiveText:#000000; //https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; +$menuBg:#0077ff; //$menuBg:#ffffff; -$menuHover:#263445; +$menuHover:#0077ff; //$menuHover:#6666cc; -$subMenuBg:#1f2d3d; +$subMenuBg: #4c8ee2; //$subMenuBg:#fcfcfc; -$subMenuHover:#001528; +$subMenuHover: #0077ff; //$subMenuHover:#6666cc; $sideBarWidth: 180px; diff --git a/src/utils/validate.js b/src/utils/validate.js index ce760ab..d651e43 100644 --- a/src/utils/validate.js +++ b/src/utils/validate.js @@ -105,14 +105,15 @@ // 手机号验证validator export const phoneValidator = (rule, value, callback) => { const reg = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/ + const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/ if (value !== '') { - if (reg.test(value) === false) { - callback(new Error('请输入正确的手机号')) + if (reg.test(value) === false && reg1.test(value) === false) { + callback(new Error('请输入正确的联系电话')) } else { callback() } } else { - callback(new Error('手机号不能为空')) + callback(new Error('联系电话不能为空')) } } @@ -140,7 +141,12 @@ const reg = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][\dABCDEFGHJKLNMxPQRSTUVWXYZ]{5}$/ const regNew = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][1-9DF][1-9ABCDEFGHJKLMNPQRSTUVWXYZ]\d{3}[1-9DF]$/ if (value !== '') { - if (reg.test(value) === false && regNew.test(value) === false) { + // if (reg.test(value) === false && regNew.test(value) === false) { + // callback(new Error('请输入正确的车牌号')) + // } else { + // callback() + // } + if (value.length!==7 && value.length!==8) { callback(new Error('请输入正确的车牌号')) } else { callback() diff --git a/src/views/alarm/alarmList.vue b/src/views/alarm/alarmList.vue index 2601cfc..2956a74 100644 --- a/src/views/alarm/alarmList.vue +++ b/src/views/alarm/alarmList.vue @@ -46,7 +46,7 @@
-
数据列表
 +
数据列表
 导出 @@ -300,11 +300,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue index 4b47872..1b5efe8 100644 --- a/src/views/alarm/alarmNow.vue +++ b/src/views/alarm/alarmNow.vue @@ -46,7 +46,7 @@
-
数据列表
 +
数据列表
 导出 @@ -66,8 +66,8 @@ @@ -291,11 +291,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/alarm/alarmPosition.vue b/src/views/alarm/alarmPosition.vue index 402da42..2da9b2c 100644 --- a/src/views/alarm/alarmPosition.vue +++ b/src/views/alarm/alarmPosition.vue @@ -8,7 +8,7 @@ v-for="item in devList" :id="item.id" :key="item.id" - :style="{ position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" + :style="{ transform: 'rotate('+ item.angle +'deg)', position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" class="point-camera" @click="detailDev(item, $event)" />
@@ -363,12 +363,12 @@ height: 155px; } .dev-normal { - background: url("../../assets/overview_images/normal.png"); + background: url("../../assets/overview_images/dev-box.png"); background-size: contain; color: #00ff0c; } .dev-alarm { - background: url("../../assets/overview_images/alarm.png"); + background: url("../../assets/overview_images/dev-box.png"); background-size: contain; color: #ff0000; } @@ -665,10 +665,10 @@ } .dev-normal { - background: url("../../assets/overview_images/normal-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-alarm { - background: url("../../assets/overview_images/alarm-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-offline { background: url("../../assets/overview_images/offline-1366.png"); diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue index 11dc51f..d3ff751 100644 --- a/src/views/area/areaList.vue +++ b/src/views/area/areaList.vue @@ -29,7 +29,7 @@
-
数据列表
 +
数据列表
 @@ -228,11 +228,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue index 703ec7d..eff1053 100644 --- a/src/views/area/defenceDetail.vue +++ b/src/views/area/defenceDetail.vue @@ -4,13 +4,13 @@ - + - + @@ -19,13 +19,13 @@ - + - + @@ -42,7 +42,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/src/views/area/defenceList.vue b/src/views/area/defenceList.vue index 8649918..cb9c4b8 100644 --- a/src/views/area/defenceList.vue +++ b/src/views/area/defenceList.vue @@ -29,7 +29,7 @@
-
数据列表
 +
数据列表
 @@ -104,8 +104,8 @@ align: 'center' }, { - text: '设备状态', - value: 'deviceState', + text: '区域类别', + value: 'areaTypeName', align: 'center' }, { @@ -253,11 +253,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue index 633e353..ddb215f 100644 --- a/src/views/car/carAdd.vue +++ b/src/views/car/carAdd.vue @@ -4,7 +4,8 @@ - + + @@ -137,7 +138,10 @@ phone: row.phone, remark: row.remark } - this.getStaffList() + getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { + this.staffList = response.data + console.log(response) + }) } else if (dialogStatus === 'detail') { this.isDetailMode = true this.isEditMode = false @@ -152,7 +156,10 @@ deptName: row.deptName, ownerName: row.ownerName } - this.getStaffList() + getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { + this.staffList = response.data + console.log(response) + }) } }, // 清除数据 @@ -186,6 +193,7 @@ }) }, getStaffList(){ + this.dataForm.ownerId = '' getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { this.staffList = response.data console.log(response) diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue index d0c0176..8d924ff 100644 --- a/src/views/car/carList.vue +++ b/src/views/car/carList.vue @@ -29,7 +29,7 @@
-
数据列表
 +
数据列表
 导出 新增 @@ -259,11 +259,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/assets/overview_images/sub-tab-border-1366.png b/src/assets/overview_images/sub-tab-border-1366.png index 21c13c1..93bbefc 100644 --- a/src/assets/overview_images/sub-tab-border-1366.png +++ b/src/assets/overview_images/sub-tab-border-1366.png Binary files differ diff --git a/src/assets/overview_images/sub-tab-border.png b/src/assets/overview_images/sub-tab-border.png index 008d28d..0f94da3 100644 --- a/src/assets/overview_images/sub-tab-border.png +++ b/src/assets/overview_images/sub-tab-border.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked-1366.png b/src/assets/overview_images/tab-index-checked-1366.png index 2171e1c..df63c85 100644 --- a/src/assets/overview_images/tab-index-checked-1366.png +++ b/src/assets/overview_images/tab-index-checked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked.png b/src/assets/overview_images/tab-index-checked.png index 22f316b..d8af05f 100644 --- a/src/assets/overview_images/tab-index-checked.png +++ b/src/assets/overview_images/tab-index-checked.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked-1366.png b/src/assets/overview_images/tab-index-unchecked-1366.png index 59657f2..cd0dc63 100644 --- a/src/assets/overview_images/tab-index-unchecked-1366.png +++ b/src/assets/overview_images/tab-index-unchecked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked.png b/src/assets/overview_images/tab-index-unchecked.png index 2a247c0..f7a9f9f 100644 --- a/src/assets/overview_images/tab-index-unchecked.png +++ b/src/assets/overview_images/tab-index-unchecked.png Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" new file mode 100644 index 0000000..42e3ab7 --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" new file mode 100644 index 0000000..d57441b --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" Binary files differ diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js index 6bd1506..dc5aa92 100644 --- a/src/router/modules/doorSys.js +++ b/src/router/modules/doorSys.js @@ -212,6 +212,27 @@ ] }, { + path: '/door/area', + component: Layout, + redirect: '/door/area', + name: 'DoorArea', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/door/area'], // 权限名称 + sys: '/door' + }, + children: [ + { + path: '/door/area/list', + name: 'DoorAreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } + } + ] + }, + { path: '/door/device', component: Layout, redirect: '/door/device', @@ -276,26 +297,5 @@ meta: { title: '营门出入次数统计', icon: '', permission: ['/door/statistics/doorCount'], keepAlive: true } } ] - }, - { - path: '/door/area', - component: Layout, - redirect: '/door/area', - name: 'DoorArea', - alwaysShow: true, - meta: { - title: '区域管理', - icon: 'icon-area', // 图标 - permission: ['/door/area'], // 权限名称 - sys: '/door' - }, - children: [ - { - path: '/door/area/list', - name: 'DoorAreaList', - component: () => import('@/views/area/areaList'), - meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } - } - ] } ] diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index ddc123c..a5137d5 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -16,7 +16,7 @@ position: relative; margin: 0 auto; .el-dialog__header { - background-color:rgb(48, 65, 86); + background-color: rgb(76, 142, 226); //background-color:rgb(47, 91, 114); .el-dialog__title{ color:white; diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 65abe46..86f8b09 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -63,13 +63,17 @@ // menu hover .submenu-title-noDropdown, .el-submenu__title { + //font-size: 15; &:hover { background-color: $menuHover !important; } } - + .sidebar-container .is-active > .el-submenu__title { + color: white !important; + //background-color: $subMenuHover !important; + } .is-active>.el-submenu__title { - color: $menuActiveText !important; + //color: $menuActiveText !important; background-color: $menuHover !important; } .el-menu-item.is-active { diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 28c9c7f..1eadf2f 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -3,19 +3,19 @@ $themeColor:rgb(48, 65, 86); $menuText:#000000; $subMenuText:#000000; -$menuActiveText:rgb(27, 177, 165); +$menuActiveText: rgb(0, 56, 123); //$menuActiveText:#ffffff; $subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 //$subMenuActiveText:#000000; //https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; +$menuBg:#0077ff; //$menuBg:#ffffff; -$menuHover:#263445; +$menuHover:#0077ff; //$menuHover:#6666cc; -$subMenuBg:#1f2d3d; +$subMenuBg: #4c8ee2; //$subMenuBg:#fcfcfc; -$subMenuHover:#001528; +$subMenuHover: #0077ff; //$subMenuHover:#6666cc; $sideBarWidth: 180px; diff --git a/src/utils/validate.js b/src/utils/validate.js index ce760ab..d651e43 100644 --- a/src/utils/validate.js +++ b/src/utils/validate.js @@ -105,14 +105,15 @@ // 手机号验证validator export const phoneValidator = (rule, value, callback) => { const reg = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/ + const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/ if (value !== '') { - if (reg.test(value) === false) { - callback(new Error('请输入正确的手机号')) + if (reg.test(value) === false && reg1.test(value) === false) { + callback(new Error('请输入正确的联系电话')) } else { callback() } } else { - callback(new Error('手机号不能为空')) + callback(new Error('联系电话不能为空')) } } @@ -140,7 +141,12 @@ const reg = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][\dABCDEFGHJKLNMxPQRSTUVWXYZ]{5}$/ const regNew = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][1-9DF][1-9ABCDEFGHJKLMNPQRSTUVWXYZ]\d{3}[1-9DF]$/ if (value !== '') { - if (reg.test(value) === false && regNew.test(value) === false) { + // if (reg.test(value) === false && regNew.test(value) === false) { + // callback(new Error('请输入正确的车牌号')) + // } else { + // callback() + // } + if (value.length!==7 && value.length!==8) { callback(new Error('请输入正确的车牌号')) } else { callback() diff --git a/src/views/alarm/alarmList.vue b/src/views/alarm/alarmList.vue index 2601cfc..2956a74 100644 --- a/src/views/alarm/alarmList.vue +++ b/src/views/alarm/alarmList.vue @@ -46,7 +46,7 @@
-
数据列表
 +
数据列表
 导出 @@ -300,11 +300,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue index 4b47872..1b5efe8 100644 --- a/src/views/alarm/alarmNow.vue +++ b/src/views/alarm/alarmNow.vue @@ -46,7 +46,7 @@
-
数据列表
 +
数据列表
 导出 @@ -66,8 +66,8 @@ @@ -291,11 +291,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/alarm/alarmPosition.vue b/src/views/alarm/alarmPosition.vue index 402da42..2da9b2c 100644 --- a/src/views/alarm/alarmPosition.vue +++ b/src/views/alarm/alarmPosition.vue @@ -8,7 +8,7 @@ v-for="item in devList" :id="item.id" :key="item.id" - :style="{ position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" + :style="{ transform: 'rotate('+ item.angle +'deg)', position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" class="point-camera" @click="detailDev(item, $event)" />
@@ -363,12 +363,12 @@ height: 155px; } .dev-normal { - background: url("../../assets/overview_images/normal.png"); + background: url("../../assets/overview_images/dev-box.png"); background-size: contain; color: #00ff0c; } .dev-alarm { - background: url("../../assets/overview_images/alarm.png"); + background: url("../../assets/overview_images/dev-box.png"); background-size: contain; color: #ff0000; } @@ -665,10 +665,10 @@ } .dev-normal { - background: url("../../assets/overview_images/normal-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-alarm { - background: url("../../assets/overview_images/alarm-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-offline { background: url("../../assets/overview_images/offline-1366.png"); diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue index 11dc51f..d3ff751 100644 --- a/src/views/area/areaList.vue +++ b/src/views/area/areaList.vue @@ -29,7 +29,7 @@
-
数据列表
 +
数据列表
 @@ -228,11 +228,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue index 703ec7d..eff1053 100644 --- a/src/views/area/defenceDetail.vue +++ b/src/views/area/defenceDetail.vue @@ -4,13 +4,13 @@ - + - + @@ -19,13 +19,13 @@ - + - + @@ -42,7 +42,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/src/views/area/defenceList.vue b/src/views/area/defenceList.vue index 8649918..cb9c4b8 100644 --- a/src/views/area/defenceList.vue +++ b/src/views/area/defenceList.vue @@ -29,7 +29,7 @@
-
数据列表
 +
数据列表
 @@ -104,8 +104,8 @@ align: 'center' }, { - text: '设备状态', - value: 'deviceState', + text: '区域类别', + value: 'areaTypeName', align: 'center' }, { @@ -253,11 +253,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue index 633e353..ddb215f 100644 --- a/src/views/car/carAdd.vue +++ b/src/views/car/carAdd.vue @@ -4,7 +4,8 @@ - + + @@ -137,7 +138,10 @@ phone: row.phone, remark: row.remark } - this.getStaffList() + getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { + this.staffList = response.data + console.log(response) + }) } else if (dialogStatus === 'detail') { this.isDetailMode = true this.isEditMode = false @@ -152,7 +156,10 @@ deptName: row.deptName, ownerName: row.ownerName } - this.getStaffList() + getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { + this.staffList = response.data + console.log(response) + }) } }, // 清除数据 @@ -186,6 +193,7 @@ }) }, getStaffList(){ + this.dataForm.ownerId = '' getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { this.staffList = response.data console.log(response) diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue index d0c0176..8d924ff 100644 --- a/src/views/car/carList.vue +++ b/src/views/car/carList.vue @@ -29,7 +29,7 @@
-
数据列表
 +
数据列表
 导出 新增 @@ -259,11 +259,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/ctrl/overview.vue b/src/views/ctrl/overview.vue index f452ea5..e2c5f62 100644 --- a/src/views/ctrl/overview.vue +++ b/src/views/ctrl/overview.vue @@ -22,32 +22,32 @@
+
正常
-
正常
 +
报警
-
报警
 - -
- -
-
离线
- + + + + + + - -
- -
-
关闭
- + + + + + +
@@ -89,77 +89,93 @@ v-for="item in devList" :id="item.id" :key="item.id" - :style="{ position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" + :style="{ transform: 'rotate('+ item.angle +'deg)', position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" class="point-camera" @click="detailDev(item, $event)" />
- - - - - 全部 +
+ + + + 人脸识别 - - - - - - - 摄像头 - 摄像头 - 人脸识别摄像头 - 车牌轨迹摄像头 - 周界防护预警摄像头 - 标准数字摄像头 - 智能球形摄像头 - 标准半球摄像头 - - - + + + + 车牌轨迹 - - - - - 电子围栏 + + + + 周界防护 - - - - - 温湿度 + + + + 标准数字 - - - - - 烟感 + + + + 智能球形 - - - - - 声光报警 + + + + 标准半球 - +
+ +
+ + + + 全部 + + + + + + 摄像头 + + + + + 电子围栏 + + + + + 温湿度 + + + + + 烟感 + + + + + + +
-
+
营区总览
三号楼
四号楼
-
+
@@ -231,12 +247,15 @@ components: { DeviceDetail }, data() { return { + showType: false, + wsPath: process.env.BASE_API+'/websocket/', title: getProject().title, bgImageSrc: tg_main, devListParams: { picture: '1', deviceTypes: [] }, + cameraClass:'dev-icon', dev: { alarm: 0, onLine: 0, @@ -300,10 +319,24 @@ }, // 设备详情表单 isFence: false, // 是否电子围栏设备 itemColor: '#f58a88', - checkDevType: [true, false, false, false, false, false] // 选中设备类型 + checkDevType: [true, false, false, false, false, false], // 选中设备类型 + checkDevType1: [false, false, false, false, false, false] // 摄像头类型 } }, + watch:{ + checkDevType: function(val) { + if(val[1]){ + this.cameraClass = 'dev-icon dev-type-selected' + }else{ + this.cameraClass = 'dev-icon' + } + } + }, mounted() { + window.addEventListener('click',this.handleKeyup) + this.wsPath = this.wsPath.replace(/http/,'ws') + console.log(this.wsPath) + // this.webSocket() this.initWindowSize() this.fetchData() @@ -317,6 +350,82 @@ } }, methods: { + handleKeyup(val){ //单击收起摄像头分类 + console.log(val) + var item = ['人脸识别','车牌轨迹','周界防护','标准数字','智能球形','标准半球'] + for(var i=0;i { + // that.$router.push({ + // path: '/overview', + // query: { refresh: true } + // }) + // } + }) + // } + } + // 监听socket错误 + this.socket.onerror = function() { + that.$notify({ + title: '服务器错误', + message: '无法接收实时报警信息,请检查服务器后重新刷新页面', + type: 'error', + duration: 0 + }) + } + // 监听socket关闭 + this.socket.onclose = function(e) { + console.log('WebSocket已关闭', e, new Date()) + } + } + }, handleSelect(key, keyPath) { this.selectDevByType(key,undefined) }, @@ -421,8 +530,7 @@ devTypes[i].className = 'dev-icon el-col el-col-24' } } - this.checkDevType = [false, false, false, false, false, false] - if(type.length>2){ + if(type !== 'camera'){ // 添加选中的样式 if (typeof event === 'undefined') { devTypes[0].className += ' dev-type-selected' @@ -430,13 +538,20 @@ event.currentTarget.className += ' dev-type-selected' } } - + if(type!=='camera'){ + this.checkDevType = [false, false, false, false, false, false] + this.checkDevType1 = [false, false, false, false, false, false] + } if (type === 'all') { this.devListParams.deviceTypes = [] this.checkDevType[0] = true - } else if (type === 'camera') { - this.devListParams.deviceTypes = cameraTypes.toString() - this.checkDevType[1] = true + } else if(type==='camera'){ + for(var i=0;i= 1920) { + if (this.winSize.width >= 1440) { this.$refs['sub-tab'].style.right = '290px' this.$refs['sub-tab'].style.top = '135px' - this.$refs['sub-tab-border'].style.right = '335px' - this.$refs['sub-tab-border'].style.top = '185px' + this.$refs['sub-tab-border'].style.right = '56px' + this.$refs['sub-tab-border'].style.top = '145px' - this.$refs['sub-tab-floor-3'].style.right = '340px' - this.$refs['sub-tab-floor-3'].style.top = '220px' - } else if (this.winSize.width >= 1366 && this.winSize.width < 1920) { + this.$refs['sub-tab-floor-3'].style.right = '70px' + this.$refs['sub-tab-floor-3'].style.top = '200px' + } else if (this.winSize.width < 1440) { this.$refs['sub-tab'].style.right = '215px' this.$refs['sub-tab'].style.top = '102px' - this.$refs['sub-tab-border'].style.right = '245px' - this.$refs['sub-tab-border'].style.top = '140px' + this.$refs['sub-tab-border'].style.right = '40px' + this.$refs['sub-tab-border'].style.top = '103px' - this.$refs['sub-tab-floor-3'].style.right = '245px' - this.$refs['sub-tab-floor-3'].style.top = '170px' + this.$refs['sub-tab-floor-3'].style.right = '50px' + this.$refs['sub-tab-floor-3'].style.top = '143px' } } else if (tab === 'four') { this.showSubTabGuider = true @@ -527,29 +646,30 @@ this.$refs['sub-tab-floor-4-1'].style.position = 'absolute' this.$refs['sub-tab-floor-4-5'].style.position = 'absolute' - if (this.winSize.width >= 1920) { + if (this.winSize.width >= 1440) { this.$refs['sub-tab'].style.right = '290px' this.$refs['sub-tab'].style.top = '210px' - this.$refs['sub-tab-border'].style.right = '335px' - this.$refs['sub-tab-border'].style.top = '260px' + this.$refs['sub-tab-border'].style.right = '56px' + this.$refs['sub-tab-border'].style.top = '288px' - this.$refs['sub-tab-floor-4-1'].style.right = '340px' - this.$refs['sub-tab-floor-4-1'].style.top = '300px' + this.$refs['sub-tab-floor-4-1'].style.right = '70px' + this.$refs['sub-tab-floor-4-1'].style.top = '330px' - this.$refs['sub-tab-floor-4-5'].style.right = '340px' - this.$refs['sub-tab-floor-4-5'].style.top = '350px' - } else if (this.winSize.width >= 1366 && this.winSize.width < 1920) { + this.$refs['sub-tab-floor-4-5'].style.right = '70px' + this.$refs['sub-tab-floor-4-5'].style.top = '370px' + } + else if (this.winSize.width < 1440) { this.$refs['sub-tab'].style.right = '215px' this.$refs['sub-tab'].style.top = '158px' - this.$refs['sub-tab-border'].style.right = '245px' - this.$refs['sub-tab-border'].style.top = '196px' + this.$refs['sub-tab-border'].style.right = '40px' + this.$refs['sub-tab-border'].style.top = '206px' - this.$refs['sub-tab-floor-4-1'].style.right = '245px' - this.$refs['sub-tab-floor-4-1'].style.top = '226px' + this.$refs['sub-tab-floor-4-1'].style.right = '50px' + this.$refs['sub-tab-floor-4-1'].style.top = '236px' - this.$refs['sub-tab-floor-4-5'].style.right = '245px' + this.$refs['sub-tab-floor-4-5'].style.right = '50px' this.$refs['sub-tab-floor-4-5'].style.top = '266px' } } else { @@ -605,9 +725,9 @@ this.showSmoking = true // 显示烟感 this.showSound = true // 显示声光报警器 if (this.winSize.width >= 1920) { - this.footLeft = (this.winSize.width - 5 * 210) / 2 + this.footLeft = (this.winSize.width - 4 * 210) / 2 } else if (this.winSize.width >= 1366 && this.winSize.width < 1920) { - this.footLeft = (this.winSize.width - 5 * 155) / 2 + this.footLeft = (this.winSize.width - 4 * 155) / 2 } } else if (index === 'tg_4_5') { this.bgImageSrc = tg_4_5 @@ -769,6 +889,7 @@ } .point-camera { background: url("../../assets/overview_images/icons/icon-camera-point.png"); + /*transform:rotate(60deg);*/ background-size: contain; @extend .point; } @@ -802,26 +923,32 @@ border-bottom-width: 0px; } .statis-block { - text-align: center; - margin-top: 20px; - font-size: 48px; + text-align: right; + margin-top: -20px; + margin-right: 40px; + font-size: 30px; } .sub-title { - text-align: center; - font-size: 32px; + text-align: left; + margin-left: 25px; + margin-top: 16px; + font-size: 30px; } .sub-data-block { - width: 122px; - height: 155px; + width: 215px; + height: 68px; } .dev-normal { - background: url("../../assets/overview_images/normal.png"); - background-size: contain; + background: url("../../assets/overview_images/dev-box.png"); + background-repeat: no-repeat; + background-size:cover; color: #00ff0c; } .dev-alarm { - background: url("../../assets/overview_images/alarm.png"); - background-size: contain; + background: url("../../assets/overview_images/dev-box.png"); + margin-left: 5px; + background-repeat: no-repeat; + background-size:cover; color: #ff0000; } .dev-offline { @@ -915,9 +1042,9 @@ .map-tab { position: absolute; - right: 20px; + right: 10px; top: 100px; - width: 300px; + width: 56px; button { margin: 5px 0px; } @@ -937,32 +1064,43 @@ } .map-index-button { position: relative; - width: 284px; - height: 74px; + width: 56px; + height: 144px; background: url("../../assets/overview_images/tab-index-unchecked.png"); - font-size: 32px; - line-height: 74px; + background-repeat:no-repeat; + writing-mode: vertical-rl; + font-size: 24px; + line-height: 30px; text-align: center; color: #FFFFFF; cursor: pointer; + padding:0px; + display:flex; + -webkit-display:flex; + flex-direction:column; + /* align-content: center; */ + /* vertical-align: middle; */ + justify-content:center; + } .index-selected { background: url("../../assets/overview_images/tab-index-checked.png"); + background-repeat:no-repeat; } .sub-tab-guider { width: 149px; height: 50px; - background: url("../../assets/overview_images/sub-tab-guider.png"); + /*background: url("../../assets/overview_images/sub-tab-guider.png");*/ } .sub-tab-border { - width: 204px; - height: 253px; + width: 235px; + height: 145px; background: url("../../assets/overview_images/sub-tab-border.png"); } .sub-tab-content { text-align: center; color: #FFFFFF; - font-size: 28px; + font-size: 20px; cursor: pointer; width: 200px; } @@ -1105,22 +1243,23 @@ } .statis-block { - margin-top: 16px; - font-size: 36px; + margin-top: -20px; + font-size: 24px; } .sub-title { + margin-top: 10px; font-size: 24px; } .sub-data-block { - width: 90px; - height: 114px; + width: 161px; + height: 51px; } .dev-normal { - background: url("../../assets/overview_images/normal-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-alarm { - background: url("../../assets/overview_images/alarm-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-offline { background: url("../../assets/overview_images/offline-1366.png"); @@ -1154,9 +1293,9 @@ } .map-tab { - right: 16px; + right: 10px; top: 90px; - width: 215px; + width: 40px; button { margin: 5px 0px; } @@ -1172,11 +1311,11 @@ background: url("../../assets/overview_images/tab-bottom-bg-1366.png"); } .map-index-button { - width: 210px; - height: 56px; + width: 40px; + height: 103px; background: url("../../assets/overview_images/tab-index-unchecked-1366.png"); - font-size: 24px; - line-height: 56px; + font-size: 18px; + line-height: 25px; } .index-selected { background: url("../../assets/overview_images/tab-index-checked-1366.png"); @@ -1185,15 +1324,15 @@ .sub-tab-guider { width: 110px; height: 37px; - background: url("../../assets/overview_images/sub-tab-guider-1366.png"); + /*background: url("../../assets/overview_images/sub-tab-guider-1366.png");*/ } .sub-tab-border { - width: 150px; - height: 186px; + width: 168px; + height: 104px; background: url("../../assets/overview_images/sub-tab-border-1366.png"); } .sub-tab-content { - font-size: 20px; + font-size: 16px; cursor: pointer; width: 145px; } diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/assets/overview_images/sub-tab-border-1366.png b/src/assets/overview_images/sub-tab-border-1366.png index 21c13c1..93bbefc 100644 --- a/src/assets/overview_images/sub-tab-border-1366.png +++ b/src/assets/overview_images/sub-tab-border-1366.png Binary files differ diff --git a/src/assets/overview_images/sub-tab-border.png b/src/assets/overview_images/sub-tab-border.png index 008d28d..0f94da3 100644 --- a/src/assets/overview_images/sub-tab-border.png +++ b/src/assets/overview_images/sub-tab-border.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked-1366.png b/src/assets/overview_images/tab-index-checked-1366.png index 2171e1c..df63c85 100644 --- a/src/assets/overview_images/tab-index-checked-1366.png +++ b/src/assets/overview_images/tab-index-checked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked.png b/src/assets/overview_images/tab-index-checked.png index 22f316b..d8af05f 100644 --- a/src/assets/overview_images/tab-index-checked.png +++ b/src/assets/overview_images/tab-index-checked.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked-1366.png b/src/assets/overview_images/tab-index-unchecked-1366.png index 59657f2..cd0dc63 100644 --- a/src/assets/overview_images/tab-index-unchecked-1366.png +++ b/src/assets/overview_images/tab-index-unchecked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked.png b/src/assets/overview_images/tab-index-unchecked.png index 2a247c0..f7a9f9f 100644 --- a/src/assets/overview_images/tab-index-unchecked.png +++ b/src/assets/overview_images/tab-index-unchecked.png Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" new file mode 100644 index 0000000..42e3ab7 --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" new file mode 100644 index 0000000..d57441b --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" Binary files differ diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js index 6bd1506..dc5aa92 100644 --- a/src/router/modules/doorSys.js +++ b/src/router/modules/doorSys.js @@ -212,6 +212,27 @@ ] }, { + path: '/door/area', + component: Layout, + redirect: '/door/area', + name: 'DoorArea', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/door/area'], // 权限名称 + sys: '/door' + }, + children: [ + { + path: '/door/area/list', + name: 'DoorAreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } + } + ] + }, + { path: '/door/device', component: Layout, redirect: '/door/device', @@ -276,26 +297,5 @@ meta: { title: '营门出入次数统计', icon: '', permission: ['/door/statistics/doorCount'], keepAlive: true } } ] - }, - { - path: '/door/area', - component: Layout, - redirect: '/door/area', - name: 'DoorArea', - alwaysShow: true, - meta: { - title: '区域管理', - icon: 'icon-area', // 图标 - permission: ['/door/area'], // 权限名称 - sys: '/door' - }, - children: [ - { - path: '/door/area/list', - name: 'DoorAreaList', - component: () => import('@/views/area/areaList'), - meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } - } - ] } ] diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index ddc123c..a5137d5 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -16,7 +16,7 @@ position: relative; margin: 0 auto; .el-dialog__header { - background-color:rgb(48, 65, 86); + background-color: rgb(76, 142, 226); //background-color:rgb(47, 91, 114); .el-dialog__title{ color:white; diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 65abe46..86f8b09 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -63,13 +63,17 @@ // menu hover .submenu-title-noDropdown, .el-submenu__title { + //font-size: 15; &:hover { background-color: $menuHover !important; } } - + .sidebar-container .is-active > .el-submenu__title { + color: white !important; + //background-color: $subMenuHover !important; + } .is-active>.el-submenu__title { - color: $menuActiveText !important; + //color: $menuActiveText !important; background-color: $menuHover !important; } .el-menu-item.is-active { diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 28c9c7f..1eadf2f 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -3,19 +3,19 @@ $themeColor:rgb(48, 65, 86); $menuText:#000000; $subMenuText:#000000; -$menuActiveText:rgb(27, 177, 165); +$menuActiveText: rgb(0, 56, 123); //$menuActiveText:#ffffff; $subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 //$subMenuActiveText:#000000; //https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; +$menuBg:#0077ff; //$menuBg:#ffffff; -$menuHover:#263445; +$menuHover:#0077ff; //$menuHover:#6666cc; -$subMenuBg:#1f2d3d; +$subMenuBg: #4c8ee2; //$subMenuBg:#fcfcfc; -$subMenuHover:#001528; +$subMenuHover: #0077ff; //$subMenuHover:#6666cc; $sideBarWidth: 180px; diff --git a/src/utils/validate.js b/src/utils/validate.js index ce760ab..d651e43 100644 --- a/src/utils/validate.js +++ b/src/utils/validate.js @@ -105,14 +105,15 @@ // 手机号验证validator export const phoneValidator = (rule, value, callback) => { const reg = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/ + const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/ if (value !== '') { - if (reg.test(value) === false) { - callback(new Error('请输入正确的手机号')) + if (reg.test(value) === false && reg1.test(value) === false) { + callback(new Error('请输入正确的联系电话')) } else { callback() } } else { - callback(new Error('手机号不能为空')) + callback(new Error('联系电话不能为空')) } } @@ -140,7 +141,12 @@ const reg = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][\dABCDEFGHJKLNMxPQRSTUVWXYZ]{5}$/ const regNew = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][1-9DF][1-9ABCDEFGHJKLMNPQRSTUVWXYZ]\d{3}[1-9DF]$/ if (value !== '') { - if (reg.test(value) === false && regNew.test(value) === false) { + // if (reg.test(value) === false && regNew.test(value) === false) { + // callback(new Error('请输入正确的车牌号')) + // } else { + // callback() + // } + if (value.length!==7 && value.length!==8) { callback(new Error('请输入正确的车牌号')) } else { callback() diff --git a/src/views/alarm/alarmList.vue b/src/views/alarm/alarmList.vue index 2601cfc..2956a74 100644 --- a/src/views/alarm/alarmList.vue +++ b/src/views/alarm/alarmList.vue @@ -46,7 +46,7 @@
-
数据列表
 +
数据列表
 导出 @@ -300,11 +300,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue index 4b47872..1b5efe8 100644 --- a/src/views/alarm/alarmNow.vue +++ b/src/views/alarm/alarmNow.vue @@ -46,7 +46,7 @@
-
数据列表
 +
数据列表
 导出 @@ -66,8 +66,8 @@ @@ -291,11 +291,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/alarm/alarmPosition.vue b/src/views/alarm/alarmPosition.vue index 402da42..2da9b2c 100644 --- a/src/views/alarm/alarmPosition.vue +++ b/src/views/alarm/alarmPosition.vue @@ -8,7 +8,7 @@ v-for="item in devList" :id="item.id" :key="item.id" - :style="{ position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" + :style="{ transform: 'rotate('+ item.angle +'deg)', position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" class="point-camera" @click="detailDev(item, $event)" />
@@ -363,12 +363,12 @@ height: 155px; } .dev-normal { - background: url("../../assets/overview_images/normal.png"); + background: url("../../assets/overview_images/dev-box.png"); background-size: contain; color: #00ff0c; } .dev-alarm { - background: url("../../assets/overview_images/alarm.png"); + background: url("../../assets/overview_images/dev-box.png"); background-size: contain; color: #ff0000; } @@ -665,10 +665,10 @@ } .dev-normal { - background: url("../../assets/overview_images/normal-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-alarm { - background: url("../../assets/overview_images/alarm-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-offline { background: url("../../assets/overview_images/offline-1366.png"); diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue index 11dc51f..d3ff751 100644 --- a/src/views/area/areaList.vue +++ b/src/views/area/areaList.vue @@ -29,7 +29,7 @@
-
数据列表
 +
数据列表
 @@ -228,11 +228,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue index 703ec7d..eff1053 100644 --- a/src/views/area/defenceDetail.vue +++ b/src/views/area/defenceDetail.vue @@ -4,13 +4,13 @@ - + - + @@ -19,13 +19,13 @@ - + - + @@ -42,7 +42,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/src/views/area/defenceList.vue b/src/views/area/defenceList.vue index 8649918..cb9c4b8 100644 --- a/src/views/area/defenceList.vue +++ b/src/views/area/defenceList.vue @@ -29,7 +29,7 @@
-
数据列表
 +
数据列表
 @@ -104,8 +104,8 @@ align: 'center' }, { - text: '设备状态', - value: 'deviceState', + text: '区域类别', + value: 'areaTypeName', align: 'center' }, { @@ -253,11 +253,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue index 633e353..ddb215f 100644 --- a/src/views/car/carAdd.vue +++ b/src/views/car/carAdd.vue @@ -4,7 +4,8 @@ - + + @@ -137,7 +138,10 @@ phone: row.phone, remark: row.remark } - this.getStaffList() + getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { + this.staffList = response.data + console.log(response) + }) } else if (dialogStatus === 'detail') { this.isDetailMode = true this.isEditMode = false @@ -152,7 +156,10 @@ deptName: row.deptName, ownerName: row.ownerName } - this.getStaffList() + getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { + this.staffList = response.data + console.log(response) + }) } }, // 清除数据 @@ -186,6 +193,7 @@ }) }, getStaffList(){ + this.dataForm.ownerId = '' getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { this.staffList = response.data console.log(response) diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue index d0c0176..8d924ff 100644 --- a/src/views/car/carList.vue +++ b/src/views/car/carList.vue @@ -29,7 +29,7 @@
-
数据列表
 +
数据列表
 导出 新增 @@ -259,11 +259,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/ctrl/overview.vue b/src/views/ctrl/overview.vue index f452ea5..e2c5f62 100644 --- a/src/views/ctrl/overview.vue +++ b/src/views/ctrl/overview.vue @@ -22,32 +22,32 @@
+
正常
-
正常
 +
报警
-
报警
 - -
- -
-
离线
- + + + + + + - -
- -
-
关闭
- + + + + + +
@@ -89,77 +89,93 @@ v-for="item in devList" :id="item.id" :key="item.id" - :style="{ position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" + :style="{ transform: 'rotate('+ item.angle +'deg)', position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" class="point-camera" @click="detailDev(item, $event)" />
- - - - - 全部 +
+ + + + 人脸识别 - - - - - - - 摄像头 - 摄像头 - 人脸识别摄像头 - 车牌轨迹摄像头 - 周界防护预警摄像头 - 标准数字摄像头 - 智能球形摄像头 - 标准半球摄像头 - - - + + + + 车牌轨迹 - - - - - 电子围栏 + + + + 周界防护 - - - - - 温湿度 + + + + 标准数字 - - - - - 烟感 + + + + 智能球形 - - - - - 声光报警 + + + + 标准半球 - +
+ +
+ + + + 全部 + + + + + + 摄像头 + + + + + 电子围栏 + + + + + 温湿度 + + + + + 烟感 + + + + + + +
-
+
营区总览
三号楼
四号楼
-
+
@@ -231,12 +247,15 @@ components: { DeviceDetail }, data() { return { + showType: false, + wsPath: process.env.BASE_API+'/websocket/', title: getProject().title, bgImageSrc: tg_main, devListParams: { picture: '1', deviceTypes: [] }, + cameraClass:'dev-icon', dev: { alarm: 0, onLine: 0, @@ -300,10 +319,24 @@ }, // 设备详情表单 isFence: false, // 是否电子围栏设备 itemColor: '#f58a88', - checkDevType: [true, false, false, false, false, false] // 选中设备类型 + checkDevType: [true, false, false, false, false, false], // 选中设备类型 + checkDevType1: [false, false, false, false, false, false] // 摄像头类型 } }, + watch:{ + checkDevType: function(val) { + if(val[1]){ + this.cameraClass = 'dev-icon dev-type-selected' + }else{ + this.cameraClass = 'dev-icon' + } + } + }, mounted() { + window.addEventListener('click',this.handleKeyup) + this.wsPath = this.wsPath.replace(/http/,'ws') + console.log(this.wsPath) + // this.webSocket() this.initWindowSize() this.fetchData() @@ -317,6 +350,82 @@ } }, methods: { + handleKeyup(val){ //单击收起摄像头分类 + console.log(val) + var item = ['人脸识别','车牌轨迹','周界防护','标准数字','智能球形','标准半球'] + for(var i=0;i { + // that.$router.push({ + // path: '/overview', + // query: { refresh: true } + // }) + // } + }) + // } + } + // 监听socket错误 + this.socket.onerror = function() { + that.$notify({ + title: '服务器错误', + message: '无法接收实时报警信息,请检查服务器后重新刷新页面', + type: 'error', + duration: 0 + }) + } + // 监听socket关闭 + this.socket.onclose = function(e) { + console.log('WebSocket已关闭', e, new Date()) + } + } + }, handleSelect(key, keyPath) { this.selectDevByType(key,undefined) }, @@ -421,8 +530,7 @@ devTypes[i].className = 'dev-icon el-col el-col-24' } } - this.checkDevType = [false, false, false, false, false, false] - if(type.length>2){ + if(type !== 'camera'){ // 添加选中的样式 if (typeof event === 'undefined') { devTypes[0].className += ' dev-type-selected' @@ -430,13 +538,20 @@ event.currentTarget.className += ' dev-type-selected' } } - + if(type!=='camera'){ + this.checkDevType = [false, false, false, false, false, false] + this.checkDevType1 = [false, false, false, false, false, false] + } if (type === 'all') { this.devListParams.deviceTypes = [] this.checkDevType[0] = true - } else if (type === 'camera') { - this.devListParams.deviceTypes = cameraTypes.toString() - this.checkDevType[1] = true + } else if(type==='camera'){ + for(var i=0;i= 1920) { + if (this.winSize.width >= 1440) { this.$refs['sub-tab'].style.right = '290px' this.$refs['sub-tab'].style.top = '135px' - this.$refs['sub-tab-border'].style.right = '335px' - this.$refs['sub-tab-border'].style.top = '185px' + this.$refs['sub-tab-border'].style.right = '56px' + this.$refs['sub-tab-border'].style.top = '145px' - this.$refs['sub-tab-floor-3'].style.right = '340px' - this.$refs['sub-tab-floor-3'].style.top = '220px' - } else if (this.winSize.width >= 1366 && this.winSize.width < 1920) { + this.$refs['sub-tab-floor-3'].style.right = '70px' + this.$refs['sub-tab-floor-3'].style.top = '200px' + } else if (this.winSize.width < 1440) { this.$refs['sub-tab'].style.right = '215px' this.$refs['sub-tab'].style.top = '102px' - this.$refs['sub-tab-border'].style.right = '245px' - this.$refs['sub-tab-border'].style.top = '140px' + this.$refs['sub-tab-border'].style.right = '40px' + this.$refs['sub-tab-border'].style.top = '103px' - this.$refs['sub-tab-floor-3'].style.right = '245px' - this.$refs['sub-tab-floor-3'].style.top = '170px' + this.$refs['sub-tab-floor-3'].style.right = '50px' + this.$refs['sub-tab-floor-3'].style.top = '143px' } } else if (tab === 'four') { this.showSubTabGuider = true @@ -527,29 +646,30 @@ this.$refs['sub-tab-floor-4-1'].style.position = 'absolute' this.$refs['sub-tab-floor-4-5'].style.position = 'absolute' - if (this.winSize.width >= 1920) { + if (this.winSize.width >= 1440) { this.$refs['sub-tab'].style.right = '290px' this.$refs['sub-tab'].style.top = '210px' - this.$refs['sub-tab-border'].style.right = '335px' - this.$refs['sub-tab-border'].style.top = '260px' + this.$refs['sub-tab-border'].style.right = '56px' + this.$refs['sub-tab-border'].style.top = '288px' - this.$refs['sub-tab-floor-4-1'].style.right = '340px' - this.$refs['sub-tab-floor-4-1'].style.top = '300px' + this.$refs['sub-tab-floor-4-1'].style.right = '70px' + this.$refs['sub-tab-floor-4-1'].style.top = '330px' - this.$refs['sub-tab-floor-4-5'].style.right = '340px' - this.$refs['sub-tab-floor-4-5'].style.top = '350px' - } else if (this.winSize.width >= 1366 && this.winSize.width < 1920) { + this.$refs['sub-tab-floor-4-5'].style.right = '70px' + this.$refs['sub-tab-floor-4-5'].style.top = '370px' + } + else if (this.winSize.width < 1440) { this.$refs['sub-tab'].style.right = '215px' this.$refs['sub-tab'].style.top = '158px' - this.$refs['sub-tab-border'].style.right = '245px' - this.$refs['sub-tab-border'].style.top = '196px' + this.$refs['sub-tab-border'].style.right = '40px' + this.$refs['sub-tab-border'].style.top = '206px' - this.$refs['sub-tab-floor-4-1'].style.right = '245px' - this.$refs['sub-tab-floor-4-1'].style.top = '226px' + this.$refs['sub-tab-floor-4-1'].style.right = '50px' + this.$refs['sub-tab-floor-4-1'].style.top = '236px' - this.$refs['sub-tab-floor-4-5'].style.right = '245px' + this.$refs['sub-tab-floor-4-5'].style.right = '50px' this.$refs['sub-tab-floor-4-5'].style.top = '266px' } } else { @@ -605,9 +725,9 @@ this.showSmoking = true // 显示烟感 this.showSound = true // 显示声光报警器 if (this.winSize.width >= 1920) { - this.footLeft = (this.winSize.width - 5 * 210) / 2 + this.footLeft = (this.winSize.width - 4 * 210) / 2 } else if (this.winSize.width >= 1366 && this.winSize.width < 1920) { - this.footLeft = (this.winSize.width - 5 * 155) / 2 + this.footLeft = (this.winSize.width - 4 * 155) / 2 } } else if (index === 'tg_4_5') { this.bgImageSrc = tg_4_5 @@ -769,6 +889,7 @@ } .point-camera { background: url("../../assets/overview_images/icons/icon-camera-point.png"); + /*transform:rotate(60deg);*/ background-size: contain; @extend .point; } @@ -802,26 +923,32 @@ border-bottom-width: 0px; } .statis-block { - text-align: center; - margin-top: 20px; - font-size: 48px; + text-align: right; + margin-top: -20px; + margin-right: 40px; + font-size: 30px; } .sub-title { - text-align: center; - font-size: 32px; + text-align: left; + margin-left: 25px; + margin-top: 16px; + font-size: 30px; } .sub-data-block { - width: 122px; - height: 155px; + width: 215px; + height: 68px; } .dev-normal { - background: url("../../assets/overview_images/normal.png"); - background-size: contain; + background: url("../../assets/overview_images/dev-box.png"); + background-repeat: no-repeat; + background-size:cover; color: #00ff0c; } .dev-alarm { - background: url("../../assets/overview_images/alarm.png"); - background-size: contain; + background: url("../../assets/overview_images/dev-box.png"); + margin-left: 5px; + background-repeat: no-repeat; + background-size:cover; color: #ff0000; } .dev-offline { @@ -915,9 +1042,9 @@ .map-tab { position: absolute; - right: 20px; + right: 10px; top: 100px; - width: 300px; + width: 56px; button { margin: 5px 0px; } @@ -937,32 +1064,43 @@ } .map-index-button { position: relative; - width: 284px; - height: 74px; + width: 56px; + height: 144px; background: url("../../assets/overview_images/tab-index-unchecked.png"); - font-size: 32px; - line-height: 74px; + background-repeat:no-repeat; + writing-mode: vertical-rl; + font-size: 24px; + line-height: 30px; text-align: center; color: #FFFFFF; cursor: pointer; + padding:0px; + display:flex; + -webkit-display:flex; + flex-direction:column; + /* align-content: center; */ + /* vertical-align: middle; */ + justify-content:center; + } .index-selected { background: url("../../assets/overview_images/tab-index-checked.png"); + background-repeat:no-repeat; } .sub-tab-guider { width: 149px; height: 50px; - background: url("../../assets/overview_images/sub-tab-guider.png"); + /*background: url("../../assets/overview_images/sub-tab-guider.png");*/ } .sub-tab-border { - width: 204px; - height: 253px; + width: 235px; + height: 145px; background: url("../../assets/overview_images/sub-tab-border.png"); } .sub-tab-content { text-align: center; color: #FFFFFF; - font-size: 28px; + font-size: 20px; cursor: pointer; width: 200px; } @@ -1105,22 +1243,23 @@ } .statis-block { - margin-top: 16px; - font-size: 36px; + margin-top: -20px; + font-size: 24px; } .sub-title { + margin-top: 10px; font-size: 24px; } .sub-data-block { - width: 90px; - height: 114px; + width: 161px; + height: 51px; } .dev-normal { - background: url("../../assets/overview_images/normal-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-alarm { - background: url("../../assets/overview_images/alarm-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-offline { background: url("../../assets/overview_images/offline-1366.png"); @@ -1154,9 +1293,9 @@ } .map-tab { - right: 16px; + right: 10px; top: 90px; - width: 215px; + width: 40px; button { margin: 5px 0px; } @@ -1172,11 +1311,11 @@ background: url("../../assets/overview_images/tab-bottom-bg-1366.png"); } .map-index-button { - width: 210px; - height: 56px; + width: 40px; + height: 103px; background: url("../../assets/overview_images/tab-index-unchecked-1366.png"); - font-size: 24px; - line-height: 56px; + font-size: 18px; + line-height: 25px; } .index-selected { background: url("../../assets/overview_images/tab-index-checked-1366.png"); @@ -1185,15 +1324,15 @@ .sub-tab-guider { width: 110px; height: 37px; - background: url("../../assets/overview_images/sub-tab-guider-1366.png"); + /*background: url("../../assets/overview_images/sub-tab-guider-1366.png");*/ } .sub-tab-border { - width: 150px; - height: 186px; + width: 168px; + height: 104px; background: url("../../assets/overview_images/sub-tab-border-1366.png"); } .sub-tab-content { - font-size: 20px; + font-size: 16px; cursor: pointer; width: 145px; } diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue index 56c1970..604138d 100644 --- a/src/views/deviceManage/deviceDetail.vue +++ b/src/views/deviceManage/deviceDetail.vue @@ -4,24 +4,24 @@ - + - + - + - + @@ -30,13 +30,13 @@ - + - + @@ -45,13 +45,13 @@ - + - + @@ -60,13 +60,13 @@ - + - + @@ -75,7 +75,7 @@ - + @@ -201,13 +201,14 @@ }, // 身份证号加密显示 encrypIdCardNo(idCard) { - if (idCard.length > 6) { - return idCard.substr(0, 6) + '********' + idCard.substr(14) - } else if (idCard) { - return idCard - } else { - return '' - } + return idCard + // if (idCard.length > 6) { + // return idCard.substr(0, 6) + '********' + idCard.substr(14) + // } else if (idCard) { + // return idCard + // } else { + // return '' + // } } } } diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/assets/overview_images/sub-tab-border-1366.png b/src/assets/overview_images/sub-tab-border-1366.png index 21c13c1..93bbefc 100644 --- a/src/assets/overview_images/sub-tab-border-1366.png +++ b/src/assets/overview_images/sub-tab-border-1366.png Binary files differ diff --git a/src/assets/overview_images/sub-tab-border.png b/src/assets/overview_images/sub-tab-border.png index 008d28d..0f94da3 100644 --- a/src/assets/overview_images/sub-tab-border.png +++ b/src/assets/overview_images/sub-tab-border.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked-1366.png b/src/assets/overview_images/tab-index-checked-1366.png index 2171e1c..df63c85 100644 --- a/src/assets/overview_images/tab-index-checked-1366.png +++ b/src/assets/overview_images/tab-index-checked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked.png b/src/assets/overview_images/tab-index-checked.png index 22f316b..d8af05f 100644 --- a/src/assets/overview_images/tab-index-checked.png +++ b/src/assets/overview_images/tab-index-checked.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked-1366.png b/src/assets/overview_images/tab-index-unchecked-1366.png index 59657f2..cd0dc63 100644 --- a/src/assets/overview_images/tab-index-unchecked-1366.png +++ b/src/assets/overview_images/tab-index-unchecked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked.png b/src/assets/overview_images/tab-index-unchecked.png index 2a247c0..f7a9f9f 100644 --- a/src/assets/overview_images/tab-index-unchecked.png +++ b/src/assets/overview_images/tab-index-unchecked.png Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" new file mode 100644 index 0000000..42e3ab7 --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" new file mode 100644 index 0000000..d57441b --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" Binary files differ diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js index 6bd1506..dc5aa92 100644 --- a/src/router/modules/doorSys.js +++ b/src/router/modules/doorSys.js @@ -212,6 +212,27 @@ ] }, { + path: '/door/area', + component: Layout, + redirect: '/door/area', + name: 'DoorArea', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/door/area'], // 权限名称 + sys: '/door' + }, + children: [ + { + path: '/door/area/list', + name: 'DoorAreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } + } + ] + }, + { path: '/door/device', component: Layout, redirect: '/door/device', @@ -276,26 +297,5 @@ meta: { title: '营门出入次数统计', icon: '', permission: ['/door/statistics/doorCount'], keepAlive: true } } ] - }, - { - path: '/door/area', - component: Layout, - redirect: '/door/area', - name: 'DoorArea', - alwaysShow: true, - meta: { - title: '区域管理', - icon: 'icon-area', // 图标 - permission: ['/door/area'], // 权限名称 - sys: '/door' - }, - children: [ - { - path: '/door/area/list', - name: 'DoorAreaList', - component: () => import('@/views/area/areaList'), - meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } - } - ] } ] diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index ddc123c..a5137d5 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -16,7 +16,7 @@ position: relative; margin: 0 auto; .el-dialog__header { - background-color:rgb(48, 65, 86); + background-color: rgb(76, 142, 226); //background-color:rgb(47, 91, 114); .el-dialog__title{ color:white; diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 65abe46..86f8b09 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -63,13 +63,17 @@ // menu hover .submenu-title-noDropdown, .el-submenu__title { + //font-size: 15; &:hover { background-color: $menuHover !important; } } - + .sidebar-container .is-active > .el-submenu__title { + color: white !important; + //background-color: $subMenuHover !important; + } .is-active>.el-submenu__title { - color: $menuActiveText !important; + //color: $menuActiveText !important; background-color: $menuHover !important; } .el-menu-item.is-active { diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 28c9c7f..1eadf2f 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -3,19 +3,19 @@ $themeColor:rgb(48, 65, 86); $menuText:#000000; $subMenuText:#000000; -$menuActiveText:rgb(27, 177, 165); +$menuActiveText: rgb(0, 56, 123); //$menuActiveText:#ffffff; $subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 //$subMenuActiveText:#000000; //https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; +$menuBg:#0077ff; //$menuBg:#ffffff; -$menuHover:#263445; +$menuHover:#0077ff; //$menuHover:#6666cc; -$subMenuBg:#1f2d3d; +$subMenuBg: #4c8ee2; //$subMenuBg:#fcfcfc; -$subMenuHover:#001528; +$subMenuHover: #0077ff; //$subMenuHover:#6666cc; $sideBarWidth: 180px; diff --git a/src/utils/validate.js b/src/utils/validate.js index ce760ab..d651e43 100644 --- a/src/utils/validate.js +++ b/src/utils/validate.js @@ -105,14 +105,15 @@ // 手机号验证validator export const phoneValidator = (rule, value, callback) => { const reg = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/ + const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/ if (value !== '') { - if (reg.test(value) === false) { - callback(new Error('请输入正确的手机号')) + if (reg.test(value) === false && reg1.test(value) === false) { + callback(new Error('请输入正确的联系电话')) } else { callback() } } else { - callback(new Error('手机号不能为空')) + callback(new Error('联系电话不能为空')) } } @@ -140,7 +141,12 @@ const reg = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][\dABCDEFGHJKLNMxPQRSTUVWXYZ]{5}$/ const regNew = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][1-9DF][1-9ABCDEFGHJKLMNPQRSTUVWXYZ]\d{3}[1-9DF]$/ if (value !== '') { - if (reg.test(value) === false && regNew.test(value) === false) { + // if (reg.test(value) === false && regNew.test(value) === false) { + // callback(new Error('请输入正确的车牌号')) + // } else { + // callback() + // } + if (value.length!==7 && value.length!==8) { callback(new Error('请输入正确的车牌号')) } else { callback() diff --git a/src/views/alarm/alarmList.vue b/src/views/alarm/alarmList.vue index 2601cfc..2956a74 100644 --- a/src/views/alarm/alarmList.vue +++ b/src/views/alarm/alarmList.vue @@ -46,7 +46,7 @@
-
数据列表
 +
数据列表
 导出 @@ -300,11 +300,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue index 4b47872..1b5efe8 100644 --- a/src/views/alarm/alarmNow.vue +++ b/src/views/alarm/alarmNow.vue @@ -46,7 +46,7 @@
-
数据列表
 +
数据列表
 导出 @@ -66,8 +66,8 @@ @@ -291,11 +291,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/alarm/alarmPosition.vue b/src/views/alarm/alarmPosition.vue index 402da42..2da9b2c 100644 --- a/src/views/alarm/alarmPosition.vue +++ b/src/views/alarm/alarmPosition.vue @@ -8,7 +8,7 @@ v-for="item in devList" :id="item.id" :key="item.id" - :style="{ position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" + :style="{ transform: 'rotate('+ item.angle +'deg)', position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" class="point-camera" @click="detailDev(item, $event)" />
@@ -363,12 +363,12 @@ height: 155px; } .dev-normal { - background: url("../../assets/overview_images/normal.png"); + background: url("../../assets/overview_images/dev-box.png"); background-size: contain; color: #00ff0c; } .dev-alarm { - background: url("../../assets/overview_images/alarm.png"); + background: url("../../assets/overview_images/dev-box.png"); background-size: contain; color: #ff0000; } @@ -665,10 +665,10 @@ } .dev-normal { - background: url("../../assets/overview_images/normal-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-alarm { - background: url("../../assets/overview_images/alarm-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-offline { background: url("../../assets/overview_images/offline-1366.png"); diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue index 11dc51f..d3ff751 100644 --- a/src/views/area/areaList.vue +++ b/src/views/area/areaList.vue @@ -29,7 +29,7 @@
-
数据列表
 +
数据列表
 @@ -228,11 +228,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue index 703ec7d..eff1053 100644 --- a/src/views/area/defenceDetail.vue +++ b/src/views/area/defenceDetail.vue @@ -4,13 +4,13 @@ - + - + @@ -19,13 +19,13 @@ - + - + @@ -42,7 +42,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/src/views/area/defenceList.vue b/src/views/area/defenceList.vue index 8649918..cb9c4b8 100644 --- a/src/views/area/defenceList.vue +++ b/src/views/area/defenceList.vue @@ -29,7 +29,7 @@
-
数据列表
 +
数据列表
 @@ -104,8 +104,8 @@ align: 'center' }, { - text: '设备状态', - value: 'deviceState', + text: '区域类别', + value: 'areaTypeName', align: 'center' }, { @@ -253,11 +253,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue index 633e353..ddb215f 100644 --- a/src/views/car/carAdd.vue +++ b/src/views/car/carAdd.vue @@ -4,7 +4,8 @@ - + + @@ -137,7 +138,10 @@ phone: row.phone, remark: row.remark } - this.getStaffList() + getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { + this.staffList = response.data + console.log(response) + }) } else if (dialogStatus === 'detail') { this.isDetailMode = true this.isEditMode = false @@ -152,7 +156,10 @@ deptName: row.deptName, ownerName: row.ownerName } - this.getStaffList() + getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { + this.staffList = response.data + console.log(response) + }) } }, // 清除数据 @@ -186,6 +193,7 @@ }) }, getStaffList(){ + this.dataForm.ownerId = '' getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { this.staffList = response.data console.log(response) diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue index d0c0176..8d924ff 100644 --- a/src/views/car/carList.vue +++ b/src/views/car/carList.vue @@ -29,7 +29,7 @@
-
数据列表
 +
数据列表
 导出 新增 @@ -259,11 +259,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/ctrl/overview.vue b/src/views/ctrl/overview.vue index f452ea5..e2c5f62 100644 --- a/src/views/ctrl/overview.vue +++ b/src/views/ctrl/overview.vue @@ -22,32 +22,32 @@
+
正常
-
正常
 +
报警
-
报警
 - -
- -
-
离线
- + + + + + + - -
- -
-
关闭
- + + + + + +
@@ -89,77 +89,93 @@ v-for="item in devList" :id="item.id" :key="item.id" - :style="{ position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" + :style="{ transform: 'rotate('+ item.angle +'deg)', position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" class="point-camera" @click="detailDev(item, $event)" />
- - - - - 全部 +
+ + + + 人脸识别 - - - - - - - 摄像头 - 摄像头 - 人脸识别摄像头 - 车牌轨迹摄像头 - 周界防护预警摄像头 - 标准数字摄像头 - 智能球形摄像头 - 标准半球摄像头 - - - + + + + 车牌轨迹 - - - - - 电子围栏 + + + + 周界防护 - - - - - 温湿度 + + + + 标准数字 - - - - - 烟感 + + + + 智能球形 - - - - - 声光报警 + + + + 标准半球 - +
+ +
+ + + + 全部 + + + + + + 摄像头 + + + + + 电子围栏 + + + + + 温湿度 + + + + + 烟感 + + + + + + +
-
+
营区总览
三号楼
四号楼
-
+
@@ -231,12 +247,15 @@ components: { DeviceDetail }, data() { return { + showType: false, + wsPath: process.env.BASE_API+'/websocket/', title: getProject().title, bgImageSrc: tg_main, devListParams: { picture: '1', deviceTypes: [] }, + cameraClass:'dev-icon', dev: { alarm: 0, onLine: 0, @@ -300,10 +319,24 @@ }, // 设备详情表单 isFence: false, // 是否电子围栏设备 itemColor: '#f58a88', - checkDevType: [true, false, false, false, false, false] // 选中设备类型 + checkDevType: [true, false, false, false, false, false], // 选中设备类型 + checkDevType1: [false, false, false, false, false, false] // 摄像头类型 } }, + watch:{ + checkDevType: function(val) { + if(val[1]){ + this.cameraClass = 'dev-icon dev-type-selected' + }else{ + this.cameraClass = 'dev-icon' + } + } + }, mounted() { + window.addEventListener('click',this.handleKeyup) + this.wsPath = this.wsPath.replace(/http/,'ws') + console.log(this.wsPath) + // this.webSocket() this.initWindowSize() this.fetchData() @@ -317,6 +350,82 @@ } }, methods: { + handleKeyup(val){ //单击收起摄像头分类 + console.log(val) + var item = ['人脸识别','车牌轨迹','周界防护','标准数字','智能球形','标准半球'] + for(var i=0;i { + // that.$router.push({ + // path: '/overview', + // query: { refresh: true } + // }) + // } + }) + // } + } + // 监听socket错误 + this.socket.onerror = function() { + that.$notify({ + title: '服务器错误', + message: '无法接收实时报警信息,请检查服务器后重新刷新页面', + type: 'error', + duration: 0 + }) + } + // 监听socket关闭 + this.socket.onclose = function(e) { + console.log('WebSocket已关闭', e, new Date()) + } + } + }, handleSelect(key, keyPath) { this.selectDevByType(key,undefined) }, @@ -421,8 +530,7 @@ devTypes[i].className = 'dev-icon el-col el-col-24' } } - this.checkDevType = [false, false, false, false, false, false] - if(type.length>2){ + if(type !== 'camera'){ // 添加选中的样式 if (typeof event === 'undefined') { devTypes[0].className += ' dev-type-selected' @@ -430,13 +538,20 @@ event.currentTarget.className += ' dev-type-selected' } } - + if(type!=='camera'){ + this.checkDevType = [false, false, false, false, false, false] + this.checkDevType1 = [false, false, false, false, false, false] + } if (type === 'all') { this.devListParams.deviceTypes = [] this.checkDevType[0] = true - } else if (type === 'camera') { - this.devListParams.deviceTypes = cameraTypes.toString() - this.checkDevType[1] = true + } else if(type==='camera'){ + for(var i=0;i= 1920) { + if (this.winSize.width >= 1440) { this.$refs['sub-tab'].style.right = '290px' this.$refs['sub-tab'].style.top = '135px' - this.$refs['sub-tab-border'].style.right = '335px' - this.$refs['sub-tab-border'].style.top = '185px' + this.$refs['sub-tab-border'].style.right = '56px' + this.$refs['sub-tab-border'].style.top = '145px' - this.$refs['sub-tab-floor-3'].style.right = '340px' - this.$refs['sub-tab-floor-3'].style.top = '220px' - } else if (this.winSize.width >= 1366 && this.winSize.width < 1920) { + this.$refs['sub-tab-floor-3'].style.right = '70px' + this.$refs['sub-tab-floor-3'].style.top = '200px' + } else if (this.winSize.width < 1440) { this.$refs['sub-tab'].style.right = '215px' this.$refs['sub-tab'].style.top = '102px' - this.$refs['sub-tab-border'].style.right = '245px' - this.$refs['sub-tab-border'].style.top = '140px' + this.$refs['sub-tab-border'].style.right = '40px' + this.$refs['sub-tab-border'].style.top = '103px' - this.$refs['sub-tab-floor-3'].style.right = '245px' - this.$refs['sub-tab-floor-3'].style.top = '170px' + this.$refs['sub-tab-floor-3'].style.right = '50px' + this.$refs['sub-tab-floor-3'].style.top = '143px' } } else if (tab === 'four') { this.showSubTabGuider = true @@ -527,29 +646,30 @@ this.$refs['sub-tab-floor-4-1'].style.position = 'absolute' this.$refs['sub-tab-floor-4-5'].style.position = 'absolute' - if (this.winSize.width >= 1920) { + if (this.winSize.width >= 1440) { this.$refs['sub-tab'].style.right = '290px' this.$refs['sub-tab'].style.top = '210px' - this.$refs['sub-tab-border'].style.right = '335px' - this.$refs['sub-tab-border'].style.top = '260px' + this.$refs['sub-tab-border'].style.right = '56px' + this.$refs['sub-tab-border'].style.top = '288px' - this.$refs['sub-tab-floor-4-1'].style.right = '340px' - this.$refs['sub-tab-floor-4-1'].style.top = '300px' + this.$refs['sub-tab-floor-4-1'].style.right = '70px' + this.$refs['sub-tab-floor-4-1'].style.top = '330px' - this.$refs['sub-tab-floor-4-5'].style.right = '340px' - this.$refs['sub-tab-floor-4-5'].style.top = '350px' - } else if (this.winSize.width >= 1366 && this.winSize.width < 1920) { + this.$refs['sub-tab-floor-4-5'].style.right = '70px' + this.$refs['sub-tab-floor-4-5'].style.top = '370px' + } + else if (this.winSize.width < 1440) { this.$refs['sub-tab'].style.right = '215px' this.$refs['sub-tab'].style.top = '158px' - this.$refs['sub-tab-border'].style.right = '245px' - this.$refs['sub-tab-border'].style.top = '196px' + this.$refs['sub-tab-border'].style.right = '40px' + this.$refs['sub-tab-border'].style.top = '206px' - this.$refs['sub-tab-floor-4-1'].style.right = '245px' - this.$refs['sub-tab-floor-4-1'].style.top = '226px' + this.$refs['sub-tab-floor-4-1'].style.right = '50px' + this.$refs['sub-tab-floor-4-1'].style.top = '236px' - this.$refs['sub-tab-floor-4-5'].style.right = '245px' + this.$refs['sub-tab-floor-4-5'].style.right = '50px' this.$refs['sub-tab-floor-4-5'].style.top = '266px' } } else { @@ -605,9 +725,9 @@ this.showSmoking = true // 显示烟感 this.showSound = true // 显示声光报警器 if (this.winSize.width >= 1920) { - this.footLeft = (this.winSize.width - 5 * 210) / 2 + this.footLeft = (this.winSize.width - 4 * 210) / 2 } else if (this.winSize.width >= 1366 && this.winSize.width < 1920) { - this.footLeft = (this.winSize.width - 5 * 155) / 2 + this.footLeft = (this.winSize.width - 4 * 155) / 2 } } else if (index === 'tg_4_5') { this.bgImageSrc = tg_4_5 @@ -769,6 +889,7 @@ } .point-camera { background: url("../../assets/overview_images/icons/icon-camera-point.png"); + /*transform:rotate(60deg);*/ background-size: contain; @extend .point; } @@ -802,26 +923,32 @@ border-bottom-width: 0px; } .statis-block { - text-align: center; - margin-top: 20px; - font-size: 48px; + text-align: right; + margin-top: -20px; + margin-right: 40px; + font-size: 30px; } .sub-title { - text-align: center; - font-size: 32px; + text-align: left; + margin-left: 25px; + margin-top: 16px; + font-size: 30px; } .sub-data-block { - width: 122px; - height: 155px; + width: 215px; + height: 68px; } .dev-normal { - background: url("../../assets/overview_images/normal.png"); - background-size: contain; + background: url("../../assets/overview_images/dev-box.png"); + background-repeat: no-repeat; + background-size:cover; color: #00ff0c; } .dev-alarm { - background: url("../../assets/overview_images/alarm.png"); - background-size: contain; + background: url("../../assets/overview_images/dev-box.png"); + margin-left: 5px; + background-repeat: no-repeat; + background-size:cover; color: #ff0000; } .dev-offline { @@ -915,9 +1042,9 @@ .map-tab { position: absolute; - right: 20px; + right: 10px; top: 100px; - width: 300px; + width: 56px; button { margin: 5px 0px; } @@ -937,32 +1064,43 @@ } .map-index-button { position: relative; - width: 284px; - height: 74px; + width: 56px; + height: 144px; background: url("../../assets/overview_images/tab-index-unchecked.png"); - font-size: 32px; - line-height: 74px; + background-repeat:no-repeat; + writing-mode: vertical-rl; + font-size: 24px; + line-height: 30px; text-align: center; color: #FFFFFF; cursor: pointer; + padding:0px; + display:flex; + -webkit-display:flex; + flex-direction:column; + /* align-content: center; */ + /* vertical-align: middle; */ + justify-content:center; + } .index-selected { background: url("../../assets/overview_images/tab-index-checked.png"); + background-repeat:no-repeat; } .sub-tab-guider { width: 149px; height: 50px; - background: url("../../assets/overview_images/sub-tab-guider.png"); + /*background: url("../../assets/overview_images/sub-tab-guider.png");*/ } .sub-tab-border { - width: 204px; - height: 253px; + width: 235px; + height: 145px; background: url("../../assets/overview_images/sub-tab-border.png"); } .sub-tab-content { text-align: center; color: #FFFFFF; - font-size: 28px; + font-size: 20px; cursor: pointer; width: 200px; } @@ -1105,22 +1243,23 @@ } .statis-block { - margin-top: 16px; - font-size: 36px; + margin-top: -20px; + font-size: 24px; } .sub-title { + margin-top: 10px; font-size: 24px; } .sub-data-block { - width: 90px; - height: 114px; + width: 161px; + height: 51px; } .dev-normal { - background: url("../../assets/overview_images/normal-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-alarm { - background: url("../../assets/overview_images/alarm-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-offline { background: url("../../assets/overview_images/offline-1366.png"); @@ -1154,9 +1293,9 @@ } .map-tab { - right: 16px; + right: 10px; top: 90px; - width: 215px; + width: 40px; button { margin: 5px 0px; } @@ -1172,11 +1311,11 @@ background: url("../../assets/overview_images/tab-bottom-bg-1366.png"); } .map-index-button { - width: 210px; - height: 56px; + width: 40px; + height: 103px; background: url("../../assets/overview_images/tab-index-unchecked-1366.png"); - font-size: 24px; - line-height: 56px; + font-size: 18px; + line-height: 25px; } .index-selected { background: url("../../assets/overview_images/tab-index-checked-1366.png"); @@ -1185,15 +1324,15 @@ .sub-tab-guider { width: 110px; height: 37px; - background: url("../../assets/overview_images/sub-tab-guider-1366.png"); + /*background: url("../../assets/overview_images/sub-tab-guider-1366.png");*/ } .sub-tab-border { - width: 150px; - height: 186px; + width: 168px; + height: 104px; background: url("../../assets/overview_images/sub-tab-border-1366.png"); } .sub-tab-content { - font-size: 20px; + font-size: 16px; cursor: pointer; width: 145px; } diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue index 56c1970..604138d 100644 --- a/src/views/deviceManage/deviceDetail.vue +++ b/src/views/deviceManage/deviceDetail.vue @@ -4,24 +4,24 @@ - + - + - + - + @@ -30,13 +30,13 @@ - + - + @@ -45,13 +45,13 @@ - + - + @@ -60,13 +60,13 @@ - + - + @@ -75,7 +75,7 @@ - + @@ -201,13 +201,14 @@ }, // 身份证号加密显示 encrypIdCardNo(idCard) { - if (idCard.length > 6) { - return idCard.substr(0, 6) + '********' + idCard.substr(14) - } else if (idCard) { - return idCard - } else { - return '' - } + return idCard + // if (idCard.length > 6) { + // return idCard.substr(0, 6) + '********' + idCard.substr(14) + // } else if (idCard) { + // return idCard + // } else { + // return '' + // } } } } diff --git a/src/views/deviceManage/deviceList.vue b/src/views/deviceManage/deviceList.vue index 1fc121f..b4515a0 100644 --- a/src/views/deviceManage/deviceList.vue +++ b/src/views/deviceManage/deviceList.vue @@ -46,7 +46,7 @@
-
数据列表
 +
数据列表
 导出 @@ -273,11 +273,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/api/visitor.js b/src/api/visitor.js index 121d5e2..187fe16 100644 --- a/src/api/visitor.js +++ b/src/api/visitor.js @@ -27,6 +27,13 @@ params }) } +// 剩余车位 +export function leftCarport() { + return request({ + url: '/visitorCar/leftCarport', + method: 'get' + }) +} // 查询来访车辆 export function getVisitorCarList(params) { diff --git a/src/assets/overview_images/dev-box-1366.png b/src/assets/overview_images/dev-box-1366.png new file mode 100644 index 0000000..d111f2b --- /dev/null +++ b/src/assets/overview_images/dev-box-1366.png Binary files differ diff --git a/src/assets/overview_images/dev-box.png b/src/assets/overview_images/dev-box.png new file mode 100644 index 0000000..4b77c5d --- /dev/null +++ b/src/assets/overview_images/dev-box.png Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" new file mode 100644 index 0000000..fa07acd --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" new file mode 100644 index 0000000..bc8c4b6 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" new file mode 100644 index 0000000..5c56a20 --- /dev/null +++ "b/src/assets/overview_images/icons/\345\215\212\347\220\203-\350\223\235.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" new file mode 100644 index 0000000..14fc247 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\272\242.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" new file mode 100644 index 0000000..e8a0d66 --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\347\273\277.png" Binary files differ diff --git "a/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" new file mode 100644 index 0000000..3fe070e --- /dev/null +++ "b/src/assets/overview_images/icons/\347\220\203\346\234\272-\350\223\235.png" Binary files differ diff --git a/src/assets/overview_images/sub-tab-border-1366.png b/src/assets/overview_images/sub-tab-border-1366.png index 21c13c1..93bbefc 100644 --- a/src/assets/overview_images/sub-tab-border-1366.png +++ b/src/assets/overview_images/sub-tab-border-1366.png Binary files differ diff --git a/src/assets/overview_images/sub-tab-border.png b/src/assets/overview_images/sub-tab-border.png index 008d28d..0f94da3 100644 --- a/src/assets/overview_images/sub-tab-border.png +++ b/src/assets/overview_images/sub-tab-border.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked-1366.png b/src/assets/overview_images/tab-index-checked-1366.png index 2171e1c..df63c85 100644 --- a/src/assets/overview_images/tab-index-checked-1366.png +++ b/src/assets/overview_images/tab-index-checked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-checked.png b/src/assets/overview_images/tab-index-checked.png index 22f316b..d8af05f 100644 --- a/src/assets/overview_images/tab-index-checked.png +++ b/src/assets/overview_images/tab-index-checked.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked-1366.png b/src/assets/overview_images/tab-index-unchecked-1366.png index 59657f2..cd0dc63 100644 --- a/src/assets/overview_images/tab-index-unchecked-1366.png +++ b/src/assets/overview_images/tab-index-unchecked-1366.png Binary files differ diff --git a/src/assets/overview_images/tab-index-unchecked.png b/src/assets/overview_images/tab-index-unchecked.png index 2a247c0..f7a9f9f 100644 --- a/src/assets/overview_images/tab-index-unchecked.png +++ b/src/assets/overview_images/tab-index-unchecked.png Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" new file mode 100644 index 0000000..42e3ab7 --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206-1366.png" Binary files differ diff --git "a/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" new file mode 100644 index 0000000..d57441b --- /dev/null +++ "b/src/assets/overview_images/\344\277\241\346\201\257\346\241\206.png" Binary files differ diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js index 6bd1506..dc5aa92 100644 --- a/src/router/modules/doorSys.js +++ b/src/router/modules/doorSys.js @@ -212,6 +212,27 @@ ] }, { + path: '/door/area', + component: Layout, + redirect: '/door/area', + name: 'DoorArea', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/door/area'], // 权限名称 + sys: '/door' + }, + children: [ + { + path: '/door/area/list', + name: 'DoorAreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } + } + ] + }, + { path: '/door/device', component: Layout, redirect: '/door/device', @@ -276,26 +297,5 @@ meta: { title: '营门出入次数统计', icon: '', permission: ['/door/statistics/doorCount'], keepAlive: true } } ] - }, - { - path: '/door/area', - component: Layout, - redirect: '/door/area', - name: 'DoorArea', - alwaysShow: true, - meta: { - title: '区域管理', - icon: 'icon-area', // 图标 - permission: ['/door/area'], // 权限名称 - sys: '/door' - }, - children: [ - { - path: '/door/area/list', - name: 'DoorAreaList', - component: () => import('@/views/area/areaList'), - meta: { title: '区域列表', icon: '', permission: ['/door/area/list'], keepAlive: true } - } - ] } ] diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index ddc123c..a5137d5 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -16,7 +16,7 @@ position: relative; margin: 0 auto; .el-dialog__header { - background-color:rgb(48, 65, 86); + background-color: rgb(76, 142, 226); //background-color:rgb(47, 91, 114); .el-dialog__title{ color:white; diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 65abe46..86f8b09 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -63,13 +63,17 @@ // menu hover .submenu-title-noDropdown, .el-submenu__title { + //font-size: 15; &:hover { background-color: $menuHover !important; } } - + .sidebar-container .is-active > .el-submenu__title { + color: white !important; + //background-color: $subMenuHover !important; + } .is-active>.el-submenu__title { - color: $menuActiveText !important; + //color: $menuActiveText !important; background-color: $menuHover !important; } .el-menu-item.is-active { diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 28c9c7f..1eadf2f 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -3,19 +3,19 @@ $themeColor:rgb(48, 65, 86); $menuText:#000000; $subMenuText:#000000; -$menuActiveText:rgb(27, 177, 165); +$menuActiveText: rgb(0, 56, 123); //$menuActiveText:#ffffff; $subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 //$subMenuActiveText:#000000; //https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; +$menuBg:#0077ff; //$menuBg:#ffffff; -$menuHover:#263445; +$menuHover:#0077ff; //$menuHover:#6666cc; -$subMenuBg:#1f2d3d; +$subMenuBg: #4c8ee2; //$subMenuBg:#fcfcfc; -$subMenuHover:#001528; +$subMenuHover: #0077ff; //$subMenuHover:#6666cc; $sideBarWidth: 180px; diff --git a/src/utils/validate.js b/src/utils/validate.js index ce760ab..d651e43 100644 --- a/src/utils/validate.js +++ b/src/utils/validate.js @@ -105,14 +105,15 @@ // 手机号验证validator export const phoneValidator = (rule, value, callback) => { const reg = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/ + const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/ if (value !== '') { - if (reg.test(value) === false) { - callback(new Error('请输入正确的手机号')) + if (reg.test(value) === false && reg1.test(value) === false) { + callback(new Error('请输入正确的联系电话')) } else { callback() } } else { - callback(new Error('手机号不能为空')) + callback(new Error('联系电话不能为空')) } } @@ -140,7 +141,12 @@ const reg = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][\dABCDEFGHJKLNMxPQRSTUVWXYZ]{5}$/ const regNew = /^[京津晋冀蒙辽吉黑沪苏浙皖闽赣鲁豫鄂湘粤桂琼渝川贵云藏陕甘青宁新][ABCDEFGHJKLMNPQRSTUVWXY][1-9DF][1-9ABCDEFGHJKLMNPQRSTUVWXYZ]\d{3}[1-9DF]$/ if (value !== '') { - if (reg.test(value) === false && regNew.test(value) === false) { + // if (reg.test(value) === false && regNew.test(value) === false) { + // callback(new Error('请输入正确的车牌号')) + // } else { + // callback() + // } + if (value.length!==7 && value.length!==8) { callback(new Error('请输入正确的车牌号')) } else { callback() diff --git a/src/views/alarm/alarmList.vue b/src/views/alarm/alarmList.vue index 2601cfc..2956a74 100644 --- a/src/views/alarm/alarmList.vue +++ b/src/views/alarm/alarmList.vue @@ -46,7 +46,7 @@
-
数据列表
 +
数据列表
 导出 @@ -300,11 +300,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue index 4b47872..1b5efe8 100644 --- a/src/views/alarm/alarmNow.vue +++ b/src/views/alarm/alarmNow.vue @@ -46,7 +46,7 @@
-
数据列表
 +
数据列表
 导出 @@ -66,8 +66,8 @@ @@ -291,11 +291,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/alarm/alarmPosition.vue b/src/views/alarm/alarmPosition.vue index 402da42..2da9b2c 100644 --- a/src/views/alarm/alarmPosition.vue +++ b/src/views/alarm/alarmPosition.vue @@ -8,7 +8,7 @@ v-for="item in devList" :id="item.id" :key="item.id" - :style="{ position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" + :style="{ transform: 'rotate('+ item.angle +'deg)', position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" class="point-camera" @click="detailDev(item, $event)" />
@@ -363,12 +363,12 @@ height: 155px; } .dev-normal { - background: url("../../assets/overview_images/normal.png"); + background: url("../../assets/overview_images/dev-box.png"); background-size: contain; color: #00ff0c; } .dev-alarm { - background: url("../../assets/overview_images/alarm.png"); + background: url("../../assets/overview_images/dev-box.png"); background-size: contain; color: #ff0000; } @@ -665,10 +665,10 @@ } .dev-normal { - background: url("../../assets/overview_images/normal-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-alarm { - background: url("../../assets/overview_images/alarm-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-offline { background: url("../../assets/overview_images/offline-1366.png"); diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue index 11dc51f..d3ff751 100644 --- a/src/views/area/areaList.vue +++ b/src/views/area/areaList.vue @@ -29,7 +29,7 @@
-
数据列表
 +
数据列表
 @@ -228,11 +228,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue index 703ec7d..eff1053 100644 --- a/src/views/area/defenceDetail.vue +++ b/src/views/area/defenceDetail.vue @@ -4,13 +4,13 @@ - + - + @@ -19,13 +19,13 @@ - + - + @@ -42,7 +42,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/src/views/area/defenceList.vue b/src/views/area/defenceList.vue index 8649918..cb9c4b8 100644 --- a/src/views/area/defenceList.vue +++ b/src/views/area/defenceList.vue @@ -29,7 +29,7 @@
-
数据列表
 +
数据列表
 @@ -104,8 +104,8 @@ align: 'center' }, { - text: '设备状态', - value: 'deviceState', + text: '区域类别', + value: 'areaTypeName', align: 'center' }, { @@ -253,11 +253,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue index 633e353..ddb215f 100644 --- a/src/views/car/carAdd.vue +++ b/src/views/car/carAdd.vue @@ -4,7 +4,8 @@ - + + @@ -137,7 +138,10 @@ phone: row.phone, remark: row.remark } - this.getStaffList() + getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { + this.staffList = response.data + console.log(response) + }) } else if (dialogStatus === 'detail') { this.isDetailMode = true this.isEditMode = false @@ -152,7 +156,10 @@ deptName: row.deptName, ownerName: row.ownerName } - this.getStaffList() + getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { + this.staffList = response.data + console.log(response) + }) } }, // 清除数据 @@ -186,6 +193,7 @@ }) }, getStaffList(){ + this.dataForm.ownerId = '' getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { this.staffList = response.data console.log(response) diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue index d0c0176..8d924ff 100644 --- a/src/views/car/carList.vue +++ b/src/views/car/carList.vue @@ -29,7 +29,7 @@
-
数据列表
 +
数据列表
 导出 新增 @@ -259,11 +259,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/ctrl/overview.vue b/src/views/ctrl/overview.vue index f452ea5..e2c5f62 100644 --- a/src/views/ctrl/overview.vue +++ b/src/views/ctrl/overview.vue @@ -22,32 +22,32 @@
+
正常
-
正常
 +
报警
-
报警
 - -
- -
-
离线
- + + + + + + - -
- -
-
关闭
- + + + + + +
@@ -89,77 +89,93 @@ v-for="item in devList" :id="item.id" :key="item.id" - :style="{ position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" + :style="{ transform: 'rotate('+ item.angle +'deg)', position: 'absolute', top: item.y * imgSize.height / imgSizeOriginal.height + 'px', left: (item.x * imgSize.width / imgSizeOriginal.width + halfLeft) + 'px' }" class="point-camera" @click="detailDev(item, $event)" />
- - - - - 全部 +
+ + + + 人脸识别 - - - - - - - 摄像头 - 摄像头 - 人脸识别摄像头 - 车牌轨迹摄像头 - 周界防护预警摄像头 - 标准数字摄像头 - 智能球形摄像头 - 标准半球摄像头 - - - + + + + 车牌轨迹 - - - - - 电子围栏 + + + + 周界防护 - - - - - 温湿度 + + + + 标准数字 - - - - - 烟感 + + + + 智能球形 - - - - - 声光报警 + + + + 标准半球 - +
+ +
+ + + + 全部 + + + + + + 摄像头 + + + + + 电子围栏 + + + + + 温湿度 + + + + + 烟感 + + + + + + +
-
+
营区总览
三号楼
四号楼
-
+
@@ -231,12 +247,15 @@ components: { DeviceDetail }, data() { return { + showType: false, + wsPath: process.env.BASE_API+'/websocket/', title: getProject().title, bgImageSrc: tg_main, devListParams: { picture: '1', deviceTypes: [] }, + cameraClass:'dev-icon', dev: { alarm: 0, onLine: 0, @@ -300,10 +319,24 @@ }, // 设备详情表单 isFence: false, // 是否电子围栏设备 itemColor: '#f58a88', - checkDevType: [true, false, false, false, false, false] // 选中设备类型 + checkDevType: [true, false, false, false, false, false], // 选中设备类型 + checkDevType1: [false, false, false, false, false, false] // 摄像头类型 } }, + watch:{ + checkDevType: function(val) { + if(val[1]){ + this.cameraClass = 'dev-icon dev-type-selected' + }else{ + this.cameraClass = 'dev-icon' + } + } + }, mounted() { + window.addEventListener('click',this.handleKeyup) + this.wsPath = this.wsPath.replace(/http/,'ws') + console.log(this.wsPath) + // this.webSocket() this.initWindowSize() this.fetchData() @@ -317,6 +350,82 @@ } }, methods: { + handleKeyup(val){ //单击收起摄像头分类 + console.log(val) + var item = ['人脸识别','车牌轨迹','周界防护','标准数字','智能球形','标准半球'] + for(var i=0;i { + // that.$router.push({ + // path: '/overview', + // query: { refresh: true } + // }) + // } + }) + // } + } + // 监听socket错误 + this.socket.onerror = function() { + that.$notify({ + title: '服务器错误', + message: '无法接收实时报警信息,请检查服务器后重新刷新页面', + type: 'error', + duration: 0 + }) + } + // 监听socket关闭 + this.socket.onclose = function(e) { + console.log('WebSocket已关闭', e, new Date()) + } + } + }, handleSelect(key, keyPath) { this.selectDevByType(key,undefined) }, @@ -421,8 +530,7 @@ devTypes[i].className = 'dev-icon el-col el-col-24' } } - this.checkDevType = [false, false, false, false, false, false] - if(type.length>2){ + if(type !== 'camera'){ // 添加选中的样式 if (typeof event === 'undefined') { devTypes[0].className += ' dev-type-selected' @@ -430,13 +538,20 @@ event.currentTarget.className += ' dev-type-selected' } } - + if(type!=='camera'){ + this.checkDevType = [false, false, false, false, false, false] + this.checkDevType1 = [false, false, false, false, false, false] + } if (type === 'all') { this.devListParams.deviceTypes = [] this.checkDevType[0] = true - } else if (type === 'camera') { - this.devListParams.deviceTypes = cameraTypes.toString() - this.checkDevType[1] = true + } else if(type==='camera'){ + for(var i=0;i= 1920) { + if (this.winSize.width >= 1440) { this.$refs['sub-tab'].style.right = '290px' this.$refs['sub-tab'].style.top = '135px' - this.$refs['sub-tab-border'].style.right = '335px' - this.$refs['sub-tab-border'].style.top = '185px' + this.$refs['sub-tab-border'].style.right = '56px' + this.$refs['sub-tab-border'].style.top = '145px' - this.$refs['sub-tab-floor-3'].style.right = '340px' - this.$refs['sub-tab-floor-3'].style.top = '220px' - } else if (this.winSize.width >= 1366 && this.winSize.width < 1920) { + this.$refs['sub-tab-floor-3'].style.right = '70px' + this.$refs['sub-tab-floor-3'].style.top = '200px' + } else if (this.winSize.width < 1440) { this.$refs['sub-tab'].style.right = '215px' this.$refs['sub-tab'].style.top = '102px' - this.$refs['sub-tab-border'].style.right = '245px' - this.$refs['sub-tab-border'].style.top = '140px' + this.$refs['sub-tab-border'].style.right = '40px' + this.$refs['sub-tab-border'].style.top = '103px' - this.$refs['sub-tab-floor-3'].style.right = '245px' - this.$refs['sub-tab-floor-3'].style.top = '170px' + this.$refs['sub-tab-floor-3'].style.right = '50px' + this.$refs['sub-tab-floor-3'].style.top = '143px' } } else if (tab === 'four') { this.showSubTabGuider = true @@ -527,29 +646,30 @@ this.$refs['sub-tab-floor-4-1'].style.position = 'absolute' this.$refs['sub-tab-floor-4-5'].style.position = 'absolute' - if (this.winSize.width >= 1920) { + if (this.winSize.width >= 1440) { this.$refs['sub-tab'].style.right = '290px' this.$refs['sub-tab'].style.top = '210px' - this.$refs['sub-tab-border'].style.right = '335px' - this.$refs['sub-tab-border'].style.top = '260px' + this.$refs['sub-tab-border'].style.right = '56px' + this.$refs['sub-tab-border'].style.top = '288px' - this.$refs['sub-tab-floor-4-1'].style.right = '340px' - this.$refs['sub-tab-floor-4-1'].style.top = '300px' + this.$refs['sub-tab-floor-4-1'].style.right = '70px' + this.$refs['sub-tab-floor-4-1'].style.top = '330px' - this.$refs['sub-tab-floor-4-5'].style.right = '340px' - this.$refs['sub-tab-floor-4-5'].style.top = '350px' - } else if (this.winSize.width >= 1366 && this.winSize.width < 1920) { + this.$refs['sub-tab-floor-4-5'].style.right = '70px' + this.$refs['sub-tab-floor-4-5'].style.top = '370px' + } + else if (this.winSize.width < 1440) { this.$refs['sub-tab'].style.right = '215px' this.$refs['sub-tab'].style.top = '158px' - this.$refs['sub-tab-border'].style.right = '245px' - this.$refs['sub-tab-border'].style.top = '196px' + this.$refs['sub-tab-border'].style.right = '40px' + this.$refs['sub-tab-border'].style.top = '206px' - this.$refs['sub-tab-floor-4-1'].style.right = '245px' - this.$refs['sub-tab-floor-4-1'].style.top = '226px' + this.$refs['sub-tab-floor-4-1'].style.right = '50px' + this.$refs['sub-tab-floor-4-1'].style.top = '236px' - this.$refs['sub-tab-floor-4-5'].style.right = '245px' + this.$refs['sub-tab-floor-4-5'].style.right = '50px' this.$refs['sub-tab-floor-4-5'].style.top = '266px' } } else { @@ -605,9 +725,9 @@ this.showSmoking = true // 显示烟感 this.showSound = true // 显示声光报警器 if (this.winSize.width >= 1920) { - this.footLeft = (this.winSize.width - 5 * 210) / 2 + this.footLeft = (this.winSize.width - 4 * 210) / 2 } else if (this.winSize.width >= 1366 && this.winSize.width < 1920) { - this.footLeft = (this.winSize.width - 5 * 155) / 2 + this.footLeft = (this.winSize.width - 4 * 155) / 2 } } else if (index === 'tg_4_5') { this.bgImageSrc = tg_4_5 @@ -769,6 +889,7 @@ } .point-camera { background: url("../../assets/overview_images/icons/icon-camera-point.png"); + /*transform:rotate(60deg);*/ background-size: contain; @extend .point; } @@ -802,26 +923,32 @@ border-bottom-width: 0px; } .statis-block { - text-align: center; - margin-top: 20px; - font-size: 48px; + text-align: right; + margin-top: -20px; + margin-right: 40px; + font-size: 30px; } .sub-title { - text-align: center; - font-size: 32px; + text-align: left; + margin-left: 25px; + margin-top: 16px; + font-size: 30px; } .sub-data-block { - width: 122px; - height: 155px; + width: 215px; + height: 68px; } .dev-normal { - background: url("../../assets/overview_images/normal.png"); - background-size: contain; + background: url("../../assets/overview_images/dev-box.png"); + background-repeat: no-repeat; + background-size:cover; color: #00ff0c; } .dev-alarm { - background: url("../../assets/overview_images/alarm.png"); - background-size: contain; + background: url("../../assets/overview_images/dev-box.png"); + margin-left: 5px; + background-repeat: no-repeat; + background-size:cover; color: #ff0000; } .dev-offline { @@ -915,9 +1042,9 @@ .map-tab { position: absolute; - right: 20px; + right: 10px; top: 100px; - width: 300px; + width: 56px; button { margin: 5px 0px; } @@ -937,32 +1064,43 @@ } .map-index-button { position: relative; - width: 284px; - height: 74px; + width: 56px; + height: 144px; background: url("../../assets/overview_images/tab-index-unchecked.png"); - font-size: 32px; - line-height: 74px; + background-repeat:no-repeat; + writing-mode: vertical-rl; + font-size: 24px; + line-height: 30px; text-align: center; color: #FFFFFF; cursor: pointer; + padding:0px; + display:flex; + -webkit-display:flex; + flex-direction:column; + /* align-content: center; */ + /* vertical-align: middle; */ + justify-content:center; + } .index-selected { background: url("../../assets/overview_images/tab-index-checked.png"); + background-repeat:no-repeat; } .sub-tab-guider { width: 149px; height: 50px; - background: url("../../assets/overview_images/sub-tab-guider.png"); + /*background: url("../../assets/overview_images/sub-tab-guider.png");*/ } .sub-tab-border { - width: 204px; - height: 253px; + width: 235px; + height: 145px; background: url("../../assets/overview_images/sub-tab-border.png"); } .sub-tab-content { text-align: center; color: #FFFFFF; - font-size: 28px; + font-size: 20px; cursor: pointer; width: 200px; } @@ -1105,22 +1243,23 @@ } .statis-block { - margin-top: 16px; - font-size: 36px; + margin-top: -20px; + font-size: 24px; } .sub-title { + margin-top: 10px; font-size: 24px; } .sub-data-block { - width: 90px; - height: 114px; + width: 161px; + height: 51px; } .dev-normal { - background: url("../../assets/overview_images/normal-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-alarm { - background: url("../../assets/overview_images/alarm-1366.png"); + background: url("../../assets/overview_images/dev-box-1366.png"); } .dev-offline { background: url("../../assets/overview_images/offline-1366.png"); @@ -1154,9 +1293,9 @@ } .map-tab { - right: 16px; + right: 10px; top: 90px; - width: 215px; + width: 40px; button { margin: 5px 0px; } @@ -1172,11 +1311,11 @@ background: url("../../assets/overview_images/tab-bottom-bg-1366.png"); } .map-index-button { - width: 210px; - height: 56px; + width: 40px; + height: 103px; background: url("../../assets/overview_images/tab-index-unchecked-1366.png"); - font-size: 24px; - line-height: 56px; + font-size: 18px; + line-height: 25px; } .index-selected { background: url("../../assets/overview_images/tab-index-checked-1366.png"); @@ -1185,15 +1324,15 @@ .sub-tab-guider { width: 110px; height: 37px; - background: url("../../assets/overview_images/sub-tab-guider-1366.png"); + /*background: url("../../assets/overview_images/sub-tab-guider-1366.png");*/ } .sub-tab-border { - width: 150px; - height: 186px; + width: 168px; + height: 104px; background: url("../../assets/overview_images/sub-tab-border-1366.png"); } .sub-tab-content { - font-size: 20px; + font-size: 16px; cursor: pointer; width: 145px; } diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue index 56c1970..604138d 100644 --- a/src/views/deviceManage/deviceDetail.vue +++ b/src/views/deviceManage/deviceDetail.vue @@ -4,24 +4,24 @@ - + - + - + - + @@ -30,13 +30,13 @@ - + - + @@ -45,13 +45,13 @@ - + - + @@ -60,13 +60,13 @@ - + - + @@ -75,7 +75,7 @@ - + @@ -201,13 +201,14 @@ }, // 身份证号加密显示 encrypIdCardNo(idCard) { - if (idCard.length > 6) { - return idCard.substr(0, 6) + '********' + idCard.substr(14) - } else if (idCard) { - return idCard - } else { - return '' - } + return idCard + // if (idCard.length > 6) { + // return idCard.substr(0, 6) + '********' + idCard.substr(14) + // } else if (idCard) { + // return idCard + // } else { + // return '' + // } } } } diff --git a/src/views/deviceManage/deviceList.vue b/src/views/deviceManage/deviceList.vue index 1fc121f..b4515a0 100644 --- a/src/views/deviceManage/deviceList.vue +++ b/src/views/deviceManage/deviceList.vue @@ -46,7 +46,7 @@
-
数据列表
 +
数据列表
 导出 @@ -273,11 +273,11 @@ margin-bottom: 50px; } .table-title{ - background-color:rgba(243, 243, 243, 1); + background-color:rgba(76, 142, 226, 1); height: $tableTitleHeight; .title-header{ line-height:$tableTitleHeight; - color: #606266; + color: white; font-size: 15px; i{ margin-left: 5px; diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue index ab2fe26..8117f07 100644 --- a/src/views/layout/components/AppHeader.vue +++ b/src/views/layout/components/AppHeader.vue @@ -1,11 +1,12 @@