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