Browse code Merge branch 'dev_atd' into dev # Conflicts: # src/main.js dev master
commit 0e733059cbd5711f7ee146e68de02a529243cefe 2 parents 38f83c4 + 4db8eb5 zhangyingjie authored on 5 Jun 2020

Showing 20 changed files

• README.md
• config/dev.env.js
• src/api/access.js
• src/api/attendance.js
• src/main.js
• src/router/index.js
• src/router/modules/attendance.js
• src/views/attendance/editRemarks.vue
• src/views/attendance/editSpecialDay.vue
• src/views/attendance/listReport.vue
• src/views/attendance/makeReport.vue
• src/views/attendance/regular.vue
• src/views/attendance/specialDay.vue
• src/views/doorManage/controlDoor.vue
• src/views/memberManage/addIris.vue
• src/views/memberManage/addPerson.vue
• src/views/memberManage/addPersonIris.vue
• src/views/memberManage/listStaff.vue
• src/views/memberManage/listVisitor.vue
• src/views/query/queryStaff.vue

Ignore Space Show notes View README.md

Ignore Space Show notes View config/dev.env.js

Ignore Space Show notes View src/api/access.js

Ignore Space Show notes View src/api/attendance.js 0 → 100644

Ignore Space Show notes View src/main.js

Ignore Space Show notes View src/router/index.js

Ignore Space Show notes View src/router/modules/attendance.js 0 → 100644

Ignore Space Show notes View src/views/attendance/editRemarks.vue 0 → 100644

Ignore Space Show notes View src/views/attendance/editSpecialDay.vue 0 → 100644

Ignore Space Show notes View src/views/attendance/listReport.vue 0 → 100644

Ignore Space Show notes View src/views/attendance/makeReport.vue 0 → 100644

Ignore Space Show notes View src/views/attendance/regular.vue 0 → 100644

Ignore Space Show notes View src/views/attendance/specialDay.vue 0 → 100644

Ignore Space Show notes View src/views/doorManage/controlDoor.vue

Ignore Space Show notes View src/views/memberManage/addIris.vue

Ignore Space Show notes View src/views/memberManage/addPerson.vue

Ignore Space Show notes View src/views/memberManage/addPersonIris.vue

Ignore Space Show notes View src/views/memberManage/listStaff.vue

Ignore Space Show notes View src/views/memberManage/listVisitor.vue

Ignore Space Show notes View src/views/query/queryStaff.vue

Show line notes below