GitBucket
|
Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev
Conflicts: package.json pnpm-lock.yaml |
|---|
|
|
| package.json |
|---|
| pnpm-lock.yaml |
|---|
| src/api/measure/person.ts |
|---|
| src/api/system/bench.ts 0 → 100644 |
|---|
| src/api/system/price.ts 0 → 100644 |
|---|
| src/api/system/tool.ts |
|---|
| src/assets/images/bench/1671087276259.jpg 0 → 100644 |
|---|
|
|
| src/components.d.ts |
|---|
| src/components/echarts/index.vue 0 → 100644 |
|---|
| src/components/echarts/pie.vue 0 → 100644 |
|---|
| src/views/measure/bench/bench.vue |
|---|
| src/views/measure/file/approve.vue |
|---|
| src/views/measure/file/components/CNASfile.vue |
|---|
| src/views/measure/file/components/addDialog.vue |
|---|
| src/views/measure/file/components/approve/templatePage.vue |
|---|
| src/views/measure/file/components/homeworkFile.vue |
|---|
| src/views/measure/file/components/programFile.vue |
|---|
| src/views/measure/file/components/qualityManual.vue |
|---|
| src/views/measure/file/components/statute.vue |
|---|
| src/views/measure/file/components/technicalCapability.vue |
|---|
| src/views/measure/file/components/templatePage.vue |
|---|
| 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/measureDept/bm.vue |
|---|
| src/views/measure/measureDept/components/addDialog.vue |
|---|
| src/views/measure/measureDept/components/templatePage.vue |
|---|
| src/views/measure/measureDept/gcz.vue |
|---|
| src/views/measure/measureDept/ks.vue |
|---|
| src/views/measure/measureDept/measureDept-interface.ts |
|---|
| src/views/measure/person/certificateLog.vue |
|---|
| src/views/measure/person/components/addPerson.vue |
|---|
| src/views/measure/person/components/addRecord.vue 0 → 100644 |
|---|
| src/views/measure/person/components/certificateAddDialog.vue |
|---|
| src/views/measure/person/components/personListDialog.vue 0 → 100644 |
|---|
| src/views/measure/person/list.vue |
|---|
| src/views/measure/person/person-interface.ts |
|---|
| src/views/measure/person/remind.vue |
|---|
| src/views/measure/price/list.vue |
|---|
| src/views/measure/price/list_interface.ts 0 → 100644 |
|---|
| src/views/measure/price/priceAdd.vue 0 → 100644 |
|---|
| src/views/measure/source/approve.vue |
|---|
| src/views/measure/source/components/all.vue 0 → 100644 |
|---|
| src/views/measure/source/components/approvalPending.vue 0 → 100644 |
|---|
| src/views/measure/source/components/canceled.vue 0 → 100644 |
|---|
| src/views/measure/source/components/draftBox.vue 0 → 100644 |
|---|
| src/views/measure/source/components/examineAndApprove.vue 0 → 100644 |
|---|
| src/views/measure/source/components/listPage.vue 0 → 100644 |
|---|
| src/views/measure/source/components/notPass.vue 0 → 100644 |
|---|
| src/views/measure/source/components/passed.vue 0 → 100644 |
|---|
| src/views/measure/source/list.vue |
|---|
| src/views/measure/source/listAdd.vue |
|---|
| src/views/measure/train/plan.vue |
|---|
| src/views/measure/train/planAdd.vue |
|---|
| src/views/measure/train/plan_interface.ts |
|---|
| src/views/measure/train/trainLog.vue |
|---|
| src/views/measure/train/trainLogAdd.vue |
|---|
| src/views/system/notice/noteAdd.vue |
|---|
| src/views/system/notice/noteList.vue |
|---|
| src/views/system/notice/noticeDetail.vue |
|---|
| src/views/system/tool/autograph/addDDialog.vue |
|---|
| src/views/system/tool/autograph/autograph.vue |
|---|
| src/views/system/tool/certificate/addDDialog.vue |
|---|
| src/views/system/tool/certificate/certificate.vue |
|---|
| src/views/system/tool/document/addDDialog.vue |
|---|
| src/views/system/tool/document/document.vue |
|---|
| src/views/system/tool/showPhoto.vue 0 → 100644 |
|---|
| src/views/system/tool/signature/addDDialog.vue |
|---|
| src/views/system/tool/signature/signature.vue |
|---|
| src/views/system/tool/tool_interface.ts |
|---|