diff --git a/src/api/attendance.js b/src/api/attendance.js index 6de8870..a36af07 100644 --- a/src/api/attendance.js +++ b/src/api/attendance.js @@ -26,3 +26,11 @@ export function statistics(params,isLoading= true) { isLoading }) } + +export function preDistance(params) { + return request({ + method: 'get', + url: '/api/oa/attendance/pre-distance', + params + }) +} diff --git a/src/api/meeting.js b/src/api/meeting.js new file mode 100644 index 0000000..84be2fe --- /dev/null +++ b/src/api/meeting.js @@ -0,0 +1,44 @@ +import request from "@/utils/request"; + +export function index(params) { + return request({ + method: 'get', + url: '/api/oa/meeting/index', + params + }) +} + +export function show(params) { + return request({ + method: 'get', + url: '/api/oa/meeting/show', + params + }) +} + +export function save(data, isLoading = true) { + return request({ + method: 'post', + url: '/api/oa/meeting/save', + data, + isLoading + }) +} + +export function destroy(params, isLoading = true) { + return request({ + method: 'get', + url: '/api/oa/meeting/destroy', + params, + isLoading + }) +} + +export function check(params,isLoading=true) { + return request({ + method: 'get', + url: '/api/oa/meeting/check-time', + params, + isLoading + }) +} diff --git a/src/api/meetingRoom.js b/src/api/meetingRoom.js new file mode 100644 index 0000000..0c4b7f1 --- /dev/null +++ b/src/api/meetingRoom.js @@ -0,0 +1,34 @@ +import request from "@/utils/request"; +export function index(params) { + return request({ + method: 'get', + url: '/api/oa/meeting-room/index', + params + }) +} + +export function show(params) { + return request({ + method: 'get', + url: '/api/oa/meeting-room/show', + params + }) +} + +export function save(data, isLoading = true) { + return request({ + method: 'post', + url: '/api/oa/meeting-room/save', + data, + isLoading + }) +} + +export function destroy(params, isLoading = true) { + return request({ + method: 'get', + url: '/api/oa/meeting-room/destroy', + params, + isLoading + }) +} diff --git a/src/api/notice.js b/src/api/notice.js new file mode 100644 index 0000000..06440dd --- /dev/null +++ b/src/api/notice.js @@ -0,0 +1,34 @@ +import request from "@/utils/request"; +export function index(params) { + return request({ + method: 'get', + url: '/api/oa/notice/index', + params + }) +} + +export function show(params) { + return request({ + method: 'get', + url: '/api/oa/notice/show', + params + }) +} + +export function save(data, isLoading = true) { + return request({ + method: 'post', + url: '/api/oa/notice/save', + data, + isLoading + }) +} + +export function destroy(params, isLoading = true) { + return request({ + method: 'get', + url: '/api/oa/notice/destroy', + params, + isLoading + }) +} diff --git a/src/icons/svg/info.svg b/src/icons/svg/info.svg new file mode 100644 index 0000000..dee7a87 --- /dev/null +++ b/src/icons/svg/info.svg @@ -0,0 +1 @@ + diff --git a/src/utils/formBuilder.js b/src/utils/formBuilder.js index d8ba4f0..110327f 100644 --- a/src/utils/formBuilder.js +++ b/src/utils/formBuilder.js @@ -241,6 +241,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab placeholder: info.help_text, multiple: !!info.multiple, 'multiple-limit': info.multiple, + filterable: true }, style: { width: "100%", @@ -449,6 +450,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab placeholder: info.help_text, multiple: !!info.multiple, 'multiple-limit': info.multiple, + filterable: true }, attrs: { placeholder: info.help_text, @@ -483,6 +485,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab clearable: true, placeholder: info.help_text, multiple: true, + filterable: true }, attrs: { placeholder: info.help_text, @@ -709,7 +712,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab color: "#333", }, }, - info.multiple ? this.form[info.name]?.split('|').map(j => { + info.multiple ? this.form[info.name]?.toString()?.split('|')?.map(j => { return options.find((i) => typeof i === "object" ? i.id == j @@ -726,7 +729,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab color: "#333", }, }, - this.form[info.name]?.split('|').map(j => { + this.form[info.name]?.toString()?.split('|').map(j => { return options.find((i) => i.id == j)?.name; })?.toString() ); @@ -744,7 +747,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab color: "#333", }, }, - info.multiple ? this.form[info.name]?.split('|').map(j => { + info.multiple ? this.form[info.name]?.toString()?.split('|').map(j => { return options.find((i) => typeof i === "object" ? i.id == j diff --git a/src/views/MeetingRoom/components/AddMeetingRoom.vue b/src/views/MeetingRoom/components/AddMeetingRoom.vue new file mode 100644 index 0000000..35c37c5 --- /dev/null +++ b/src/views/MeetingRoom/components/AddMeetingRoom.vue @@ -0,0 +1,74 @@ + + + + + diff --git a/src/views/MeetingRoom/index.vue b/src/views/MeetingRoom/index.vue new file mode 100644 index 0000000..e740465 --- /dev/null +++ b/src/views/MeetingRoom/index.vue @@ -0,0 +1,190 @@ + + + + + diff --git a/src/views/attendance/index.vue b/src/views/attendance/index.vue index 5884a1b..d913c7a 100644 --- a/src/views/attendance/index.vue +++ b/src/views/attendance/index.vue @@ -5,23 +5,29 @@ -
-
打卡状态 {{ isGetLocation ? '可打卡' : '不可打卡' }}
-
当前位置: +
+
+
打卡状态 {{ isGetLocation ? isOutSign ? '外勤打卡' : '可打卡' : '不可打卡' }}
+
当前位置: {{pos.address}} ({{pos.lng}},{{pos.lat}})
-
当前距离:
-
最大打卡范围:
+
当前距离:{{ nowDistance }}
+
最大打卡范围:{{ maxDistance }}
+
+ +
+ +
- +
+ + diff --git a/src/views/meeting/index.vue b/src/views/meeting/index.vue new file mode 100644 index 0000000..7187679 --- /dev/null +++ b/src/views/meeting/index.vue @@ -0,0 +1,354 @@ + + + + + diff --git a/src/views/notice/components/AddNotice.vue b/src/views/notice/components/AddNotice.vue new file mode 100644 index 0000000..ab3d7f4 --- /dev/null +++ b/src/views/notice/components/AddNotice.vue @@ -0,0 +1,186 @@ + + + + + diff --git a/src/views/notice/index.vue b/src/views/notice/index.vue new file mode 100644 index 0000000..4baffd3 --- /dev/null +++ b/src/views/notice/index.vue @@ -0,0 +1,212 @@ + + + + +