解决冲突
dev
commit 352889c11444583e7229778e7d3919c01e47d101
2 parents 8c3d1a9 + 0d66bfa
dutingting authored on 8 Dec 2022
Showing 76 changed files
View
.env.production
View
.env.test
View
pnpm-lock.yaml
View
src/api/index.ts
View
src/api/measure/file.ts 0 → 100644
View
src/api/measure/person.ts 0 → 100644
View
src/api/system/area.ts
View
src/api/system/login.ts
View
src/api/system/plan.ts 0 → 100644
View
src/api/system/source.ts
View
src/assets/images/login-image/banner.png 0 → 100644
View
src/assets/images/login-image/bg.png 0 → 100644
View
src/assets/images/login-image/frame.png 0 → 100644
View
src/components/NormalTable/index.vue
View
src/components/SearchArea/SearchItem.vue
View
src/components/SearchArea/index.vue
View
src/components/TableContainer/index.vue
View
src/layouts/components/Header/index.vue
View
src/layouts/index.vue
View
src/main.ts
View
src/settings.ts
View
src/utils/exportXlsx.ts
View
src/views/login.vue
View
src/views/measure/file/approve.vue
View
src/views/measure/file/components/CNASfile.vue 0 → 100644
View
src/views/measure/file/components/addDialog.vue 0 → 100644
View
src/views/measure/file/components/approve/all.vue 0 → 100644
View
src/views/measure/file/components/approve/cancel.vue 0 → 100644
View
src/views/measure/file/components/approve/drafts.vue 0 → 100644
View
src/views/measure/file/components/approve/inApproval.vue 0 → 100644
View
src/views/measure/file/components/approve/passed.vue 0 → 100644
View
src/views/measure/file/components/approve/pending.vue 0 → 100644
View
src/views/measure/file/components/approve/templatePage.vue 0 → 100644
View
src/views/measure/file/components/approve/unPassed.vue 0 → 100644
View
src/views/measure/file/components/detailDialog.vue 0 → 100644
View
src/views/measure/file/components/homeworkFile.vue 0 → 100644
View
src/views/measure/file/components/programFile.vue 0 → 100644
View
src/views/measure/file/components/qualityManual.vue 0 → 100644
View
src/views/measure/file/components/statute.vue 0 → 100644
View
src/views/measure/file/components/technicalCapability.vue 0 → 100644
View
src/views/measure/file/components/templatePage.vue 0 → 100644
View
src/views/measure/file/file-interface.ts 0 → 100644
View
src/views/measure/file/manageMethod.vue
View
src/views/measure/file/measureRule.vue
View
src/views/measure/file/quality.vue
View
src/views/measure/file/rules.vue
View
src/views/measure/file/testingMethod.vue
View
src/views/measure/person/components/addPerson.vue 0 → 100644
View
src/views/measure/person/components/certificateAddDialog.vue 0 → 100644
View
src/views/measure/person/components/userListDialog.vue 0 → 100644
View
src/views/measure/person/list.vue
View
src/views/measure/person/person-interface.ts 0 → 100644
View
src/views/measure/source/list.vue
View
src/views/measure/source/listAdd.vue
View
src/views/measure/source/list_interface.ts
View
src/views/measure/train/plan.vue
View
src/views/measure/train/planAdd.vue 0 → 100644
View
src/views/measure/train/plan_interface.ts 0 → 100644
View
src/views/system/area/areaSelectTree.vue
View
src/views/system/area/editArea.vue
View
src/views/system/area/listArea.vue
View
src/views/system/dept/listDept.vue
View
src/views/system/dict/listDict.vue
View
src/views/system/log/listErrorLog.vue
View
src/views/system/log/listLog.vue
View
src/views/system/log/loginLog.vue
View
src/views/system/notice/noteList.vue
View
src/views/system/resource/listResource.vue
View
src/views/system/role/listRole.vue
View
src/views/system/tool/autograph/addDDialog.vue
View
src/views/system/tool/autograph/autograph.vue
View
src/views/system/tool/certificate/certificate.vue
View
src/views/system/tool/document/document.vue
View
src/views/system/tool/signature/signature.vue
View
src/views/system/user/listUser.vue
View
vite/plugins/html.ts